gentoo resync : 14.07.2018

4412 files changed, 19215 insertions, 70734 deletions

diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index fcfa85853fc0..c13c1df59214 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/abstract-deque-0.2.2 b/dev-haskell/abstract-deque-0.2.2
new file mode 100644
index 000000000000..df40d71c6ef9
--- /dev/null
+++ b/dev-haskell/abstract-deque-0.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/hunit:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/test-framework-0.6:=[profile?] >=dev-haskell/test-framework-hunit-0.2.7:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Abstract, parameterized interface to mutable Deques
+EAPI=5
+HOMEPAGE=https://github.com/rrnewton/haskell-lockfree-queue/wiki
+IUSE=usecas doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/hunit:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/test-framework-0.6:=[profile?] >=dev-haskell/test-framework-hunit-0.2.7:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.2.2
+SRC_URI=mirror://hackage/packages/archive/abstract-deque/0.2.2/abstract-deque-0.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8ef331b75fc8fc1e086b550723d8a7dd
diff --git a/dev-haskell/abstract-deque-0.3 b/dev-haskell/abstract-deque-0.3
new file mode 100644
index 000000000000..e0b56eda86ee
--- /dev/null
+++ b/dev-haskell/abstract-deque-0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= usecas? ( >=dev-haskell/atomic-primops-0.5.0.2:=[profile?] ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Abstract, parameterized interface to mutable Deques
+EAPI=5
+HOMEPAGE=https://github.com/rrnewton/haskell-lockfree/wiki
+IUSE=usecas doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= usecas? ( >=dev-haskell/atomic-primops-0.5.0.2:=[profile?] )
+SLOT=0/0.3
+SRC_URI=mirror://hackage/packages/archive/abstract-deque/0.3/abstract-deque-0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cdb38e9689c565635734cb3ef2a474a1
diff --git a/dev-haskell/abstract-deque-tests-0.3 b/dev-haskell/abstract-deque-tests-0.3
new file mode 100644
index 000000000000..1699b91961d8
--- /dev/null
+++ b/dev-haskell/abstract-deque-tests-0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/abstract-deque-0.3:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-haskell/test-framework-0.6:=[profile?] >=dev-haskell/test-framework-hunit-0.2.7:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A test-suite for any queue or double-ended queue satisfying an interface
+EAPI=5
+HOMEPAGE=https://github.com/rrnewton/haskell-lockfree/wiki
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/abstract-deque-0.3:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-haskell/test-framework-0.6:=[profile?] >=dev-haskell/test-framework-hunit-0.2.7:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/0.3
+SRC_URI=mirror://hackage/packages/archive/abstract-deque-tests/0.3/abstract-deque-tests-0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7e06a5ad461957f11fce6f6898a17d93
diff --git a/dev-haskell/abstract-deque-tests/Manifest b/dev-haskell/abstract-deque-tests/Manifest
deleted file mode 100644
index 44ce8ec2b9dc..000000000000
--- a/dev-haskell/abstract-deque-tests/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST abstract-deque-tests-0.3.tar.gz 11427 BLAKE2B 2a43e52bb0a5b7634f179e5857eb01d76429134345003fc2f3b14460363221940f8296ac3adc5f024e2578e684664092c2ec5c1b2eb45af378ec32011e1dca67 SHA512 0e7ecb27d156e91c156a81866a1854aabd0fa88b57598575fbacb578bbfa769ba4de699158e8e12a7d26afe583e2a397b871ac0c08819a5b63bef749f8c1c213
-EBUILD abstract-deque-tests-0.3.ebuild 824 BLAKE2B 4566bf964ffbeb58aa97dde39d1dee56ebe4f39f1031b75d6b2af67a6c47d4962d6e5985971f6fd9c59d1b83d47bae51dbb81bb30183d63c82119fa8da52bacf SHA512 427f0e1c98b6c9443185830c1e6bdda47a38f9d576862db760ed0544ba5509d1392bae5f147a9b17970e9b72498ecd6ce5ba71bf1908ba93e60cf50ff12d96e8
-MISC metadata.xml 504 BLAKE2B 43a84b77443bcffc071408db6b40340be83536e6e663b87a9ba5fe560cacf7c907b4c02d583bdfa8f5f3dc195773f25052d0be8ee96eb0cb9613f43faeeaa3be SHA512 29b76c3328560db5317d967fab5df09b35463b7cfc4dac465673ec970b471c0886e0b199fa6ea659b47e92edadc95a1a92c242c816f45b2318ac5d5b92ae6f38
diff --git a/dev-haskell/abstract-deque-tests/abstract-deque-tests-0.3.ebuild b/dev-haskell/abstract-deque-tests/abstract-deque-tests-0.3.ebuild
deleted file mode 100644
index 8c8001450cf2..000000000000
--- a/dev-haskell/abstract-deque-tests/abstract-deque-tests-0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A test-suite for any queue or double-ended queue satisfying an interface"
-HOMEPAGE="https://github.com/rrnewton/haskell-lockfree/wiki"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/abstract-deque-0.3:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?]
-	>=dev-haskell/test-framework-0.6:=[profile?]
-	>=dev-haskell/test-framework-hunit-0.2.7:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/abstract-deque-tests/metadata.xml b/dev-haskell/abstract-deque-tests/metadata.xml
deleted file mode 100644
index a1162f03bb91..000000000000
--- a/dev-haskell/abstract-deque-tests/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides tests that can be used with any queue implementation
-		that satisfies the `abstract-deque` interface.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">rrnewton/haskell-lockfree</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/abstract-deque/Manifest b/dev-haskell/abstract-deque/Manifest
deleted file mode 100644
index f3b684c25fd6..000000000000
--- a/dev-haskell/abstract-deque/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST abstract-deque-0.2.2.tar.gz 15771 BLAKE2B 91979cf7d95ddb1fb349cf767806c81e46d8f8820ef8986efa3e77aa123d3f271865204ab7deb34b25be7c3fb20b942008671f9a880cfda339c8a7527ab3e75e SHA512 0a572a4943b90c7a99955f522b790c1ba3149f29ff072927d4f49013e174491a48312dcbbc45df271196d8f90725ea1b9ecc60ed218f71646bbb703555ded1b9
-DIST abstract-deque-0.3.tar.gz 7219 BLAKE2B 46bb9997b6ff7dc111bafb650feaf35fa2955d2b2db34dbb964c982a042967bec5994b43e333b2b248717f6e486347a202b3abc2c688e305e9fa683b3ef59df6 SHA512 9293a366918f54458ffe13f6737bab2bee961b730732eff563d900b451bf5f7dde30276c9406bfc5c0ea64104afb70db3588b13d478bf9c60842dad906195f7a
-EBUILD abstract-deque-0.2.2.ebuild 844 BLAKE2B f1a93d4d693e7dfd733f1ed505141c7b4df125c02585ab1111c4623340d29a0d0ae81ebfc8271516ce718b8b615155a82812ec008822e807e3a662abd8bdedfa SHA512 3becd88656b3669122a81b9825b9743fc2ce0d72d260ebee72b2765d84767aa60276272cdf986e326c65adbb093cfb6334920d604b14a6862e13e8f3aebeb719
-EBUILD abstract-deque-0.3.ebuild 749 BLAKE2B 224d5d6c63defd51f084e0851d1b5a7976d15293de6a7c899dc149ddaf99f2a930db5b5d821c8d160c845fe5742199bbfe3edf83501998792c33b0fd460ddbda SHA512 346909dc21b3485222b27715b0aa5aa84155c204f624e55c4aea79c0c132b885552443cfa82606aee27211a2c4ef606e606edb37a4ea0375147fccc4608e7dd4
-MISC metadata.xml 1178 BLAKE2B 0e3b3bc8f5bd9fc0b9027f95f6ebfa7fa942ee1b81c229cc72d20a2fb0bc8d7c92bf486b472ef3159443fc12bfed64200e00d2c42bbc2090b9c7ecd1f67b4a87 SHA512 0cc30ac24a6ea65a0b9a66910d5f75ecc91a0daeb4f029eb2a6ff835788fac38aa4a286828ad0575cee2105df42ec19d72e5ce1553ef88963986e390f8d6ebfc
diff --git a/dev-haskell/abstract-deque/abstract-deque-0.2.2.ebuild b/dev-haskell/abstract-deque/abstract-deque-0.2.2.ebuild
deleted file mode 100644
index 1893b959bafd..000000000000
--- a/dev-haskell/abstract-deque/abstract-deque-0.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Abstract, parameterized interface to mutable Deques"
-HOMEPAGE="https://github.com/rrnewton/haskell-lockfree-queue/wiki"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="usecas"
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-		dev-haskell/random:=[profile?]
-		>=dev-haskell/test-framework-0.6:=[profile?]
-		>=dev-haskell/test-framework-hunit-0.2.7:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag usecas usecas)
-}
diff --git a/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild b/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild
deleted file mode 100644
index bb7dc38383c7..000000000000
--- a/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Abstract, parameterized interface to mutable Deques"
-HOMEPAGE="https://github.com/rrnewton/haskell-lockfree/wiki"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="usecas"
-
-RDEPEND="dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	usecas? ( >=dev-haskell/atomic-primops-0.5.0.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag usecas usecas)
-}
diff --git a/dev-haskell/abstract-deque/metadata.xml b/dev-haskell/abstract-deque/metadata.xml
deleted file mode 100644
index d611f698e043..000000000000
--- a/dev-haskell/abstract-deque/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		An abstract interface to highly-parameterizable queues/deques.
-		
-		Background: There exists a feature space for queues that extends between:
-		
-		* simple, single-ended, non-concurrent, bounded queues
-		
-		* double-ended, threadsafe, growable queues
-		
-		... with important points inbetween (such as
-		the queues used for work-stealing).
-		
-		This package includes an interface for Deques that allows the
-		programmer to use a single API for all of the above, while using the
-		type-system to select an efficient implementation given the
-		requirements (using type families).
-		
-		This package also includes a simple reference implementation based
-		on 'IORef' and "Data.Sequence".
-	</longdescription>
-	<use>
-		<flag name="usecas"> Enable the reference implementation to use hardware compare-and-swap.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">rrnewton/haskell-lockfree</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/abstract-par-0.3.3-r1 b/dev-haskell/abstract-par-0.3.3-r1
new file mode 100644
index 000000000000..36cc85ac9a7f
--- /dev/null
+++ b/dev-haskell/abstract-par-0.3.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Type classes generalizing the functionality of the 'monad-par' library
+EAPI=5
+HOMEPAGE=https://github.com/simonmar/monad-par
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.3
+SRC_URI=mirror://hackage/packages/archive/abstract-par/0.3.3/abstract-par-0.3.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c25da96b35f9a624d6eb3509d4310352
diff --git a/dev-haskell/abstract-par/Manifest b/dev-haskell/abstract-par/Manifest
deleted file mode 100644
index 1bd16afbe078..000000000000
--- a/dev-haskell/abstract-par/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST abstract-par-0.3.3.tar.gz 4714 BLAKE2B d43acc721fc7d4e0f9c9fc85f2edeb489ea145332173840d93bfac9b0bcffcc50a89cf33a1b0f8736c76fc894140ba8d45f13821bf1515491d012f0ee53915a7 SHA512 d603745202ececf5a514e5ac7da82fdd03dd27ec4fbb11a870a7b0a6c92e468cf3bd68763afa748434b3ed0ed5b80a1d2cefaa84c68a84b82028225400841605
-EBUILD abstract-par-0.3.3-r1.ebuild 579 BLAKE2B 2d7605be68bdecdf20261fdc411854d6c49ebf2f741b0f61f6893b83b31f3564bece751e69a1c2c8d038e460de0cd8fc3a1d87a2d99f159b36552babbebd5511 SHA512 22b52f003277793c38e12cc3afba062f6d69139ed2b4fa68496e4b38a0716222827d9da1ba853113548f750c12284a70aadc702fbd484d013e0a32f9fb81445f
-MISC metadata.xml 1070 BLAKE2B 6ac5c448d5a29dd1e4db15baa992adc943add6d164ca5e0260f5e2781b03bba9a0326e83980c7f7284849a4c53fbd18258ce96eeba47c79204ce97ff7df0e335 SHA512 c3857eb79d35fe107f199d71aa3942313592f8b0b3ef356dc29162d87d1f412046ca24dc73a8c084a7a444645343c4bfa3b2bd2ac4945dd9fcf11349422deb88
diff --git a/dev-haskell/abstract-par/abstract-par-0.3.3-r1.ebuild b/dev-haskell/abstract-par/abstract-par-0.3.3-r1.ebuild
deleted file mode 100644
index 6cd776de2721..000000000000
--- a/dev-haskell/abstract-par/abstract-par-0.3.3-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Type classes generalizing the functionality of the 'monad-par' library"
-HOMEPAGE="https://github.com/simonmar/monad-par"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/abstract-par/metadata.xml b/dev-haskell/abstract-par/metadata.xml
deleted file mode 100644
index 0dd7f40405b4..000000000000
--- a/dev-haskell/abstract-par/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The 'Par' monad(s) offer an alternative
-		parallel programming API to that provided by the
-		@parallel@ package.
-		A 'Par' monad allows the simple description of
-		parallel computations, and can be used to add
-		parallelism to pure Haskell code.  The basic API
-		is straightforward: a @Par@ monad supports forking
-		and simple communication in terms of 'IVar's.
-		This module is an interface module only. It
-		provides a number of type clasess, but not an
-		implementation.  The type classes separate different
-		levels of @Par@ functionality.  See the
-		"Control.Monad.Par.Class" module for more details.
-		The 'monad-par' library is one example of a
-		concrete library providing this interface.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">simonmar/monad-par</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/ac-ppm-1.1.1 b/dev-haskell/ac-ppm-1.1.1
new file mode 100644
index 000000000000..f875c5eeb215
--- /dev/null
+++ b/dev-haskell/ac-ppm-1.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Trivial package for writing PPM images
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/AC-PPM
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.1
+SRC_URI=mirror://hackage/packages/archive/AC-PPM/1.1.1/AC-PPM-1.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=38d787d9805e018f39ec6c83a21a9265
diff --git a/dev-haskell/ac-ppm/Manifest b/dev-haskell/ac-ppm/Manifest
deleted file mode 100644
index 9186485bb61d..000000000000
--- a/dev-haskell/ac-ppm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST AC-PPM-1.1.1.tar.gz 2958 BLAKE2B c2d5c96eebde31a45d8bd3c956687d01fc0c56906b841816bfcc80912831324fde0ccbb67f7aff99fc3efe4797fafcec554cd2599806168c9ea8c975d6f1eb0f SHA512 c296cb02fa9d70ca1f75bfdda8e307f66c800ac0e7b110bdd4af685c6acc506f3310456519d2445f850263baa22aa317266c68166bfcb551d297296d8c4de5ef
-EBUILD ac-ppm-1.1.1.ebuild 617 BLAKE2B 0d6db68d4a45704818dabfc1681889ed653f9c6dfff3f4b7f013a28172d858d07966cbf731a2fae98c9618e8137d09b4267e65e27f44c7a42502f5ef41cebdcc SHA512 adf3723ef10f9a920bfe43e72df19db72768be5efbaec264942b06f0307e245204afff2391aa2e47058f97c2b98b0a63e19e2b860e7bfe01575341119da76a37
-MISC metadata.xml 853 BLAKE2B 9e8a3c9d7ef69ba49739ae4e0befd08b0746eae2413064381c08b23a987e72cbc3f39ff44f1e1901675da0a868d7c41db25c2cd79aa8510ac2da2087558934eb SHA512 cc3e811eedb17c5d16bc84fcb4674fa2d21de42f8b6adec9c92a529664c44b6801a60b994bdb74cfb3ee21afaa167bf7549c8dab010004399e87c356e5ccc9d0
diff --git a/dev-haskell/ac-ppm/ac-ppm-1.1.1.ebuild b/dev-haskell/ac-ppm/ac-ppm-1.1.1.ebuild
deleted file mode 100644
index d04dbbbd7396..000000000000
--- a/dev-haskell/ac-ppm/ac-ppm-1.1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="AC-PPM"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Trivial package for writing PPM images"
-HOMEPAGE="http://hackage.haskell.org/package/AC-PPM"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/ac-ppm/metadata.xml b/dev-haskell/ac-ppm/metadata.xml
deleted file mode 100644
index 435999615a27..000000000000
--- a/dev-haskell/ac-ppm/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package is written in 100% Haskell and enables you to
-		write PPM (\&quot;Portable Pixel Map\&quot;) images in human-readable
-		text format as well as the more efficient binary format.
-		It uses the ByteString library for maximum efficiency.
-		For those that don&#39;t know, PPM is an image file format
-		which is trivially simple, but therefore horribly inefficient.
-		None the less, many programs can read PPM files, so this
-		package represents an easy way to write Haskell code that
-		generates images, without having to depend on any external
-		C code.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/adjunctions-4.2.2 b/dev-haskell/adjunctions-4.2.2
new file mode 100644
index 000000000000..6df063c4ac07
--- /dev/null
+++ b/dev-haskell/adjunctions-4.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.4:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/void-0.5.5.1:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Adjunctions and representable functors
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/adjunctions/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.4:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/void-0.5.5.1:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/4.2.2
+SRC_URI=mirror://hackage/packages/archive/adjunctions/4.2.2/adjunctions-4.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d63ae5f81e562c073d824f2326cf877a
diff --git a/dev-haskell/adjunctions-4.3 b/dev-haskell/adjunctions-4.3
new file mode 100644
index 000000000000..1576699ccf97
--- /dev/null
+++ b/dev-haskell/adjunctions-4.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.5:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/void-0.5.5.1:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Adjunctions and representable functors
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/adjunctions/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.5:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/void-0.5.5.1:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/4.3
+SRC_URI=mirror://hackage/packages/archive/adjunctions/4.3/adjunctions-4.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c325b0330baa23cd574a68b78d2fdb9e
diff --git a/dev-haskell/adjunctions/Manifest b/dev-haskell/adjunctions/Manifest
deleted file mode 100644
index d44cec35bef5..000000000000
--- a/dev-haskell/adjunctions/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST adjunctions-4.2.2.tar.gz 15442 BLAKE2B 8e8a7405aa4e2d0e17acae9c22220b9dea7b1cdf27aa7969143998c1f81710cc22e85d8f896b1c981e0b1d2557c2e84dff891c48fee1a7738020d1b34813a544 SHA512 039fd506839a1955d89e7c4ae3cb6c824e30a85b2f2e59de341b8b6f54bf2f363f047902a619dc35d6f86e5e71c1f1741181f1d2b86a233557d37b9f873cffdf
-DIST adjunctions-4.3.tar.gz 15651 BLAKE2B c63a84d01d50db942d6f6f58e8244322ee135eeee22f4816d01d7aeec314151a2f0a0fde2958d5c6707bfb59d008d5c6bdbab3a97da06ca442b12c76a538add8 SHA512 8045848e84627f4458b7784c5f50d81e6482daa9a9fea58eec32630cca825fc9a616474992b1ff74bb16f1ae4aeb464fa0ee1906d0e613f341138b39cda8ffa7
-EBUILD adjunctions-4.2.2.ebuild 1397 BLAKE2B d3c4a40f3747161b2c4ecb65918bc2df560b2d4c568a98f8beba767d1492be56a7d5d18d4bf9a836ba14b8d005e2f2ddc54beffcab79b4aa5a97db49466ffe41 SHA512 8808286bf6b626f9221d227677bff97343fdb3be21f6a8ea288b505fcdb2cd49be932f538593f789451c6aee4476cbbf59beddfe61811871f20f4c6b93c463c9
-EBUILD adjunctions-4.3.ebuild 1495 BLAKE2B b88ba53efeb98321c99b37ddb17b1bbc9b9e5ff151a4c6f02d30155cfcba60f7c9c99c70549e0836c40bfa9d8679f8eaea9d61414533a2e5bb37d69d2f5f2483 SHA512 7be9988a7149f5364bbe9511e2c7f42fd6bc9e8620a5cf90736171f7e6696a5d0e079cdd1e1168f0ebbbcb53ec22d810efac44c9c5be6c81beec0eb32f968409
-MISC metadata.xml 385 BLAKE2B 3c25c4215d88413d47e1b859f2c80d9caa7f0c822f022582dcdb8e6444754c65bb15a80327772c1a405ef6ddc38ef08abda615e174dd2d6e642268b906e7f6e4 SHA512 04b10eb6db339f470d8a50fa5288fb6bbc1d783497c788177cfa005b9ca3076b4fbf3d3897d18e3fcca910d08694b114e3cc0f480f3bbf64489251c9a9ec79c3
diff --git a/dev-haskell/adjunctions/adjunctions-4.2.2.ebuild b/dev-haskell/adjunctions/adjunctions-4.2.2.ebuild
deleted file mode 100644
index 94f79a16b72f..000000000000
--- a/dev-haskell/adjunctions/adjunctions-4.2.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Adjunctions and representable functors"
-HOMEPAGE="https://github.com/ekmett/adjunctions/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.4:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/void-0.5.5.1:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/adjunctions/adjunctions-4.3.ebuild b/dev-haskell/adjunctions/adjunctions-4.3.ebuild
deleted file mode 100644
index 1f6915ab2585..000000000000
--- a/dev-haskell/adjunctions/adjunctions-4.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Adjunctions and representable functors"
-HOMEPAGE="https://github.com/ekmett/adjunctions/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.5:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/void-0.5.5.1:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/adjunctions/metadata.xml b/dev-haskell/adjunctions/metadata.xml
deleted file mode 100644
index ad9ebf4754f9..000000000000
--- a/dev-haskell/adjunctions/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Adjunctions
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/adjunctions</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/aeson-0.6.2.1 b/dev-haskell/aeson-0.6.2.1
new file mode 100644
index 000000000000..85643e99d920
--- /dev/null
+++ b/dev-haskell/aeson-0.6.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.8.6.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/dlist-0.2:=[profile?] >=dev-haskell/hashable-1.1.2.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/text-0.11.1.0:=[profile?] >=dev-haskell/unordered-containers-0.1.3.0:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 test? ( dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast JSON parsing and encoding
+EAPI=5
+HOMEPAGE=https://github.com/bos/aeson
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.8.6.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/dlist-0.2:=[profile?] >=dev-haskell/hashable-1.1.2.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/text-0.11.1.0:=[profile?] >=dev-haskell/unordered-containers-0.1.3.0:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/0.6.2.1
+SRC_URI=mirror://hackage/packages/archive/aeson/0.6.2.1/aeson-0.6.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8d4a936a2b41633043b89ecd2ac77351
diff --git a/dev-haskell/aeson-0.7.0.6 b/dev-haskell/aeson-0.7.0.6
new file mode 100644
index 000000000000..59c8062ef9b7
--- /dev/null
+++ b/dev-haskell/aeson-0.7.0.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.11.3.4:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/dlist-0.2:=[profile?] >=dev-haskell/hashable-1.1.2.0:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/scientific-0.3.1:=[bytestring-builder,profile?] <dev-haskell/scientific-0.4:=[bytestring-builder,profile?] dev-haskell/syb:=[profile?] >=dev-haskell/text-0.11.1.0:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/attoparsec dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 dev-haskell/text dev-haskell/unordered-containers dev-haskell/vector ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast JSON parsing and encoding
+EAPI=5
+HOMEPAGE=https://github.com/bos/aeson
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.11.3.4:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/dlist-0.2:=[profile?] >=dev-haskell/hashable-1.1.2.0:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/scientific-0.3.1:=[bytestring-builder,profile?] <dev-haskell/scientific-0.4:=[bytestring-builder,profile?] dev-haskell/syb:=[profile?] >=dev-haskell/text-0.11.1.0:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.0.6
+SRC_URI=mirror://hackage/packages/archive/aeson/0.7.0.6/aeson-0.7.0.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f98b99201ec21eea70f610265ec955b0
diff --git a/dev-haskell/aeson-0.8.0.2 b/dev-haskell/aeson-0.8.0.2
new file mode 100644
index 000000000000..66b3597df147
--- /dev/null
+++ b/dev-haskell/aeson-0.8.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.11.3.4:=[profile?] >=dev-haskell/dlist-0.2:=[profile?] >=dev-haskell/hashable-1.1.2.0:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/scientific-0.3.1:=[bytestring-builder,profile?] <dev-haskell/scientific-0.4:=[bytestring-builder,profile?] dev-haskell/syb:=[profile?] >=dev-haskell/text-1.1.1.0:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast JSON parsing and encoding
+EAPI=5
+HOMEPAGE=https://github.com/bos/aeson
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.11.3.4:=[profile?] >=dev-haskell/dlist-0.2:=[profile?] >=dev-haskell/hashable-1.1.2.0:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/scientific-0.3.1:=[bytestring-builder,profile?] <dev-haskell/scientific-0.4:=[bytestring-builder,profile?] dev-haskell/syb:=[profile?] >=dev-haskell/text-1.1.1.0:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.8.0.2
+SRC_URI=mirror://hackage/packages/archive/aeson/0.8.0.2/aeson-0.8.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e1ea27407080d4998670062ed8b5cf16
diff --git a/dev-haskell/aeson-0.9.0.1 b/dev-haskell/aeson-0.9.0.1
new file mode 100644
index 000000000000..4abaecb3b019
--- /dev/null
+++ b/dev-haskell/aeson-0.9.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.13.0.0:=[profile?] >=dev-haskell/dlist-0.2:=[profile?] >=dev-haskell/hashable-1.1.2.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/scientific-0.3.1:=[bytestring-builder,profile?] <dev-haskell/scientific-0.4:=[bytestring-builder,profile?] dev-haskell/syb:=[profile?] >=dev-haskell/text-1.1.1.0:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/unordered-containers-0.2.5.0:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast JSON parsing and encoding
+EAPI=5
+HOMEPAGE=https://github.com/bos/aeson
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.13.0.0:=[profile?] >=dev-haskell/dlist-0.2:=[profile?] >=dev-haskell/hashable-1.1.2.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/scientific-0.3.1:=[bytestring-builder,profile?] <dev-haskell/scientific-0.4:=[bytestring-builder,profile?] dev-haskell/syb:=[profile?] >=dev-haskell/text-1.1.1.0:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/unordered-containers-0.2.5.0:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.9.0.1
+SRC_URI=mirror://hackage/packages/archive/aeson/0.9.0.1/aeson-0.9.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f55db9f9dff24a760249bb02ef3e6ebd
diff --git a/dev-haskell/aeson-1.0.2.1 b/dev-haskell/aeson-1.0.2.1
new file mode 100644
index 000000000000..c6f420d21a0a
--- /dev/null
+++ b/dev-haskell/aeson-1.0.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.13.0.1:=[profile?] >=dev-haskell/base-compat-0.9.1:=[profile?] <dev-haskell/base-compat-0.10:=[profile?] >=dev-haskell/dlist-0.2:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/hashable-1.1.2.0:=[profile?] >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/scientific-0.3.4.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18.2:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/tagged-0.8.3:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-1.1.1.0:=[profile?] >=dev-haskell/time-locale-compat-0.1.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5.0:=[profile?] >=dev-haskell/vector-0.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/base-orphans-0.5.3 <dev-haskell/base-orphans-0.6 dev-haskell/base16-bytestring >=dev-haskell/generic-deriving-1.10 <dev-haskell/generic-deriving-1.12 >=dev-haskell/hashable-1.2.4.0 >=dev-haskell/hashable-time-0.2 <dev-haskell/hashable-time-0.3 dev-haskell/hunit >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9.3 >=dev-haskell/quickcheck-instances-0.3.12 dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast JSON parsing and encoding
+EAPI=6
+HOMEPAGE=https://github.com/bos/aeson
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.13.0.1:=[profile?] >=dev-haskell/base-compat-0.9.1:=[profile?] <dev-haskell/base-compat-0.10:=[profile?] >=dev-haskell/dlist-0.2:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/hashable-1.1.2.0:=[profile?] >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/scientific-0.3.4.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18.2:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/tagged-0.8.3:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-1.1.1.0:=[profile?] >=dev-haskell/time-locale-compat-0.1.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5.0:=[profile?] >=dev-haskell/vector-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.0.2.1
+SRC_URI=mirror://hackage/packages/archive/aeson/1.0.2.1/aeson-1.0.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=69c56974735f16c14c077884ca097bce
diff --git a/dev-haskell/aeson-compat-0.3.6 b/dev-haskell/aeson-compat-0.3.6
new file mode 100644
index 000000000000..28ae22139ea0
--- /dev/null
+++ b/dev-haskell/aeson-compat-0.3.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.1:=[profile?] >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base-compat-0.6.0:=[profile?] <dev-haskell/base-compat-0.10:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.16.2.2:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/time-locale-compat-0.1.0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/base-orphans-0.4.5 <dev-haskell/base-orphans-0.6 >=dev-haskell/quickcheck-2.7.6 >=dev-haskell/quickcheck-instances-0.3 <dev-haskell/quickcheck-instances-0.3.13 >=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.12 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Compatibility layer for aeson
+EAPI=6
+HOMEPAGE=https://github.com/phadej/aeson-compat#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.1:=[profile?] >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base-compat-0.6.0:=[profile?] <dev-haskell/base-compat-0.10:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.16.2.2:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/time-locale-compat-0.1.0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.3.6
+SRC_URI=mirror://hackage/packages/archive/aeson-compat/0.3.6/aeson-compat-0.3.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=65e587028d00961d0375ab9d6e371a82
diff --git a/dev-haskell/aeson-compat/Manifest b/dev-haskell/aeson-compat/Manifest
deleted file mode 100644
index d991ef7d7f7e..000000000000
--- a/dev-haskell/aeson-compat/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aeson-compat-0.3.6.tar.gz 8956 BLAKE2B 82a201543c2719e2bffbca1682e4181980ea5a26b7f0df782b5a5db7f99cbd60c477988d011ef8149f9f93fe8740935ef1fd174881cff62431d830b82da08708 SHA512 2d2bd172a1335886894df73fbb999ce5b8ae5ff710866560278b4bcf27a5ef4a2ff025a0a97cc4f764e85819bf6a9771bdaf7acbd830f1baee5f3133ff5c185d
-EBUILD aeson-compat-0.3.6.ebuild 2125 BLAKE2B 81944fc3fbca23b90bcdab321f11dd8579fca5c17859b92428d8475deda8950afae149c90ac625edd0839df5aa9ffc466a64de08bb36a2c1a283d88c7d084ab8 SHA512 28c54c824f315e09efa048436dbee90a8f95829b5b1dcbab4ec54d94844f5faa8fd21b38d75e5df8accb65f93c5e95360920c50c15810724d6f854b30d81b34b
-MISC metadata.xml 406 BLAKE2B 1c0f6ca620c1db4eccc6f1cc9f681e86ec441b2319b1f634b6c4d6317da0446820e5aa7a3ba51b7e9d3068286f1af8eea8df1c78517a514870b9bbb66666dc55 SHA512 9e9212d62d26253da1ea61274f831d6e799d32b0d888be0b341df2dbda4edac71023beba570ac3b58f244359736ec51f9e20053962e6995696f824a247fe5283
diff --git a/dev-haskell/aeson-compat/aeson-compat-0.3.6.ebuild b/dev-haskell/aeson-compat/aeson-compat-0.3.6.ebuild
deleted file mode 100644
index b49b1bfea86f..000000000000
--- a/dev-haskell/aeson-compat/aeson-compat-0.3.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Compatibility layer for aeson"
-HOMEPAGE="https://github.com/phadej/aeson-compat#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.1:=[profile?]
-	>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/base-compat-0.6.0:=[profile?] <dev-haskell/base-compat-0.10:=[profile?]
-	>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
-	>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.16.2.2:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/time-locale-compat-0.1.0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/base-orphans-0.4.5 <dev-haskell/base-orphans-0.6
-		>=dev-haskell/quickcheck-2.7.6
-		>=dev-haskell/quickcheck-instances-0.3 <dev-haskell/quickcheck-instances-0.3.13
-		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck            >=2.7.6 && <2.9.2' 'QuickCheck            >=2.7.6'
-}
diff --git a/dev-haskell/aeson-compat/metadata.xml b/dev-haskell/aeson-compat/metadata.xml
deleted file mode 100644
index ae80fa7672b9..000000000000
--- a/dev-haskell/aeson-compat/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Compatibility layer for @aeson@
-	</longdescription>
-	<upstream>
-		<remote-id type="github">phadej/aeson-compat</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/aeson-pretty-0.7.1 b/dev-haskell/aeson-pretty-0.7.1
new file mode 100644
index 000000000000..6f808761188e
--- /dev/null
+++ b/dev-haskell/aeson-pretty-0.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.1.3.0:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-lang/ghc-6.10.4:= !lib-only? ( >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/cmdargs-0.7:=[profile?] ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=JSON pretty-printing library and command-line tool
+EAPI=5
+HOMEPAGE=https://github.com/informatikr/aeson-pretty
+IUSE=lib-only doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.1.3.0:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-lang/ghc-6.10.4:= !lib-only? ( >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/cmdargs-0.7:=[profile?] )
+SLOT=0/0.7.1
+SRC_URI=mirror://hackage/packages/archive/aeson-pretty/0.7.1/aeson-pretty-0.7.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d45989854b8725dc90808b23bc1925e5
diff --git a/dev-haskell/aeson-pretty-0.7.2 b/dev-haskell/aeson-pretty-0.7.2
new file mode 100644
index 000000000000..64e1dd23ecff
--- /dev/null
+++ b/dev-haskell/aeson-pretty-0.7.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.1.3.0:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-lang/ghc-7.4.1:= !lib-only? ( >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/cmdargs-0.7:=[profile?] ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=JSON pretty-printing library and command-line tool
+EAPI=5
+HOMEPAGE=https://github.com/informatikr/aeson-pretty
+IUSE=lib-only doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.1.3.0:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-lang/ghc-7.4.1:= !lib-only? ( >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/cmdargs-0.7:=[profile?] )
+SLOT=0/0.7.2
+SRC_URI=mirror://hackage/packages/archive/aeson-pretty/0.7.2/aeson-pretty-0.7.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7db84620bab44f43dd494bca3207fcf4
diff --git a/dev-haskell/aeson-pretty-0.8.2 b/dev-haskell/aeson-pretty-0.8.2
new file mode 100644
index 000000000000..4329fd487d1f
--- /dev/null
+++ b/dev-haskell/aeson-pretty-0.8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.10:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.1.3.0:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-lang/ghc-7.4.1:= !lib-only? ( >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/cmdargs-0.7:=[profile?] ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=JSON pretty-printing library and command-line tool
+EAPI=6
+HOMEPAGE=https://github.com/informatikr/aeson-pretty
+IUSE=lib-only doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.10:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.1.3.0:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-lang/ghc-7.4.1:= !lib-only? ( >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/cmdargs-0.7:=[profile?] )
+SLOT=0/0.8.2
+SRC_URI=mirror://hackage/packages/archive/aeson-pretty/0.8.2/aeson-pretty-0.8.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cafba6a904bdcb51f97086c18cdd0489
diff --git a/dev-haskell/aeson-pretty/Manifest b/dev-haskell/aeson-pretty/Manifest
deleted file mode 100644
index d372ca844a1d..000000000000
--- a/dev-haskell/aeson-pretty/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST aeson-pretty-0.7.1.tar.gz 4811 BLAKE2B 4a8cb1d51376cdc403f5bbff92b012ca6e88bc02283cfe2a0990611a7b74153d820a4d5b826b92f58d8afa14e67b5336453864add33e7716efd9bc0adc949cde SHA512 53522c5235b8252c0a293ebe6a988cfb7f61cc575df664a27851652a47b948acd322898e70e128c91d1aaf6b5bd27c8a1717edcc3ea423f34e7943791a301326
-DIST aeson-pretty-0.7.2.tar.gz 4838 BLAKE2B cc2ae346a7fbc13f854cf4bb716be68b2e45e2c15848cc5b77c15275fe0d43288a1987e5a95835ba923269612b8914338fca5e25c0ce66e59d9798a4e821ec55 SHA512 beabdb13c1a7c5a8fa7acdfe0e0f7b6b00d901d6aada360c17e43704cddd92d6464901885dd529710cc090c9649aa63b7241a5155178f0ff27145ed1ef4f347b
-DIST aeson-pretty-0.8.2.tar.gz 5456 BLAKE2B 7fef48f20aca649a49b84f79790ad7b6605c5f4655a5d8bea965104ffed0436449ebed7b6f40079164e86d4a016c7259fc48d35ce1e74caff5c805d7599bef15 SHA512 ec3af960b6afff9eb25d3679c23f8c627b9baeb0c10bcd9eb1ac60cc118988e6e47904d7e93bb4e260578fa41b58cfa7bd797fa5e0043c985a8f2b574b7d243a
-EBUILD aeson-pretty-0.7.1.ebuild 929 BLAKE2B 730ce642a74c2ca79effef53f87d96fbb61bb9535fa2a3798ad3279d4d5bf9d158ed05917b833aecb249a83c6c648e2eae2921610217e35d679595e4fbc16d5f SHA512 b052fda0758e1fbdc9c0f0984d9afe443ec65e19ae7d43a8e7f452416be990e00bf3226ac2d2be7aee47b062cc00e4b2323c240ca920db90d87e197a78ec1885
-EBUILD aeson-pretty-0.7.2.ebuild 930 BLAKE2B 7a7609b99fc9ae42c88cce39aab0762cc35e899b849e63f240f0c7f29c2fe95d954cc57cff3dc8eca8f9af335d82e17f4a7ea199b42d681da4d3f427ad773f64 SHA512 ce2b22da0330c71603fc8b75201b59bdbf106dc2596715057db98d45f4aa1155b33856db4fbb747868663cf263200d74eda01c0a24dfff72954e47d7cb6e9daf
-EBUILD aeson-pretty-0.8.2.ebuild 1049 BLAKE2B d7b3f71a518b7452489d63b56037afe9e5253da04e8e025cff9766f03fcf4990a1aecf69acfe3f6e3f12395889f715b3ee8bde0ed8dc69fee1a79178a8c6e738 SHA512 de48f2c94bed379600416bdbacf78ac872b7089b869ccb0fabda751b72d1d9d8f612e1b23b6409c909f148f787987bc08f9211d82b45e08760f996ab3359dea2
-MISC metadata.xml 1084 BLAKE2B f7a8caf4e37967a6615328a96b204cccaf8229576767137cdbe65184ead5c2ea543c6f4c69927c603e2f71d96e4c2887b725f18011a7fd25c91d7f6127d64d0e SHA512 9561989967c30ea725461606c5e3200220cc5d32d71b726a4aff0e7e88b4638c02bcb4459e2ffe460e2f0a673d1ec35fe08506e526534be06627b22af23b9713
diff --git a/dev-haskell/aeson-pretty/aeson-pretty-0.7.1.ebuild b/dev-haskell/aeson-pretty/aeson-pretty-0.7.1.ebuild
deleted file mode 100644
index a56fbc759635..000000000000
--- a/dev-haskell/aeson-pretty/aeson-pretty-0.7.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="JSON pretty-printing library and command-line tool"
-HOMEPAGE="https://github.com/informatikr/aeson-pretty"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="lib-only"
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/unordered-containers-0.1.3.0:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	!lib-only? ( >=dev-haskell/attoparsec-0.10:=[profile?]
-			>=dev-haskell/cmdargs-0.7:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag lib-only lib-only)
-}
diff --git a/dev-haskell/aeson-pretty/aeson-pretty-0.7.2.ebuild b/dev-haskell/aeson-pretty/aeson-pretty-0.7.2.ebuild
deleted file mode 100644
index 88b6216f42af..000000000000
--- a/dev-haskell/aeson-pretty/aeson-pretty-0.7.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="JSON pretty-printing library and command-line tool"
-HOMEPAGE="https://github.com/informatikr/aeson-pretty"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="lib-only"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/unordered-containers-0.1.3.0:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	!lib-only? ( >=dev-haskell/attoparsec-0.10:=[profile?]
-			>=dev-haskell/cmdargs-0.7:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag lib-only lib-only)
-}
diff --git a/dev-haskell/aeson-pretty/aeson-pretty-0.8.2.ebuild b/dev-haskell/aeson-pretty/aeson-pretty-0.8.2.ebuild
deleted file mode 100644
index 34d902e691c0..000000000000
--- a/dev-haskell/aeson-pretty/aeson-pretty-0.8.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="JSON pretty-printing library and command-line tool"
-HOMEPAGE="https://github.com/informatikr/aeson-pretty"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="lib-only"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.10:=[profile?]
-	>=dev-haskell/scientific-0.3:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/unordered-containers-0.1.3.0:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	!lib-only? ( >=dev-haskell/attoparsec-0.10:=[profile?]
-			>=dev-haskell/cmdargs-0.7:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag lib-only lib-only)
-}
diff --git a/dev-haskell/aeson-pretty/metadata.xml b/dev-haskell/aeson-pretty/metadata.xml
deleted file mode 100644
index a7cb017d960f..000000000000
--- a/dev-haskell/aeson-pretty/metadata.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="lib-only">don't build 'aeson-pretty' executable.</flag>
-	</use>
-	<longdescription>
-		A JSON pretty-printing library compatible with aeson as well as
-		a command-line tool to improve readabilty of streams of JSON data.
-		
-		The /library/ provides the function "encodePretty". It is a drop-in
-		replacement for aeson's "encode" function, producing JSON-ByteStrings for
-		human readers.
-		
-		The /command-line tool/ reads JSON from stdin and writes prettified JSON
-		to stdout. It also offers a complementary "compact"-mode, essentially the
-		opposite of pretty-printing. If you specify @-flib-only@ like this
-		
-		&gt; cabal install -flib-only aeson-pretty
-		
-		the command-line tool will NOT be installed.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">informatikr/aeson-pretty</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/aeson-qq-0.7.4 b/dev-haskell/aeson-qq-0.7.4
new file mode 100644
index 000000000000..052db0099672
--- /dev/null
+++ b/dev-haskell/aeson-qq-0.7.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/haskell-src-meta-0.1.0:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/text:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=JSON quasiquoter for Haskell
+EAPI=5
+HOMEPAGE=https://github.com/zalora/aeson-qq
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/haskell-src-meta-0.1.0:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/text:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.4
+SRC_URI=mirror://hackage/packages/archive/aeson-qq/0.7.4/aeson-qq-0.7.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=81bb01b5bbebc305846692f1770bd635
diff --git a/dev-haskell/aeson-qq-0.8.1 b/dev-haskell/aeson-qq-0.8.1
new file mode 100644
index 000000000000..3d4e5415fcfd
--- /dev/null
+++ b/dev-haskell/aeson-qq-0.8.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.6:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base-compat:=[profile?] >=dev-haskell/haskell-src-meta-0.1.0:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=JSON quasiquoter for Haskell
+EAPI=5
+HOMEPAGE=https://github.com/zalora/aeson-qq
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base-compat:=[profile?] >=dev-haskell/haskell-src-meta-0.1.0:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.8.1
+SRC_URI=mirror://hackage/packages/archive/aeson-qq/0.8.1/aeson-qq-0.8.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=34de90dcabf8b1107102193cb149193a
diff --git a/dev-haskell/aeson-qq/Manifest b/dev-haskell/aeson-qq/Manifest
deleted file mode 100644
index 7560b12fedaf..000000000000
--- a/dev-haskell/aeson-qq/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST aeson-qq-0.7.4.tar.gz 4202 BLAKE2B adf425ea18b06658aaa509693a65a80d8bac4aa46013e9d30de9b8e46772239ab18ccb975207c95b773e2253722a347c36ed5417a112c751f91a1b92ee8b8464 SHA512 4ca302f27d03698d661bf04c8fa2cfb2d725988e694f62bddfd0ae544e64c6b4980b796cf4b85e13fd9ae289922b242e649abc71df2588306cd024d38e7d90fb
-DIST aeson-qq-0.8.1.tar.gz 4286 BLAKE2B 1b1e66d5a9c3f67f43b46665f246c1e83ffdcb92193be69614d49a8236f54b9ad97ca2304bb7e7100c246e682e68cf6ec81ebe3c3fcb1e8019986507a8a45630 SHA512 b1c697c60b7ec721f7801f5ff242ddceaa19a9ada257e7c6b3d3ef502163c058a50bed1110f8fbf761fa8f3da79abec33a04edb2b6555b0d6cf9a0710ad0302d
-EBUILD aeson-qq-0.7.4.ebuild 753 BLAKE2B 74d6b30392c3c3a591f3fadd1974b1780fd593592df52c96b4b8849718e1cdc598f77aecff337040ccb6c9efdf5dffc7f36f718d7244df737c353b07100055e5 SHA512 cd1d9ca242f383f3d1ce4dce411cbcee176f7e311dde02f68531cda7bfb09facccead34fee185aaa997f49afe5c7654e896913eca954a1a879c34da72712f2fe
-EBUILD aeson-qq-0.8.1.ebuild 864 BLAKE2B 3e8f878675ccbac75a0f582d8398d50bbabd0be803373a693573c6642b9316e62b92a6a163392ffffe99713b36eee3c7a06aa15f2ab8e0e82c3ce5a424a9131d SHA512 ae48792e929d0e9147fcc6242b50b7913c6c653fdac6fe9d6f7d9028f5df180bc7ac172c4d0b265ff60aa49bb3512e5160c29234ac5a88e7f26d8d965dd8ce2b
-MISC metadata.xml 727 BLAKE2B fb4fc94b0cc95d9e0a31529f45dfaab83c09c0d81ae64f0334e40054c12cfcacb93fbf8293eb2b99722c32b63bf66ebde6119af30af45b4a40212a462c42b935 SHA512 a8ad3155394526f744fa3a5aac2940a93817d5c8237d57ccb393afb3077a5c135bffb8ebee3f2208e20968e47c6f861deb24c9d46e6f75f887ec94dd311ba0f5
diff --git a/dev-haskell/aeson-qq/aeson-qq-0.7.4.ebuild b/dev-haskell/aeson-qq/aeson-qq-0.7.4.ebuild
deleted file mode 100644
index e2f11d086e5d..000000000000
--- a/dev-haskell/aeson-qq/aeson-qq-0.7.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="JSON quasiquoter for Haskell"
-HOMEPAGE="https://github.com/zalora/aeson-qq"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
-	>=dev-haskell/haskell-src-meta-0.1.0:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/aeson-qq/aeson-qq-0.8.1.ebuild b/dev-haskell/aeson-qq/aeson-qq-0.8.1.ebuild
deleted file mode 100644
index 1f3a0e44a09f..000000000000
--- a/dev-haskell/aeson-qq/aeson-qq-0.8.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="JSON quasiquoter for Haskell"
-HOMEPAGE="https://github.com/zalora/aeson-qq"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/base-compat:=[profile?]
-	>=dev-haskell/haskell-src-meta-0.1.0:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/aeson-qq/metadata.xml b/dev-haskell/aeson-qq/metadata.xml
deleted file mode 100644
index 93baffe1b288..000000000000
--- a/dev-haskell/aeson-qq/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		@aeson-qq@ provides a JSON quasiquoter for Haskell.
-		
-		This package exposes the function `aesonQQ` that compile-time
-		converts a string representation of a JSON value into a
-		`Data.Aeson.Value`.  `aesonQQ` has the signature
-		
-		&gt;aesonQQ :: QuasiQuoter
-		
-		Consult the @README@ for documentation:
-		&lt;https://github.com/zalora/aeson-qq#readme&gt;
-	</longdescription>
-	<upstream>
-		<remote-id type="github">zalora/aeson-qq</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/aeson/Manifest b/dev-haskell/aeson/Manifest
deleted file mode 100644
index 4295103810dd..000000000000
--- a/dev-haskell/aeson/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST aeson-0.6.2.1.tar.gz 110417 BLAKE2B 718321a0042771672e0e713ac35572f00e4e8feb1f9a4ed5e44c1b9e483aea6c6690f2c0107d8d1c23638308a14779efd5f90b7e0d026e23d49a9806d0ab5ae6 SHA512 01bd894f09a7e09ceb8cf3112dcb2dc290886d042c85f6db464526118767a1159ba94296f0419e500ab4059d7dc4f3a4e3a5e46aed0e032cc2e263ae207cc0ad
-DIST aeson-0.7.0.6.tar.gz 141565 BLAKE2B cad9f7826ee36241414341a50ad3bc5f2540412f667096cb0a3a6c8ac266c68a74bc887c58f89ee265693f2a60e096b016dcc21c99e0479dd6f27950e0476bd4 SHA512 68a34188e3fb3a4c99a9b2380b5b0e294c2e4a11321162cda7fc6b73c81e6706d51f77c069df4ada68e372867891fdee9ca2443993f802b06aa5137170e613ea
-DIST aeson-0.8.0.2.tar.gz 143850 BLAKE2B 23c8167d29d9ce82b43ca07904ba21bb6e6c8fba8a0bd2cc4a94bdc6869b338f728238d5a824425b2438515b39f0aedcf3d105d0a37315bf955c0f1cd623ea0f SHA512 fb5a976302b1422c11b0d20848dfa6b9f596874e59dd325868269fd61f4b2ee2b4bf12683c3758d7f24566564cfddb6426e64fb1f159bb8feb2eb35fb223caf0
-DIST aeson-0.9.0.1.tar.gz 154482 BLAKE2B 4ad5b665b1659279f5788c8a665916adc487bbd74138886b0dbf71eecfeba47d65734173e54062bcbee051f41bd7a536cd331c5f8b57c64a2b3aa4881f314df3 SHA512 04de524b10843fb12f8d51e72560d67a94e761edb515c472d891a61b56ab867c8fd8ed26d5fd7b2dc637a9b7ac1705e764a104e9253342984b755bb0f0e9128c
-DIST aeson-1.0.2.1.tar.gz 241837 BLAKE2B a8a4e0c9315c0e3b1a35ea9f87945200a324383e0cdcaf941809fbfb55f4c5d9e94206059d1457a3e825c2a52fdad16544e0b3aba09c35957829a15b28972199 SHA512 2647cc22cec7bfbb9ac27e20a471333a7abd436bd338d8069093259fdf3829b04c16043ff669382461a4fdfa84dfd4f59837ece704f7a773ebf4aca21afa5e8e
-EBUILD aeson-0.6.2.1.ebuild 1120 BLAKE2B b35b90dbca16a34426defc8e757a113a7860048b781882a416dbc4269cce12a749a6899ebbe5671ae9ffc2289193f349fc3b6c3e82fead358ab8250c2086c65c SHA512 f363e95b80b52cdd9c0c69fe3e73e5ecb8c5250f39e3ae3dcf6d69eba0b182628354b46429eab53b0e54b3c0e6c8089acb3d84b9d7a96159a17455d9751898bd
-EBUILD aeson-0.7.0.6.ebuild 1391 BLAKE2B 8262e174b0188a72ddd259ece040668e50447a0d3a4e5d96dd0b80fa298a49717c2411414dde934366e5146ba256b22149f282e38cc4f235599d6464baef024c SHA512 47950cb99ba69512bd8e20a428f5daccbbb61d7bd097693631b94c2146ca2c8295fc797edbff9ad9ed42540ea4f80658185f162d3da6c4cc4b83d609cbace460
-EBUILD aeson-0.8.0.2.ebuild 1250 BLAKE2B a8c057bb47ec9598a2b2fd531058df1ec6615f0c6e393e14d353ef4fb5a6c9ab383ad0a51b318771aac09361efe076d297128f2c221e03c5b24b86354b9d9495 SHA512 85e43b5bfd36ad9e956cdc251000a8aa00db10140622c08c90178df0f12c607d2016660d4f7c3bd108223bc4a731a288d8a2c908d8fd29037f70e4db5e4e572d
-EBUILD aeson-0.9.0.1.ebuild 1322 BLAKE2B ba2606aa0e75c804dcf36b4d0d70b6c7a6858a7c3753943cbfb5d09107722f40adea7d92ce4168547107b198cc8b4202ce260f5e2587c97261682488fb5eafbf SHA512 8f2bce845c1b6e7760be3de56a414654b2bdd5a0cff801b5e09aea9f5d809b5700cfc222c9878643198d7ed04090b83f3eb5194d3715fe6d64aee2172d68166e
-EBUILD aeson-1.0.2.1.ebuild 2060 BLAKE2B 204f2f69ce8fbdf5b4ebc8f4153b3fb8b3f9bb6788a163dea23ce9ccd93f3141ca5b5ba6830d56e608c2753077cdaebf776e864b1bb203f64d5f00fee5af5301 SHA512 ab9f28ac38d11367d9dba91cdaffd9b6e67cdf9719a71f92a60443619a5a949f4fcbfc3fcc5f99229667819d49806ba8f16ab1da104406d7c4196610a900bfc8
-MISC metadata.xml 2376 BLAKE2B 287afc42dbc1f2e4bb1797968830fa1098d07d573f700eed42c06d5ba1b78e9cd578dc343ed753684316bd2168fd61c1428eea9c249db530b9741f65db95f698 SHA512 413b1102c88c193a86c563e1a74a9a6320a312037b5992d862ffd889d345917a8c9d406f49e2c05e8eb95d436676d4e69cce4fa0a267d33b772ecadb45a70e2e
diff --git a/dev-haskell/aeson/aeson-0.6.2.1.ebuild b/dev-haskell/aeson/aeson-0.6.2.1.ebuild
deleted file mode 100644
index 23adce15f660..000000000000
--- a/dev-haskell/aeson/aeson-0.6.2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast JSON parsing and encoding"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.8.6.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	>=dev-haskell/dlist-0.2:=[profile?]
-	>=dev-haskell/hashable-1.1.2.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/text-0.11.1.0:=[profile?]
-	>=dev-haskell/unordered-containers-0.1.3.0:=[profile?]
-	>=dev-haskell/vector-0.7.1:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-quickcheck2 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/aeson/aeson-0.7.0.6.ebuild b/dev-haskell/aeson/aeson-0.7.0.6.ebuild
deleted file mode 100644
index 6fa59a1789c1..000000000000
--- a/dev-haskell/aeson/aeson-0.7.0.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast JSON parsing and encoding"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.11.3.4:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	>=dev-haskell/dlist-0.2:=[profile?]
-	>=dev-haskell/hashable-1.1.2.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/scientific-0.3.1:=[bytestring-builder,profile?] <dev-haskell/scientific-0.4:=[bytestring-builder,profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/text-0.11.1.0:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.3.0:=[profile?]
-	>=dev-haskell/vector-0.7.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/attoparsec
-		dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2
-		dev-haskell/text
-		dev-haskell/unordered-containers
-		dev-haskell/vector )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/aeson/aeson-0.8.0.2.ebuild b/dev-haskell/aeson/aeson-0.8.0.2.ebuild
deleted file mode 100644
index 46596b061de1..000000000000
--- a/dev-haskell/aeson/aeson-0.8.0.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast JSON parsing and encoding"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.11.3.4:=[profile?]
-	>=dev-haskell/dlist-0.2:=[profile?]
-	>=dev-haskell/hashable-1.1.2.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/scientific-0.3.1:=[bytestring-builder,profile?] <dev-haskell/scientific-0.4:=[bytestring-builder,profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/text-1.1.1.0:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.3.0:=[profile?]
-	>=dev-haskell/vector-0.7.1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/aeson/aeson-0.9.0.1.ebuild b/dev-haskell/aeson/aeson-0.9.0.1.ebuild
deleted file mode 100644
index 971fe7c9edf2..000000000000
--- a/dev-haskell/aeson/aeson-0.9.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast JSON parsing and encoding"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.13.0.0:=[profile?]
-	>=dev-haskell/dlist-0.2:=[profile?]
-	>=dev-haskell/hashable-1.1.2.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-haskell/scientific-0.3.1:=[bytestring-builder,profile?] <dev-haskell/scientific-0.4:=[bytestring-builder,profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/text-1.1.1.0:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.5.0:=[profile?]
-	>=dev-haskell/vector-0.7.1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/aeson/aeson-1.0.2.1.ebuild b/dev-haskell/aeson/aeson-1.0.2.1.ebuild
deleted file mode 100644
index c6080d1b95ea..000000000000
--- a/dev-haskell/aeson/aeson-1.0.2.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -developer,-fast
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast JSON parsing and encoding"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.13.0.1:=[profile?]
-	>=dev-haskell/base-compat-0.9.1:=[profile?] <dev-haskell/base-compat-0.10:=[profile?]
-	>=dev-haskell/dlist-0.2:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/hashable-1.1.2.0:=[profile?]
-	>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/scientific-0.3.4.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.18.2:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/tagged-0.8.3:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/text-1.1.1.0:=[profile?]
-	>=dev-haskell/time-locale-compat-0.1.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.5.0:=[profile?]
-	>=dev-haskell/vector-0.8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/base-orphans-0.5.3 <dev-haskell/base-orphans-0.6
-		dev-haskell/base16-bytestring
-		>=dev-haskell/generic-deriving-1.10 <dev-haskell/generic-deriving-1.12
-		>=dev-haskell/hashable-1.2.4.0
-		>=dev-haskell/hashable-time-0.2 <dev-haskell/hashable-time-0.3
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9.3
-		>=dev-haskell/quickcheck-instances-0.3.12
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer \
-		--flag=-fast
-}
diff --git a/dev-haskell/aeson/metadata.xml b/dev-haskell/aeson/metadata.xml
deleted file mode 100644
index 343bb16f130d..000000000000
--- a/dev-haskell/aeson/metadata.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A JSON parsing and encoding library optimized for ease of use
-		and high performance.
-		
-		/Note/: if you use GHCi or Template Haskell, please see the
-		@README@ file for important details about building this package,
-		and other packages that depend on it:
-		&lt;https://github.com/mailrank/aeson#readme&gt;
-		
-		Parsing performance on a late 2010 MacBook Pro (2.66GHz Core i7),
-		for mostly-English tweets from Twitter's JSON search API:
-		
-		* 0.8 KB, 32-bit GHC 6.12.3: 30538 msg\/sec (24.9 MB\/sec)
-		
-		* 0.8 KB, 64-bit GHC 7.0.3: 31204 msg\/sec (25.4 MB\/sec)
-		
-		* 6.4 KB, 32-bit GHC 6.12.3: 6731 msg\/sec (42.3 MB\/sec)
-		
-		* 6.4 KB, 64-bit GHC 7.0.3: 6627 msg\/sec (41.7 MB\/sec)
-		
-		* 11.8 KB, 32-bit GHC 6.12.3: 3751 msg\/sec (43.2 MB\/sec)
-		
-		* 11.8 KB, 64-bit GHC 7.0.3: 3381 msg\/sec (38.9 MB\/sec)
-		
-		* 31.2 KB, 32-bit GHC 6.12.3: 1306 msg\/sec (39.8 MB\/sec)
-		
-		* 31.2 KB, 64-bit GHC 7.0.3: 1132 msg\/sec (34.5 MB\/sec)
-		
-		* 61.5 KB, 32-bit GHC 6.12.3: 616 msg\/sec (37.0 MB\/sec)
-		
-		* 61.5 KB, 64-bit GHC 7.0.3: 534 msg\/sec (32.1 MB\/sec)
-		
-		Handling heavily-escaped text is a little more work.  Here is
-		parsing performance with Japanese tweets, where much of the text
-		is entirely Unicode-escaped.
-		
-		* 14.6 KB, 32-bit GHC 6.12.3: 2315 msg\/sec (33.1 MB\/sec)
-		
-		* 14.6 KB, 64-bit GHC 7.0.3: 1986 msg\/sec (28.4 MB\/sec)
-		
-		* 44.1 KB, 32-bit GHC 6.12.3: 712 msg\/sec (30.7 MB\/sec)
-		
-		* 44.1 KB, 64-bit GHC 7.0.3: 634 msg\/sec (27.3 MB\/sec)
-		
-		* 82.9 KB, 32-bit GHC 6.12.3: 377 msg\/sec (30.5 MB\/sec)
-		
-		* 82.9 KB, 64-bit GHC 7.0.3: 332 msg\/sec (26.9 MB\/sec)
-		
-		Encoding performance on the same machine and data:
-		
-		* English, 854 bytes: 43439 msg\/sec (35.4 MB/sec)
-		
-		* English, 6.4 KB: 7127 msg\/sec (44.8 MB/sec)
-		
-		* Engish, 61.5 KB: 765 msg\/sec (46.0 MB/sec)
-		
-		* Japanese, 14.6 KB: 4727 msg\/sec (67.5 MB/sec)
-		
-		* Japanese, 44.1 KB: 1505 msg\/sec (64.8 MB/sec)
-		
-		(A note on naming: in Greek mythology, Aeson was the father of Jason.)
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bos/aeson</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/alex-3.1.3 b/dev-haskell/alex-3.1.3
new file mode 100644
index 000000000000..c08429640925
--- /dev/null
+++ b/dev-haskell/alex-3.1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/cabal-1.8 >=dev-haskell/quickcheck-2 >=dev-lang/ghc-6.10.4 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Alex is a tool for generating lexical analysers in Haskell
+EAPI=5
+HOMEPAGE=http://www.haskell.org/alex/
+IUSE=doc test
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/alex/3.1.3/alex-3.1.3.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9adde1ff46d2c2b4c366338f54eeb56f
diff --git a/dev-haskell/alex-3.1.7 b/dev-haskell/alex-3.1.7
new file mode 100644
index 000000000000..1dc4decc8a80
--- /dev/null
+++ b/dev-haskell/alex-3.1.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/quickcheck-2:2= >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Alex is a tool for generating lexical analysers in Haskell
+EAPI=5
+HOMEPAGE=http://www.haskell.org/alex/
+IUSE=doc test
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/quickcheck-2:2= >=dev-lang/ghc-7.4.1:=
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/alex/3.1.7/alex-3.1.7.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5ace2176f4a26f7d193b9a9315776fce
diff --git a/dev-haskell/alex-3.2.1 b/dev-haskell/alex-3.2.1
new file mode 100644
index 000000000000..0efeec3cb64e
--- /dev/null
+++ b/dev-haskell/alex-3.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/quickcheck-2:2= >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Alex is a tool for generating lexical analysers in Haskell
+EAPI=6
+HOMEPAGE=http://www.haskell.org/alex/
+IUSE=doc test
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/quickcheck-2:2= >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/alex/3.2.1/alex-3.2.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1c25ddf8803b85bce555cc5c00e30b7b
diff --git a/dev-haskell/alex/Manifest b/dev-haskell/alex/Manifest
deleted file mode 100644
index 8d7a9057b42f..000000000000
--- a/dev-haskell/alex/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST alex-3.1.3.tar.gz 99868 BLAKE2B 9a7d03fed24dfec82584edc5043ee9cac141649035910f7fa075c41e67d6d57dcde99363fc0f4ff83a6f535bbc462fdf4cfad6e92785a480351e38e079ec9aeb SHA512 f09f720627b9f2cae5d9d3a99488c2249e82c9310f0a436bccbd5238bd3215fae287706ee6f7530533c801348bdbfebc9fd54cafc15a75d528462b2ee987eb3c
-DIST alex-3.1.7.tar.gz 103624 BLAKE2B c7ca36113bf5951621906dffc47481e8e4a2cb2007773de7480b63379d648ca2b2b2c73d835eb981d1f46087a8adeec1887898e6d1c5205c8e1c7308bab7ec90 SHA512 0c4e87011617d8f8ad7cdf32b91e3ecc65ad66ea378c8086de8cbeb7ae3b37df478fb834e3bc453e3448fcae9d03b19ce9844bba35ad66a3cdf6e912790fe0a1
-DIST alex-3.2.1.tar.gz 111167 BLAKE2B efad30da0e26303d08d74b762a83ad3ddc0ec8069942b0e5ae170e480dde6b65771f5cb4fedfd27e9379719c2eebbaef68d33328a87be49dc60a0e7b86861619 SHA512 97e2e1677efcde5ec04a393f8b768f97a291ff63a3411cc0a0aef18b75e6825307d22d9c379eb7775dde519ebf60378e07c9181ea1a8bf9ea2ef631d7071c2e7
-EBUILD alex-3.1.3.ebuild 1403 BLAKE2B 519248d066faee7599f2cfc18292012eed811d1333dde9869764c1b5423f3bfce473fe4d20ee0fb8fea28cbd68ee57f3589856eef842f3e021a95589ea9e3acc SHA512 4a4fe7b6d18ee88b97fc000e7624a39c137bd6510edd40dcfe9fc6d20f1dac0d7483b8e9493aaa22134b5cb49821358954dce003988cf7363822d21793460ae4
-EBUILD alex-3.1.7.ebuild 1576 BLAKE2B 3da75e4a0c475d71458ef5e6fe6c6705990a0bfb95ce18a9650c3a4e9b979458c8d79d282d6233be4e96da52cc2c9dab0ecbe618d5b3519f3dd669bd9aa2e55e SHA512 bb3e2ce815aeffbfef8937aa1829322435b06e325d0e87965004a9050e9105379f53dc30d05be3f98a0aaf49471fda2b0eb4c7fee8827b4085b064b3e0892274
-EBUILD alex-3.2.1.ebuild 1606 BLAKE2B 9aaa09794dc1e66a2aec57f3ba473eabe6875f74e6b73ab7957bf24034f6e53b74c43449d5f9fe0ef35d824ba3f7312936e549b0e327aac00845b0a8842006dc SHA512 5785d287ac69f04f10807d6e1bd2f9ae50c57e6788ad6d4a83d6a9b352cc2448af3756b17a78aa7985793675acc1fed68884051f91b77794f9bbf85ea7473ab9
-MISC metadata.xml 349 BLAKE2B 0e0922a706cc99af24707269cbe80a8969df912d02317294a007d43a81263b232a3f2b199b4f981a023143a765427851335493a10235feb627ff8adf85497c62 SHA512 9c41217241498cd036d00fce456cea108f675c71c12bab05305dcfbdbd5d55d5c7db8163e5315eef12f9ca8467276b6fad9038d47da729f448338655691a9ff8
diff --git a/dev-haskell/alex/alex-3.1.3.ebuild b/dev-haskell/alex/alex-3.1.3.ebuild
deleted file mode 100644
index c35a1f165a0c..000000000000
--- a/dev-haskell/alex/alex-3.1.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit autotools haskell-cabal
-
-DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
-HOMEPAGE="http://www.haskell.org/alex/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	>=dev-haskell/quickcheck-2
-	>=dev-lang/ghc-6.10.4
-	doc? ( ~app-text/docbook-xml-dtd-4.2
-		app-text/docbook-xsl-stylesheets
-		>=dev-libs/libxslt-1.1.2 )"
-
-src_prepare() {
-	# drop depend on itself and happy, otherwise cabal tries to regenerate it
-	rm src/{Scan.x,Parser.y} || die
-
-	for f in Scan Parser; do
-		mv "${S}/dist/build/alex/alex-tmp/$f.hs" "${S}"/src/ || die
-	done
-
-	if use doc; then
-		cd "${S}/doc/"
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	# make sure we don't accidentally use those
-	# installed in system
-	haskell-cabal_src_configure \
-		--with-alex=false \
-		--with-happy=false
-
-	if use doc; then
-		cd "${S}/doc/"
-		econf
-	fi
-}
-
-src_compile() {
-	cabal_src_compile
-
-	if use doc; then
-		emake -C "${S}/doc/" -j1
-	fi
-}
-
-src_install() {
-	cabal_src_install
-
-	if use doc; then
-		doman "${S}/doc/alex.1"
-		dohtml -r "${S}/doc/alex/"
-	fi
-	dodoc README
-}
diff --git a/dev-haskell/alex/alex-3.1.7.ebuild b/dev-haskell/alex/alex-3.1.7.ebuild
deleted file mode 100644
index 4947a9871f78..000000000000
--- a/dev-haskell/alex/alex-3.1.7.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +small_base
-
-CABAL_FEATURES="bin test-suite"
-inherit autotools eutils haskell-cabal
-
-DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
-HOMEPAGE="http://www.haskell.org/alex/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="doc"
-
-RDEPEND=">=dev-haskell/quickcheck-2:2=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	doc? ( ~app-text/docbook-xml-dtd-4.2
-		app-text/docbook-xsl-stylesheets
-		>=dev-libs/libxslt-1.1.2 )
-"
-
-src_prepare() {
-	# drop depend on itself and happy, otherwise cabal tries to regenerate it
-	rm src/{Scan.x,Parser.y} || die
-
-	for f in Scan Parser; do
-		mv "${S}/dist/build/alex/alex-tmp/$f.hs" "${S}"/src/ || die
-	done
-
-	if use doc; then
-		cd "${S}/doc/"
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	# make sure we don't accidentally use those
-	# installed in system
-	haskell-cabal_src_configure \
-		--with-alex=false \
-		--with-happy=false \
-		--flag=small_base
-
-	if use doc; then
-		cd "${S}/doc/"
-		econf
-	fi
-}
-
-src_compile() {
-	cabal_src_compile
-
-	if use doc; then
-		emake -C "${S}/doc/" -j1
-	fi
-}
-
-src_test() {
-	# workaround https://github.com/haskell/cabal/issues/2398
-	emake -k -C tests all || die
-}
-
-src_install() {
-	cabal_src_install
-
-	if use doc; then
-		doman "${S}/doc/alex.1"
-		dohtml -r "${S}/doc/alex/"
-	fi
-	dodoc README
-}
diff --git a/dev-haskell/alex/alex-3.2.1.ebuild b/dev-haskell/alex/alex-3.2.1.ebuild
deleted file mode 100644
index f884b46b15a6..000000000000
--- a/dev-haskell/alex/alex-3.2.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: +small_base
-
-CABAL_FEATURES="test-suite"
-inherit autotools haskell-cabal
-
-DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
-HOMEPAGE="http://www.haskell.org/alex/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-haskell/quickcheck-2:2=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	doc? ( ~app-text/docbook-xml-dtd-4.2
-		app-text/docbook-xsl-stylesheets
-		>=dev-libs/libxslt-1.1.2 )
-"
-
-RESTRICT=test # fails tests
-
-src_prepare() {
-	default
-
-	# drop depend on itself and happy, otherwise cabal tries to regenerate it
-	rm src/{Scan.x,Parser.y} || die
-
-	for f in Scan Parser; do
-		mv "${S}/dist/build/alex/alex-tmp/$f.hs" "${S}"/src/ || die
-	done
-
-	if use doc; then
-		cd "${S}/doc/"
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	# make sure we don't accidentally use those
-	# installed in system
-	haskell-cabal_src_configure \
-		--with-alex=false \
-		--with-happy=false \
-		--flag=small_base
-
-	if use doc; then
-		cd "${S}/doc/"
-		econf
-	fi
-}
-
-src_compile() {
-	haskell-cabal_src_compile
-
-	if use doc; then
-		emake -C "${S}/doc/" -j1
-	fi
-}
-
-src_test() {
-	# workaround https://github.com/haskell/cabal/issues/2398
-	emake -k -C tests all || die
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	if use doc; then
-		doman "${S}/doc/alex.1"
-		dohtml -r "${S}/doc/alex/"
-	fi
-}
diff --git a/dev-haskell/alex/metadata.xml b/dev-haskell/alex/metadata.xml
deleted file mode 100644
index 244d701ec388..000000000000
--- a/dev-haskell/alex/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Alex is a tool for generating lexical analysers in Haskell
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/alsa-core-0.5.0.1-r2 b/dev-haskell/alsa-core-0.5.0.1-r2
new file mode 100644
index 000000000000..db020efc5e4a
--- /dev/null
+++ b/dev-haskell/alsa-core-0.5.0.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-lang/ghc-6.10.4:= media-libs/alsa-lib >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binding to the ALSA Library API (Exceptions)
+EAPI=5
+HOMEPAGE=http://www.haskell.org/haskellwiki/ALSA
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-lang/ghc-6.10.4:= media-libs/alsa-lib
+SLOT=0/0.5.0.1
+SRC_URI=mirror://hackage/packages/archive/alsa-core/0.5.0.1/alsa-core-0.5.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=132ede4988651195b0b89f0f41f42819
diff --git a/dev-haskell/alsa-core/Manifest b/dev-haskell/alsa-core/Manifest
deleted file mode 100644
index a45506771fe4..000000000000
--- a/dev-haskell/alsa-core/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST alsa-core-0.5.0.1.tar.gz 2668 BLAKE2B 869b90b509fac4017378cf1e2f98e374e2bb50673d2d2f48afdd66ab6cefec9c589efebee10915d7b33a784d1ce9a03f8136c3b86df4ede3a00f129b255091d2 SHA512 e02c8353911bf2c0c703400701ae72be6f510f771ff56dfc09322cbcf3a006f4cd0903f71f7ed2268886b3468113d5ce76933eedf5fad47aa71cb052d07fc4b4
-EBUILD alsa-core-0.5.0.1-r2.ebuild 684 BLAKE2B f36289a8332cdb20a4ed69ee253ab30bd384d49b3fab07d03449b7b2bc8ae4b71aee64be941c53ab8a32e0dc12b44766ef7f3c63a6d6f194037bf8f0dc039835 SHA512 cce05838c4417c8e97bf235eb550e84570e6b4def30eeb7b8a186901c67b9274d34d89115d180e2e1fce940b16cfc1e1d0777d62f66d676b30abdc01eea0cb0f
-MISC metadata.xml 391 BLAKE2B c7f264da1ed74de8122b88a00f62bb62391a7a1e18e35198b061343fd3b905bb79214e3aecb7f4fa0c24edddf5c63114c6f207ceea5080853c0749de0634ec06 SHA512 5c312cd7baa096916061907851660a723970168f7ba02bb04043fd42295091929e5d65fe1c5b439c2fc97f36abeedaf0449af921ba05ad685543541e4f731bca
diff --git a/dev-haskell/alsa-core/alsa-core-0.5.0.1-r2.ebuild b/dev-haskell/alsa-core/alsa-core-0.5.0.1-r2.ebuild
deleted file mode 100644
index 9f45900b8879..000000000000
--- a/dev-haskell/alsa-core/alsa-core-0.5.0.1-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the ALSA Library API (Exceptions)"
-HOMEPAGE="http://www.haskell.org/haskellwiki/ALSA"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?]
-		<dev-haskell/extensible-exceptions-0.2:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		media-libs/alsa-lib"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/alsa-core/metadata.xml b/dev-haskell/alsa-core/metadata.xml
deleted file mode 100644
index 8474e22c52ad..000000000000
--- a/dev-haskell/alsa-core/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides access to ALSA infrastructure,
-		that is needed by both alsa-seq and alsa-pcm.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/alsa-mixer-0.1.2-r2 b/dev-haskell/alsa-mixer-0.1.2-r2
new file mode 100644
index 000000000000..18a7456611db
--- /dev/null
+++ b/dev-haskell/alsa-mixer-0.1.2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND==dev-haskell/alsa-core-0.5*:=[profile?] >=dev-lang/ghc-6.10.4:= media-libs/alsa-lib dev-haskell/c2hs >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Bindings to the ALSA simple mixer API
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/alsa-mixer
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND==dev-haskell/alsa-core-0.5*:=[profile?] >=dev-lang/ghc-6.10.4:= media-libs/alsa-lib
+SLOT=0/0.1.2
+SRC_URI=mirror://hackage/packages/archive/alsa-mixer/0.1.2/alsa-mixer-0.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b932e8114dfbeb1fe02b65a989f1b723
diff --git a/dev-haskell/alsa-mixer-0.2.0.2 b/dev-haskell/alsa-mixer-0.2.0.2
new file mode 100644
index 000000000000..af7cbedbe9a8
--- /dev/null
+++ b/dev-haskell/alsa-mixer-0.2.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] >=dev-lang/ghc-7.6.1:= media-libs/alsa-lib dev-haskell/c2hs >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Bindings to the ALSA simple mixer API
+EAPI=5
+HOMEPAGE=https://github.com/ttuegel/alsa-mixer
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] >=dev-lang/ghc-7.6.1:= media-libs/alsa-lib
+SLOT=0/0.2.0.2
+SRC_URI=mirror://hackage/packages/archive/alsa-mixer/0.2.0.2/alsa-mixer-0.2.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=73c87efbf0267a96f1e3dbf2197ab90c
diff --git a/dev-haskell/alsa-mixer-0.2.0.3 b/dev-haskell/alsa-mixer-0.2.0.3
new file mode 100644
index 000000000000..6f167f0ee538
--- /dev/null
+++ b/dev-haskell/alsa-mixer-0.2.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] >=dev-lang/ghc-7.6.1:= media-libs/alsa-lib dev-haskell/c2hs >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Bindings to the ALSA simple mixer API
+EAPI=5
+HOMEPAGE=https://github.com/ttuegel/alsa-mixer
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] >=dev-lang/ghc-7.6.1:= media-libs/alsa-lib
+SLOT=0/0.2.0.3
+SRC_URI=mirror://hackage/packages/archive/alsa-mixer/0.2.0.3/alsa-mixer-0.2.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c5a41e849442749650df07d87fb797b7
diff --git a/dev-haskell/alsa-mixer/Manifest b/dev-haskell/alsa-mixer/Manifest
deleted file mode 100644
index 371db099a739..000000000000
--- a/dev-haskell/alsa-mixer/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST alsa-mixer-0.1.2.tar.gz 6901 BLAKE2B c33ba2abb9d220bafc04ee0c6fb0508c9029db813c56304964b5bc83c143370a4389c8960b34555fc9f50a7936d5168581b7283a3dbc4e3592b7e8962b9eb75a SHA512 fae4c1f9b65d47a55b2674b04c38f46fc440222c7215b1bb95de14b7c642068392a73c0cebb08b4e3cf49ab824ec78a57d942279364e28bfa45be471f1b8fdfa
-DIST alsa-mixer-0.2.0.2.tar.gz 7184 BLAKE2B 0cb5005e16345a75c6b6b16b09cf2a0317b430f7bf11207a824e1970e250d13e38999bc5fb722c78439cc15d60318914d1a0eaad7ee4ebfc042ba056a919b332 SHA512 f480008cfe5dd87e01b22bd3af44caee17095dc1be2e535acdca4cb2b56cd87fb086b8222ae10b1ca866818469dff7309ea6e0b7ec22ad83cdff07e6a702aa76
-DIST alsa-mixer-0.2.0.3.tar.gz 7269 BLAKE2B 43008051829b8dde0edf33216b61649c2a3974d43fc4f00cde5d2e21809afdc23d89642bdb7526856d4fd929843211a44a6cb0f924fae79247b678ad870facbb SHA512 32bce115331a622cdc944c9dbeb8ae886793330a4eadce35de857145d4440d7bc8bbac518b7739613436958b392133bae5f1da2cd91c6d21810373fda8a69083
-EBUILD alsa-mixer-0.1.2-r2.ebuild 632 BLAKE2B 646994609980ddfe97b8806cb4aa7846c9990a762716d1cad1f54e758fc575f50ca8388de0732a2608e9cad31020e6606eb2eb29614e8cc60ea050298fb9b62b SHA512 c49afd69d94e704d623a8d00a86c3db15c11ddf3289ad9f883e5f84adc1d593472a55ad967532d3ca9bbe9f1db7629cafade99958cf8f9d2d01910027d35e82c
-EBUILD alsa-mixer-0.2.0.2.ebuild 664 BLAKE2B 28c793dd747b371f16d684cf17fa62b08a1ed271d34da9db467e266081b89829d9d4fe6c83baeda9ff70b508e9e21bf054bdc3c1327c4f776a9a1d1446a07c55 SHA512 423d79312d137df6356cdf67f94a36f32ebc13a03543874059a42b60a18cac702e35b0e3f87990d42e74fb81eed55c8b1c27a268862f176c3c58a58a626abac4
-EBUILD alsa-mixer-0.2.0.3.ebuild 668 BLAKE2B 6d5d19e3d5a52e49309d17a513ef346e92ee694a181491b619c92763b62b7e3d76ac127483d49ffd622c52e5a8fdac48ea25487e48b38c255c6c9c7f69a95f91 SHA512 eba59c0e0818e94d94461b75a970909fa874a88571f8d260dd2fdbfe00cc50f27c0c3c4acb56fbbf92090ec251b57bf322184126dccc3592f383bfade5b84965
-MISC metadata.xml 442 BLAKE2B 21b428e5a14dec862b969281130d6417fed7752e5f6326b082b79207898c9c1a95f71da22a7c65f1052787eb7703172f50b3d99b8fb767f5c60c35e3d5ef825a SHA512 5a88d9acbbc7991f66947aaf6e5db7e2898701249b74875e66c36d1fb36615f16bcd871c859ef7cf08473ddb63e91c16b3fcab96adf0985b2f9e7ae47d4cd087
diff --git a/dev-haskell/alsa-mixer/alsa-mixer-0.1.2-r2.ebuild b/dev-haskell/alsa-mixer/alsa-mixer-0.1.2-r2.ebuild
deleted file mode 100644
index 4dffb7eda757..000000000000
--- a/dev-haskell/alsa-mixer/alsa-mixer-0.1.2-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to the ALSA simple mixer API"
-HOMEPAGE="http://hackage.haskell.org/package/alsa-mixer"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/alsa-core-0.5*:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		media-libs/alsa-lib"
-DEPEND="${RDEPEND}
-		dev-haskell/c2hs
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/alsa-mixer/alsa-mixer-0.2.0.2.ebuild b/dev-haskell/alsa-mixer/alsa-mixer-0.2.0.2.ebuild
deleted file mode 100644
index 0462aac1aae9..000000000000
--- a/dev-haskell/alsa-mixer/alsa-mixer-0.2.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to the ALSA simple mixer API"
-HOMEPAGE="https://github.com/ttuegel/alsa-mixer"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-	media-libs/alsa-lib
-"
-DEPEND="${RDEPEND}
-	dev-haskell/c2hs
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/alsa-mixer/alsa-mixer-0.2.0.3.ebuild b/dev-haskell/alsa-mixer/alsa-mixer-0.2.0.3.ebuild
deleted file mode 100644
index 73a64f0f0644..000000000000
--- a/dev-haskell/alsa-mixer/alsa-mixer-0.2.0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to the ALSA simple mixer API"
-HOMEPAGE="https://github.com/ttuegel/alsa-mixer"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-	media-libs/alsa-lib
-"
-DEPEND="${RDEPEND}
-	dev-haskell/c2hs
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/alsa-mixer/metadata.xml b/dev-haskell/alsa-mixer/metadata.xml
deleted file mode 100644
index 442f7bd356ae..000000000000
--- a/dev-haskell/alsa-mixer/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides haskell bindings to the ALSA simple mixer API.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ttuegel/alsa-mixer</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/alut-2.1.0.0 b/dev-haskell/alut-2.1.0.0
new file mode 100644
index 000000000000..0b9a4396bead
--- /dev/null
+++ b/dev-haskell/alut-2.1.0.0
@@ -0,0 +1,13 @@
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0a31462df421820e587a7f3eeab2d532
diff --git a/dev-haskell/alut-2.2.0.0 b/dev-haskell/alut-2.2.0.0
new file mode 100644
index 000000000000..54e1943fd184
--- /dev/null
+++ b/dev-haskell/alut-2.2.0.0
@@ -0,0 +1,13 @@
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5418c29e457f6e68f31a507546c365c8
diff --git a/dev-haskell/alut-2.3.0.1 b/dev-haskell/alut-2.3.0.1
new file mode 100644
index 000000000000..a964c7f58351
--- /dev/null
+++ b/dev-haskell/alut-2.3.0.1
@@ -0,0 +1,13 @@
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5604011db2477663643b5a1fae06e26d
diff --git a/dev-haskell/alut-2.4.0.2 b/dev-haskell/alut-2.4.0.2
new file mode 100644
index 000000000000..175d0defd86e
--- /dev/null
+++ b/dev-haskell/alut-2.4.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/openal-1.7:=[profile?] <dev-haskell/openal-1.8:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= media-libs/freealut >=dev-haskell/cabal-1.10 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=examples doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/openal-1.7:=[profile?] <dev-haskell/openal-1.8:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= media-libs/freealut
+SLOT=0/2.4.0.2
+SRC_URI=mirror://hackage/packages/archive/ALUT/2.4.0.2/ALUT-2.4.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3f233144688c1d0bca29d707a7b73c51
diff --git a/dev-haskell/alut/Manifest b/dev-haskell/alut/Manifest
deleted file mode 100644
index b7d834b350bf..000000000000
--- a/dev-haskell/alut/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST ALUT-2.1.0.0.tar.gz 69999 BLAKE2B 2857db67ef38db4bd55b6351fe5c64a3e69e10c594357cd2e64479961a019651a1cc0e4ee040592a2f15ca1f4d352a93f5177012e43bbffff1db5c9cdea00bd3 SHA512 7d21a047b210cc331eb9b8b926433c5306451ac8cbf13a1ff38c5562ed9c5898f895338ddb625e5608e31d420f04c0547684f7f58b371b441f23a2444307ad94
-DIST ALUT-2.2.0.0.tar.gz 94174 BLAKE2B 0f55f28e7225ec5e2d193e075391aaec5f846d57d505af6c03b07cfee7575ad75b6ff0d85911d23b8becc68c3380411b40b80e38d083bcae01f9a4218a8b93e5 SHA512 4d9111b2d64d33b5a6c7a4c1c4210086a5ed1cf824f1d7753cc9036c57a8a77a6b88ce2effd5929d36313220505197a71369ee47e29e81ca98d8a2b7a537c041
-DIST ALUT-2.3.0.1.tar.gz 25500 BLAKE2B 067f6700db8a85a9bd720f2a3bcd9b41b189cee9c53aaccbdeeb0947b25a4cd0292b47a19ffa62d3ba4ccde258e21feacf94470d0a93d2a711910ce45d0e846b SHA512 c2fdb231105735f82a1500948cecd184ffc89cef3e8c3ca992107463c2812da74cf260504823ef1fe5e038a2bcf54cec5a004fc052d20d95e856f153c4adf61d
-DIST ALUT-2.4.0.2.tar.gz 26231 BLAKE2B 0af581e97d58ca4358e5675ecbe17891b45f229fb2a1fa6316f3a060001ab36604bb627d6d1b8ae78ace3e382860d65df5a9aea20c82e0bf8bbd5450bb31b32b SHA512 b2ede23635f73660db008e402567c376ef77c081312b76767a2c6d5a4f30bac7e3e8c6533da371828470865218cdb076be4dac07c11bdda0feb7889552d024f1
-EBUILD alut-2.1.0.0.ebuild 602 BLAKE2B a7d1e9ccd67a43e0ddd12fd551a7db8ab8a30279731d8686cf9919ab235fc3b98cd7ac6256524ebc1a388784eed98516ed9e46f0381927fe9e2ad35a246b2e38 SHA512 0493340b6784ca03e8a0a7f75d784a76b7f920c93c029e71803dd3fa7fe0a835925520540c03de96ac0130f5d4b2b5a44bb450f0d216d21a48feffaf58cb37c2
-EBUILD alut-2.2.0.0.ebuild 690 BLAKE2B 03f9ca00e17baae5f4e17f0ff243a69519fc84d1de6e6f46a56bf25b75a287da9a20e0ccf9c66ca958346e3c0fe1e54865a247a506ebbf83baba3b24d15768be SHA512 543a1cdac47c5b16461b371bef3894b4521a07a6e993ea724fd20a75729bdd18ffb7e68b6c57cfd3e747114b6c79c913d1e121936af3505b86d02e403d3adc13
-EBUILD alut-2.3.0.1.ebuild 860 BLAKE2B 43b26bedddfa50ff3f66f7a4ea853e67dba8a9c840af428b32b7a291f89a4479a0dfd07072bbcb094328dc957f88c186d175a2047ca84fae468f9fd9940b2d25 SHA512 b5262d0dd788fb9d6a7f6e2d48318808fa5cf8d84343532eb0c166892b27b6cfcdc58341048a87b66419238e2a56b23a05777e6f1258f35dd22cb0c797cbcbc7
-EBUILD alut-2.4.0.2.ebuild 1085 BLAKE2B 4109741675075bcaa55b1a3071b0e243bb61e069113991c8515cefbe1616c2236db2721b01959fa0c59394d5b4e3f085c8851713ec805efeb97e26996be4de4a SHA512 20d364db0118d9ee81df3eace17dbea736c900a211c81f400248b75e5b5743dc9513cf04aca0b33ae381b8c65e07d4ebe20e465ca128a279aafd4bd47280e2ef
-MISC metadata.xml 311 BLAKE2B d1edbd170f8774a220b1750e05390e0f6693a81de85b49b6d54df3ca8502adb7faf0aa99b66bd0374209433d91c1697216780b9de70d3a173b16256a72b6fba7 SHA512 41a19ed33057a3d03f99c30fe71898900cf0d5a15fa90c23de4bac7313872ceef0aa0f0d59f50d24ecb58bac144b46264812fa107137c187b67f084d3a307ee4
diff --git a/dev-haskell/alut/alut-2.1.0.0.ebuild b/dev-haskell/alut/alut-2.1.0.0.ebuild
deleted file mode 100644
index 128a7e537b88..000000000000
--- a/dev-haskell/alut/alut-2.1.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
-
-MY_PN="ALUT"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Haskell binding for the OpenAL Utility Toolkit"
-HOMEPAGE="http://haskell.org/ghc/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=" amd64 x86"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.4
-	>=dev-haskell/opengl-2.2.1
-	>=dev-haskell/openal-1.3.1
-	media-libs/freealut"
-
-S="${WORKDIR}/${MY_P}"
-
-#TODO: install examples perhaps?
diff --git a/dev-haskell/alut/alut-2.2.0.0.ebuild b/dev-haskell/alut/alut-2.2.0.0.ebuild
deleted file mode 100644
index 18a67826d792..000000000000
--- a/dev-haskell/alut/alut-2.2.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="ALUT"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenAL Utility Toolkit"
-HOMEPAGE="http://connect.creativelabs.com/openal/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/openal[profile?]
-		dev-haskell/statevar[profile?]
-		>=dev-lang/ghc-6.8.2
-		media-libs/freealut"
-DEPEND="${RDEPEND}
-		dev-haskell/cabal"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/alut/alut-2.3.0.1.ebuild b/dev-haskell/alut/alut-2.3.0.1.ebuild
deleted file mode 100644
index 1ff57f1b9636..000000000000
--- a/dev-haskell/alut/alut-2.3.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-#hackport: flags: -usenativewindowslibraries
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="ALUT"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenAL Utility Toolkit"
-HOMEPAGE="https://github.com/haskell-openal/ALUT"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-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
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/alut/alut-2.4.0.2.ebuild b/dev-haskell/alut/alut-2.4.0.2.ebuild
deleted file mode 100644
index e59b27a79fbe..000000000000
--- a/dev-haskell/alut/alut-2.4.0.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -usenativewindowslibraries,buildexamples:examples
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="ALUT"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenAL Utility Toolkit"
-HOMEPAGE="https://github.com/haskell-openal/ALUT"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND=">=dev-haskell/openal-1.7:=[profile?] <dev-haskell/openal-1.8:=[profile?]
-	>=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	media-libs/freealut
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples buildexamples) \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/alut/metadata.xml b/dev-haskell/alut/metadata.xml
deleted file mode 100644
index da1f27875e62..000000000000
--- a/dev-haskell/alut/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">haskell-openal/ALUT</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/annotated-wl-pprint-0.7.0 b/dev-haskell/annotated-wl-pprint-0.7.0
new file mode 100644
index 000000000000..f3bdaddcce83
--- /dev/null
+++ b/dev-haskell/annotated-wl-pprint-0.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.10.2:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=The Wadler/Leijen Pretty Printer, with annotation support
+EAPI=6
+HOMEPAGE=https://github.com/david-christiansen/annotated-wl-pprint
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.10.2:=
+SLOT=0/0.7.0
+SRC_URI=mirror://hackage/packages/archive/annotated-wl-pprint/0.7.0/annotated-wl-pprint-0.7.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2217242a59ec9dbea7e74765188cad7c
diff --git a/dev-haskell/annotated-wl-pprint/Manifest b/dev-haskell/annotated-wl-pprint/Manifest
deleted file mode 100644
index 5dc1bd1dc508..000000000000
--- a/dev-haskell/annotated-wl-pprint/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST annotated-wl-pprint-0.7.0.tar.gz 10338 BLAKE2B 3210f0ecde3e9689ea17c27210cb11a260c02b8db9dc285335c715330202918f5d22792a27ea5f89dd7946d8e6deac5911bc81ed8e207095426e82a07753e090 SHA512 1e7ea93a63c500ebb23458202c62ed37eee7f462bbc4c390822de37fd0f411983eed49fed4c69ffb32705519f9aa956131d14ad930f21b48b28c5de5d4095f0a
-EBUILD annotated-wl-pprint-0.7.0.ebuild 587 BLAKE2B 7b944a2016ae67aee4d802e521742fff72f194a3a234be47c81297dfbb1f94dac1d04041caa70201a7ac44ea0419f61ef72a005576f6bcbf5cdb2cf70a60abc6 SHA512 f1430a327841df61b558c14240996d4a8d8287c56b63207c466065b419e428275120cc5cc5a1fc9a9a32dabe5d1d66db9d8262df91a2890d18c8161f12a1ad6f
-MISC metadata.xml 563 BLAKE2B 55a2a554ff36122d2cf4f679a0c2d0599cbf28da645bfffd8164683f086c95f0a2a443ab597c01a29418dad809dab21399d769c9e242f3f5fc03372ba24017b1 SHA512 f41d3e734f06d45dbf2fcb5bf9ef403af790fbf3c982ecb33ea81911b2d97e2538adb9e4d66d52978a3ea1fbb6c2a04456dfc377e3e7c8806af493c7020ebba7
diff --git a/dev-haskell/annotated-wl-pprint/annotated-wl-pprint-0.7.0.ebuild b/dev-haskell/annotated-wl-pprint/annotated-wl-pprint-0.7.0.ebuild
deleted file mode 100644
index 9fcad81af4f1..000000000000
--- a/dev-haskell/annotated-wl-pprint/annotated-wl-pprint-0.7.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="The Wadler/Leijen Pretty Printer, with annotation support"
-HOMEPAGE="https://github.com/david-christiansen/annotated-wl-pprint"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.10.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/annotated-wl-pprint/metadata.xml b/dev-haskell/annotated-wl-pprint/metadata.xml
deleted file mode 100644
index 5a30faac9d8f..000000000000
--- a/dev-haskell/annotated-wl-pprint/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This is a modified version of wl-pprint, which was based on Wadler's
-		paper "A Prettier  Printer".  See the haddocks for full info.  This
-		version allows the library user to annotate the text with semantic
-		information, which can later be rendered in a variety of ways.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/ansi-terminal-0.5.5 b/dev-haskell/ansi-terminal-0.5.5
new file mode 100644
index 000000000000..e5113ef6efdf
--- /dev/null
+++ b/dev-haskell/ansi-terminal-0.5.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a6c4862f6bfa98afa5fc88f1d9841445
diff --git a/dev-haskell/ansi-terminal-0.6.2.1 b/dev-haskell/ansi-terminal-0.6.2.1
new file mode 100644
index 000000000000..655478c28a33
--- /dev/null
+++ b/dev-haskell/ansi-terminal-0.6.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dad2072eacd64b8672ad6e9c62593d7d
diff --git a/dev-haskell/ansi-terminal-0.6.2.3 b/dev-haskell/ansi-terminal-0.6.2.3
new file mode 100644
index 000000000000..7fa30d74637a
--- /dev/null
+++ b/dev-haskell/ansi-terminal-0.6.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2cbc1344cf77800a5ccf7b93f9858f1d
diff --git a/dev-haskell/ansi-terminal/Manifest b/dev-haskell/ansi-terminal/Manifest
deleted file mode 100644
index d888d49c16e3..000000000000
--- a/dev-haskell/ansi-terminal/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST ansi-terminal-0.5.5.tar.gz 13136 BLAKE2B 0a0d35d5bc69a0a5a19a083cdecc4a3e41cecbad53dba9abd304dad48a8429b48baa37865c5ba40d6d636c5cfb84c23d6ab5b72857470e7f4aca8ac5c673a8f7 SHA512 9fee8511f2edcadf146d1759634592ef725d6e18ccd278ba13cfbd117c918814ae65195237f83b36a96e0b8a89a7731edff2d692138baff9e3473e46d4982ce5
-DIST ansi-terminal-0.6.2.1.tar.gz 14652 BLAKE2B ae068a4e0a1c4f17c01d4e5aa7c1daa350ea5b5b18e8dfadebb2f4be5891076f2c78e82a829bc8638bfd69cce2e847c0910a56a18661b764e2fc9f785d375386 SHA512 6a38f6ec13ca2c2669c707eeab1749fa7ca1805fa162cc024867cf0cabb5746c8844bc2188680de3f9dd748cfcb72917b88ac9122ff6b86459c80aa061f2adbf
-DIST ansi-terminal-0.6.2.3.tar.gz 21964 BLAKE2B 3c3fdb0cd5808978e474602df9f722a4a349162975618e0144aa9b863039b0b8dc73d106c441481b8755f338fe252a9c0effc269a468b55f51fb9c025c648b75 SHA512 3d2999d0dcd45950240731ae9bbf5b65fbd5b00660b4f6387afa2e3db89f2f1a6690ea72311348cddd8e27fa31c447f282795c2ae1b76a5306aade785eb3448d
-EBUILD ansi-terminal-0.5.5.ebuild 601 BLAKE2B d6dc0425c113163079b8ffd38fee646e317100c32be86e46ca49b1d9b57917e78842f6b9f72848ef64b0e822059b7f26bf3c0e5d28ae1d62d9413412866f4afb SHA512 0e2fd81ec1478407561c8538b7b288b7acaf2af38a243346a5cd1c9fe54a26f6671c598b24c03506d9384a161c958555c2fe1e9c14a9213d20720faae91a40b0
-EBUILD ansi-terminal-0.6.2.1.ebuild 695 BLAKE2B 06e4758c34621fab611f84efbf5d62ff46df9d73bbe641a99b7b06ef8b455597943a7aceebf02c396ea16cbe3e0ce52a1a8146768c97bc7900681cb9e3a07d44 SHA512 fda381b8bfe4939d879ca7557b81beccefefa3c2ed8647fb585ec6428ab817d87d32d4f1f907326ff8327715dff1752161dc96050fa503dfec46cddc11261fcb
-EBUILD ansi-terminal-0.6.2.3.ebuild 707 BLAKE2B 6dc3f9e933e0e14583db0fc7bf69495d46317551eee434e702ba18b955fb3ded8a19f0b09d33913a0779a6b9936b1c1d28c83985e90a968a6011f76c570de966 SHA512 63ed368bb43413483ac9983718bce21b72dd99f22780b92721fa8dac58983b182343fb668e3e699d4be68fd8e9bb2186cea3240593afce15fa794c78d8683768
-MISC metadata.xml 702 BLAKE2B 405eb8c2075636879af2db86ada502ff241f976f3a34c20e4e45aeefde968456ebadd1d01b4470f20b377c6a665623ce69884644c0a15b98d757f9823a2a51eb SHA512 ca4f14bf1a7508e8d6496752d11583b331a02512fd073f7c2d24a125d6e99901ff24c36fbbb9b745e74c05f93ba0b43573463841b56d0ae0e181b2a2ba1d6a4b
diff --git a/dev-haskell/ansi-terminal/ansi-terminal-0.5.5.ebuild b/dev-haskell/ansi-terminal/ansi-terminal-0.5.5.ebuild
deleted file mode 100644
index bb6f8ad12bce..000000000000
--- a/dev-haskell/ansi-terminal/ansi-terminal-0.5.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.13
-
-EAPI=4
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple ANSI terminal support, with Windows compatibility"
-HOMEPAGE="https://batterseapower.github.com/ansi-terminal"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/ansi-terminal/ansi-terminal-0.6.2.1.ebuild b/dev-haskell/ansi-terminal/ansi-terminal-0.6.2.1.ebuild
deleted file mode 100644
index 39b47f0b983f..000000000000
--- a/dev-haskell/ansi-terminal/ansi-terminal-0.6.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple ANSI terminal support, with Windows compatibility"
-HOMEPAGE="https://github.com/feuerbach/ansi-terminal"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="example"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag example example)
-}
diff --git a/dev-haskell/ansi-terminal/ansi-terminal-0.6.2.3.ebuild b/dev-haskell/ansi-terminal/ansi-terminal-0.6.2.3.ebuild
deleted file mode 100644
index 2532196f2048..000000000000
--- a/dev-haskell/ansi-terminal/ansi-terminal-0.6.2.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple ANSI terminal support, with Windows compatibility"
-HOMEPAGE="https://github.com/feuerbach/ansi-terminal"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="example"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag example example)
-}
diff --git a/dev-haskell/ansi-terminal/metadata.xml b/dev-haskell/ansi-terminal/metadata.xml
deleted file mode 100644
index 5c68501a1743..000000000000
--- a/dev-haskell/ansi-terminal/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		ANSI terminal support for Haskell: allows cursor movement, screen clearing, color output showing or hiding the cursor, and
-		changing the title. Compatible with Windows and those Unixes with ANSI terminals, but only GHC is supported as a compiler.
-	</longdescription>
-	<use>
-		<flag name="example">Build the example application.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">feuerbach/ansi-terminal</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/ansi-wl-pprint-0.6.7.1 b/dev-haskell/ansi-wl-pprint-0.6.7.1
new file mode 100644
index 000000000000..52363222c4a7
--- /dev/null
+++ b/dev-haskell/ansi-wl-pprint-0.6.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8f7c54d81bc2b1cdb5a17ef785a9bdd6
diff --git a/dev-haskell/ansi-wl-pprint-0.6.7.3 b/dev-haskell/ansi-wl-pprint-0.6.7.3
new file mode 100644
index 000000000000..e4b20663efc0
--- /dev/null
+++ b/dev-haskell/ansi-wl-pprint-0.6.7.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=64aba6ef441fd123c8242b24274f66bb
diff --git a/dev-haskell/ansi-wl-pprint/Manifest b/dev-haskell/ansi-wl-pprint/Manifest
deleted file mode 100644
index 9e7d3053beba..000000000000
--- a/dev-haskell/ansi-wl-pprint/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST ansi-wl-pprint-0.6.7.1.tar.gz 14862 BLAKE2B 4b51ea893ce5aa80e40d53b928ef3cc076a3271da50d715faf52e6f067be270b5362a2e3ef6d1890cf9aa2c4397c1b9c7e75aaf05214fab42a930098470750ac SHA512 e0524f7ba0e6ba3eefc2c04d0186579c70687c65d672e11b09a6b4352ae51f2b30e9c4a4753ca30840d24c82be8f6faa1183c29a2ee154b8c2485e1c01cad546
-DIST ansi-wl-pprint-0.6.7.3.tar.gz 14983 BLAKE2B d9de853cb03cdb23f061820aee0ac48abc513db4e0feb00529869f2ace742843b312d74fa737897b5690720a3537154f1b876e309360cdc41ffe1f84b93521ba SHA512 c5b41ee5890251ff3524bca9d5d0b457b54838906f4145e09e68cf88cb11e7bd59e05ba99c660ad61a9fcfb4e9201be4c916de2a066dfca12922292790590eba
-EBUILD ansi-wl-pprint-0.6.7.1.ebuild 805 BLAKE2B 2f1dd57136f2d6fccf4033b9e1078b2bc61d3bbd090cdcf3c8cd6e837c7812a885aeebc1379e871f84d8aebe472b81dec08d3804f11556466fb4db868a107559 SHA512 0051f0146d07ca734cb54ebe2612a59cbe7abb771699ca98b65a781cfc4aa74ac89878f6295f1019ea70d59e97e91f33947dc7666ac41a81b40431d465ffb28f
-EBUILD ansi-wl-pprint-0.6.7.3.ebuild 802 BLAKE2B c2434932b4d41b653ad97e29a1a08400bd6e6eb5cbc11dd89fe40f71c3990f5a903ab1d2901172fb304854c3051fbbfe90f3a6f9b62361d106e26b14976b8ccb SHA512 a62c15242ea5898d492d86675a92f29766c499ea0ea0c77c61065998517eac80875d74e1dfe66007a5bac6363423d4d567f916c6ce4f54d351b06de39847c4ff
-MISC metadata.xml 640 BLAKE2B bbc4f8f5621d458eab0c1ea200b6a70201cc3825033302b57d235c76e3aba1f80dd07b8e204a1546a43b92782d93ca6c0c776d8fba1f6e35cf36901b19038da3 SHA512 7999a66b49fce8bdd94736eeb4eb47858b06daae8928053531df4892f34e46f5135c92c9b7659446573b144e6e8d37d27306b608759eb30d2e71addb81a7ffd1
diff --git a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild
deleted file mode 100644
index e42b98257c9d..000000000000
--- a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="The Wadler/Leijen Pretty Printer for colored ANSI terminal output"
-HOMEPAGE="https://github.com/batterseapower/ansi-wl-pprint"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="example"
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag example example)
-}
diff --git a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.3.ebuild b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.3.ebuild
deleted file mode 100644
index 378462f16834..000000000000
--- a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="The Wadler/Leijen Pretty Printer for colored ANSI terminal output"
-HOMEPAGE="https://github.com/ekmett/ansi-wl-pprint"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="example"
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag example example)
-}
diff --git a/dev-haskell/ansi-wl-pprint/metadata.xml b/dev-haskell/ansi-wl-pprint/metadata.xml
deleted file mode 100644
index 2ffd00b91707..000000000000
--- a/dev-haskell/ansi-wl-pprint/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This is a pretty printing library based on Wadler's paper "A Prettier Printer". It has been enhanced with support for ANSI terminal colored output using the ansi-terminal package.
-	</longdescription>
-	<use>
-		<flag name="example">Build the example application.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">batterseapower/ansi-wl-pprint</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/appar-0.1.4 b/dev-haskell/appar-0.1.4
new file mode 100644
index 000000000000..0dfbd1018dba
--- /dev/null
+++ b/dev-haskell/appar-0.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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 simple applicative parser
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/appar
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.1.4
+SRC_URI=mirror://hackage/packages/archive/appar/0.1.4/appar-0.1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9bf1459fe1364d7eb4cdac149388c5d2
diff --git a/dev-haskell/appar/Manifest b/dev-haskell/appar/Manifest
deleted file mode 100644
index b92f5e0a31a9..000000000000
--- a/dev-haskell/appar/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST appar-0.1.4.tar.gz 3904 BLAKE2B bf9be10c63f5cf33b034f771fe38496daf178c251c8f0c1d2d923b524b6de6bfd2583ab2e41dc5319238a7d7e902836684f1363a1c8dbd6aeb9b0114f69b2d6f SHA512 cc4d7a0c910e20ae32f787db894fec29374aed19c208a79012f78e048bdc8383262f124187242654ca7df981647644b9cabb6fd3a4af8d02d7c4e90b46e726ac
-EBUILD appar-0.1.4.ebuild 532 BLAKE2B 7ec4438dd7ab022f7b2f927ca46602030630109e1996705b70a29c3b5c6e873548b58418792723226e96acd96728953fe332834ae955dfa9c11362b7fa8e7c85 SHA512 97a9d73ddc2a6ae1b41623ad7bcdb2836d6aae1c0cdd3d74401218f1da48377008d66310f2edf7b12065a4485866a0a24a84bd24648f7d971139d0404c7258d3
-MISC metadata.xml 334 BLAKE2B 649d766c62419c76762f4a81a59edce2e0a3042ec63fc7afb39443e06498cda82f32b4ae7205f0f7e6987e20e7f92e015a629ed081d0b168b7542a0b49a269e4 SHA512 64ad67668d136f50969c171f09b143c906b071dc617f8d8812d165397434f3d4317e63335f8d6abe6022548ce93aa33433188098226b6a453e4ab84bf874d796
diff --git a/dev-haskell/appar/appar-0.1.4.ebuild b/dev-haskell/appar/appar-0.1.4.ebuild
deleted file mode 100644
index 3a77c80f0234..000000000000
--- a/dev-haskell/appar/appar-0.1.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A simple applicative parser"
-HOMEPAGE="http://hackage.haskell.org/package/appar"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/appar/metadata.xml b/dev-haskell/appar/metadata.xml
deleted file mode 100644
index 14c1fd1f6ab3..000000000000
--- a/dev-haskell/appar/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A simple applicative parser in Parsec style
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/argparser-0.3.4 b/dev-haskell/argparser-0.3.4
new file mode 100644
index 000000000000..46ebb0e9a9e9
--- /dev/null
+++ b/dev-haskell/argparser-0.3.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >dev-haskell/htf-0.9 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Command line parsing framework for console applications
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/argparser
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.3.4
+SRC_URI=mirror://hackage/packages/archive/argparser/0.3.4/argparser-0.3.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a03f5889a874c157f664e4adf833446c
diff --git a/dev-haskell/argparser/Manifest b/dev-haskell/argparser/Manifest
deleted file mode 100644
index 694387b3bd8e..000000000000
--- a/dev-haskell/argparser/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST argparser-0.3.4.tar.gz 14562 BLAKE2B d3c8fa436f9cc63f5d344423b88290363eab401cc82b53ebd0a638e1020031c4994aa0d5e10b1868579e8a0f6beed7df2a908a834e735179546d10a85358692e SHA512 c7aa03426e42df57ea02ad86d044624ce8e7c0e5b3ce124434fa64a172c8dbf70001e1353b9d3bb15ad780535adc8c0426939d1b26e52a7c51b17987fc72d7d7
-EBUILD argparser-0.3.4.ebuild 663 BLAKE2B 3bd963e4e6976409e0ab649e6a87bfb118c4321c38fc17c43aea680cd3a7df8136b79afccc58bfbdeae16b9343c12faa340e811d28100b8e7fa559228e75c271 SHA512 f83f0cacc4f6c6741f52a502922958c7eab8def12e053874416276fc78d35eef3977e15f67d8219ed565f977ec27aa7e692b9dbb719de25788ab7cc6d741a058
-MISC metadata.xml 356 BLAKE2B 3be6c0e78fa3d4d05919482993f0a50d7f9743df2b60d66eb1e9353b19cc3df45981e9e5dc13b79b0f1ca4d4c13259fb9a8738475298287e77407929ff370fa2 SHA512 9ea4136b816438eccfed24f15844ae3270948c77a3afdeb534ffe5c5d0ae50eb5b6b1d173249d7a3818d8f23aec8e942352fe6bbcf00846077688ce75360ec3a
diff --git a/dev-haskell/argparser/argparser-0.3.4.ebuild b/dev-haskell/argparser/argparser-0.3.4.ebuild
deleted file mode 100644
index b7624c15f69b..000000000000
--- a/dev-haskell/argparser/argparser-0.3.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Command line parsing framework for console applications"
-HOMEPAGE="http://hackage.haskell.org/package/argparser"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # missing files
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >dev-haskell/htf-0.9
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/argparser/metadata.xml b/dev-haskell/argparser/metadata.xml
deleted file mode 100644
index 4723062c2054..000000000000
--- a/dev-haskell/argparser/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Provides a combinator library for defining a command line parser.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/arithmoi-0.4.1.3 b/dev-haskell/arithmoi-0.4.1.3
new file mode 100644
index 000000000000..8d419352fd37
--- /dev/null
+++ b/dev-haskell/arithmoi-0.4.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient basic number-theoretic functions. Primes, powers, integer logarithms
+EAPI=5
+HOMEPAGE=https://github.com/cartazio/arithmoi
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.1.3
+SRC_URI=mirror://hackage/packages/archive/arithmoi/0.4.1.3/arithmoi-0.4.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=72dc613d9897773e1ec4106843453965
diff --git a/dev-haskell/arithmoi-0.4.2.0 b/dev-haskell/arithmoi-0.4.2.0
new file mode 100644
index 000000000000..976d1150cd19
--- /dev/null
+++ b/dev-haskell/arithmoi-0.4.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.9 >=dev-haskell/smallcheck-1.1 <dev-haskell/smallcheck-1.2 >=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.12 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 >=dev-haskell/tasty-smallcheck-0.8 <dev-haskell/tasty-smallcheck-0.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient basic number-theoretic functions. Primes, powers, integer logarithms
+EAPI=6
+HOMEPAGE=https://github.com/cartazio/arithmoi
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.2.0
+SRC_URI=mirror://hackage/packages/archive/arithmoi/0.4.2.0/arithmoi-0.4.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ccbe32bc22ba55a3df1f89e6b647c5ab
diff --git a/dev-haskell/arithmoi-0.4.3.0 b/dev-haskell/arithmoi-0.4.3.0
new file mode 100644
index 000000000000..88abb8ca11eb
--- /dev/null
+++ b/dev-haskell/arithmoi-0.4.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/semigroups-0.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/quickcheck-2.7.6 <dev-haskell/quickcheck-2.10 >=dev-haskell/smallcheck-1.1 <dev-haskell/smallcheck-1.2 >=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.12 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 >=dev-haskell/tasty-smallcheck-0.8 <dev-haskell/tasty-smallcheck-0.9 >=dev-haskell/transformers-compat-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient basic number-theoretic functions. Primes, powers, integer logarithms
+EAPI=6
+HOMEPAGE=https://github.com/cartazio/arithmoi
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/semigroups-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.4.3.0
+SRC_URI=mirror://hackage/packages/archive/arithmoi/0.4.3.0/arithmoi-0.4.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=44bef7e298877ec7963ea0ae2c3cc392
diff --git a/dev-haskell/arithmoi/Manifest b/dev-haskell/arithmoi/Manifest
deleted file mode 100644
index 4321f15436b4..000000000000
--- a/dev-haskell/arithmoi/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST arithmoi-0.4.1.3.tar.gz 66196 BLAKE2B d576f3cace1ea39a55b6e9bcc3e3e6d941fe8ec6a0b31435f404bb0151a4170d4079cad96eefbb319c08ecc3aae5ab6141500b75925617b5fa4e6c86539fe93c SHA512 abc5939207e502dffd91b3a4e2b9c688eef388a6b9354576fcb4badf4625da1cad0e9698cb42b293b37cc29427ad2679170452374fbf6cd5e614d53db34cd9f6
-DIST arithmoi-0.4.2.0.tar.gz 84676 BLAKE2B 971b2ba5cca0e2af9944a06f02f02b5ff2c0e613a3c3f6963fdd906c4d617ab19ceabc8bc16f8c7fe12d6fd540c439b1af138da7bed75494cdb3d4f41993e255 SHA512 687f12aef8baf98c778498b9a0bb33f0ac3175d009ba8dcd14d6ff8bb13252120f6821e80932410a1413637b591f81b92e0ecd25cd7870464e1629f3d0bf866c
-DIST arithmoi-0.4.3.0.tar.gz 93661 BLAKE2B ff815ab9bcd8bd5ccbfcdde134049e98aebaf3c41b693b56c8048d918cc778fcb4ab321486d20b4084a61e340c0a00ae45541c12da4f8d19c7e28df81168a4a7 SHA512 0c67237a84a2c7e2abc1bbc78176e64e7f6ac23399c765dba316d429391f351734eacb924960d69d4fc603b17a4df1b40985bcbc8bbb7c51805eb72a0346b545
-EBUILD arithmoi-0.4.1.3.ebuild 860 BLAKE2B 8a2874b2c3cfb283aa95d21517ec96db9b080c2982a309b2044d1d2b4efa71c5c2846fb8c5f6eb7f78d5450c7d3462f716d9ec21623e5aff67cafbe339ef3496 SHA512 a3b9c9ed1ad46c112489f216cf94bd9612c73358ff37acca5ff0fedf2139df1d90a484c38f2b90698fd24bce330be4d9979085eb17251f4aa991e030bd8bd0b7
-EBUILD arithmoi-0.4.2.0.ebuild 1227 BLAKE2B f8280189b9ac41c4b103c314b193bf7579e7a22ef1b34b19b1a0ed4a17ab0c87340bfbdddeb912eea841bbd0295b7a9dcc8997af6de46e3326effa69f8dc9c4f SHA512 ffc2d3bc1fea3c56b0beb7fc79a2d5ad3837bfa96bde153ccc3531f83e0eb4107fe039ace29b202ded8786b0a457afbf9d82e55ee113ff9518d717ecf0b0b0cf
-EBUILD arithmoi-0.4.3.0.ebuild 1384 BLAKE2B 84cf9ac7495cdc836fcf6e8c215577c0e78231170510478152ff95ad8c7d863248b041d7266de1eca3984a1ea2246563cca197604dcdf8a7469171d466aa307a SHA512 12957a92d036c54e127754645311a59209abe974128606113ad9ebeb75a82be0999e8b90c1ddb36272b8ee1017bc066d83775b2ea6bea692e092c9413a673b8c
-MISC metadata.xml 814 BLAKE2B 26281ca55d86a794b8f3d323a9a58fe1bd52868fe677fbb5d0509eabb5154ca79eeec6fb5e1fe414c391930a95c9be7ca2e2e47f6ba465c971f0d219df545f3e SHA512 95714cf6da1b5e139ff711f959f6e0a62d3c2d9943aa15d09ab86e19ef4888d11c5108bcdf6865a22f0e72e10066bdbe644044777848982d432499ee24b74723
diff --git a/dev-haskell/arithmoi/arithmoi-0.4.1.3.ebuild b/dev-haskell/arithmoi/arithmoi-0.4.1.3.ebuild
deleted file mode 100644
index af5085c17a83..000000000000
--- a/dev-haskell/arithmoi/arithmoi-0.4.1.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -llvm
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient basic number-theoretic functions. Primes, powers, integer logarithms"
-HOMEPAGE="https://github.com/cartazio/arithmoi"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hspec )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-llvm
-}
diff --git a/dev-haskell/arithmoi/arithmoi-0.4.2.0.ebuild b/dev-haskell/arithmoi/arithmoi-0.4.2.0.ebuild
deleted file mode 100644
index 4b9539d1da49..000000000000
--- a/dev-haskell/arithmoi/arithmoi-0.4.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -check-bounds
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient basic number-theoretic functions. Primes, powers, integer logarithms"
-HOMEPAGE="https://github.com/cartazio/arithmoi"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/smallcheck-1.1 <dev-haskell/smallcheck-1.2
-		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9
-		>=dev-haskell/tasty-smallcheck-0.8 <dev-haskell/tasty-smallcheck-0.9 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-check-bounds
-}
diff --git a/dev-haskell/arithmoi/arithmoi-0.4.3.0.ebuild b/dev-haskell/arithmoi/arithmoi-0.4.3.0.ebuild
deleted file mode 100644
index b6438c58fa74..000000000000
--- a/dev-haskell/arithmoi/arithmoi-0.4.3.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -check-bounds
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient basic number-theoretic functions. Primes, powers, integer logarithms"
-HOMEPAGE="https://github.com/cartazio/arithmoi"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/semigroups-0.8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/quickcheck-2.7.6 <dev-haskell/quickcheck-2.10
-		>=dev-haskell/smallcheck-1.1 <dev-haskell/smallcheck-1.2
-		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9
-		>=dev-haskell/tasty-smallcheck-0.8 <dev-haskell/tasty-smallcheck-0.9
-		>=dev-haskell/transformers-compat-0.4 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-check-bounds
-}
diff --git a/dev-haskell/arithmoi/metadata.xml b/dev-haskell/arithmoi/metadata.xml
deleted file mode 100644
index c32026c57e0a..000000000000
--- a/dev-haskell/arithmoi/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A library of basic functionality needed for
-		number-theoretic calculations. The aim of this library
-		is to provide efficient implementations of the functions.
-		Primes and related things (totients, factorisation),
-		powers (integer roots and tests, modular exponentiation),
-		integer logarithms.
-		Note: Requires GHC &gt;= 6.12 with the integer-gmp package
-		for efficiency. Portability is on the to-do list (with
-		low priority, however).
-	</longdescription>
-	<upstream>
-		<remote-id type="github">cartazio/arithmoi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/arrows-0.4.4.1-r1 b/dev-haskell/arrows-0.4.4.1-r1
new file mode 100644
index 000000000000..63043bf90210
--- /dev/null
+++ b/dev-haskell/arrows-0.4.4.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/stream:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=180da6293baaa22400bdb99f3167db52
diff --git a/dev-haskell/arrows/Manifest b/dev-haskell/arrows/Manifest
deleted file mode 100644
index c5b36b0579a2..000000000000
--- a/dev-haskell/arrows/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST arrows-0.4.4.1.tar.gz 12261 BLAKE2B b5272da27d18c11b91ccbf7bd27cbfebfed0ffeab6ea36fcb10f932c73a05a4ac9410e46f363ae54231e73c5221420192a28bd50e0ed879241b127b0235b1cf3 SHA512 642bc893ba5a01d139498fdd8d97531daf76c583eee3317ee7b0cb15bdd5304022a0c7d9280d1eef58bba40de9782cea01325c8fed45232c15261c49b060d352
-EBUILD arrows-0.4.4.1-r1.ebuild 546 BLAKE2B 684a12031320b6cf3b520148bc48b32c0928453188e8040d7955122ea069f7f26ae308e955e33d02947582510edb5c74548b4df8c626ff5a1ec5332d45b7e786 SHA512 9727f3370b5df5489f8fb6ede3c8c26ea3e025adc12c5c9df599436ef3559e6e90aa07a0c42422f75397d33cdd54a9269fdb9954e75f2f8f9db41e87041e65c4
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/arrows/arrows-0.4.4.1-r1.ebuild b/dev-haskell/arrows/arrows-0.4.4.1-r1.ebuild
deleted file mode 100644
index 3c6c072c9e82..000000000000
--- a/dev-haskell/arrows/arrows-0.4.4.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Arrow classes and transformers"
-HOMEPAGE="http://www.haskell.org/arrows/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-haskell/stream:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-0"
diff --git a/dev-haskell/arrows/metadata.xml b/dev-haskell/arrows/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/arrows/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/ascii-progress-0.2.1.2 b/dev-haskell/ascii-progress-0.2.1.2
new file mode 100644
index 000000000000..cdc17ecfe4d1
--- /dev/null
+++ b/dev-haskell/ascii-progress-0.2.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/ansi-terminal:=[profile?] >=dev-haskell/async-2.0.1.5:=[profile?] >=dev-haskell/conduit-1.2:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] dev-haskell/http:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-3 >=dev-haskell/quickcheck-2.6 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A simple progress bar for the console
+EAPI=5
+HOMEPAGE=https://github.com/yamadapc/haskell-ascii-progress
+IUSE=examples doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/ansi-terminal:=[profile?] >=dev-haskell/async-2.0.1.5:=[profile?] >=dev-haskell/conduit-1.2:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] dev-haskell/http:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.2.1.2
+SRC_URI=mirror://hackage/packages/archive/ascii-progress/0.2.1.2/ascii-progress-0.2.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dc541d2444b2326297280df4f0694522
diff --git a/dev-haskell/ascii-progress/Manifest b/dev-haskell/ascii-progress/Manifest
deleted file mode 100644
index da5be88482e1..000000000000
--- a/dev-haskell/ascii-progress/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ascii-progress-0.2.1.2.tar.gz 6385 BLAKE2B 881137613669a9e043c801769dd290d4c96c5aabeb7a50951bcb984f612be3722aa866bd48f61751538a076e97cb347b555c19932af2c25ce9233607efab01a9 SHA512 cc1a9f1d48d522fe3a8d9afe7a200c2bd4f9e573f99ccae0993af75ab15ede8bfe7630776385e680af3540661613c60cf7aa81a08b9b83b5d8f72aaf8f869b52
-EBUILD ascii-progress-0.2.1.2.ebuild 1085 BLAKE2B ba134744a40eaaf2307f9e6dc2f702e13af251f7a7e97f0d61e48c2cf0a8671c77b79d419861a784bbd6c8fff7dcc84121fe92b90ff8a33e94b404f4ea12f812 SHA512 944ac7451590498f02401bd75ea184e0aa69e9a28f3d8744c473fd1eb958a900e33667a86c748901ddf1369a259efac6a0a12a7a4b8bba7c57fdd5789a1e9476
-MISC metadata.xml 615 BLAKE2B 993060b61fda7fe9f518fbb85441aec367eb8515a029cefdb6035af8a47e1ab39613861ee4bb71f790b2b0a646e6b7e4966db1e6328cf5afa7cf611e124c5f9c SHA512 dfd2b21fcf84b945b7967584bf6639186f2e8780f11cb61c6ff055c2fee6dda644e4758e762971d54b69644b4c3be7c316bacdd28f1e3fd6411d82ac9fd1f338
diff --git a/dev-haskell/ascii-progress/ascii-progress-0.2.1.2.ebuild b/dev-haskell/ascii-progress/ascii-progress-0.2.1.2.ebuild
deleted file mode 100644
index 2b76e631b499..000000000000
--- a/dev-haskell/ascii-progress/ascii-progress-0.2.1.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A simple progress bar for the console"
-HOMEPAGE="https://github.com/yamadapc/haskell-ascii-progress"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="dev-haskell/ansi-terminal:=[profile?]
-	>=dev-haskell/async-2.0.1.5:=[profile?]
-	>=dev-haskell/conduit-1.2:=[profile?]
-	>=dev-haskell/data-default-0.5.3:=[profile?]
-	dev-haskell/http:=[profile?]
-	>=dev-haskell/http-conduit-2.1:=[profile?]
-	>=dev-haskell/http-types-0.8:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-3
-		>=dev-haskell/quickcheck-2.6 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples examples)
-}
diff --git a/dev-haskell/ascii-progress/metadata.xml b/dev-haskell/ascii-progress/metadata.xml
deleted file mode 100644
index 0bf7ce133e01..000000000000
--- a/dev-haskell/ascii-progress/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A simple Haskell progress bar for the console. Heavily borrows from TJ
-		Holowaychuk's Node.JS project
-		&lt;https://github.com/tj/node-progress progress&gt;
-		
-		&lt;https://github.com/yamadapc/haskell-ascii-progress github&gt;
-	</longdescription>
-	<upstream>
-		<remote-id type="github">yamadapc/haskell-ascii-progress</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/asn1-data-0.7.1 b/dev-haskell/asn1-data-0.7.1
new file mode 100644
index 000000000000..6ae123cef79a
--- /dev/null
+++ b/dev-haskell/asn1-data-0.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/cereal[profile?] dev-haskell/mtl[profile?] >=dev-haskell/text-0.11[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=ASN1 data reader and writer in RAW, BER and DER forms
+EAPI=4
+HOMEPAGE=https://github.com/vincenthz/hs-asn1/tree/master/data
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/cereal[profile?] dev-haskell/mtl[profile?] >=dev-haskell/text-0.11[profile?] >=dev-lang/ghc-6.8.2
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/asn1-data/0.7.1/asn1-data-0.7.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f32b484e414d8624f13c094eaf5b5b6f
diff --git a/dev-haskell/asn1-data-0.7.1-r1 b/dev-haskell/asn1-data-0.7.1-r1
new file mode 100644
index 000000000000..639b92e3008d
--- /dev/null
+++ b/dev-haskell/asn1-data-0.7.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/cereal:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=ASN1 data reader and writer in RAW, BER and DER forms
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-asn1/tree/master/data
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/cereal:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.1
+SRC_URI=mirror://hackage/packages/archive/asn1-data/0.7.1/asn1-data-0.7.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7efab12b7e499840a47a4659a4a79aa0
diff --git a/dev-haskell/asn1-data-0.7.2 b/dev-haskell/asn1-data-0.7.2
new file mode 100644
index 000000000000..8da1a21e2640
--- /dev/null
+++ b/dev-haskell/asn1-data-0.7.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/cereal:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=ASN1 data reader and writer in RAW, BER and DER forms
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-asn1/tree/master/data
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/cereal:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.2
+SRC_URI=mirror://hackage/packages/archive/asn1-data/0.7.2/asn1-data-0.7.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b84059c0a81d61148350a2db016871d7
diff --git a/dev-haskell/asn1-data/Manifest b/dev-haskell/asn1-data/Manifest
deleted file mode 100644
index 8c7c77792ed1..000000000000
--- a/dev-haskell/asn1-data/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX asn1-data-0.7.1-ghc-7.10.patch 694 BLAKE2B 5c74f73562b63f78ea2aca0cbf3c01cc6a9a64624c7088404be40e4f1ba6bebed95e852b7dfa2f7b222f84a189a550013f11a1d6a44d983ac0d29155e2848d57 SHA512 272069aee6905a2233ee929024cb919edd3c62771a90b31194b458fb9c514a23f3038055c2122230c556ec1aa6e53f5e8b41d81734ce05e7f6b9cd90279e735f
-DIST asn1-data-0.7.1.tar.gz 17500 BLAKE2B 4c24167096019d7834c8ebb6fe3d36b41ac366042ea69aa7e0fbc745af7d05bf204e15d4137f2b57ef2f30f5c2cd4905859cf6deedda4966412a23a3c2bcac90 SHA512 dc6021daf15e5f9b93703641780c6d81c6b385d2127bcc2f735ecaf54d1be5163ad5e9ae291a3e223ff05cf03e8bbf11af0791ee810a0ba174e9cc9e9fd910d0
-DIST asn1-data-0.7.2.tar.gz 17672 BLAKE2B a4d088400c58efe6528f49eb728f5be902f91fe8de32391e1267ec5ba596c51095df91444b41577d52554778e4589121c9d65243f0fb744277ce933729b062fa SHA512 739c2a9e99a978ba5384da5d5ed388554471f2f6e898c9e07f26de6c6d48bbb236d83b6e2281be7ce4d9db6225acb230010393e1cd368ef9cf4f65eddb8e1e38
-EBUILD asn1-data-0.7.1-r1.ebuild 748 BLAKE2B d97169a49d7be4635495176500f4b1fa116f0f02d2bf83b8101a8fe497dc1e75d062982bcda75ee01ed260e2e962f459f5e7d9bb7dc9781e5199965f83b5b4c7 SHA512 76864a172b5a7b9e18e99fb254617e89f45eeccfa910d8fef0a8e38c4bb702eb018d61bb987baf2fbbe197226bc0cd4cfa24eba25aed5d0fc731739377c98771
-EBUILD asn1-data-0.7.1.ebuild 667 BLAKE2B 6be26bc84a6436219abce4e0b3b7fa29c6d909039190bec4cfae03873c30fa68e3e3fcefd22c26438c69bf95220d355caf4d4dd36ae2460b0c666c1e1bc9cf35 SHA512 e3e95898cad9560cc77c71293b14e63e09b37496ecb14e3b61fb680ed92813e79a7b2fc9facbec1d42bd13cc917a6e2402a833995692665b335264e3be4c5fd1
-EBUILD asn1-data-0.7.2.ebuild 773 BLAKE2B 0e812de5bc309e4bddefca90db0cead63acbe1c6c26c21bad48a5c6e50fdca0cdafd22d8f22b1477b9278f18b245635b5c907c3a615d8ebc4b5d6e3649a30c9e SHA512 9e10be2df0490243724d3674401dfca75abde4e6245bf20e41feabb32c6f65b1fd503125a67c9d2acba7550347267f9e7318539e8bd0970ed70ba0fb5cb39a15
-MISC metadata.xml 530 BLAKE2B 51cf206d4c4e31306e91d0c6376add5ec793ad5f59df2bf8b7f8513e3801e442ea3a846945f5e715271f49c14e6833f739cd93999fb5f920f6b4cc808c888e90 SHA512 b3d4af593f4fcbee0cae32b9cda14786e111cfcb043721b666005a710b72804acd528123f4a90e5222dc985a9475633c5ee1b5f6106cc49b3206347c438e4574
diff --git a/dev-haskell/asn1-data/asn1-data-0.7.1-r1.ebuild b/dev-haskell/asn1-data/asn1-data-0.7.1-r1.ebuild
deleted file mode 100644
index 533e1e7cdeb2..000000000000
--- a/dev-haskell/asn1-data/asn1-data-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-DESCRIPTION="ASN1 data reader and writer in RAW, BER and DER forms"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1/tree/master/data"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/cereal:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-}
diff --git a/dev-haskell/asn1-data/asn1-data-0.7.1.ebuild b/dev-haskell/asn1-data/asn1-data-0.7.1.ebuild
deleted file mode 100644
index 72b24d566c85..000000000000
--- a/dev-haskell/asn1-data/asn1-data-0.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="ASN1 data reader and writer in RAW, BER and DER forms"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1/tree/master/data"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/cereal[profile?]
-		dev-haskell/mtl[profile?]
-		>=dev-haskell/text-0.11[profile?]
-		>=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/asn1-data/asn1-data-0.7.2.ebuild b/dev-haskell/asn1-data/asn1-data-0.7.2.ebuild
deleted file mode 100644
index c978ebce58ff..000000000000
--- a/dev-haskell/asn1-data/asn1-data-0.7.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -test
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="ASN1 data reader and writer in RAW, BER and DER forms"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1/tree/master/data"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/cereal:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-test
-}
diff --git a/dev-haskell/asn1-data/files/asn1-data-0.7.1-ghc-7.10.patch b/dev-haskell/asn1-data/files/asn1-data-0.7.1-ghc-7.10.patch
deleted file mode 100644
index 8bf958454bef..000000000000
--- a/dev-haskell/asn1-data/files/asn1-data-0.7.1-ghc-7.10.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Data/ASN1/Parse.hs b/Data/ASN1/Parse.hs
-index eeea2be..83bc80e 100644
---- a/Data/ASN1/Parse.hs
-+++ b/Data/ASN1/Parse.hs
-@@ -24 +24 @@ import Control.Monad.Error
--import Control.Applicative ((<$>))
-+import Control.Applicative ((<$>), Applicative)
-@@ -25,7 +25,7 @@ import Control.Applicative ((<$>))
- 
- -- | Parse ASN1 Monad
- newtype ParseASN1 a = P { runP :: ErrorT String (State [ASN1]) a }
--        deriving (Functor, Monad, MonadError String)
-+        deriving (Functor, Applicative, Monad, MonadError String)
- 
- -- | run the parse monad over a stream and returns the result and the remaining ASN1 Stream.
- runParseASN1State :: ParseASN1 a -> [ASN1] -> Either String (a,[ASN1])
diff --git a/dev-haskell/asn1-data/metadata.xml b/dev-haskell/asn1-data/metadata.xml
deleted file mode 100644
index 03e145ac586e..000000000000
--- a/dev-haskell/asn1-data/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		ASN1 data reader and writer in raw form with supports for high level forms of ASN1 (BER, CER and DER).
-		
-		All interfaces use the enumerator interface.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-asn1-data</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/asn1-encoding-0.8.1.3 b/dev-haskell/asn1-encoding-0.8.1.3
new file mode 100644
index 000000000000..394f1826fd46
--- /dev/null
+++ b/dev-haskell/asn1-encoding-0.8.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/asn1-types-0.2.1:=[profile?] <dev-haskell/asn1-types-0.3:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 test? ( dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2:2=[profile?] >=dev-haskell/test-framework-0.3:=[profile?] >=dev-haskell/test-framework-quickcheck2-0.2:=[profile?] ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=ASN1 data reader and writer in RAW, BER and DER forms
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-asn1
+IUSE=test doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/asn1-types-0.2.1:=[profile?] <dev-haskell/asn1-types-0.3:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/0.8.1.3
+SRC_URI=mirror://hackage/packages/archive/asn1-encoding/0.8.1.3/asn1-encoding-0.8.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cdf230d28bb8d5b81c6f5a9531143ab4
diff --git a/dev-haskell/asn1-encoding-0.9.0 b/dev-haskell/asn1-encoding-0.9.0
new file mode 100644
index 000000000000..4aed86d204dc
--- /dev/null
+++ b/dev-haskell/asn1-encoding-0.9.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-haskell/hourglass-0.2.6:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/tasty dev-haskell/tasty-quickcheck dev-haskell/text ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=ASN1 data reader and writer in RAW, BER and DER forms
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-asn1
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-haskell/hourglass-0.2.6:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.9.0
+SRC_URI=mirror://hackage/packages/archive/asn1-encoding/0.9.0/asn1-encoding-0.9.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f1084a3b8c445853e2f95ce5d313d258
diff --git a/dev-haskell/asn1-encoding-0.9.3 b/dev-haskell/asn1-encoding-0.9.3
new file mode 100644
index 000000000000..efd3b432aeee
--- /dev/null
+++ b/dev-haskell/asn1-encoding-0.9.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-haskell/hourglass-0.2.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/mtl dev-haskell/tasty dev-haskell/tasty-quickcheck dev-haskell/text ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=ASN1 data reader and writer in RAW, BER and DER forms
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-asn1
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-haskell/hourglass-0.2.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.9.3
+SRC_URI=mirror://hackage/packages/archive/asn1-encoding/0.9.3/asn1-encoding-0.9.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ee0c0a0940be201cc24aca10310ea3f0
diff --git a/dev-haskell/asn1-encoding-0.9.4 b/dev-haskell/asn1-encoding-0.9.4
new file mode 100644
index 000000000000..3a61b3dd1184
--- /dev/null
+++ b/dev-haskell/asn1-encoding-0.9.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-haskell/hourglass-0.2.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/mtl dev-haskell/tasty dev-haskell/tasty-quickcheck dev-haskell/text ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=ASN1 data reader and writer in RAW, BER and DER forms
+EAPI=6
+HOMEPAGE=https://github.com/vincenthz/hs-asn1
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-haskell/hourglass-0.2.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.9.4
+SRC_URI=mirror://hackage/packages/archive/asn1-encoding/0.9.4/asn1-encoding-0.9.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fd9118e0baf0ee92ea63bf71c2e6622b
diff --git a/dev-haskell/asn1-encoding/Manifest b/dev-haskell/asn1-encoding/Manifest
deleted file mode 100644
index 14f6039fb7bf..000000000000
--- a/dev-haskell/asn1-encoding/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX asn1-encoding-0.9.0-32bit-tests.patch 905 BLAKE2B 802bab879e05a5c2a2dbfa9c910cb7ca0c21ac0d67f50618368f41032e67b6d1ca9782d46f85b4130b41cbcce350f046cfd1b1066c3b67e2a78e08adff1d8d94 SHA512 707cc6f1106cecb0ca88616b30bbff033c8bc160d3c40393eef3bf3f501154201b841379b4304401ce23b763e87d0f691a2c5f0f608f4f6cf34611bd5ee70138
-DIST asn1-encoding-0.8.1.3.tar.gz 16099 BLAKE2B ef97e3cc0d40fcaa98d319f373efb7807cfbb890ce9b23f3e1f3af7ad56e005478ea387f5a35cbc59a719cddbe98bcf5b6e75a75c71106570f5f959a5f8e6d42 SHA512 be5d97db5904cb71fd99db919a6da8e958b3e0aedaea6bbd21d316fc41dd79852d8567edecb75eb212279a9f6af3d566d3e8aa5f5f22f46a8d9ca0883af64dd9
-DIST asn1-encoding-0.9.0.tar.gz 15997 BLAKE2B 3e5aa3aadec8495303528d868b7eb76c3ebaa8f915fd73149cefc2fc7f87eae053456dd02a986f86e08ab0e25fa7f21ec7dbbd2898934af54b6bf9aeaa02deb8 SHA512 b7693c74ba01d46d93371faa1df14bdef233b8b0fcbd4de0d6a853e41795622e1edc79c278372976454107d97f8a6ba10c44cab2539103796d56b9df4fa4b0ee
-DIST asn1-encoding-0.9.3.tar.gz 16069 BLAKE2B 6929de8cccb95ce918f74951650b8ca49007da16cb9ad7417ad7434d0bb4031d2d5b906c0fbb4d643ae6fc290da90b47546b9f6cd171fdbcb51328226dd12c1c SHA512 c6e2f45403504da1740fb581083306ce1fbdaa54f9aa05f5c80a67517ad1d82140fde887cc88e0a6c9b9d778ada2013b6725c4debd1e7522729434b246ce1160
-DIST asn1-encoding-0.9.4.tar.gz 16127 BLAKE2B 247a3561aa9113c6b5c4cea846404cbdb00c1800f07fd636b0e79da109ef9c39d98ea04bd360bfcee26e0386ad2a314195ec4855fb72fc35e644048d2821ba6f SHA512 d9d8d6208a9d4eb6e106918b2c35ce026c5c5f0108263378b10dc1bffaf46c5737a557bbcb68f912bbe3c89b01e8be9c7c6dd0125fe29e19dcbcd30840317955
-EBUILD asn1-encoding-0.8.1.3.ebuild 991 BLAKE2B 8cb4c5644854f38fee86251887e60c68b4da5f276725568d04fae1f6da35ead08f8a43fb33c874394ed869e22f4d3617c831a97d0a39faeda7734b5378c90657 SHA512 578ff18bd0bd384d330471eddc0928aa38252c10e3239f356d87cd0fe62c3674fc04330577d270d6367bd8d2c117221044908ad58a4a9993fc834f29ae125153
-EBUILD asn1-encoding-0.9.0.ebuild 865 BLAKE2B 7df2792504b07f58c502447781a0d75d9129f8f70bd1443f5736dfe0916bec21428546df450df2863b33a8f3691057e47871ce51279f884f5889bd1e830cf2e1 SHA512 04d50ddf06b5ffbc7baf6ab8cd2943cf74d8a5140db3240346a204eafa374018435ca591111e5425cf4549876ac3746d4c87dd52e80dd40d09c120ef8202744f
-EBUILD asn1-encoding-0.9.3.ebuild 797 BLAKE2B 7f97d5e9d70b04767252cda21c152a3cfe4c1106c855888123032f15f97fbd9c95b4b02608853612218591ca89a8a692b8a9157a1de18fdcac344e4b47456f46 SHA512 4342c181f873b316624a67e05b9ca20e177f5670d6f57e9f7e4cb8720a89c6d4876497bd2ad530be028fab000a53c716f4046ee9ec9afeb95dd06699eaa9d729
-EBUILD asn1-encoding-0.9.4.ebuild 795 BLAKE2B 2b57487f484d4113e2b6c4bb8375c377a3ab35836990c660be8b00bfdf08a8905b932ca8d37ec76a81b453b1f95a44d6854dbe28858d06daac7e6a157f642373 SHA512 0a4453166d3243d7d93cf73e18194fb35c9eb5cacd3ae699279fe7f556f4d679e55cb4229edb606b51921a2676ec75d69207dc6b059101dda1345102f5463d75
-MISC metadata.xml 471 BLAKE2B 8493c1867169f6ad2d77b3f5b815df797b4f921b3c7452d080fc3d4cf9b2375a14a566129886766888e4c7b9ec0e37fd1bdbe1f0e2b7d706c4237ad8c47223eb SHA512 36969d3c6f726261b2be7cb03b8e7ae968ea156462536ced2eb900962d812ea47b021b4eeb8923d99225f41e0c046d73eedac4a26512a96334df5f2a103d93b2
diff --git a/dev-haskell/asn1-encoding/asn1-encoding-0.8.1.3.ebuild b/dev-haskell/asn1-encoding/asn1-encoding-0.8.1.3.ebuild
deleted file mode 100644
index 17f5f1743591..000000000000
--- a/dev-haskell/asn1-encoding/asn1-encoding-0.8.1.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="ASN1 data reader and writer in RAW, BER and DER forms"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-haskell/asn1-types-0.2.1:=[profile?] <dev-haskell/asn1-types-0.3:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( dev-haskell/hunit:=[profile?]
-		>=dev-haskell/quickcheck-2:2=[profile?]
-		>=dev-haskell/test-framework-0.3:=[profile?]
-		>=dev-haskell/test-framework-quickcheck2-0.2:=[profile?] )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test test)
-}
diff --git a/dev-haskell/asn1-encoding/asn1-encoding-0.9.0.ebuild b/dev-haskell/asn1-encoding/asn1-encoding-0.9.0.ebuild
deleted file mode 100644
index 02ae67ec2063..000000000000
--- a/dev-haskell/asn1-encoding/asn1-encoding-0.9.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="ASN1 data reader and writer in RAW, BER and DER forms"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	>=dev-haskell/hourglass-0.2.6:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-quickcheck
-		dev-haskell/text )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-32bit-tests.patch
-}
diff --git a/dev-haskell/asn1-encoding/asn1-encoding-0.9.3.ebuild b/dev-haskell/asn1-encoding/asn1-encoding-0.9.3.ebuild
deleted file mode 100644
index fcc3ca5fda2a..000000000000
--- a/dev-haskell/asn1-encoding/asn1-encoding-0.9.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="ASN1 data reader and writer in RAW, BER and DER forms"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	>=dev-haskell/hourglass-0.2.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/mtl
-		dev-haskell/tasty
-		dev-haskell/tasty-quickcheck
-		dev-haskell/text )
-"
diff --git a/dev-haskell/asn1-encoding/asn1-encoding-0.9.4.ebuild b/dev-haskell/asn1-encoding/asn1-encoding-0.9.4.ebuild
deleted file mode 100644
index 0c9ec8d2de8b..000000000000
--- a/dev-haskell/asn1-encoding/asn1-encoding-0.9.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="ASN1 data reader and writer in RAW, BER and DER forms"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	>=dev-haskell/hourglass-0.2.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/mtl
-		dev-haskell/tasty
-		dev-haskell/tasty-quickcheck
-		dev-haskell/text )
-"
diff --git a/dev-haskell/asn1-encoding/files/asn1-encoding-0.9.0-32bit-tests.patch b/dev-haskell/asn1-encoding/files/asn1-encoding-0.9.0-32bit-tests.patch
deleted file mode 100644
index 2b45be985bba..000000000000
--- a/dev-haskell/asn1-encoding/files/asn1-encoding-0.9.0-32bit-tests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-On 32-bit systems Hourglass silently breaks dates
-out of range '1970 +- 68' years due to use of
-'time_t' and 'gmtime_r' from installed libc.
-
-Workaround test failures by not testing times out of this range.
-
-Github-bug: https://github.com/vincenthz/hs-hourglass/issues/21
-Github-bug: https://github.com/vincenthz/hs-asn1/issues/12
-diff --git a/tests/Tests.hs b/tests/Tests.hs
-index 5a82ec9..525de82 100644
---- a/tests/Tests.hs
-+++ b/tests/Tests.hs
-@@ -88,7 +88,10 @@ instance Arbitrary BitArray where
- 
- instance Arbitrary Date where
-     arbitrary = do
--        y <- choose (1951, 2050)
-+        -- 2037 and not 2050
-+        -- due to a limitation of 'timeConvert' on 32-bit systems:
-+        --  https://github.com/vincenthz/hs-hourglass/issues/21
-+        y <- choose (1951, 2037)
-         m <- elements [ January .. December]
-         d <- choose (1, 30)
-         return $ normalizeDate $ Date y m d
diff --git a/dev-haskell/asn1-encoding/metadata.xml b/dev-haskell/asn1-encoding/metadata.xml
deleted file mode 100644
index 798454e0e839..000000000000
--- a/dev-haskell/asn1-encoding/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		ASN1 data reader and writer in raw form with supports for high level forms of ASN1 (BER, and DER).
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-asn1</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/asn1-parse-0.8.1 b/dev-haskell/asn1-parse-0.8.1
new file mode 100644
index 000000000000..40756888b416
--- /dev/null
+++ b/dev-haskell/asn1-parse-0.8.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/asn1-encoding-0.8:=[profile?] >=dev-haskell/asn1-types-0.2:=[profile?] <dev-haskell/asn1-types-0.3:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple monadic parser for ASN1 stream types
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-asn1
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/asn1-encoding-0.8:=[profile?] >=dev-haskell/asn1-types-0.2:=[profile?] <dev-haskell/asn1-types-0.3:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/0.8.1
+SRC_URI=mirror://hackage/packages/archive/asn1-parse/0.8.1/asn1-parse-0.8.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=74aa3b273f4c73f2d5c0c600151082dc
diff --git a/dev-haskell/asn1-parse-0.9.1 b/dev-haskell/asn1-parse-0.9.1
new file mode 100644
index 000000000000..dd4b0806a0d7
--- /dev/null
+++ b/dev-haskell/asn1-parse-0.9.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple monadic parser for ASN1 stream types
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-asn1
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.9.1
+SRC_URI=mirror://hackage/packages/archive/asn1-parse/0.9.1/asn1-parse-0.9.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=16e755c3c8161e9f30a665589f8358ae
diff --git a/dev-haskell/asn1-parse-0.9.4 b/dev-haskell/asn1-parse-0.9.4
new file mode 100644
index 000000000000..8caef3d54886
--- /dev/null
+++ b/dev-haskell/asn1-parse-0.9.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple monadic parser for ASN1 stream types
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-asn1
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.9.4
+SRC_URI=mirror://hackage/packages/archive/asn1-parse/0.9.4/asn1-parse-0.9.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e179e8df14222234270803332f69eedd
diff --git a/dev-haskell/asn1-parse/Manifest b/dev-haskell/asn1-parse/Manifest
deleted file mode 100644
index 8b80ea0b1b1b..000000000000
--- a/dev-haskell/asn1-parse/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST asn1-parse-0.8.1.tar.gz 2724 BLAKE2B 5caca79503128c9971ba1a66fe52de5fc5dcf854495562262e540c74c48aa21168399f09811d518e506bbb6fd89222dafbf074d310a4b5cd63be3a60ac0e71ef SHA512 d175903a4e2eacaf56b3c641c3a78adebfdbe263678a59c0ba44d5c1185408800f1aabad3d0ce622fe1029e204699477b36565df5bd1049ebba0df10f72eb128
-DIST asn1-parse-0.9.1.tar.gz 2785 BLAKE2B 829fe0a8cf9e1bd5b69207ac8c197e73511236d8c6260196c1ccff8ec78965ce8a6434abdf227607e0b56cd57a0af6501bcca3653518258aa93fceee5868ca92 SHA512 69799adf27188a8b1468cfc35c5a17ffe668aa30f585e8d8ff0b9153936a8825e9d548fca38d8e4ea5823ae511f179c5b56c5fe804260048bd3c5e373a077d17
-DIST asn1-parse-0.9.4.tar.gz 2860 BLAKE2B 9e9d1ae63a125215143ec31f10149fb3cd4e821c83b91e99031de8fabe73cd0c91ebba6c2ca77ec78a2093e5d1760483f4174e409d957f5f86045b91444b85c4 SHA512 10579753addf0580d33f2d7d8571bedb3b4ff3d485891dd7db8b75ae09550cbd42ee9d00a452263810079eeb77ec630687b193a6d4b538bfdb683b92c9e64637
-EBUILD asn1-parse-0.8.1.ebuild 749 BLAKE2B 2dde71cdaa4d3ed474ff7b3adeea5c20b91bf1f0a6a44e2c6113fd0253f6ffbe0dad5690091ed7d2171166a1d6002add4c433c9aea17d3093b8be93ff1ccd508 SHA512 6326ca72394a8be7ca0ee76a9b2e02909fad85cd8bc1ae65f4158779f75a6aff5e850143343db2c46397d2ae2a028d879bc0cdff8d9e23a7b79c6877c9c42014
-EBUILD asn1-parse-0.9.1.ebuild 705 BLAKE2B 5b7b269b105174f4339587d8a095ef54c84fc8e52de7aac07df205b6db8ad1a0d2d0796399d6f8096f12e5fe1f56e1957a1c81e30348e0907a35911de6007900 SHA512 53e8914e4d8a6e125bf6dfd8df0e3a9474fa29bfba5c837c7197496f1163e8300813194da5c6e8841e663933f711f1175648049a13d9a021fd65e5df0d72a917
-EBUILD asn1-parse-0.9.4.ebuild 678 BLAKE2B 2b3db5b0f77cd5850a9adce614548895fb6499dbf2e7528cedde2539cfe3b9378132df7ed1099a17aa8222ebb7faace7362d1045fa3322f19bb008eda3b93645 SHA512 8e68f05376c669b40e7d1ce94496a5f9deecba5adb7ae576680d70d3273ce9c703c36e5a876da0e8113d952498cd3f948a8d96d6e7dc6792eee252c8c6922bdf
-MISC metadata.xml 463 BLAKE2B 7c3abc8b99ff29bd4ccd577649a7f1a543eac9c85e29381e510ab824e7b03b116578377a172317fc7bec58bfcdb9a3a6e91a31e0226ef526baa107f44b0479d7 SHA512 8f66fdcc7b44e78d49916787df1efe998cf79136ba3bb1ed0221b85ffc9e23b8b340fafe6da611c8e95cfd9e041699d48f101bd07c5e9283c4d1829f6f859411
diff --git a/dev-haskell/asn1-parse/asn1-parse-0.8.1.ebuild b/dev-haskell/asn1-parse/asn1-parse-0.8.1.ebuild
deleted file mode 100644
index bd752049a8a0..000000000000
--- a/dev-haskell/asn1-parse/asn1-parse-0.8.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple monadic parser for ASN1 stream types"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.8:=[profile?]
-	>=dev-haskell/asn1-types-0.2:=[profile?] <dev-haskell/asn1-types-0.3:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/asn1-parse/asn1-parse-0.9.1.ebuild b/dev-haskell/asn1-parse/asn1-parse-0.9.1.ebuild
deleted file mode 100644
index 788531165dac..000000000000
--- a/dev-haskell/asn1-parse/asn1-parse-0.9.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple monadic parser for ASN1 stream types"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?]
-	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/asn1-parse/asn1-parse-0.9.4.ebuild b/dev-haskell/asn1-parse/asn1-parse-0.9.4.ebuild
deleted file mode 100644
index aec52edcf62f..000000000000
--- a/dev-haskell/asn1-parse/asn1-parse-0.9.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple monadic parser for ASN1 stream types"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?]
-	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/asn1-parse/metadata.xml b/dev-haskell/asn1-parse/metadata.xml
deleted file mode 100644
index 26861d6a2692..000000000000
--- a/dev-haskell/asn1-parse/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Simple monadic parser for ASN1 stream types, when ASN1 pattern matching is not convenient.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-asn1</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/asn1-types-0.2.0 b/dev-haskell/asn1-types-0.2.0
new file mode 100644
index 000000000000..b0bd7da4a721
--- /dev/null
+++ b/dev-haskell/asn1-types-0.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=ASN.1 types
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-asn1/tree/master/types
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.12.1:=
+SLOT=0/0.2.0
+SRC_URI=mirror://hackage/packages/archive/asn1-types/0.2.0/asn1-types-0.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bd45f9314d3cd07debd7126f74bda58f
diff --git a/dev-haskell/asn1-types-0.2.3 b/dev-haskell/asn1-types-0.2.3
new file mode 100644
index 000000000000..f895584448d5
--- /dev/null
+++ b/dev-haskell/asn1-types-0.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=ASN.1 types
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-asn1/tree/master/types
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.12.1:=
+SLOT=0/0.2.3
+SRC_URI=mirror://hackage/packages/archive/asn1-types/0.2.3/asn1-types-0.2.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=efa5ca9e1df05f3f4f5d2e1515ae7f77
diff --git a/dev-haskell/asn1-types-0.3.0 b/dev-haskell/asn1-types-0.3.0
new file mode 100644
index 000000000000..233eef320f3a
--- /dev/null
+++ b/dev-haskell/asn1-types-0.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/hourglass:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=ASN.1 types
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-asn1/tree/master/types
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/hourglass:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.0
+SRC_URI=mirror://hackage/packages/archive/asn1-types/0.3.0/asn1-types-0.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cbd3b46371f137594a5326b8bb4555d9
diff --git a/dev-haskell/asn1-types-0.3.2 b/dev-haskell/asn1-types-0.3.2
new file mode 100644
index 000000000000..c69a9e46f7dd
--- /dev/null
+++ b/dev-haskell/asn1-types-0.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/hourglass:=[profile?] dev-haskell/memory:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=ASN.1 types
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-asn1/tree/master/types
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/hourglass:=[profile?] dev-haskell/memory:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.2
+SRC_URI=mirror://hackage/packages/archive/asn1-types/0.3.2/asn1-types-0.3.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0218454e6276fd357320eac9c706b62b
diff --git a/dev-haskell/asn1-types/Manifest b/dev-haskell/asn1-types/Manifest
deleted file mode 100644
index 91f137265ff9..000000000000
--- a/dev-haskell/asn1-types/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST asn1-types-0.2.0.tar.gz 5248 BLAKE2B b84ede6c89da0d73937a2fd08d5f9fce230ebd5f9882fda948d6b6e1efbe2c614d694f435c2fa7afff3b29ae6172bf5a3d2257804f8815b42d91f3dda1bb8321 SHA512 da28b3565c74eba8faf5de4f9cb24d90242412d4fbc358199b803c1f0b50c6c4dca89aada813d7126fb482300cfd3d43130be2f700d4c7943de2966870936cd9
-DIST asn1-types-0.2.3.tar.gz 5411 BLAKE2B 4309a5fa877d46898f446b995dfb37414f0110acef42ed96353589cacf8a2cb8c9a9fae922215baf3eac2d0c8c3561c5f5bac6e877acf761cf0bbf8fc9fa2b81 SHA512 09074e2fbadd2cb79f8c8cd7fb2d64794d7bcfe09a9eea345b98895ad855ea187fb33882c420a380ee362e61990824d6b365e75ed5fa429d994bd7e0582ddbdf
-DIST asn1-types-0.3.0.tar.gz 5391 BLAKE2B 506ca6f853911f3b412ebc8bed53558976b1229c30fa0ea2fde2b84b747bc5a13e63e43be042ebd911f9dc527603776d7d7fc865086c5ac8a3861fe6994bbc76 SHA512 7955320acb2a7801cc268d8cc7bbf2a9c8c127b151d89c1abffd0994f6cecb57979b25612f7efc922c82d9abeb7dc5ff6db2d08e26fdd1c36a6bfcd428b122be
-DIST asn1-types-0.3.2.tar.gz 6424 BLAKE2B 6c3a0016297b928a6744e6068cad7fa159151c5b726e961e8b918f576bf2e7cf8df9e2ded904517ee4afe4a64b4437e0d38f073569893a37eade6a52d9b481d8 SHA512 d5eb4c9f4fc44ff06b4d0d4c6be4ad2b43e01478de6ca48d2a78bad69d828f1c48095ccb4542546357f8934141b4c96f156d954072b91f1695ef1536ddc50e08
-EBUILD asn1-types-0.2.0.ebuild 535 BLAKE2B fddf65adcac3c6fb534c14189f3f8f0b41e6a147c095bb8f2a6a6eab20defc21f0e4c0877d38c0c50e2381416c8fc54d41c90c0e4b098fc24a77ada3f86aa36c SHA512 5ebb1b54c4f925638498314cff56188937fed7f9fef2289e5832140b1146874e243a19ab085ed326405aaf6caae1873a5826d05f25a269e7c4f9452efc0f113a
-EBUILD asn1-types-0.2.3.ebuild 542 BLAKE2B f886c38998db0c1337c8ab36b7033062644b5a8fbd321c97191f55441f469293d3613de1d0a5a9325a203262bd8e18353966468286f32d1881ede60629b211e8 SHA512 ba23b20df7fb2ff1f1411cc3b667705c1ec7fa7319367260ea673c4b4157878192267ea436a64d914d47581de10ec3f943ca2691d26e17495f93f579e4033fc7
-EBUILD asn1-types-0.3.0.ebuild 565 BLAKE2B 4ae03cf226ee406138eb98ce5f6f13fcdb4965ca2563cbe39d3139b80eb8774feda1cd718dbf0ea1574436374e89ee4cf8fd0e4ce250118263c950d64e1984c4 SHA512 248389e480448f26c9cc55384c34edba6dbb204578bee65dbb36eb0286a953d488644a762abf39bbe60b0d4d3a8200c4cd6ac572112cc37635cc9b9b9c085baa
-EBUILD asn1-types-0.3.2.ebuild 604 BLAKE2B ded2d912d4171dd33313968f142566719266c8003dcdba72f82ca939cf2e82c4c3f2c8dd8018fde6a11da9a7150bd0d9edf86b3ea39eacb22298cbeca9ad0771 SHA512 20dc28732c3ff8b0e8428274f0bc80e55d59d5694700a969866f133d8886395892e3cdd4ecf5f000446bc35b28223bda7659d2c4d73cf5121e14d57ba133b7c9
-MISC metadata.xml 399 BLAKE2B cadbd47b3b299c5b2d7b59584d013ff7d8e4e13044a0aa4cc9be15cc8bbfd36e2d23fe2e0dafb7f375ed3f27c80ddb57af7f28cd148cd24d74917ae1d727dc4a SHA512 3ab84ea14383c4a7e38fae089b7b0c44a646c272cca19920fbabfeebf7a2433c2403de8842b16f958516696176e0eca24004e019763ebaf180bb1bc512637a4a
diff --git a/dev-haskell/asn1-types/asn1-types-0.2.0.ebuild b/dev-haskell/asn1-types/asn1-types-0.2.0.ebuild
deleted file mode 100644
index 1d4755fe01c4..000000000000
--- a/dev-haskell/asn1-types/asn1-types-0.2.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="ASN.1 types"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1/tree/master/types"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/asn1-types/asn1-types-0.2.3.ebuild b/dev-haskell/asn1-types/asn1-types-0.2.3.ebuild
deleted file mode 100644
index f41fb9930df1..000000000000
--- a/dev-haskell/asn1-types/asn1-types-0.2.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="ASN.1 types"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1/tree/master/types"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/asn1-types/asn1-types-0.3.0.ebuild b/dev-haskell/asn1-types/asn1-types-0.3.0.ebuild
deleted file mode 100644
index ddf5116f6a6b..000000000000
--- a/dev-haskell/asn1-types/asn1-types-0.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="ASN.1 types"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1/tree/master/types"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hourglass:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/asn1-types/asn1-types-0.3.2.ebuild b/dev-haskell/asn1-types/asn1-types-0.3.2.ebuild
deleted file mode 100644
index ba9aebbb1b0b..000000000000
--- a/dev-haskell/asn1-types/asn1-types-0.3.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="ASN.1 types"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1/tree/master/types"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hourglass:=[profile?]
-	dev-haskell/memory:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/asn1-types/metadata.xml b/dev-haskell/asn1-types/metadata.xml
deleted file mode 100644
index a2d6d3d44b11..000000000000
--- a/dev-haskell/asn1-types/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		ASN.1 standard types
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-asn1-types</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/async-2.0.1.4 b/dev-haskell/async-2.0.1.4
new file mode 100644
index 000000000000..2d21d5c6e34c
--- /dev/null
+++ b/dev-haskell/async-2.0.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-lang/ghc-7.0.1:= test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Run IO operations asynchronously and wait for their results
+EAPI=5
+HOMEPAGE=https://github.com/simonmar/async
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-lang/ghc-7.0.1:=
+SLOT=0/2.0.1.4
+SRC_URI=mirror://hackage/packages/archive/async/2.0.1.4/async-2.0.1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d477cda1cabe299cfe1d7bdab95ee0a2
diff --git a/dev-haskell/async-2.0.2 b/dev-haskell/async-2.0.2
new file mode 100644
index 000000000000..b591865e6135
--- /dev/null
+++ b/dev-haskell/async-2.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Run IO operations asynchronously and wait for their results
+EAPI=5
+HOMEPAGE=https://github.com/simonmar/async
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.0.2
+SRC_URI=mirror://hackage/packages/archive/async/2.0.2/async-2.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9f218c0b5aadd4a44bcf1111a0e66bef
diff --git a/dev-haskell/async-2.1.1 b/dev-haskell/async-2.1.1
new file mode 100644
index 000000000000..d684102b0432
--- /dev/null
+++ b/dev-haskell/async-2.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Run IO operations asynchronously and wait for their results
+EAPI=6
+HOMEPAGE=https://github.com/simonmar/async
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.1.1
+SRC_URI=mirror://hackage/packages/archive/async/2.1.1/async-2.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=232866e2cc5366eab5a2ded01fd2dec7
diff --git a/dev-haskell/async/Manifest b/dev-haskell/async/Manifest
deleted file mode 100644
index 98cf4349d1be..000000000000
--- a/dev-haskell/async/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST async-2.0.1.4.tar.gz 8349 BLAKE2B 3323c08beddd482a3d0442fd64afebabb01cd8307dae2650ee27687ca247c73eaf0ce45f953180ecf4f706705041933cd0387699ca1592d72b63761932b47790 SHA512 8b170644ce92f9788e22771239542e46ee14b9898404744f6a97b955ef22ae4b3fa280ea759f228cb22f2083b5ee007f39c61063f82e5cce8f6bf1c6df789a71
-DIST async-2.0.2.tar.gz 8565 BLAKE2B 8bda599c7a5bd30b67d73de87f136eae3535619e3eb274b928f6536cc2c4f6f03d73ff31e619f8681449fdf501aa08b83c2324e1121ffcfeaa69d732df7675d7 SHA512 beac3452aca98f9c41fb86b1b9e105a324df5a05e10c7d616927bb94888d6d2ed5385e0ec901fdfa050a43e991f5089757d3941ce97db98c148a159893bddc1e
-DIST async-2.1.1.tar.gz 10565 BLAKE2B a379efe6df6c58d1962d820b0f1370c87af487b61f7c3ed32fb22398d77be8265a9577d44793624fd8b0d41c930c2f94106511d816df9600e7b7a17b897641bc SHA512 85a878389f019df0038f7b0ea82e8619f30eed97cc5c53438dbcaef128c08cdf5658afa203605434a2e1eb885fc28515a30c83341cb1b77331362205d521972b
-EBUILD async-2.0.1.4.ebuild 832 BLAKE2B f9960f60231759f3935221703e7aed56148e2273df5d1ef61b06cf41bd9364ba1aa2e4ac7812158ebf71f18a3983c4daa0159aa6f1b00c118c452b956f42a370 SHA512 3582d92b5d21906c92cb6ca7b642f4edf86391f4dc301312230f526f4bf076ad109d18faacf473a523394d23a91b2cfd0fbb657cfbecde7956e8641b4b6fb1d4
-EBUILD async-2.0.2.ebuild 755 BLAKE2B f8f75b6b534ee323a579fb2a37ae8e294390a45c5222f899b943675983c9da32a65d56f0f3893388d26a2cf7e3f1ca4d77aa36b73fc3cfa660e00a4737c23eca SHA512 6d2fceed548b4673b799b04f3c8448bd8706520a9f7f60af11f1c0613e3d0ef62a3e176a3b55ab511025e41d3c16ee54cfa5656d71ca588e792a417498512648
-EBUILD async-2.1.1.ebuild 756 BLAKE2B 8e75874e7b75aa157d176edf261a79705747130d60908ced3269d2e95f98d5ec45fa8570bb09b1cd8580140e5f6dd76cf253b2b8a33bfc2e89d7361260173f61 SHA512 e9a8e214d78534f3b56fdf6b72f34240b60acfe779a1e34160f0523bd00be1bb526b5eb093f8acda2a36bb2ea162e87676434c22e20474dce8d8a387e9e500b9
-MISC metadata.xml 1591 BLAKE2B e513dd2e93240046dadb6412fa548d7a7390700a80d241a4fc00a8204220541fec695e82fdd64a122dcf923f6ec91c8ba67c627c6997386cc09b24956364d3f3 SHA512 9fb7bd1b705dc30c1e8bfeedf6cb4f3ce0391b60dc0eb362536615e7e693cfff0917fa74c1fc725811db1017d186782994b3aeb106059fca5852c1232f48080e
diff --git a/dev-haskell/async/async-2.0.1.4.ebuild b/dev-haskell/async/async-2.0.1.4.ebuild
deleted file mode 100644
index 8492c7691579..000000000000
--- a/dev-haskell/async/async-2.0.1.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Run IO operations asynchronously and wait for their results"
-HOMEPAGE="https://github.com/simonmar/async"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.2:=[profile?]
-		<dev-haskell/stm-2.5:=[profile?]
-		>=dev-lang/ghc-7.0.1:="
-DEPEND="${RDEPEND}
-		test? ( dev-haskell/hunit
-			dev-haskell/test-framework
-			dev-haskell/test-framework-hunit
-		)
-		>=dev-haskell/cabal-1.8"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >= 4.3 && < 4.7' 'base >= 4.3'
-}
diff --git a/dev-haskell/async/async-2.0.2.ebuild b/dev-haskell/async/async-2.0.2.ebuild
deleted file mode 100644
index 411a79cea032..000000000000
--- a/dev-haskell/async/async-2.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Run IO operations asynchronously and wait for their results"
-HOMEPAGE="https://github.com/simonmar/async"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
diff --git a/dev-haskell/async/async-2.1.1.ebuild b/dev-haskell/async/async-2.1.1.ebuild
deleted file mode 100644
index 3827b4ce1cb8..000000000000
--- a/dev-haskell/async/async-2.1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Run IO operations asynchronously and wait for their results"
-HOMEPAGE="https://github.com/simonmar/async"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
diff --git a/dev-haskell/async/metadata.xml b/dev-haskell/async/metadata.xml
deleted file mode 100644
index 85a5a5773f03..000000000000
--- a/dev-haskell/async/metadata.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-	</maintainer>
-	<longdescription>
-		This package provides a higher-level interface over
-		threads, in which an @Async a@ is a concurrent
-		thread that will eventually deliver a value of
-		type @a@.  The package provides ways to create
-		@Async@ computations, wait for their results, and
-		cancel them.
-		
-		Using @Async@ is safer than using threads in two
-		ways:
-		
-		* When waiting for a thread to return a result,
-		if the thread dies with an exception then the
-		caller must either re-throw the exception
-		('wait') or handle it ('waitCatch'); the
-		exception cannot be ignored.
-		
-		* The API makes it possible to build a tree of
-		threads that are automatically killed when
-		their parent dies (see 'withAsync').
-		
-		Changes in 2.0.1.3:
-		
-		* Bump @base@ dependency to allow 4.6
-		
-		Changes in 2.0.1.2:
-		
-		* Bump @stm@ dependency to 2.4
-		
-		Changes in 2.0.1.1:
-		
-		* Safe Haskell support: @Control.Concurrent.Async@ is now @Trustworthy@
-		
-		Changes in 2.0.1.0:
-		
-		* Added a @Functor@ instance for @Async@
-		
-		* Added @asyncBound@, @asyncOn@, @asyncWithUnmask@, @asyncOnWithUnmask@, @withAsyncBound@, @withAsyncOn@, @withAsyncWithUnmask@, @withAsyncOnWithUnmask@.
-		
-		* Added @mapConcurrently@
-		
-		* Added @Concurrently@ (with @Applicative@ and @Alternative@ instances)
-	</longdescription>
-	<upstream>
-		<remote-id type="github">simonmar/async</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/atomic-primops-0.4-r1 b/dev-haskell/atomic-primops-0.4-r1
new file mode 100644
index 000000000000..371f1b0c8de0
--- /dev/null
+++ b/dev-haskell/atomic-primops-0.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/bits-atomic:=[profile?] dev-haskell/cabal:=[profile?] dev-haskell/primitive:=[profile?] >=dev-lang/ghc-7.4.1:= profile? ( !<dev-haskell/cabal-1.17 ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A safe approach to CAS and other atomic ops in Haskell
+EAPI=5
+HOMEPAGE=https://github.com/rrnewton/haskell-lockfree-queue/wiki
+IUSE=debug doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/bits-atomic:=[profile?] dev-haskell/cabal:=[profile?] dev-haskell/primitive:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4
+SRC_URI=mirror://hackage/packages/archive/atomic-primops/0.4/atomic-primops-0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=76526e6f6e7ab4ba0c256a7b91302035
diff --git a/dev-haskell/atomic-primops-0.6.1.1 b/dev-haskell/atomic-primops-0.6.1.1
new file mode 100644
index 000000000000..d9b3d1bfd944
--- /dev/null
+++ b/dev-haskell/atomic-primops-0.6.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/primitive:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A safe approach to CAS and other atomic ops in Haskell
+EAPI=5
+HOMEPAGE=https://github.com/rrnewton/haskell-lockfree/wiki
+IUSE=debug doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/primitive:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/0.6.1.1
+SRC_URI=mirror://hackage/packages/archive/atomic-primops/0.6.1.1/atomic-primops-0.6.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=79474bbff51e0678ddd91de6d7ee7aee
diff --git a/dev-haskell/atomic-primops-0.7 b/dev-haskell/atomic-primops-0.7
new file mode 100644
index 000000000000..0f6b67998e12
--- /dev/null
+++ b/dev-haskell/atomic-primops-0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/primitive:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A safe approach to CAS and other atomic ops in Haskell
+EAPI=5
+HOMEPAGE=https://github.com/rrnewton/haskell-lockfree/wiki
+IUSE=debug doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/primitive:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/0.7
+SRC_URI=mirror://hackage/packages/archive/atomic-primops/0.7/atomic-primops-0.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=79474bbff51e0678ddd91de6d7ee7aee
diff --git a/dev-haskell/atomic-primops-0.8.0.4 b/dev-haskell/atomic-primops-0.8.0.4
new file mode 100644
index 000000000000..4c6a472dedca
--- /dev/null
+++ b/dev-haskell/atomic-primops-0.8.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/primitive:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A safe approach to CAS and other atomic ops in Haskell
+EAPI=6
+HOMEPAGE=https://github.com/rrnewton/haskell-lockfree/wiki
+IUSE=debug doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/primitive:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/0.8.0.4
+SRC_URI=mirror://hackage/packages/archive/atomic-primops/0.8.0.4/atomic-primops-0.8.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=28e07b5bc52b57c3fe99657ba7630893
diff --git a/dev-haskell/atomic-primops/Manifest b/dev-haskell/atomic-primops/Manifest
deleted file mode 100644
index c6a82f2a7988..000000000000
--- a/dev-haskell/atomic-primops/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST atomic-primops-0.4.tar.gz 24982 BLAKE2B c8b730a6eb7c8ed438b56b1fab88d318ee1ebfc9455ff0383655481fc695078de6b86d4db97fc2be5aa147fe9f5e08594a9605eff687b11b0a01970254949403 SHA512 981610ad2aa22a9e8a629f04bbf5d42f3a62dabde9787c2481597357a6f7bf9b894bc2c1bab8dfc92002789021704e2725abecac55a4fbd4c263821327cd8023
-DIST atomic-primops-0.6.1.1.tar.gz 30423 BLAKE2B 623ac4829251532003df6e2c5609240554c644a0172f6e6c5ca9fd14b469c5647eb19875af46e49f1887687f98a9bd256ef8904b8eabb1e843b04323975dee42 SHA512 02e1fd969320fb477b430b57333aba09fe4dabc04df9d03ea6996d6d11d6f2b442d28828d7cf77690fae35f3a90cc2222054466acdd214b5c5bde3cbdaf3b94e
-DIST atomic-primops-0.7.tar.gz 30560 BLAKE2B b1ff65b125f29b35a846e217d8e5a95a489924ae131cbbd877d1957de40ba6d244d99fbd8711c8e267fe0f9d8154152c2670ec32ac0a7dd6fb283f12a3aeb616 SHA512 5231515cb37e4f31b35232ff60ee8bd9c273ee8c9c1e08cb5c84b82d3381afb9301979a4774362145be22c08d5c4852afaaa3c7d67b8e1613abbb477c533b8a4
-DIST atomic-primops-0.8.0.4.tar.gz 34075 BLAKE2B 7f1c25d5ff200965704cebd9f7e9abda83e1e14893278cc3b4a44bc48e1cf409c885ceb1670244acdf19ef47e11ffc16b56872c41917983f3fd5b0abd1226f7c SHA512 c130d1f51093f2f6c80c15ff4f8f92ca9cc6c81f9e00d1ead5b87bb13f4998b5234a005a2ff6d62d4e33355c08dcd83a06981fb8a6332d1ed21cbdafebcf1194
-EBUILD atomic-primops-0.4-r1.ebuild 811 BLAKE2B 6ee3afbf4301dca2ce40d502f950e45c94f839f0fe5e154568b06e904a35d98aa0204f4c4c567c9b28254cc0534d78602ab82af649dd17416a7e1dbc900bfccb SHA512 1dd1ed70f0d9c31c6353911ebbdc6d6894b49f004bb69daee6f0321c43dd9033083554a82a0c219cc8e6a73b797c6403644175be2afcde971fcab86a86d62810
-EBUILD atomic-primops-0.6.1.1.ebuild 698 BLAKE2B c0d26da6e220d9197d0d6a4e9dc1f35611a34d727e605c5f39883f53de79eb41b0157e276bbe5c0b71c7af193545c83fc62c865f048561a835c2dfa34e8dea40 SHA512 920fd519a17612f11ffe9e7a614e72e72b253ffdfaaf934a8d0896e31a1134a156ba9f5e7cbcb1226abf04d6da874dd39111b0007d25aeb470c1344f48bd9ef2
-EBUILD atomic-primops-0.7.ebuild 698 BLAKE2B c0d26da6e220d9197d0d6a4e9dc1f35611a34d727e605c5f39883f53de79eb41b0157e276bbe5c0b71c7af193545c83fc62c865f048561a835c2dfa34e8dea40 SHA512 920fd519a17612f11ffe9e7a614e72e72b253ffdfaaf934a8d0896e31a1134a156ba9f5e7cbcb1226abf04d6da874dd39111b0007d25aeb470c1344f48bd9ef2
-EBUILD atomic-primops-0.8.0.4.ebuild 696 BLAKE2B 5a0dc8339ae7eac5d68f44880263b3937d0a4780779950b8b6f453cbb7a00e5da8c2ba2c299107d9e91832726e5da00e035e8fa89c621ebda942948bb2273258 SHA512 98a8ec86714b0f18eaee477002ad0637a281dbafae0a43ea82fd0bf0626d53867941d1027aa3fe620af02d02c60f40caa6767819a66f29309b414b9ae5342f08
-MISC metadata.xml 795 BLAKE2B fbbecd6e02a73d69ec58540a514741c4558bde56852eda9945be200d89c7cfd040b29402b8a4ac151226afef20b44d36ab0b2b722efcd1529914851b478a7d30 SHA512 51ea1759b6c00341781bf4873a21dcb02e7fd0814dded71cf5dd0ec0975b7ff439b8298098a60c3d9f72b56ceefa831b67cbfab9cbad1757924b69fdd6554784
diff --git a/dev-haskell/atomic-primops/atomic-primops-0.4-r1.ebuild b/dev-haskell/atomic-primops/atomic-primops-0.4-r1.ebuild
deleted file mode 100644
index 6be5054e66f4..000000000000
--- a/dev-haskell/atomic-primops/atomic-primops-0.4-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib haddock hoogle hscolour profile"
-inherit haskell-cabal
-
-DESCRIPTION="A safe approach to CAS and other atomic ops in Haskell"
-HOMEPAGE="https://github.com/rrnewton/haskell-lockfree-queue/wiki"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="dev-haskell/bits-atomic:=[profile?]
-		dev-haskell/cabal:=[profile?]
-		dev-haskell/primitive:=[profile?]
-		>=dev-lang/ghc-7.4.1:="
-DEPEND="${RDEPEND}
-		profile? ( !<dev-haskell/cabal-1.17 )
-		>=dev-haskell/cabal-1.8"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug)
-}
diff --git a/dev-haskell/atomic-primops/atomic-primops-0.6.1.1.ebuild b/dev-haskell/atomic-primops/atomic-primops-0.6.1.1.ebuild
deleted file mode 100644
index 3cf17adb9ceb..000000000000
--- a/dev-haskell/atomic-primops/atomic-primops-0.6.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A safe approach to CAS and other atomic ops in Haskell"
-HOMEPAGE="https://github.com/rrnewton/haskell-lockfree/wiki"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug)
-}
diff --git a/dev-haskell/atomic-primops/atomic-primops-0.7.ebuild b/dev-haskell/atomic-primops/atomic-primops-0.7.ebuild
deleted file mode 100644
index 3cf17adb9ceb..000000000000
--- a/dev-haskell/atomic-primops/atomic-primops-0.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A safe approach to CAS and other atomic ops in Haskell"
-HOMEPAGE="https://github.com/rrnewton/haskell-lockfree/wiki"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug)
-}
diff --git a/dev-haskell/atomic-primops/atomic-primops-0.8.0.4.ebuild b/dev-haskell/atomic-primops/atomic-primops-0.8.0.4.ebuild
deleted file mode 100644
index 8247175e8416..000000000000
--- a/dev-haskell/atomic-primops/atomic-primops-0.8.0.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A safe approach to CAS and other atomic ops in Haskell"
-HOMEPAGE="https://github.com/rrnewton/haskell-lockfree/wiki"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug)
-}
diff --git a/dev-haskell/atomic-primops/metadata.xml b/dev-haskell/atomic-primops/metadata.xml
deleted file mode 100644
index 3b5e2361d2c4..000000000000
--- a/dev-haskell/atomic-primops/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		After GHC 7.4 a new `casMutVar#` primop became available, but it's
-		difficult to use safely, because pointer equality is a highly
-		unstable property in Haskell.  This library provides a safer method
-		based on the concept of "Tickets".
-		
-		Also, this library uses the "foreign primop" capability of GHC to
-		add access to other variants that may be of
-		interest, specifically, compare and swap inside an array.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">rrnewton/haskell-lockfree</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/attoparsec-0.10.4.0 b/dev-haskell/attoparsec-0.10.4.0
new file mode 100644
index 000000000000..7ef0461f498d
--- /dev/null
+++ b/dev-haskell/attoparsec-0.10.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-0.11.1.5:=[profile?] >=dev-lang/ghc-6.10.4:= test? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.4 >=dev-haskell/test-framework-quickcheck2-0.2 ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast combinator parsing for bytestrings and text
+EAPI=5
+HOMEPAGE=https://github.com/bos/attoparsec
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-0.11.1.5:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.10.4.0
+SRC_URI=mirror://hackage/packages/archive/attoparsec/0.10.4.0/attoparsec-0.10.4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=aa9dd336230f87178e1b9aba2a0f6dc8
diff --git a/dev-haskell/attoparsec-0.11.2.1 b/dev-haskell/attoparsec-0.11.2.1
new file mode 100644
index 000000000000..cd19a6487104
--- /dev/null
+++ b/dev-haskell/attoparsec-0.11.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/scientific-0.2:=[profile?] >=dev-haskell/text-0.11.3.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.4 >=dev-haskell/test-framework-quickcheck2-0.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast combinator parsing for bytestrings and text
+EAPI=5
+HOMEPAGE=https://github.com/bos/attoparsec
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/scientific-0.2:=[profile?] >=dev-haskell/text-0.11.3.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.11.2.1
+SRC_URI=mirror://hackage/packages/archive/attoparsec/0.11.2.1/attoparsec-0.11.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=306c5fcf476aaea35f3e9fffd4c87d48
diff --git a/dev-haskell/attoparsec-0.12.1.5 b/dev-haskell/attoparsec-0.12.1.5
new file mode 100644
index 000000000000..354fbb335491
--- /dev/null
+++ b/dev-haskell/attoparsec-0.12.1.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-1.1.1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/quickcheck-2.7 dev-haskell/quickcheck-unicode >=dev-haskell/test-framework-0.8.0.2 >=dev-haskell/test-framework-quickcheck2-0.3.0.3 dev-haskell/vector ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast combinator parsing for bytestrings and text
+EAPI=5
+HOMEPAGE=https://github.com/bos/attoparsec
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-1.1.1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.12.1.5
+SRC_URI=mirror://hackage/packages/archive/attoparsec/0.12.1.5/attoparsec-0.12.1.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=65c8dd6474b0ebdd8ffbcbf174a60c09
diff --git a/dev-haskell/attoparsec-0.13.0.1 b/dev-haskell/attoparsec-0.13.0.1
new file mode 100644
index 000000000000..dd538838f375
--- /dev/null
+++ b/dev-haskell/attoparsec-0.13.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-1.1.1.3:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/quickcheck-2.7 dev-haskell/quickcheck-unicode >=dev-haskell/test-framework-0.8.0.2 >=dev-haskell/test-framework-quickcheck2-0.3.0.3 dev-haskell/vector ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast combinator parsing for bytestrings and text
+EAPI=5
+HOMEPAGE=https://github.com/bos/attoparsec
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-1.1.1.3:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.13.0.1
+SRC_URI=mirror://hackage/packages/archive/attoparsec/0.13.0.1/attoparsec-0.13.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ee6297ef0f7bc22265cacc5c9c70b26a
diff --git a/dev-haskell/attoparsec-0.13.0.2 b/dev-haskell/attoparsec-0.13.0.2
new file mode 100644
index 000000000000..8c4d5ba7e210
--- /dev/null
+++ b/dev-haskell/attoparsec-0.13.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-1.1.1.3:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/quickcheck-2.7 dev-haskell/quickcheck-unicode >=dev-haskell/tasty-0.11 >=dev-haskell/tasty-quickcheck-0.8 dev-haskell/vector ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast combinator parsing for bytestrings and text
+EAPI=6
+HOMEPAGE=https://github.com/bos/attoparsec
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-1.1.1.3:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.13.0.2
+SRC_URI=mirror://hackage/packages/archive/attoparsec/0.13.0.2/attoparsec-0.13.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a02a8a08e9d5159d498418859a800995
diff --git a/dev-haskell/attoparsec-0.13.1.0 b/dev-haskell/attoparsec-0.13.1.0
new file mode 100644
index 000000000000..1e5c99fdae39
--- /dev/null
+++ b/dev-haskell/attoparsec-0.13.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.16.1:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-1.1.1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/quickcheck-2.7 dev-haskell/quickcheck-unicode >=dev-haskell/tasty-0.11 >=dev-haskell/tasty-quickcheck-0.8 dev-haskell/vector ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast combinator parsing for bytestrings and text
+EAPI=6
+HOMEPAGE=https://github.com/bos/attoparsec
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.16.1:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-1.1.1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.13.1.0
+SRC_URI=mirror://hackage/packages/archive/attoparsec/0.13.1.0/attoparsec-0.13.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9761b0514d0a3f0779d1deaaff236040
diff --git a/dev-haskell/attoparsec-conduit-1.0.1.2 b/dev-haskell/attoparsec-conduit-1.0.1.2
new file mode 100644
index 000000000000..fed3e1bca343
--- /dev/null
+++ b/dev-haskell/attoparsec-conduit-1.0.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] =dev-haskell/conduit-1.0*:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/resourcet ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Consume attoparsec parsers via conduit
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] =dev-haskell/conduit-1.0*:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.0.1.2
+SRC_URI=mirror://hackage/packages/archive/attoparsec-conduit/1.0.1.2/attoparsec-conduit-1.0.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a01cf61c724d8d33373809b6ff7c6b4b
diff --git a/dev-haskell/attoparsec-conduit-1.1.0 b/dev-haskell/attoparsec-conduit-1.1.0
new file mode 100644
index 000000000000..2dced14dfaa2
--- /dev/null
+++ b/dev-haskell/attoparsec-conduit-1.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8
+DESCRIPTION=Consume attoparsec parsers via conduit. (deprecated)
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.1.0
+SRC_URI=mirror://hackage/packages/archive/attoparsec-conduit/1.1.0/attoparsec-conduit-1.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6b57eaceff0ed305691794af7b0da1d1
diff --git a/dev-haskell/attoparsec-conduit/Manifest b/dev-haskell/attoparsec-conduit/Manifest
deleted file mode 100644
index 690441c32980..000000000000
--- a/dev-haskell/attoparsec-conduit/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST attoparsec-conduit-1.0.1.2.tar.gz 4361 BLAKE2B f183c01074752963a9b1089cf877ecdb1e37fbcc420205e944b26c0f1927e785545f72887269f912f55ee8e74bbade607b318a89b3bac7b8d4cabc924969824c SHA512 25707a2ec55ce8da553cea00cc8b89866ada472cedfb21b4e37d477d9d405dc7b640dfc01b32878c71de886cf67c68b27c94e4911ec23850a55f648fcb1aabd7
-DIST attoparsec-conduit-1.1.0.tar.gz 1210 BLAKE2B b2a02358ff9516971d1abcca57c3c6e2eb9b83f83af3bbd9ed3b89af4977329fbf7dc9b776cef7383715d7911cfde0df41601aff07d50160c1bb3b463f3eedb6 SHA512 7a883b25cc1bfed03a35593927d51dba920fca8d29e610adb7a409807867241847583f68550cc1344a2e333639a703db860ac6c8f6e19f36595a9001e9334472
-EBUILD attoparsec-conduit-1.0.1.2.ebuild 832 BLAKE2B 8d22f02f0e427a2f0fda7c44b4f2418f95935bb8e983e615068d875670a3667d9d455ad5e54c2266d7216a0fb6f9cffd0fc471afd45ef2858df8aa915f1bbcfb SHA512 69111b3bb98940537e2c521314f348e522bb569b61583f49f59457c9ee69f507a537c7c0c322fc1da472bc07db66e6e6abc734fd8f31802d5dab791e8765a826
-EBUILD attoparsec-conduit-1.1.0.ebuild 575 BLAKE2B b5bc318eaf9c4771ff6b6f76b8aa52c0bace823a06ad60ea5ab8a99705f0db394e3af5db73f1ed09b168964cd13608c08cf35e00fb49fb6024e1e7766d12ac99 SHA512 a7026b63f72cc0273840cb2c4e8bd3259b504aae159110743696dc7012d07f50cc833da6636df9cf28952a5b212304e2104fb2357281e9231c39dca283d03466
-MISC metadata.xml 407 BLAKE2B 9bce6e6164ea0fcbd76efaf47190ce039cc0067b87d8414388904084d3e78127c01f8fa66e5a2e988d56141deb145fd15d504c0c97671e92b1eefbcc160c0860 SHA512 234b78264facb056392e4d69723d73d3ca7ae63829894d8e734410d7a547bb1771cca8af408a7a4afaa1908292cdad5d6e5aabb8ad5f644e867c80edaf44228f
diff --git a/dev-haskell/attoparsec-conduit/attoparsec-conduit-1.0.1.2.ebuild b/dev-haskell/attoparsec-conduit/attoparsec-conduit-1.0.1.2.ebuild
deleted file mode 100644
index 3cda0bc824e0..000000000000
--- a/dev-haskell/attoparsec-conduit/attoparsec-conduit-1.0.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Consume attoparsec parsers via conduit"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-		=dev-haskell/conduit-1.0*:=[profile?]
-		>=dev-haskell/text-0.11:=[profile?]
-		>=dev-haskell/transformers-0.2.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/resourcet
-		)"
diff --git a/dev-haskell/attoparsec-conduit/attoparsec-conduit-1.1.0.ebuild b/dev-haskell/attoparsec-conduit/attoparsec-conduit-1.1.0.ebuild
deleted file mode 100644
index 47c2d3fae38e..000000000000
--- a/dev-haskell/attoparsec-conduit/attoparsec-conduit-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Consume attoparsec parsers via conduit. (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/attoparsec-conduit/metadata.xml b/dev-haskell/attoparsec-conduit/metadata.xml
deleted file mode 100644
index f58272adb545..000000000000
--- a/dev-haskell/attoparsec-conduit/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Turn attoparsec parsers into sinks.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/conduit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/attoparsec-enumerator-0.3.4 b/dev-haskell/attoparsec-enumerator-0.3.4
new file mode 100644
index 000000000000..230bf41c89d1
--- /dev/null
+++ b/dev-haskell/attoparsec-enumerator-0.3.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pass input from an enumerator to an Attoparsec parser
+EAPI=5
+HOMEPAGE=https://john-millikin.com/software/attoparsec-enumerator/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.4
+SRC_URI=mirror://hackage/packages/archive/attoparsec-enumerator/0.3.4/attoparsec-enumerator-0.3.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4a1fa57a1879a3f943462e1c44476282
diff --git a/dev-haskell/attoparsec-enumerator/Manifest b/dev-haskell/attoparsec-enumerator/Manifest
deleted file mode 100644
index e2d9b627dcaf..000000000000
--- a/dev-haskell/attoparsec-enumerator/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST attoparsec-enumerator-0.3.4.tar.gz 2485 BLAKE2B e5d290228bec79723b4693e1c6e56e318483e2c60fd226022fc968903cbfd25ca6b8f09a2a4376c1671b3bd2dbf72e35f1a9f39e1d0ac8187e3e9b71f0c37744 SHA512 caf6bc858c9c0f41f3ec332cf4149bdc9233cad112579eb79a20dff1893994cee365c2863a47a72fef8d30aaab1d30b506b98c3a8b8429c461811f717c8fd31d
-EBUILD attoparsec-enumerator-0.3.4.ebuild 776 BLAKE2B f9297a35a19ee0a0a03fc8f5e5d642e8995ce7697f0b66381e759268d32661ab2e737e2f0f19c8d6fec96dd1546810036b7f5405b1070d85b47db857a0301503 SHA512 5d41682a5416b9a5e275a7c4c5e07417b973057c84308ea88f587b2fd57000cff9579695eefaaa0602d3bf3d0ea6971809e6df9af77e5e25596aebd7a9893e7f
-MISC metadata.xml 1034 BLAKE2B a2196ee3dccd3617b51604662ab3ecee40c9b882337f0ce1c839ee26633354705ac1121b48d59b76986cd9f3fcf3f82a715f22ff1125d2af253bd37260122808 SHA512 4d2750da94e3b02f493fa2b8ea288c429b5795367ff77b8010e0cdcaafd7974a5425e8041301038cc8fb142b791a5fcfd95e717adeff2f343b84334b2d4c8a22
diff --git a/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild b/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild
deleted file mode 100644
index ba1ee261d228..000000000000
--- a/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pass input from an enumerator to an Attoparsec parser"
-HOMEPAGE="https://john-millikin.com/software/attoparsec-enumerator/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/attoparsec-enumerator/metadata.xml b/dev-haskell/attoparsec-enumerator/metadata.xml
deleted file mode 100644
index 4f48a5c05d4f..000000000000
--- a/dev-haskell/attoparsec-enumerator/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library allows an Attoparsec parser to receive input incrementally
-		from an enumerator. This could be used for parsing large files, or
-		implementing binary network protocols.
-		
-		&gt; (-# LANGUAGE OverloadedStrings #-)
-		&gt;
-		&gt; import Control.Applicative
-		&gt; import Data.Attoparsec
-		&gt; import Data.Attoparsec.Enumerator
-		&gt; import Data.Enumerator
-		&gt; import Data.Enumerator.Binary (enumHandle)
-		&gt; import Data.Enumerator.List
-		&gt; import System.IO
-		&gt;
-		&gt; parser = string "foo" &lt;|&gt; string "bar"
-		&gt;
-		&gt; main = do
-		&gt;     xy &lt;- run_ (enumHandle 1 stdin $$ do
-		&gt;         x &lt;- iterParser parser
-		&gt;         y &lt;- iterParser parser
-		&gt;         return (x, y))
-		&gt;     print xy
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/attoparsec/Manifest b/dev-haskell/attoparsec/Manifest
deleted file mode 100644
index a63d6f6c58ef..000000000000
--- a/dev-haskell/attoparsec/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-DIST attoparsec-0.10.4.0.tar.gz 36268 BLAKE2B 88fc72f059c5b241a9d75aed3d5d41b5157378ce6a468b71fef4f751255999e39fb9637cd5f7abf394b4df8baa6da3ec20802be69a6a4c49541149846e929081 SHA512 f32db51d6c4e8119fb28a8d51f6d7452f8870765b652992f577602aba0ecb9e81522fd4919a907f1b7b8ff06d21d4bd64c05b86f808b098f93fbb22daaaa7e8f
-DIST attoparsec-0.11.2.1.tar.gz 36439 BLAKE2B 45a80493fd5c5351eb3ce046bde91bb736bf6e76b6edd2993405ee5a6d9dae1cab2a18871c10e166e8d7aa218c8bd30ea3f1180fd3008b7ac1b66dc71b526269 SHA512 33f27bad5e13e515a07a77247a31822e136531da8d9aa7c15ad9cf1205d681c53b68d09c2e09d3b6c2fba9ec7bfae640f6ac0a9ed45cd421b11cabb1f5cd4282
-DIST attoparsec-0.12.1.5.tar.gz 64844 BLAKE2B 6810d621a29d0670d104c81d57ed4fe30aae1b6149bad23bb50e890b69fd1e44f872783ef93e27e6f1aad514f09942dba0bb8ad699d5a8203873fda516d6d26b SHA512 e861b93bfcdeb284c95e7c96d2a41754e2ad061f169842523bd8680b60743f0d6d300e13237d17b776f60b338152b4fa10679aeb95d1cf0c9d073e093952e9e4
-DIST attoparsec-0.13.0.1.tar.gz 66039 BLAKE2B 1272ec5d2d64325d2f68d277e25a494b4b64a028ce64284de6868385730be5a797727632252b93becc947103093299468a9d6045ef461127274712957df982c5 SHA512 596a1bda128c116b9e56decf0f5850b01f58c4b0bb81454155a1ee7b4c6b7143476cb9d66f02fba10e6fa5d5fb7a47dead6265dd3d98baeea4d8fa4a9958289c
-DIST attoparsec-0.13.0.2.tar.gz 67669 BLAKE2B f93d118968adf24446c5f99c45f504db4efe4c9d2ff0884782b2c629d0595d46079afe3824cc2e7acd69f73cf14ec8ccd244be2adfa666b4b1a0b1f804509ef5 SHA512 3b9453e5e4baca58182c8463b4ff988eb66b3984e93e7f38ea4378d3a6265ed7044cbb896aaa3c797f6389e953f73e8c6994024db1cb7aec1e165f007c010754
-DIST attoparsec-0.13.1.0.tar.gz 159512 BLAKE2B bb4326254d6c7df13ff021d9eb369dd9ac97022b24af630db9b36fdabfb5719fe11792453a68f032d61fba78e11fef8e417c892733fa5af22704701815cd5783 SHA512 bb66cab56208975b252a418a43eecbe85f3f2f3d16ff53accecade02885bc45828eb5dc5b79565d8d3f2ed955ac0400f9733658eed516aef8bb41b829c747d9e
-EBUILD attoparsec-0.10.4.0.ebuild 803 BLAKE2B ce05e79d466586507c8cf3bfe3abf619cccfc27198d1e9c83e1fd03fbe45311d733b89d8781c765743c8014f23b14544ca18c17e8cc3d09726961376e4109e6a SHA512 ee6c0f63fd26630e93bb8a07f213930c838d2f9b5c6e893c2d706faa84d07bc65bc4f2b05f45b713906a0a3a79227739380cb230bf67fd7495afc24541e96587
-EBUILD attoparsec-0.11.2.1.ebuild 868 BLAKE2B 4809812dd155a2aa57cee13fad607ad1cc1f649f711f4c982b7544237495f285c812307006015946ee09ac00cecfb8eb090b85d98a476725610883607dcd2c4c SHA512 35a09dd5b23a81d6ef22c99af2d73acbcafad8170575eefe0453f2a6d0ef60dd1925cf376d1f98e87990a7ac82433ee31f6e685e5e4c925317264c6cbc1a5507
-EBUILD attoparsec-0.12.1.5.ebuild 968 BLAKE2B 26e6e88f7273ad5f83ad3d7b9d9d45c525575ec62e8c36b2b08a8bca9d1cc4dc5855881dd3b98ef5ea572e03a33dc4e240ea9acbe18669c9bc7a7f99f5779b4d SHA512 4cd28a39120993cc46e1f3c512541b0fdd9689ef5cedb232a20463a37862bad02df683dc9d81e931211e6c271b3168404b0a91106ef8df21ab3f7f2ebac352ab
-EBUILD attoparsec-0.13.0.1.ebuild 1009 BLAKE2B 11bcffc02d7f02b6943558fe73b708ba32f5a1fde155e697b5c6e52708daecf3dc619289a65bba6dfdf5f019235c95f60c1226e8e1479464c075faa81501278a SHA512 e2c3fc90378d3f6ec4db233ddf509d59f2b90ded3c0ea622c2df328c5add22bc342550a1997099e8abc6665057b97200bc9300d49e6e8e4a147b995393106edd
-EBUILD attoparsec-0.13.0.2.ebuild 985 BLAKE2B bcbb404882b94d2fbfe40624a9362ec1387de6be8c70692367ffe06fde2caf8b355e03ec7d9beb341fb5b81ed37195b53299f6414f8d796f22dfd48ddc97a9d6 SHA512 9a1d331c4d08515dd3c0eaf7ba9cbc8288c6bf97c26618409c75b469c70fc31a0b557c8486d62d843bcbcb390382d44bf777707cc15d7c05b9f60f4a827030eb
-EBUILD attoparsec-0.13.1.0.ebuild 1107 BLAKE2B 0e1bb93132b8a9118cd7b0b016603619ebc83e37f1916254c16c11d01abdbe6f4ae81e1ae7567f7a29ab7abbd1547005b4275a41a14277ed3a117a94da08d13a SHA512 39f2cc6a5737dd570bb148df293773991527dc87cf08d03e55dc16cdd896f7aa4d28dd3d3962891c1df4574d547d569a06cc9d47c771038815cc5ccfb9ddd336
-MISC metadata.xml 514 BLAKE2B 551631ac80f8d13c6993b532a7ccb86b3749ee0e63e580220fe8413b9c89627ac9da347ff69e49ecdc957733d03f9af431a814370e2c51b77417d25291ddb437 SHA512 77aa3fc771b12645bc64d295637eb3d6470fb1aa2ff6c12b37a2056bc554a93e150db3db72a20cd3cab9d162f8fb7ea2a3605a78c3fb53d48cd509ae85552aa5
diff --git a/dev-haskell/attoparsec/attoparsec-0.10.4.0.ebuild b/dev-haskell/attoparsec/attoparsec-0.10.4.0.ebuild
deleted file mode 100644
index 40b62d45ae80..000000000000
--- a/dev-haskell/attoparsec/attoparsec-0.10.4.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast combinator parsing for bytestrings and text"
-HOMEPAGE="https://github.com/bos/attoparsec"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.11.1.5:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		test? ( >=dev-haskell/quickcheck-2.4
-			>=dev-haskell/test-framework-0.4
-			>=dev-haskell/test-framework-quickcheck2-0.2
-		)
-		>=dev-haskell/cabal-1.8"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/attoparsec/attoparsec-0.11.2.1.ebuild b/dev-haskell/attoparsec/attoparsec-0.11.2.1.ebuild
deleted file mode 100644
index 6191704ca281..000000000000
--- a/dev-haskell/attoparsec/attoparsec-0.11.2.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast combinator parsing for bytestrings and text"
-HOMEPAGE="https://github.com/bos/attoparsec"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/scientific-0.2:=[profile?]
-	>=dev-haskell/text-0.11.3.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/quickcheck-2.4
-		>=dev-haskell/test-framework-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/attoparsec/attoparsec-0.12.1.5.ebuild b/dev-haskell/attoparsec/attoparsec-0.12.1.5.ebuild
deleted file mode 100644
index ca0051acfcf1..000000000000
--- a/dev-haskell/attoparsec/attoparsec-0.12.1.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast combinator parsing for bytestrings and text"
-HOMEPAGE="https://github.com/bos/attoparsec"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/text-1.1.1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/quickcheck-2.7
-		dev-haskell/quickcheck-unicode
-		>=dev-haskell/test-framework-0.8.0.2
-		>=dev-haskell/test-framework-quickcheck2-0.3.0.3
-		dev-haskell/vector )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/attoparsec/attoparsec-0.13.0.1.ebuild b/dev-haskell/attoparsec/attoparsec-0.13.0.1.ebuild
deleted file mode 100644
index abe5051250d8..000000000000
--- a/dev-haskell/attoparsec/attoparsec-0.13.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast combinator parsing for bytestrings and text"
-HOMEPAGE="https://github.com/bos/attoparsec"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/text-1.1.1.3:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/quickcheck-2.7
-		dev-haskell/quickcheck-unicode
-		>=dev-haskell/test-framework-0.8.0.2
-		>=dev-haskell/test-framework-quickcheck2-0.3.0.3
-		dev-haskell/vector )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/attoparsec/attoparsec-0.13.0.2.ebuild b/dev-haskell/attoparsec/attoparsec-0.13.0.2.ebuild
deleted file mode 100644
index 3c1fe089edd7..000000000000
--- a/dev-haskell/attoparsec/attoparsec-0.13.0.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast combinator parsing for bytestrings and text"
-HOMEPAGE="https://github.com/bos/attoparsec"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/text-1.1.1.3:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/quickcheck-2.7
-		dev-haskell/quickcheck-unicode
-		>=dev-haskell/tasty-0.11
-		>=dev-haskell/tasty-quickcheck-0.8
-		dev-haskell/vector )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/attoparsec/attoparsec-0.13.1.0.ebuild b/dev-haskell/attoparsec/attoparsec-0.13.1.0.ebuild
deleted file mode 100644
index 0170701c6b19..000000000000
--- a/dev-haskell/attoparsec/attoparsec-0.13.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast combinator parsing for bytestrings and text"
-HOMEPAGE="https://github.com/bos/attoparsec"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.16.1:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/text-1.1.1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/quickcheck-2.7
-		dev-haskell/quickcheck-unicode
-		>=dev-haskell/tasty-0.11
-		>=dev-haskell/tasty-quickcheck-0.8
-		dev-haskell/vector )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/attoparsec/metadata.xml b/dev-haskell/attoparsec/metadata.xml
deleted file mode 100644
index 470df1227e2d..000000000000
--- a/dev-haskell/attoparsec/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A fast parser combinator library, aimed particularly at dealing
-		efficiently with network protocols and complicated text/binary
-		file formats.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bos/attoparsec</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/authenticate-1.3.2.11 b/dev-haskell/authenticate-1.3.2.11
new file mode 100644
index 000000000000..fd5e3362f1ce
--- /dev/null
+++ b/dev-haskell/authenticate-1.3.2.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] >=dev-haskell/http-conduit-1.5:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-haskell/tagstream-conduit-0.5.5:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.1:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Authentication methods for Haskell web applications
+EAPI=5
+HOMEPAGE=https://github.com/yesodweb/authenticate
+IUSE=+network-uri doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] >=dev-haskell/http-conduit-1.5:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-haskell/tagstream-conduit-0.5.5:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.1:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/1.3.2.11
+SRC_URI=mirror://hackage/packages/archive/authenticate/1.3.2.11/authenticate-1.3.2.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9382ab50bb06a716393634164da17ae5
diff --git a/dev-haskell/authenticate-1.3.3.1 b/dev-haskell/authenticate-1.3.3.1
new file mode 100644
index 000000000000..40f38f496453
--- /dev/null
+++ b/dev-haskell/authenticate-1.3.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] >=dev-haskell/http-conduit-1.5:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-haskell/tagstream-conduit-0.5.5:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.1:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Authentication methods for Haskell web applications
+EAPI=6
+HOMEPAGE=https://github.com/yesodweb/authenticate
+IUSE=+network-uri doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] >=dev-haskell/http-conduit-1.5:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-haskell/tagstream-conduit-0.5.5:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.1:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/1.3.3.1
+SRC_URI=mirror://hackage/packages/archive/authenticate/1.3.3.1/authenticate-1.3.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9201fca971eeab9cd067f796b6061579
diff --git a/dev-haskell/authenticate-1.3.3.2 b/dev-haskell/authenticate-1.3.3.2
new file mode 100644
index 000000000000..8aae9c6ac3b7
--- /dev/null
+++ b/dev-haskell/authenticate-1.3.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] >=dev-haskell/http-conduit-1.5:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-haskell/tagstream-conduit-0.5.5:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.1:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Authentication methods for Haskell web applications
+EAPI=6
+HOMEPAGE=https://github.com/yesodweb/authenticate
+IUSE=+network-uri doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] >=dev-haskell/http-conduit-1.5:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-haskell/tagstream-conduit-0.5.5:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.1:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/1.3.3.2
+SRC_URI=mirror://hackage/packages/archive/authenticate/1.3.3.2/authenticate-1.3.3.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f9b4828b0d79bb0daf3c26f7fc8f8385
diff --git a/dev-haskell/authenticate/Manifest b/dev-haskell/authenticate/Manifest
deleted file mode 100644
index 6a155e90414c..000000000000
--- a/dev-haskell/authenticate/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST authenticate-1.3.2.11.tar.gz 8728 BLAKE2B 5c2a319ed40dc4b5cacfb7f5824e240cc9f60b95db6aca45b5ebfc6974f6bdd228386b889bf7eba65850dca88ef0c0d00e67e17aa75bc6308838a446e256c8bc SHA512 8e1358bd6dd62f10b372fd5df6bd2b50f1c161ade466316efa9e036c17be97e7c561eab968a2e17d28cc12988db454618bf11b8c9bc5e9a20d864423756eccb5
-DIST authenticate-1.3.3.1.tar.gz 8703 BLAKE2B cfeb564029efa9ffceac72dcf9f506feeefe5cdf4c133785f55d71659ff398248f1ce286db8585c93039f6b03c291892e8df8fb110db5a5c8f5d2424acb45332 SHA512 e2caa227dfc4a4878ac7011d79d98c539320cb2fe5d9e260a9c71951486ba8af396fbcd0ccf3cb80205063881c7922f3d1a62d693ff8e1529b88e3cfc2e3c5c8
-DIST authenticate-1.3.3.2.tar.gz 8785 BLAKE2B 43307b9551e9894805a26bced9aeeda87464bfd9e92666a329a3c424afdf6bae74e03262316d98a97b45bfda74369287e8b9e766e9b4f8dc9919294fd3b7a811 SHA512 98fd1e5fde51c9e2db10c9d22429d8c51914f28ec8493457a77afa5a9dc41a8e9920b27583d5aac9752a3b39561713f87489043c552396d132c75139a8e46927
-EBUILD authenticate-1.3.2.11.ebuild 1356 BLAKE2B 7e190d6cd69947e0926cd2049afde337189b9ea3a2dd430e50a9eabc8e29ef2db1b8f60ce5a0b49815e80317fdfa3a993953bc8258a42594b6ef87b1b5297df3 SHA512 bfff20d684516576182c0f82ce9a931aed824876becfb1223ffc334542e3dae72fdf1ff0da6d9c3f6b60aec90ea06fc5d8a2c61dda17ca82d044dc8a210a8918
-EBUILD authenticate-1.3.3.1.ebuild 1356 BLAKE2B 8131da3d225d7148aa366ff98c1acfc7c748999489e6b104bb836475b3dae010b45e33bef10f8d849129cb74074ce5efdbefee5199aa21e2f2ef43a751caee56 SHA512 2fd66e0d12243966d0defb647d7adfd45bc5df6072e0cf89e426e32f3822b16134424592123990394f4d39a0b3ffb82997a4e578448dfef6ab9ec12a004af08c
-EBUILD authenticate-1.3.3.2.ebuild 1354 BLAKE2B b76eef144e3537c9c08a5b95743d92d754a794cf6d52e4861cc8a3e225c19540d7aee512ee1f5715592121d85af2855ac26e613ac6371fd2a68bf2523e62eb60 SHA512 5009667837eb2c3681e4c7f8bd04ceb1013b5bc6a762f4020060ecf765a821b3388a45757d0c621abf059316798da4c0d3218906c123c8263d934582334678e1
-MISC metadata.xml 548 BLAKE2B ce9aef6698cafad38765c272819ddc56882413e1f2cf575f0d7a02edf7365ab837d7014d20fc1455c9771f1d9a5c66bdc6fadd819fe0681c01c49aefe000c690 SHA512 dadbf9c551c9776e77f449e2651bc7e7c7f106a509bd5ef120a8f0ed9b113ef8a33b6dd6c808e40d2f65dcd54dcc5dea02ce6a6745aafe858d6c8673c3f46e73
diff --git a/dev-haskell/authenticate/authenticate-1.3.2.11.ebuild b/dev-haskell/authenticate/authenticate-1.3.2.11.ebuild
deleted file mode 100644
index faee0c58bcc1..000000000000
--- a/dev-haskell/authenticate/authenticate-1.3.2.11.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication methods for Haskell web applications"
-HOMEPAGE="https://github.com/yesodweb/authenticate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	>=dev-haskell/conduit-0.5:=[profile?]
-	>=dev-haskell/http-conduit-1.5:=[profile?]
-	>=dev-haskell/http-types-0.6:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-haskell/tagstream-conduit-0.5.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.1:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/authenticate/authenticate-1.3.3.1.ebuild b/dev-haskell/authenticate/authenticate-1.3.3.1.ebuild
deleted file mode 100644
index cab350f26e39..000000000000
--- a/dev-haskell/authenticate/authenticate-1.3.3.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication methods for Haskell web applications"
-HOMEPAGE="https://github.com/yesodweb/authenticate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	>=dev-haskell/conduit-0.5:=[profile?]
-	>=dev-haskell/http-conduit-1.5:=[profile?]
-	>=dev-haskell/http-types-0.6:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-haskell/tagstream-conduit-0.5.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.1:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/authenticate/authenticate-1.3.3.2.ebuild b/dev-haskell/authenticate/authenticate-1.3.3.2.ebuild
deleted file mode 100644
index eb6b4163c589..000000000000
--- a/dev-haskell/authenticate/authenticate-1.3.3.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication methods for Haskell web applications"
-HOMEPAGE="https://github.com/yesodweb/authenticate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	>=dev-haskell/conduit-0.5:=[profile?]
-	>=dev-haskell/http-conduit-1.5:=[profile?]
-	>=dev-haskell/http-types-0.6:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-haskell/tagstream-conduit-0.5.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.1:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/authenticate/metadata.xml b/dev-haskell/authenticate/metadata.xml
deleted file mode 100644
index 17e204eb451f..000000000000
--- a/dev-haskell/authenticate/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Focus is on third-party authentication methods, such as OpenID and BrowserID.
-	</longdescription>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">yesodweb/authenticate</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/auto-update-0.1.2.2 b/dev-haskell/auto-update-0.1.2.2
new file mode 100644
index 000000000000..53990ab25f03
--- /dev/null
+++ b/dev-haskell/auto-update-0.1.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficiently run periodic, on-demand actions
+EAPI=5
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.2.2
+SRC_URI=mirror://hackage/packages/archive/auto-update/0.1.2.2/auto-update-0.1.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=26eca76571ccfc37eba9cb99c5f6fef6
diff --git a/dev-haskell/auto-update-0.1.3 b/dev-haskell/auto-update-0.1.3
new file mode 100644
index 000000000000..a8998c5e1646
--- /dev/null
+++ b/dev-haskell/auto-update-0.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficiently run periodic, on-demand actions
+EAPI=5
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.3
+SRC_URI=mirror://hackage/packages/archive/auto-update/0.1.3/auto-update-0.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=20910d13d2b5e478ef2b3112f34adcd7
diff --git a/dev-haskell/auto-update-0.1.4 b/dev-haskell/auto-update-0.1.4
new file mode 100644
index 000000000000..1805df8e6226
--- /dev/null
+++ b/dev-haskell/auto-update-0.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficiently run periodic, on-demand actions
+EAPI=6
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.4
+SRC_URI=mirror://hackage/packages/archive/auto-update/0.1.4/auto-update-0.1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=36e5c00bc4050770a1c0f895241aefbc
diff --git a/dev-haskell/auto-update/Manifest b/dev-haskell/auto-update/Manifest
deleted file mode 100644
index 506d6d958d08..000000000000
--- a/dev-haskell/auto-update/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST auto-update-0.1.2.2.tar.gz 6651 BLAKE2B 0fd4a69ad9835d476a1b873fdb72da65582382307f943d673af71b3a4b8032c7a48fce4e08b81efbbcd0cf4d16f24bdf521af66ec9d654d170221a0a7e309813 SHA512 40358d82324653b20433041262b13f4491cfa51b58ace9554d292c09f8f0d979aed19244d4d204b34f8a296a259b968a4c3c639650e06adc7057b53057c67a74
-DIST auto-update-0.1.3.tar.gz 6799 BLAKE2B 7aff212b55b975153d066dd5637c24a6e3d66da59315a94c0af0c55bbadd1d5562cae3fead19625c6a8b459d90aa2fd085b8acf70769a24099550204892c2912 SHA512 54eb034f75d214d428a2ba4d830e4301d5c4ca0df5c55c54aaa5257bc561c1033a34f4e65c3f64606591f03aff8194b04397ffa298a779a8ee0b46fc7ed32ad3
-DIST auto-update-0.1.4.tar.gz 8607 BLAKE2B 0f2a86e45a67576db44880ba738f55d9f5bb630022e52c6514c6aad5318620c0036c669800840b59c7103852c9564a690e9827401f4457fd906b6d75a781bf54 SHA512 071e3b630503462320de3229ee955f378f95d69d6404b9bc4c6b493341f565ef04c41e12eafa4f7d7a85826dec0eed150fc58a77a2ce9f3b802dfc2a240ea45d
-EBUILD auto-update-0.1.2.2.ebuild 545 BLAKE2B ace9a92a8944ca13ba0617fc87d66472c5ca117986443bad1c087b142332f90266cc085a588ae1fd137132f7eba541d1011ef5dd65aefca8dccd44286b326d57 SHA512 227783d1cdd1bfa726b4a292d24d056d287ae379fc47c138c716bd79fa5fdbf5933721ebc57a24ae50d84b198693a63e618f8def54fd7b784f4a8d14e4869236
-EBUILD auto-update-0.1.3.ebuild 547 BLAKE2B a1f1af2589d105f42cb67d172aa9cf38625c71d9897d029b452fb2dccf583a8290ac2dbcf20330ca6c25b968905b55c1c06d1cf8466c51527888da6e5e70eb66 SHA512 5cbe973c8b0d339baa978ca10e5725b05e2ac0e56bff03ad9c3531efe85ac3216ffb5377014330973247fff8c6e3c6dab9d6fdb01e59cd6801d841f5b18e9a5e
-EBUILD auto-update-0.1.4.ebuild 545 BLAKE2B a4cbab469f1e212e97bf444177ad0010666f31a78789a4bd3444611db0ca76e83352b8160ed6dddc4bd79eb89024ee7352178523b0dbbceb4456579780dcb3c4 SHA512 d5bc48c582ba00a27ff2fa1b3eb2f97b511c41698ccdb5ade52bb197341bece4c8f7d45a2fc570f8ddba7960b9119b1a2200404e57b6b3683727fbe019bdc174
-MISC metadata.xml 922 BLAKE2B acaccb87fe64e61842d227f07629a7f358ba47143dbc1e11b4ffddb09a3818423dcfdef002d033db50dcd6062b996561877f0b85c0ea79195735d3fdd34a8445 SHA512 34e86c54aaa8c98cc94f86f38d4c88bf862d965a02122905ae2dda86dd84100236b989f90eaf538da8f865dab8894647f7f50adb39c88437d1bf140e5e57dac5
diff --git a/dev-haskell/auto-update/auto-update-0.1.2.2.ebuild b/dev-haskell/auto-update/auto-update-0.1.2.2.ebuild
deleted file mode 100644
index 6c0751615736..000000000000
--- a/dev-haskell/auto-update/auto-update-0.1.2.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Efficiently run periodic, on-demand actions"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/auto-update/auto-update-0.1.3.ebuild b/dev-haskell/auto-update/auto-update-0.1.3.ebuild
deleted file mode 100644
index 7d76d635d8d3..000000000000
--- a/dev-haskell/auto-update/auto-update-0.1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Efficiently run periodic, on-demand actions"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/auto-update/auto-update-0.1.4.ebuild b/dev-haskell/auto-update/auto-update-0.1.4.ebuild
deleted file mode 100644
index 9d041414242a..000000000000
--- a/dev-haskell/auto-update/auto-update-0.1.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Efficiently run periodic, on-demand actions"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/auto-update/metadata.xml b/dev-haskell/auto-update/metadata.xml
deleted file mode 100644
index b0223bf6088a..000000000000
--- a/dev-haskell/auto-update/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A common problem is the desire to have an action run at a scheduled interval, but only if it is needed. For example, instead of having every web request result in a new @getCurrentTime@ call, we'd like to have a single worker thread run every second, updating an @IORef@. However, if the request frequency is less than once per second, this is a pessimization, and worse, kills idle GC.
-		
-		This library allows you to define actions which will either be performed by a dedicated thread or, in times of low volume, will be executed by the calling thread.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">yesodweb/wai</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/aws-0.11.3-r1 b/dev-haskell/aws-0.11.3-r1
new file mode 100644
index 000000000000..59542e1ffd63
--- /dev/null
+++ b/dev-haskell/aws-0.11.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.5:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] <dev-haskell/conduit-extra-1.2:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.9:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= examples? ( >=dev-haskell/errors-1.4:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] ) !examples? ( >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] ) >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/aeson-0.7 >=dev-haskell/errors-1.4.7 >=dev-haskell/http-client-0.3 >=dev-haskell/lifted-base-0.2 >=dev-haskell/mtl-2.1 >=dev-haskell/quickcheck-2.7 >=dev-haskell/quickcheck-instances-0.3 >=dev-haskell/tasty-0.8 >=dev-haskell/tasty-quickcheck-0.8 >=dev-haskell/text-1.1 >=dev-haskell/transformers-base-0.4 !examples? ( >=dev-haskell/transformers-0.3 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Amazon Web Services (AWS) for Haskell
+EAPI=5
+HOMEPAGE=https://github.com/aristidb/aws
+IUSE=examples doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.5:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] <dev-haskell/conduit-extra-1.2:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.9:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= examples? ( >=dev-haskell/errors-1.4:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] ) !examples? ( >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] )
+RESTRICT=test
+SLOT=0/0.11.3
+SRC_URI=mirror://hackage/packages/archive/aws/0.11.3/aws-0.11.3.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0d5f024c081915c8ea0afe815493c975
diff --git a/dev-haskell/aws-0.12.1 b/dev-haskell/aws-0.12.1
new file mode 100644
index 000000000000..9f295cc52853
--- /dev/null
+++ b/dev-haskell/aws-0.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.5:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] <dev-haskell/conduit-extra-1.2:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.9:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?] >=dev-lang/ghc-7.6.1:= examples? ( >=dev-haskell/errors-1.4:=[profile?] <dev-haskell/errors-2.0:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] ) !examples? ( >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] ) >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/aeson-0.7 >=dev-haskell/errors-1.4.7 <dev-haskell/errors-2.0 >=dev-haskell/http-client-0.3 >=dev-haskell/lifted-base-0.2 >=dev-haskell/mtl-2.1 >=dev-haskell/quickcheck-2.7 >=dev-haskell/quickcheck-instances-0.3 >=dev-haskell/tasty-0.8 >=dev-haskell/tasty-quickcheck-0.8 >=dev-haskell/text-1.1 >=dev-haskell/transformers-base-0.4 !examples? ( >=dev-haskell/transformers-0.3 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Amazon Web Services (AWS) for Haskell
+EAPI=5
+HOMEPAGE=https://github.com/aristidb/aws
+IUSE=examples doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.5:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] <dev-haskell/conduit-extra-1.2:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.9:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?] >=dev-lang/ghc-7.6.1:= examples? ( >=dev-haskell/errors-1.4:=[profile?] <dev-haskell/errors-2.0:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] ) !examples? ( >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] )
+RESTRICT=test
+SLOT=0/0.12.1
+SRC_URI=mirror://hackage/packages/archive/aws/0.12.1/aws-0.12.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=88fe5400a168f2d06b913fe6179da22e
diff --git a/dev-haskell/aws-0.14.1 b/dev-haskell/aws-0.14.1
new file mode 100644
index 000000000000..06cd1867655c
--- /dev/null
+++ b/dev-haskell/aws-0.14.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] <dev-haskell/conduit-extra-1.2:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.10:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?] >=dev-lang/ghc-7.8.2:= examples? ( >=dev-haskell/errors-2.0:=[profile?] dev-haskell/exceptions:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/aeson-0.7 >=dev-haskell/http-client-0.3 <dev-haskell/http-client-0.5 <dev-haskell/http-client-tls-0.5 >=dev-haskell/lifted-base-0.2 >=dev-haskell/mtl-2.1 >=dev-haskell/quickcheck-2.7 >=dev-haskell/quickcheck-instances-0.3 >=dev-haskell/tasty-0.8 >=dev-haskell/tasty-hunit-0.8 >=dev-haskell/tasty-quickcheck-0.8 >=dev-haskell/text-1.1 >=dev-haskell/transformers-base-0.4 !examples? ( >=dev-haskell/errors-2.0 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Amazon Web Services (AWS) for Haskell
+EAPI=6
+HOMEPAGE=https://github.com/aristidb/aws
+IUSE=examples doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] <dev-haskell/conduit-extra-1.2:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.10:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?] >=dev-lang/ghc-7.8.2:= examples? ( >=dev-haskell/errors-2.0:=[profile?] dev-haskell/exceptions:=[profile?] )
+RESTRICT=test
+SLOT=0/0.14.1
+SRC_URI=mirror://hackage/packages/archive/aws/0.14.1/aws-0.14.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c27404f52016ee9632bb7b869b043d05
diff --git a/dev-haskell/aws/Manifest b/dev-haskell/aws/Manifest
deleted file mode 100644
index 219f30382ae6..000000000000
--- a/dev-haskell/aws/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX aws-0.11.3-ghc-7.10.patch 975 BLAKE2B 0e5e21abc586c434da612c0ad29c5b8285da3f57575e0b97daa96d4aa257283f844cfb417f3d04c5f48207c4b3580e2a96110ced73f43295be31ca0111865616 SHA512 6675ee77d5698a190f2c7b882699cb241a2f94981e6a8b7cee1c4ac72adf1cb8507e36103df32f0773f9f3ecb3de169c81ebddca5d88eaa2ccb72406dbbb14b6
-DIST aws-0.11.3.tar.gz 90102 BLAKE2B 4a22b5fe3cabdaeda68229ac9bd653221242a17c259245c650a9e92fed87ee8d58ed3cef4cbc732d0c5f8e92481b42d4a3be4a5b3ecb5c183e52e9e922941938 SHA512 0343d8ef17ad06525c7c131eb97408d3298c46f4dd472604bd4b3a20c2bb1e880e12f9a0e345ee2fe9bfe56b684fd653e9a99b7919e8d97fce4ca0cdd720afb5
-DIST aws-0.12.1.tar.gz 90763 BLAKE2B ef33803420a163c51386165e3d3b94efb61d1e8d4983ab7c23e6c94b09b4f8638e2663657587a1b1ed381446e01a9bc120ca4a3ef9057114698ab870332961e2 SHA512 8c89a982196b654ad4f001d30cb415a9272aacb582c8879173babc4183ca4eb21c025399f1bb5e2624a77a1c38da9b4637bf1dfa0a5bbccb888808a5e654bbf9
-DIST aws-0.14.1.tar.gz 95017 BLAKE2B eab2eccdfc160b16ccd35e6028854e8bcaebf3309269199be752a240a2757a69be496eae0e6d757a814d1d0f6b30f0d3f6cd87954a95a5aaf2d8347245956b29 SHA512 0616d085291748d3ec1ef24d7914562f85fde0577f8100b0dd7f8bc2c817fffb4945372fb80aad98dce652fbf1f063a55afe3ba7aff89ddd5bcd2ba43047ad8c
-EBUILD aws-0.11.3-r1.ebuild 3615 BLAKE2B bde5be519ddf2a4a8fc013c3a8b5eec9f2ca6faab40ea151cb5762b191e6e7febd528ffd8db6fa5f0e1b6599f8ad54d154bc2a7105e1cf4faab9a986ad677002 SHA512 7a9316d6003a3df61e1f4fce739aab93a355762a6919bf594bd37481bc8809d70e36c9b5104eedc2e51f18813c8c218ebe0b7dbee7b6cff185fe75f41e744158
-EBUILD aws-0.12.1.ebuild 3486 BLAKE2B 46351e536175c77cefa33ebef9fbce75623a57724e3ef39221d940fa831a3340e2e0a7ac72caff07072a9d8fce42f4b93606a18166f51b8f2120bd1b8399222b SHA512 ce9b6785e8a101bbba756e3606dcab69525150437cb056d4eb235b69c9e788b74a52c6a60c20604b9cfecc53a11e97290d8b6d4f2419911ff23d1ddf10e29ecc
-EBUILD aws-0.14.1.ebuild 3293 BLAKE2B 3cc1b8ea6c1e0be0f068b21a1e0a1176fa6c18390370d2cdfd67abb20245ac4d80ef9bc420bc9760f2e4350d9271c9b2328a993168b01203acb693a1e647e7ec SHA512 58419b16853685396923a2890b73d0afd0ce0ee2bb10817d0b185167a342ba596b51b97a65918350f44276e538ae1a3f74d8f693364f6c04b870f976ed6bdc9d
-MISC metadata.xml 579 BLAKE2B 994c0d3d2e70a04f4a4bac3981c9e994476cb9fab61d2a135183b547fe4c66adf08e7a5bb76dfffcb6436f867b4b6b813ccf023d1a1bf32ae12afb847f819e1f SHA512 e539e4a84e42065fd427edf1c8c32d8a55aa3df19407bdafa9cf301a9a19ac89d1102e0cd429ed92343e0e7d31a3669993614aff42ef4e643ee88ed3565cc5fd
diff --git a/dev-haskell/aws/aws-0.11.3-r1.ebuild b/dev-haskell/aws/aws-0.11.3-r1.ebuild
deleted file mode 100644
index a11a78a3814d..000000000000
--- a/dev-haskell/aws/aws-0.11.3-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit base haskell-cabal
-
-DESCRIPTION="Amazon Web Services (AWS) for Haskell"
-HOMEPAGE="https://github.com/aristidb/aws"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RESTRICT=test # needs aws accound
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
-	>=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?]
-	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
-	>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.5:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?] <dev-haskell/conduit-extra-1.2:=[profile?]
-	>=dev-haskell/cryptohash-0.11:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
-	>=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
-	>=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.9:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/network-2:=[profile?] <dev-haskell/network-3:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
-	>=dev-haskell/scientific-0.3:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	examples? ( >=dev-haskell/errors-1.4:=[profile?]
-			dev-haskell/exceptions:=[profile?]
-			>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] )
-	!examples? ( >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/aeson-0.7
-		>=dev-haskell/errors-1.4.7
-		>=dev-haskell/http-client-0.3
-		>=dev-haskell/lifted-base-0.2
-		>=dev-haskell/mtl-2.1
-		>=dev-haskell/quickcheck-2.7
-		>=dev-haskell/quickcheck-instances-0.3
-		>=dev-haskell/tasty-0.8
-		>=dev-haskell/tasty-quickcheck-0.8
-		>=dev-haskell/text-1.1
-		>=dev-haskell/transformers-base-0.4
-		!examples? ( >=dev-haskell/transformers-0.3 ) )
-"
-
-PATCHES=("${FILESDIR}/${P}-ghc-7.10.patch")
-
-src_prepare() {
-	base_src_prepare
-	cabal_chdeps \
-		'tagged               >= 0.7     && < 0.8' 'tagged               >= 0.7     && < 0.9'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples examples)
-}
diff --git a/dev-haskell/aws/aws-0.12.1.ebuild b/dev-haskell/aws/aws-0.12.1.ebuild
deleted file mode 100644
index 3d1c858c5b2d..000000000000
--- a/dev-haskell/aws/aws-0.12.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Amazon Web Services (AWS) for Haskell"
-HOMEPAGE="https://github.com/aristidb/aws"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RESTRICT=test # needs aws accound
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
-	>=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
-	>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.5:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?] <dev-haskell/conduit-extra-1.2:=[profile?]
-	>=dev-haskell/cryptohash-0.11:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
-	>=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
-	>=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.9:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/network-2:=[profile?] <dev-haskell/network-3:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
-	>=dev-haskell/scientific-0.3:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-	examples? ( >=dev-haskell/errors-1.4:=[profile?] <dev-haskell/errors-2.0:=[profile?]
-			dev-haskell/exceptions:=[profile?]
-			>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] )
-	!examples? ( >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/aeson-0.7
-		>=dev-haskell/errors-1.4.7 <dev-haskell/errors-2.0
-		>=dev-haskell/http-client-0.3
-		>=dev-haskell/lifted-base-0.2
-		>=dev-haskell/mtl-2.1
-		>=dev-haskell/quickcheck-2.7
-		>=dev-haskell/quickcheck-instances-0.3
-		>=dev-haskell/tasty-0.8
-		>=dev-haskell/tasty-quickcheck-0.8
-		>=dev-haskell/text-1.1
-		>=dev-haskell/transformers-base-0.4
-		!examples? ( >=dev-haskell/transformers-0.3 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples examples)
-}
diff --git a/dev-haskell/aws/aws-0.14.1.ebuild b/dev-haskell/aws/aws-0.14.1.ebuild
deleted file mode 100644
index ae37ba96b6fa..000000000000
--- a/dev-haskell/aws/aws-0.14.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Amazon Web Services (AWS) for Haskell"
-HOMEPAGE="https://github.com/aristidb/aws"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RESTRICT=test # needs aws accound
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
-	>=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
-	>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?] <dev-haskell/conduit-extra-1.2:=[profile?]
-	>=dev-haskell/cryptohash-0.11:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
-	>=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
-	>=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.10:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/network-2:=[profile?] <dev-haskell/network-3:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
-	>=dev-haskell/scientific-0.3:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	examples? ( >=dev-haskell/errors-2.0:=[profile?]
-			dev-haskell/exceptions:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/aeson-0.7
-		>=dev-haskell/http-client-0.3 <dev-haskell/http-client-0.5
-		<dev-haskell/http-client-tls-0.5
-		>=dev-haskell/lifted-base-0.2
-		>=dev-haskell/mtl-2.1
-		>=dev-haskell/quickcheck-2.7
-		>=dev-haskell/quickcheck-instances-0.3
-		>=dev-haskell/tasty-0.8
-		>=dev-haskell/tasty-hunit-0.8
-		>=dev-haskell/tasty-quickcheck-0.8
-		>=dev-haskell/text-1.1
-		>=dev-haskell/transformers-base-0.4
-		!examples? ( >=dev-haskell/errors-2.0 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples examples)
-}
diff --git a/dev-haskell/aws/files/aws-0.11.3-ghc-7.10.patch b/dev-haskell/aws/files/aws-0.11.3-ghc-7.10.patch
deleted file mode 100644
index 4d2db5d35a5f..000000000000
--- a/dev-haskell/aws/files/aws-0.11.3-ghc-7.10.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- aws-0.11.3-orig/aws.cabal	2015-03-24 05:26:53.000000000 +1100
-+++ aws-0.11.3/aws.cabal	2015-04-04 10:18:21.057164803 +1100
-@@ -126,7 +126,7 @@
-                        cryptohash           >= 0.11    && < 0.12,
-                        data-default         >= 0.5.3   && < 0.6,
-                        directory            >= 1.0     && < 1.3,
--                       filepath             >= 1.1     && < 1.4,
-+                       filepath             >= 1.1     && < 1.5,
-                        http-conduit         >= 2.1     && < 2.2,
-                        http-types           >= 0.7     && < 0.9,
-                        lifted-base          >= 0.1     && < 0.3,
---- aws-0.11.3-orig/Examples/DynamoDb.hs	2015-03-24 05:26:53.000000000 +1100
-+++ aws-0.11.3/Examples/DynamoDb.hs	2015-04-04 10:18:43.712140567 +1100
-@@ -1,5 +1,6 @@
- {-# LANGUAGE OverloadedStrings   #-}
- {-# LANGUAGE ScopedTypeVariables #-}
-+{-# LANGUAGE FlexibleContexts #-}
- 
- module Main where
- 
diff --git a/dev-haskell/aws/metadata.xml b/dev-haskell/aws/metadata.xml
deleted file mode 100644
index f05125d63240..000000000000
--- a/dev-haskell/aws/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Bindings for Amazon Web Services (AWS), with the aim of supporting all AWS services. To see a high level overview of the library, see the README at &lt;https://github.com/aristidb/aws/blob/master/README.org&gt;.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">aristidb/aws</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/base-compat-0.2.1 b/dev-haskell/base-compat-0.2.1
new file mode 100644
index 000000000000..e20b4cdee127
--- /dev/null
+++ b/dev-haskell/base-compat-0.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= test? ( >=dev-haskell/hspec-1.3 dev-haskell/setenv ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A compatibility layer for base
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/base-compat
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.2.1
+SRC_URI=mirror://hackage/packages/archive/base-compat/0.2.1/base-compat-0.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=828647b6fc1d33e27988f80b0d4c82ea
diff --git a/dev-haskell/base-compat-0.4.2 b/dev-haskell/base-compat-0.4.2
new file mode 100644
index 000000000000..b6cafb31f8cd
--- /dev/null
+++ b/dev-haskell/base-compat-0.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/errorcall-eq-instance:=[profile?] dev-haskell/setenv:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A compatibility layer for base
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/base-compat
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-haskell/errorcall-eq-instance:=[profile?] dev-haskell/setenv:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.4.2
+SRC_URI=mirror://hackage/packages/archive/base-compat/0.4.2/base-compat-0.4.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ef477e6111b9e9a8fa803cfe445edf74
diff --git a/dev-haskell/base-compat-0.5.0 b/dev-haskell/base-compat-0.5.0
new file mode 100644
index 000000000000..23f40fd8ce05
--- /dev/null
+++ b/dev-haskell/base-compat-0.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/errorcall-eq-instance:=[profile?] dev-haskell/setenv:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.8 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A compatibility layer for base
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/base-compat
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/errorcall-eq-instance:=[profile?] dev-haskell/setenv:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.5.0
+SRC_URI=mirror://hackage/packages/archive/base-compat/0.5.0/base-compat-0.5.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c4297cd4eca01428b00694d247ea5b04
diff --git a/dev-haskell/base-compat-0.8.2 b/dev-haskell/base-compat-0.8.2
new file mode 100644
index 000000000000..53e2b3354931
--- /dev/null
+++ b/dev-haskell/base-compat-0.8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.8 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A compatibility layer for base
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/base-compat
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.8.2
+SRC_URI=mirror://hackage/packages/archive/base-compat/0.8.2/base-compat-0.8.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b2bac5e14b38ca5a8323be05523aa37a
diff --git a/dev-haskell/base-compat-0.9.1 b/dev-haskell/base-compat-0.9.1
new file mode 100644
index 000000000000..0db42522bc4b
--- /dev/null
+++ b/dev-haskell/base-compat-0.9.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.8 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A compatibility layer for base
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/base-compat
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.9.1
+SRC_URI=mirror://hackage/packages/archive/base-compat/0.9.1/base-compat-0.9.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ac9d1d47e919f747a3e2292bbe3e054d
diff --git a/dev-haskell/base-compat/Manifest b/dev-haskell/base-compat/Manifest
deleted file mode 100644
index 20efa194896d..000000000000
--- a/dev-haskell/base-compat/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST base-compat-0.2.1.tar.gz 9158 BLAKE2B 642c7f5f5b2a91cd6e38a6643cc719e5fa60f261c50bbda708b284daa2ccbbee2a3ae95f13f0c3180baf398b7f5db85d011f6ec944a2dd17b6ab73ec92225dd2 SHA512 959ce234c61211dc62850f656bb8342aa1fe0c849607a32d43f23d121eb1cb4c3f25a8b669042d9e76aa2f634708219e1a15a4a9afa89e3a3e1a4276b73c0214
-DIST base-compat-0.4.2.tar.gz 4094 BLAKE2B 3b17f5a74b14e4eac0b7269edac3b457bfa55d45584a31117fb847f8dd340a9df613e1686369262a55772b8364527b98100bbee66312e63ccf4468c3a499984c SHA512 5f55b68d59b22a2cd6f197a3f783ad3d088afaadb27ad9810c66b9407d0e43c938901ac1a53eba54edae4cf519b2625e19a4934b09702cd9e32b9815fdc8305d
-DIST base-compat-0.5.0.tar.gz 4342 BLAKE2B 8e1c16683be353d7eb949c1bf9893f7e0f02fc5ec46c88abfd388fed62da06851cc74ec26c866651b14ad111ee4fbdf008d50957f5e008c7f31a275f6dc341b1 SHA512 d591c96922720fd42ca01744f289b4ef2e228704bd2cb4b7aac5bf5a0de3b5ad5eaf46fe5f2a56e903e3a94ecf228ed494896f8a491173f9077be35c834a0377
-DIST base-compat-0.8.2.tar.gz 16053 BLAKE2B 93f3ef7773c78001a155866698c51c66917a80ee61c82a5c51217b09969a781dfc03a6428d9dfa39a3b2a984dfce57b621a682f099cbe94b9776fde86aeb25b7 SHA512 3942ba0f03a2ee979130d185321f6f48fc3e71a610fb0e65d0b4cfa1ff0112776670a4322d141e9b6465060b44c2d5cf4acff3928648800927b90ce36c2b3760
-DIST base-compat-0.9.1.tar.gz 26251 BLAKE2B 06d204cb6cc904cbaf3cc66d01356c18eb1440ddfe6fbf787f0bf547263a83b80c3a4740231888b68ffd419ad6bf2ddb840aea344d70c11b295e9e4d3cba8fc2 SHA512 e79cb17f96c6abb170cfb836c1ff5a6cb2916dee46f00e3701a8fe264eb06bc4b0f0b825f40e2a151f18b5ee67d98ef713877ee22253d862e175185909c8eeba
-EBUILD base-compat-0.2.1.ebuild 617 BLAKE2B 7d01be9e7df4a567ebe7d75548176d908cfc5ba5ef74599bc99692659c4f47da8a8ba172ae461a4bbcf9e788fd136b46104893447446ec0b162365c7cecc4c20 SHA512 aff98969843384b6aacc40eaffcde20f78176fef3cd9d41f375c7fa4be78a87c1d6f10e8794b3158db4a3e4bddc577bd04e842a22ad70d8f2933d9568000df60
-EBUILD base-compat-0.4.2.ebuild 672 BLAKE2B db27a9815d52dd3d9b6959b0af8083bae982bf912fddc663f411e30fff15f296dbc21d7aca4ca6000083e17d6e6afbd1f6cb28d56954f3d3c8ce7635e88efd91 SHA512 fa27c8ccb7c5137f0c91102beeed49eea9d352359df780017d0479e1c18facfa768c658b24325d8982dd2472cf984e047cbbdaed1e40103ae84ee862981c7fdc
-EBUILD base-compat-0.5.0.ebuild 699 BLAKE2B 03ee5b422b4d8c66e38b192bdd234f056f0e94e20479ccb5b1bf9d2eb1b968b4fdc20c0e966831835b6f49cb96c199b85186c18dd0abdeaf34ac1a7c36f11119 SHA512 3d23c1772dca4adfff253b420c7e8f8289911ab21553bcccbf83832e7044f8d0854c77b5b762e236fc3f02406b20d152a15e4ab3c1e6e5d51815b4cb583087de
-EBUILD base-compat-0.8.2.ebuild 619 BLAKE2B 0dda4fc1e5cdcbe37127cfdacb8ec8cfc1bc1ab51577007e60de14d4b482eda9087bade26b2699610001d4df81c8f3f2e00ac51e27fbe627b84919b24d6ebe85 SHA512 24c6d88d9c32318063cf100f27c26cf224a7fc6524903d9fb05d13525385dffd6bd23c3b7cc51e3ca034f87bf56b22feb1b2b60b76037f1ad990c737cf2caada
-EBUILD base-compat-0.9.1.ebuild 617 BLAKE2B 02b21d4ce6fd5e0c0e714a39da99a1ff792331879c6cf179798a887d7bafc22268eae59a31a2a43469027ae2a3221bce0a684b5859f35cddd71f7411b932b0b2 SHA512 d53999096c63e813fc20fc26f0386f1cb32773f74dabdff46c448aa3f16d4be877e8c8a9c3ac26c794135e725aee089b3997508dd09d8aa8fbbbc2696b870954
-MISC metadata.xml 403 BLAKE2B b7e17297a4bcf642f6a31cc8ea90ea70139a8d7df7be9efeb813dda8e89117011e4104e3fd70c0546e0c9dc6d550407997803afe3448df7bf3125911145303c6 SHA512 03dc1ed3064ec0cff1d67ea3559d124e78b639d9eca9304b9864384cdd9bf51547a73d6569754fe5da74fc204e4ac1317bed92847f6a0ef14033eab3f4e7bfcb
diff --git a/dev-haskell/base-compat/base-compat-0.2.1.ebuild b/dev-haskell/base-compat/base-compat-0.2.1.ebuild
deleted file mode 100644
index 781ce97b5b75..000000000000
--- a/dev-haskell/base-compat/base-compat-0.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A compatibility layer for base"
-HOMEPAGE="http://hackage.haskell.org/package/base-compat"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/setenv
-		)
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/base-compat/base-compat-0.4.2.ebuild b/dev-haskell/base-compat/base-compat-0.4.2.ebuild
deleted file mode 100644
index cb308436f6e6..000000000000
--- a/dev-haskell/base-compat/base-compat-0.4.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A compatibility layer for base"
-HOMEPAGE="http://hackage.haskell.org/package/base-compat"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/errorcall-eq-instance:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/base-compat/base-compat-0.5.0.ebuild b/dev-haskell/base-compat/base-compat-0.5.0.ebuild
deleted file mode 100644
index 99472ea8e387..000000000000
--- a/dev-haskell/base-compat/base-compat-0.5.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A compatibility layer for base"
-HOMEPAGE="http://hackage.haskell.org/package/base-compat"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/errorcall-eq-instance:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.8
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/base-compat/base-compat-0.8.2.ebuild b/dev-haskell/base-compat/base-compat-0.8.2.ebuild
deleted file mode 100644
index d810e3b51d29..000000000000
--- a/dev-haskell/base-compat/base-compat-0.8.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A compatibility layer for base"
-HOMEPAGE="http://hackage.haskell.org/package/base-compat"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.8
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/base-compat/base-compat-0.9.1.ebuild b/dev-haskell/base-compat/base-compat-0.9.1.ebuild
deleted file mode 100644
index 7af9e2d14aa8..000000000000
--- a/dev-haskell/base-compat/base-compat-0.9.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A compatibility layer for base"
-HOMEPAGE="http://hackage.haskell.org/package/base-compat"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.8
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/base-compat/metadata.xml b/dev-haskell/base-compat/metadata.xml
deleted file mode 100644
index 46296b14ebec..000000000000
--- a/dev-haskell/base-compat/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Ban CPP from your code.  See the README for what is covered:
-		&lt;https://github.com/sol/base-compat#readme&gt;
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/base-orphans-0.3.2 b/dev-haskell/base-orphans-0.3.2
new file mode 100644
index 000000000000..95cb5114ee77
--- /dev/null
+++ b/dev-haskell/base-orphans-0.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Backwards-compatible orphan instances for base
+EAPI=5
+HOMEPAGE=https://github.com/haskell-compat/base-orphans#readme
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.2
+SRC_URI=mirror://hackage/packages/archive/base-orphans/0.3.2/base-orphans-0.3.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=300d014e069731d8426216e7b8c8def6
diff --git a/dev-haskell/base-orphans-0.5.4 b/dev-haskell/base-orphans-0.5.4
new file mode 100644
index 000000000000..f3163de8d5e2
--- /dev/null
+++ b/dev-haskell/base-orphans-0.5.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Backwards-compatible orphan instances for base
+EAPI=6
+HOMEPAGE=https://github.com/haskell-compat/base-orphans#readme
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.5.4
+SRC_URI=mirror://hackage/packages/archive/base-orphans/0.5.4/base-orphans-0.5.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f9271c73d4ca7fa9690abaaa69e5ab04
diff --git a/dev-haskell/base-orphans/Manifest b/dev-haskell/base-orphans/Manifest
deleted file mode 100644
index 97be9ebd2cdd..000000000000
--- a/dev-haskell/base-orphans/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST base-orphans-0.3.2.tar.gz 12608 BLAKE2B c2e14671dc69c083a8910e4debd64d472382ca4f35c781ccb207f9f8be5193321c7d0c2941455175ed9e813d1eb53ac8617b86a2ec2227bd2f1181b1bb8260de SHA512 2c62148c49e123a8e6f95ac65c4b8998c73f3f0d0bfc71e90058f3d75d760b048f8b3f8a0e88ac80c39947ce3d3d42243b66a2370045e44cbacb1f054335303c
-DIST base-orphans-0.5.4.tar.gz 16834 BLAKE2B 3eb1427497c744b64ab1bd122f005f1ba75f2eb9a76c62fda2fe950c77f3a06b0969268eaf15fa759642f16512e707164c8ad2846f30f283c32a99e0df25ed66 SHA512 41338450e2669936ff8bedbd59954b988154f286e9beb37f4ab98983070b5a99bc3340e3b56fe2701c2a7cc3eed0d8dd549241f1b19c252ea4db8600dd5b5fab
-EBUILD base-orphans-0.3.2.ebuild 635 BLAKE2B 26cbb25f7b5f7a090d8f636c070b86b8f7638476c939d4e42ca297b108baa043d4bf4ce537309dbb4d47f6dc27388b36ac26db3f815494e9ed90d11666404ea1 SHA512 2cd791d5aca73c8ee91d1a1fb5a6d4832b4003df4ae5e5f584e4936472aff6b14c2ad780989225526c6353eb02c3a338a7b2c2ff3e72ef2e6c9ad31617ccd42e
-EBUILD base-orphans-0.5.4.ebuild 660 BLAKE2B 731fd94bcd91ac367358a1b5c6f645e43796a7e1735b72251c0b0ac33b7500ca1a110590f7264cbad638985a9dec3809571def5b586fb27ef2b4d097882ce341 SHA512 c13bf9120276d6738717b79bc6b4fb87571e25d9bfa08e0dd10b96cc48753c9eebab591de57889008e2c2b37870cf1122c8e2fb6d93938e36c8cb197ffaf3fcf
-MISC metadata.xml 806 BLAKE2B d4196716e787b1274e91334b61667f00c67ff9ac70153089aa95b93ce2f5730d761be0d62a5cc97a20921573fea9a1153b937f27cc7c2b808f6d7c9e8a22d647 SHA512 68f21e99d939f8b6488595980f717948f9b4eec2c096dde3463d851de8025a461fc465660750a1840bd6157d2787364fa69525002589de5f4fbeca55f7999278
diff --git a/dev-haskell/base-orphans/base-orphans-0.3.2.ebuild b/dev-haskell/base-orphans/base-orphans-0.3.2.ebuild
deleted file mode 100644
index eebdea69c2dc..000000000000
--- a/dev-haskell/base-orphans/base-orphans-0.3.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Backwards-compatible orphan instances for base"
-HOMEPAGE="https://github.com/haskell-compat/base-orphans#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
-"
diff --git a/dev-haskell/base-orphans/base-orphans-0.5.4.ebuild b/dev-haskell/base-orphans/base-orphans-0.5.4.ebuild
deleted file mode 100644
index 90017ab39aeb..000000000000
--- a/dev-haskell/base-orphans/base-orphans-0.5.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Backwards-compatible orphan instances for base"
-HOMEPAGE="https://github.com/haskell-compat/base-orphans#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/base-orphans/metadata.xml b/dev-haskell/base-orphans/metadata.xml
deleted file mode 100644
index ded6ee8fd1c2..000000000000
--- a/dev-haskell/base-orphans/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		@base-orphans@ defines orphan instances that mimic instances available in later versions of @base@ to a wider (older) range of compilers. @base-orphans@ does not export anything except the orphan instances themselves and complements @&lt;http://hackage.haskell.org/package/base-compat base-compat&gt;@.
-		
-		See the README for what instances are covered: &lt;https://github.com/haskell-compat/base-orphans#readme&gt;
-	</longdescription>
-	<upstream>
-		<remote-id type="github">haskell-compat/base-orphans#readme</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/base-prelude-1.0.1.1 b/dev-haskell/base-prelude-1.0.1.1
new file mode 100644
index 000000000000..125cbd1a60dc
--- /dev/null
+++ b/dev-haskell/base-prelude-1.0.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=The most complete prelude formed solely from the "base" package
+EAPI=6
+HOMEPAGE=https://github.com/nikita-volkov/base-prelude
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.6.1:=
+SLOT=0/1.0.1.1
+SRC_URI=mirror://hackage/packages/archive/base-prelude/1.0.1.1/base-prelude-1.0.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=88b26c59bfa1311c582010d85a1e833d
diff --git a/dev-haskell/base-prelude/Manifest b/dev-haskell/base-prelude/Manifest
deleted file mode 100644
index 0ef8c0fb7aa2..000000000000
--- a/dev-haskell/base-prelude/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST base-prelude-1.0.1.1.tar.gz 4038 BLAKE2B 11f5a26beb32e8e4d1841d1e98984fee9df9fae92083a06f2e322b2c9054be33fff395ebe6552a2ccfe278cb1d119589269040dd6421b1d58d30c6276ab4b18d SHA512 6bcb0794488d9b0805f6385257d6d04ef8cbadd2445534e688a66ac18863be4af2878be968c9733fd58a60dc8c7531f6a7cedd193b46342feb43a3f1f023b757
-EBUILD base-prelude-1.0.1.1.ebuild 583 BLAKE2B de0f48a2bff8a378ae332561acb848e6a3ae6023b81028825223c254c0d6f6a0bded382cf734fb07e687a103a23124b25272445b02093d5415eb4b1fb5d44f7d SHA512 6baad824751520a5b196bf3f5d01f7b2152c477fce8d38c12d059e536e2e3cf0318b52a9ffdc709d9bb257159149332464bd60a7c18408fda138a1d89e65e120
-MISC metadata.xml 945 BLAKE2B a9382f6ecce320a9c3796f042727bb5092acba53826b5160a05f9a89bc4776e229bd42136567c8dcb05f9f02bcd893304610cf4abe04a3f4518ed72fdb4dc542 SHA512 cab916deb37631cc623cdb799d10338f21cafa557879dc3b96ab8627a06f5ee4cf196b1b5b668fed1a838e8d195d63526d3a8587f5134730375af0d2504d439f
diff --git a/dev-haskell/base-prelude/base-prelude-1.0.1.1.ebuild b/dev-haskell/base-prelude/base-prelude-1.0.1.1.ebuild
deleted file mode 100644
index e31dd3a6ed52..000000000000
--- a/dev-haskell/base-prelude/base-prelude-1.0.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="The most complete prelude formed solely from the \"base\" package"
-HOMEPAGE="https://github.com/nikita-volkov/base-prelude"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/base-prelude/metadata.xml b/dev-haskell/base-prelude/metadata.xml
deleted file mode 100644
index ca9a5160de97..000000000000
--- a/dev-haskell/base-prelude/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A library which aims to reexport all the non-conflicting and
-		most general definitions from the \&quot;base\&quot; package.
-		This includes APIs for applicatives, arrows, monoids, foldables, traversables,
-		exceptions, generics, ST, MVars and STM.
-		
-		This package will never have any dependencies other than \&quot;base\&quot;.
-		
-		/Versioning policy/
-		
-		The versioning policy of this package deviates from PVP in the sense
-		that its exports in part are transitively determined by the version of \&quot;base\&quot;.
-		Therefore it&#39;s recommended for the users of \&quot;base-prelude\&quot; to specify
-		the bounds of \&quot;base\&quot; as well.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/base-unicode-symbols-0.2.2.4 b/dev-haskell/base-unicode-symbols-0.2.2.4
new file mode 100644
index 000000000000..4173d922831d
--- /dev/null
+++ b/dev-haskell/base-unicode-symbols-0.2.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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=Unicode alternatives for common functions and operators
+EAPI=5
+HOMEPAGE=http://haskell.org/haskellwiki/Unicode-symbols
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.2.2.4
+SRC_URI=mirror://hackage/packages/archive/base-unicode-symbols/0.2.2.4/base-unicode-symbols-0.2.2.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=091a7ef24f77c2aaf238c00827d25172
diff --git a/dev-haskell/base-unicode-symbols/Manifest b/dev-haskell/base-unicode-symbols/Manifest
deleted file mode 100644
index be9bc63059a6..000000000000
--- a/dev-haskell/base-unicode-symbols/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST base-unicode-symbols-0.2.2.4.tar.gz 5562 BLAKE2B 7482612b993cd4470a6268d49a5384a3907c95506092ff54b96ce2b823744fca9fd3ab18980b193da7a48fd572b84833b916446d73e34cbcbd54161b3c410016 SHA512 8dcdafa1075ccea8f188b880b90430b7e86270f68fcca47bbee7fa7e695bc90765566e09a0f032103d8cf2a265069e80288f56714190c9e68470141e469a994d
-EBUILD base-unicode-symbols-0.2.2.4.ebuild 582 BLAKE2B 5428b2fad956510dc3c004c6766995484c432501d1e09c5ad16a4d2ca7eb6ab8b1d24285d81ac39d898afc395c032282b8145d3572ff21501c3baf52bdcc7c3e SHA512 10934f5941477c67d82662171100209a5a93029b8ce272073e9124ec5b3c7a609785fa28185c1935d72650679b468d90209f854a9defc22651caf478a195a0bc
-MISC metadata.xml 1004 BLAKE2B b12afc1bea8da697f8132d45076e1bc8c9a18e46a471b2496ba6264308283691ad5dc757de7586f21341c2930b08ad05021a4366418a4069b838f8b70614b0b6 SHA512 3dc724d28f44cf1fb90f8324cc2df0398a726d21b54a78d08a57c75a832aa14d8f5ce01dcd5c4310ddbf28e5fb15d2a5a265ce616c9d5a477450985448df3b5d
diff --git a/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.2.4.ebuild b/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.2.4.ebuild
deleted file mode 100644
index ef90f4babfed..000000000000
--- a/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.2.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Unicode alternatives for common functions and operators"
-HOMEPAGE="http://haskell.org/haskellwiki/Unicode-symbols"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/base-unicode-symbols/metadata.xml b/dev-haskell/base-unicode-symbols/metadata.xml
deleted file mode 100644
index ca23dac36027..000000000000
--- a/dev-haskell/base-unicode-symbols/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-	</maintainer>
-	<longdescription>
-		This package defines new symbols for a number of functions,
-		operators and types in the base package.
-		
-		All symbols are documented with their actual definition and
-		information regarding their Unicode code point. They should be
-		completely interchangeable with their definitions.
-		
-		For further Unicode goodness you can enable the @UnicodeSyntax@
-		language extension \[1\]. This extension enables Unicode characters
-		to be used to stand for certain ASCII character sequences,
-		i.e. &amp;#x2192; instead of @-&gt;@, &amp;#x2200; instead of @forall@ and many
-		others.
-		
-		Original idea by P&amp;#xE9;ter Divi&amp;#xE1;nszky.
-		
-		\[1\] &lt;http://www.haskell.org/ghc/docs/latest/html/users_guide/syntax-extns.html#unicode-syntax&gt;
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/base16-bytestring-0.1.1.6 b/dev-haskell/base16-bytestring-0.1.1.6
new file mode 100644
index 000000000000..a21153c0c4bf
--- /dev/null
+++ b/dev-haskell/base16-bytestring-0.1.1.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast base16 (hex) encoding and decoding for ByteStrings
+EAPI=5
+HOMEPAGE=https://github.com/bos/base16-bytestring
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.1.1.6
+SRC_URI=mirror://hackage/packages/archive/base16-bytestring/0.1.1.6/base16-bytestring-0.1.1.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3c0b546be8d1b7b24d6bf63216dafb61
diff --git a/dev-haskell/base16-bytestring/Manifest b/dev-haskell/base16-bytestring/Manifest
deleted file mode 100644
index e5709c1b6063..000000000000
--- a/dev-haskell/base16-bytestring/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST base16-bytestring-0.1.1.6.tar.gz 3694 BLAKE2B 81ea5573cc853a6fb55400b28b7a667ba175a6ae65547dd7ae8b450a72d950c4513bf464f1646c4f8167a2e477974180d85a1884a22b468c5646a5c8b6da2186 SHA512 699bc1f7819a1c0cea0154626f8799301bc9360bc997a5e9313a605ec33ea04d77219b100693021fd43e01d8d979374db07e6e3fabef5301c411f335e30a8cba
-EBUILD base16-bytestring-0.1.1.6.ebuild 570 BLAKE2B 24c66610bed392bd4fecb91cfed1e48173ffb262ac65ddeb7241b1a3ba4d420bc162064fccc923c66720fc6f0f1a32c0ace747f5eec2617602ec479bcc4e8bef SHA512 9ce22cc454d6779ec00dc8dfd3debf84a8d80aea9f0db42afb8f53258feadb055989576b53b9d0fb3b655b3365243a2c567b4282f5450a8c1a19bff8b22d43bf
-MISC metadata.xml 432 BLAKE2B ab9f02333bb28e9548718c71824efdbfe2e26a00b474383768d5cae32728fa8a9ee5f3777b367469bbf26bfe0d304617a345cd10bda4833662639cdc977a420c SHA512 01711bdf5dc977130458d4e9181ed0985c35c1c6fd0da1d1367233a0fa2a2c8c8e584599bc5492f037845856dc8b1e163314c5d1519ba5b1a18c67448b370e95
diff --git a/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.6.ebuild b/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.6.ebuild
deleted file mode 100644
index 3610784beb00..000000000000
--- a/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Fast base16 (hex) encoding and decoding for ByteStrings"
-HOMEPAGE="https://github.com/bos/base16-bytestring"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/base16-bytestring/metadata.xml b/dev-haskell/base16-bytestring/metadata.xml
deleted file mode 100644
index 4a6a62905750..000000000000
--- a/dev-haskell/base16-bytestring/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Fast base16 (hex) encoding and decoding for ByteStrings
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bos/base16-bytestring</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/base64-bytestring-0.1.1.3 b/dev-haskell/base64-bytestring-0.1.1.3
new file mode 100644
index 000000000000..ce2388e9b235
--- /dev/null
+++ b/dev-haskell/base64-bytestring-0.1.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2.4.0.1 dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast base64 encoding and deconding for ByteStrings
+EAPI=4
+HOMEPAGE=https://github.com/bos/base64-bytestring
+IUSE=test doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.1
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/base64-bytestring/0.1.1.3/base64-bytestring-0.1.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0bcbe358215066c782084f4282c975de
diff --git a/dev-haskell/base64-bytestring-1.0.0.1 b/dev-haskell/base64-bytestring-1.0.0.1
new file mode 100644
index 000000000000..58502dea9cee
--- /dev/null
+++ b/dev-haskell/base64-bytestring-1.0.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast base64 encoding and decoding for ByteStrings
+EAPI=5
+HOMEPAGE=https://github.com/bos/base64-bytestring
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/1.0.0.1
+SRC_URI=mirror://hackage/packages/archive/base64-bytestring/1.0.0.1/base64-bytestring-1.0.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f68551ff8249e26dc5926149e042bf44
diff --git a/dev-haskell/base64-bytestring/Manifest b/dev-haskell/base64-bytestring/Manifest
deleted file mode 100644
index 0cd6953c706a..000000000000
--- a/dev-haskell/base64-bytestring/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST base64-bytestring-0.1.1.3.tar.gz 6976 BLAKE2B 7d454b27a1bed7513954c191064776c5a9fed03d91657688a5ca5eccb58bc180f73cc731f4f053d7a0c6ab57f54472ce89b0492f359b9dc0a15470e81f3c5ea8 SHA512 49ca6320ddb3a6b149fd61e6a046404fc692c7030d4ad48e6d390b645e1c5343854d9814f7e58369c8cba0089d0da1803c57d808c4217bfefe27303d93a20587
-DIST base64-bytestring-1.0.0.1.tar.gz 9080 BLAKE2B 272bd4cd4a87c76d5d85bf0bda4b9659168e9623deaebfdc2cedc7083b833fda9512775d17096e8f01b6ca1a1f73c9d1bfa5059b7564f1f3dc2cd467322cfbc8 SHA512 6936b34955b89a275f5bd71c74bbad2be6ff9e2023ac652bdbc9c5b10dd624e3862fc348849858fdb5c7b8aacc36ab4cda8bc6ea797c129b6b28d7e2e2e610e7
-EBUILD base64-bytestring-0.1.1.3.ebuild 784 BLAKE2B 8c28c608e7fd180a640b5f93635586a9fd684a64da023dc9ae448f06393e0007d26970927fe7bcbf69372aa5e6d8b434a168b449a98964f01d5097f48b3ca9fe SHA512 404ce2f83d6b00a39fab94a5b18c0f720306b723c940ea8e90d6528253adef5b8876c6a300721c6438beaef94fb7208647b44ec50a6855bb547aee4dc0664932
-EBUILD base64-bytestring-1.0.0.1.ebuild 736 BLAKE2B 2c1a537bd8aa684a5ac1d6f388a4da6ad4063d4284bdb74605c766690d4d95c5dc4bec7aaa5fe8dd5fdad92fdf630c2bd5eae98b10e080c2ec0363259fa3e78c SHA512 3a217c481e7750f37e972694bae92cf417ffaa67fc1603a330b1cfb28f426fecdb4b768eb7376e7107f69ea8c70779534383bc6ea1eda64d66a2364094254c53
-MISC metadata.xml 427 BLAKE2B 18ffaff4e2a78e35554df1a79485899f0774127364d99346d93568c435b6b6b73552ac25977213adc356f0e4ba69d05b5d0bfdddfab28ee070087102bf94cf00 SHA512 8a018f951503918aba4bf65beff55d11dfe886cb5c78a166bed89e585366b8d836176ed304eb182bdb3b74fe775257f8b0073aa315516a8d16239e6b1a07a35e
diff --git a/dev-haskell/base64-bytestring/base64-bytestring-0.1.1.3.ebuild b/dev-haskell/base64-bytestring/base64-bytestring-0.1.1.3.ebuild
deleted file mode 100644
index e7871444013c..000000000000
--- a/dev-haskell/base64-bytestring/base64-bytestring-0.1.1.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Fast base64 encoding and deconding for ByteStrings"
-HOMEPAGE="https://github.com/bos/base64-bytestring"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? (
-			dev-haskell/hunit
-			>=dev-haskell/quickcheck-2.4.0.1
-			dev-haskell/test-framework
-			dev-haskell/test-framework-hunit
-			dev-haskell/test-framework-quickcheck2
-		)
-		"
-
-src_configure() {
-	cabal_src_configure $(use test && use_enable test tests) #395351
-}
diff --git a/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.1.ebuild b/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.1.ebuild
deleted file mode 100644
index dfec24631f4d..000000000000
--- a/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast base64 encoding and decoding for ByteStrings"
-HOMEPAGE="https://github.com/bos/base64-bytestring"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		test? ( dev-haskell/hunit
-			dev-haskell/quickcheck
-			dev-haskell/test-framework
-			dev-haskell/test-framework-hunit
-			dev-haskell/test-framework-quickcheck2
-		)
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/base64-bytestring/metadata.xml b/dev-haskell/base64-bytestring/metadata.xml
deleted file mode 100644
index 165c7f0e429c..000000000000
--- a/dev-haskell/base64-bytestring/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Fast base64 encoding and deconding for ByteStrings
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bos/base64-bytestring</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/basic-prelude-0.3.11 b/dev-haskell/basic-prelude-0.3.11
new file mode 100644
index 000000000000..b1c8ddca25e3
--- /dev/null
+++ b/dev-haskell/basic-prelude-0.3.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/hashable:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/readargs-1.2:=[profile?] <dev-haskell/readargs-1.3:=[profile?] dev-haskell/safe:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An enhanced core prelude; a common foundation for alternate preludes
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/basic-prelude
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/hashable:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/readargs-1.2:=[profile?] <dev-haskell/readargs-1.3:=[profile?] dev-haskell/safe:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.11
+SRC_URI=mirror://hackage/packages/archive/basic-prelude/0.3.11/basic-prelude-0.3.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=37e0835539ec7570719cc7dbb50a894a
diff --git a/dev-haskell/basic-prelude-0.4.1 b/dev-haskell/basic-prelude-0.4.1
new file mode 100644
index 000000000000..464836d6656e
--- /dev/null
+++ b/dev-haskell/basic-prelude-0.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/hashable:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/readargs-1.2:=[profile?] <dev-haskell/readargs-1.3:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An enhanced core prelude; a common foundation for alternate preludes
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/basic-prelude
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/hashable:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/readargs-1.2:=[profile?] <dev-haskell/readargs-1.3:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.1
+SRC_URI=mirror://hackage/packages/archive/basic-prelude/0.4.1/basic-prelude-0.4.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bba43f674f99bdd447e6c3d2c90923da
diff --git a/dev-haskell/basic-prelude/Manifest b/dev-haskell/basic-prelude/Manifest
deleted file mode 100644
index 36c77ddeecbf..000000000000
--- a/dev-haskell/basic-prelude/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST basic-prelude-0.3.11.tar.gz 5234 BLAKE2B 4f4fe53affabf8fb21b3dc950dce46f9102410be56a2e03c3e9b7e75f2230e77740adb674d4056781e2e0c734e75522081f421db64e0ce6c03e77e24fcbf43d4 SHA512 450fe8f2c628d93b4a092c29cf229e0722b31604204b3b82956ea19e682c0a3bf83665046425f422185c4b9ab22e65bd87788f814279cb6e4e4aa9057aac9445
-DIST basic-prelude-0.4.1.tar.gz 5513 BLAKE2B 6d6e85b610a60ef7bc123daaaacb52984bb6a53874d424c85c1fe800b7cdb2f120bd7a4564ba60b002b4440e0beff8b96268d8da0af7fd6c8aabd156efe9e0ef SHA512 5a7d692cccc6e2a9dbc7a947611334583f8f99a455c302f4904b4c5461436cebc5e1a90d450990fa11927fe7f3dd41f10aca8720d538fb926ece11cdcd4a0a10
-EBUILD basic-prelude-0.3.11.ebuild 993 BLAKE2B 77b41d27174066f28b8d9ea54cd638dd9f1147488650f4956b5bf158f41910e32699da7d68cfdfed076a706501eddeab7c0f4da2a28261aae198e440fc9142c9 SHA512 3b3730605211326a7d8409d202e35240e5f173111872971bb13e961f05d81b8cf24ee710dc0b5eda2456d6c03b869dfff9beacbccec24837e98211508e931bc1
-EBUILD basic-prelude-0.4.1.ebuild 906 BLAKE2B afa92b7376196b50685e1f5068ec1e6b4e4b2e01b00c1b86163265421067f3029a511c46d47ac158946ff6622456d5f37dc56fbc580adeabba0ea88fae8720c7 SHA512 5e1a76b1487240c872069b16bc656f92674b339d555ba313723b0f5e152125f1491639b2e6787d1150c92bd320aeed31a8431b90d283b440351c467746d8c848
-MISC metadata.xml 1662 BLAKE2B 855e736a9ecd8690814bfec10d3313645398c1c04e6877d6c4f02e703536b7323cd0f46ee1e4c8be7be8a95c240bd8634d77c703d879fbec8971a412c02078d0 SHA512 6911021fe7f0229f3509bfa2efef2036ed232378a13be90a63f70deeb2f93378c9c45d10169ecc117bb3cfffed5803ab0fd3905a165ca5c641d90fdba3543fb5
diff --git a/dev-haskell/basic-prelude/basic-prelude-0.3.11.ebuild b/dev-haskell/basic-prelude/basic-prelude-0.3.11.ebuild
deleted file mode 100644
index 8688826fd480..000000000000
--- a/dev-haskell/basic-prelude/basic-prelude-0.3.11.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="An enhanced core prelude; a common foundation for alternate preludes"
-HOMEPAGE="https://github.com/snoyberg/basic-prelude"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hashable:=[profile?]
-	dev-haskell/lifted-base:=[profile?]
-	>=dev-haskell/readargs-1.2:=[profile?] <dev-haskell/readargs-1.3:=[profile?]
-	dev-haskell/safe:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/basic-prelude/basic-prelude-0.4.1.ebuild b/dev-haskell/basic-prelude/basic-prelude-0.4.1.ebuild
deleted file mode 100644
index b78f0e51c1e8..000000000000
--- a/dev-haskell/basic-prelude/basic-prelude-0.4.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="An enhanced core prelude; a common foundation for alternate preludes"
-HOMEPAGE="https://github.com/snoyberg/basic-prelude"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hashable:=[profile?]
-	dev-haskell/lifted-base:=[profile?]
-	>=dev-haskell/readargs-1.2:=[profile?] <dev-haskell/readargs-1.3:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/basic-prelude/metadata.xml b/dev-haskell/basic-prelude/metadata.xml
deleted file mode 100644
index b666bf9348f9..000000000000
--- a/dev-haskell/basic-prelude/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The premise of @basic-prelude@ is that there are a lot of very commonly desired features missing from the standard @Prelude@, such as commonly used operators (@\&lt;$\&gt;@ and @&gt;=&gt;@, for instance) and imports for common datatypes (e.g., @ByteString@ and @Vector@). At the same time, there are lots of other components which are more debatable, such as providing polymorphic versions of common functions.
-		
-		So @basic-prelude@ is intended to give a common foundation for a number of alternate preludes. The package provides two modules: @CorePrelude@ provides the common ground for other preludes to build on top of, while @BasicPrelude@ exports @CorePrelude@ together with commonly used list functions to provide a drop-in replacement for the standard @Prelude@.
-		
-		Users wishing to have an improved @Prelude@ can use @BasicPrelude@. Developers wishing to create a new prelude should use @CorePrelude@.
-		
-		Release history:
-		
-		[0.3] Moved a number of exports from @BasicPrelude@ to @CorePrelude@ and vice-versa.
-		
-		[0.2] Renamed @BasicPrelude@ to @CorePrelude@ and added a new @BasicPrelude@ module provided a full-featured @Prelude@ alternative. Also added a number of new exports.
-		
-		[0.1] Initial version, code taken from @classy-prelude@ with a few minor tweaks.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/basic-prelude</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/bencode-0.5-r1 b/dev-haskell/bencode-0.5-r1
new file mode 100644
index 000000000000..55e3adac258d
--- /dev/null
+++ b/dev-haskell/bencode-0.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/binary:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parser and printer for bencoded data
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/bencode
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/binary:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.5
+SRC_URI=mirror://hackage/packages/archive/bencode/0.5/bencode-0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a1c29f2b0212ce2d08bebd34f30ea9be
diff --git a/dev-haskell/bencode-0.6.0.0 b/dev-haskell/bencode-0.6.0.0
new file mode 100644
index 000000000000..19c80afb6f26
--- /dev/null
+++ b/dev-haskell/bencode-0.6.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/binary:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parser and printer for bencoded data
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/bencode
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/binary:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.6.0.0
+SRC_URI=mirror://hackage/packages/archive/bencode/0.6.0.0/bencode-0.6.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=be0aad94b7d990ba0671baac4f40a2a8
diff --git a/dev-haskell/bencode/Manifest b/dev-haskell/bencode/Manifest
deleted file mode 100644
index a254ad4a8ab1..000000000000
--- a/dev-haskell/bencode/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST bencode-0.5.tar.gz 4678 BLAKE2B 11309fa238926733c2bee5d466678e6ea0307e02f30e168c061553f8a6cf1e518413bf34e9a19043706a41531f31e94ffcad4f68a174850934105212de3113fe SHA512 0829d3224684dc6082cc97db854962591df3f343417a5917cf423f41fdeb2fb2f36e71521ce43b7d41d6e436ff2a325024492eeaa0a26cc04876816f8a283987
-DIST bencode-0.6.0.0.tar.gz 4622 BLAKE2B 597e06b7abeebd6dbdbb8b5afa0d978553bf8d9e61b1f3f2e40bf4c2730599518bbeaffb206cad2a6089ab03be5b225e475e1f54d7babc08dce923e2c06a0efb SHA512 be05a5a086d095e8ed79318c7b0a6e5e29f2483f8c9cbfe768c339353d473f8eb5c3060aaed9d60675bdfd13686e02b2261939ca6d34cc9488318daf2cc664d1
-EBUILD bencode-0.5-r1.ebuild 614 BLAKE2B 5c96ddcb4710b11d18a88b93bfbebb3939f82a53b715ddc810b155edaa15b5f96709f7125c3d5ece019fb2106ee00c6904d863f899a066b8cbd8fa2013cc4869 SHA512 78c9831ebc35adbef57b289aa228774840134d32ca71d21d77df43bef879cec1a7369e40b7f7cd60b4e52cba0b873ba209c1e72729b949d9a13fb7af8f69dfa0
-EBUILD bencode-0.6.0.0.ebuild 615 BLAKE2B 7499243a8a02d961ac85ac6feb66481b383c6d4081cddecab9a6eaedc65609dffbeb9cc77cbb943e597ac503973420ca243d22e1c3e38f79f9a31fc915e22985 SHA512 8dd38b322d011338f16094809394218d189d93ec3f25a5db06da2e9d6d00253253433b6c8cacc2bd0928ce88af393716343fb46d9121a6b59ec206e5cfe86c57
-MISC metadata.xml 328 BLAKE2B b10abd5d44da6d8a242d0c03786bdc83385510309bca740fff3a57cb44c07ee4c5df15af5fbc17dbb229500e05e4f5c65e2ae72bb822e12a708d3d63bb370c50 SHA512 38781d6ca54584c312e1d51e817117c6a8b1308e3025fc9a25bf3d29fb836f38e05d512a702d0e5f2777c546774607faf6b040c440b9327291b702db5059704f
diff --git a/dev-haskell/bencode/bencode-0.5-r1.ebuild b/dev-haskell/bencode/bencode-0.5-r1.ebuild
deleted file mode 100644
index 52dd2cd595df..000000000000
--- a/dev-haskell/bencode/bencode-0.5-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parser and printer for bencoded data"
-HOMEPAGE="http://hackage.haskell.org/package/bencode"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/binary:=[profile?]
-		dev-haskell/parsec:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-0"
diff --git a/dev-haskell/bencode/bencode-0.6.0.0.ebuild b/dev-haskell/bencode/bencode-0.6.0.0.ebuild
deleted file mode 100644
index 65c7e60bfb02..000000000000
--- a/dev-haskell/bencode/bencode-0.6.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parser and printer for bencoded data"
-HOMEPAGE="http://hackage.haskell.org/package/bencode"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/binary:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/bencode/metadata.xml b/dev-haskell/bencode/metadata.xml
deleted file mode 100644
index c521fac08962..000000000000
--- a/dev-haskell/bencode/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Parser and printer for bencoded data.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/bifunctors-3.2.0.1 b/dev-haskell/bifunctors-3.2.0.1
new file mode 100644
index 000000000000..a86abacc1f3e
--- /dev/null
+++ b/dev-haskell/bifunctors-3.2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND==dev-haskell/semigroupoids-3*:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[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=Haskell 98 bifunctors, bifoldables and bitraversables
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/bifunctors/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND==dev-haskell/semigroupoids-3*:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/3.2.0.1
+SRC_URI=mirror://hackage/packages/archive/bifunctors/3.2.0.1/bifunctors-3.2.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3b17ed60c7e4778234657927be5ad8c6
diff --git a/dev-haskell/bifunctors-4.1.1.1 b/dev-haskell/bifunctors-4.1.1.1
new file mode 100644
index 000000000000..fd7b5a3cf905
--- /dev/null
+++ b/dev-haskell/bifunctors-4.1.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell 98 bifunctors, bifoldables and bitraversables
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/bifunctors/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/4.1.1.1
+SRC_URI=mirror://hackage/packages/archive/bifunctors/4.1.1.1/bifunctors-4.1.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fe6d12502f93eb013b791b3471a46ec6
diff --git a/dev-haskell/bifunctors-4.2.1 b/dev-haskell/bifunctors-4.2.1
new file mode 100644
index 000000000000..ff28a07dfbd7
--- /dev/null
+++ b/dev-haskell/bifunctors-4.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell 98 bifunctors, bifoldables and bitraversables
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/bifunctors/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/4.2.1
+SRC_URI=mirror://hackage/packages/archive/bifunctors/4.2.1/bifunctors-4.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=022ab1581e68cdf9d9c2622cd03726a5
diff --git a/dev-haskell/bifunctors-5 b/dev-haskell/bifunctors-5
new file mode 100644
index 000000000000..10a13cde960d
--- /dev/null
+++ b/dev-haskell/bifunctors-5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell 98 bifunctors, bifoldables and bitraversables
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/bifunctors/
+IUSE=+semigroups +tagged doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:= semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] )
+SLOT=0/5
+SRC_URI=mirror://hackage/packages/archive/bifunctors/5/bifunctors-5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=efc9eb1b56c3b9535cd1c783b007752a
diff --git a/dev-haskell/bifunctors-5.4.1 b/dev-haskell/bifunctors-5.4.1
new file mode 100644
index 000000000000..f40a8f573c92
--- /dev/null
+++ b/dev-haskell/bifunctors-5.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.8 >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell 98 bifunctors, bifoldables and bitraversables
+EAPI=6
+HOMEPAGE=https://github.com/ekmett/bifunctors/
+IUSE=+semigroups +tagged doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] )
+SLOT=0/5.4.1
+SRC_URI=mirror://hackage/packages/archive/bifunctors/5.4.1/bifunctors-5.4.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=be30f201f23f44ce3d3bce62d9baee9b
diff --git a/dev-haskell/bifunctors/Manifest b/dev-haskell/bifunctors/Manifest
deleted file mode 100644
index e558409a7ed7..000000000000
--- a/dev-haskell/bifunctors/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST bifunctors-3.2.0.1.tar.gz 7332 BLAKE2B 5b72dbb0f14e87bd967eb4a3699a2d7f27e623c36c4baa304f4b5c2cd99c87277b12457a5b58088e59aa8ed002b7e7b848a3565fec0b83ae537d5680b91bda30 SHA512 bd4612327b4f9bc54468d48608fb85e4da416c844a8f0e67c9df8cafe5b3f1385fec8571d470d7baf2f58518cf80add1589164ae0ec02fde6bc240efe386e6f7
-DIST bifunctors-4.1.1.1.tar.gz 10310 BLAKE2B 0f303a34e219e0245abb5cfedbefd8da8c30f5979ad1cd5f1c831d6c36f4732d35bb3871cce669724eb2aa3c1647c6d2922de0438159acba1f069c47ae9aa745 SHA512 9d572f47bd574e7f740b1c2f12ff2c76439ec3b34657f57efba9f23abb5b42e38fdb77b8bfe20e8896f5a8bb2465fee7c02a1adaf7e02ea822b2660d2e7de278
-DIST bifunctors-4.2.1.tar.gz 11494 BLAKE2B f0cbf4c7338239a3d358e0a551552654525941b8f79df72201a28fde192001475fa3782323f145ad14d23d19790baf22ce0304458892a4ebd1586f4aad008012 SHA512 850bf36f6a575e4f1c937f5d65f499a126b813d231a8cbe77aaab0c5f9462f67b25fcad8ff29629f90f95e201c3408d0290e9db4cfaf010a33bd0e7f336a0a05
-DIST bifunctors-5.4.1.tar.gz 39878 BLAKE2B 2e2c4a027e24fc0324be0fcb93ea0d530313c9d31378b540ae0956e734c0dab17a1cb37367fa90d1eb1bb0078cd67029dfddc6e78ca42961865f6a9a53cd4696 SHA512 2b309a8b37b0993159d383ea07b95ca5bb69bc9fd653d0bd0c502c0598a400e11d4e9c8f25c27adbfb5adff209eaa36c242ca9a2618b962cdd9e843b6fbb1a3b
-DIST bifunctors-5.tar.gz 10562 BLAKE2B 32323e27e86e6a2ded76a8877a118378f8834f5fd64f7459fb53262ce787034e29ca85035f497a34ec02271f7d5af3017e8f87dca3a9b8f3837c06d6675edfca SHA512 5d25764587e8f358687f0cb3b6b831980d267d43c5a67b16611405c9196094d107e05e369a0de55befb9731f8c561fe80859298511fde4f3cefae4a1a2672184
-EBUILD bifunctors-3.2.0.1.ebuild 730 BLAKE2B d6888dc2e7bc38f1aa0132cf0c3647d733367d35b11484e081efbde9f0d329674c821f1a977edec0935d30b61488616f017009b8d37e9c100e000d889d10dcef SHA512 d9d1976c9209e07d5c04fbbc7e14df2d9cfb104f4abf137a047183eee7297da67c5763a663beaa7358d04a5447a8cf719746c890eb1435a038b8271aa695d7a6
-EBUILD bifunctors-4.1.1.1.ebuild 764 BLAKE2B e5209e5d52163244c8fd5d1ef71f478e7b858e8d47240164e82361bc1c4098c121ae4df0d9012bf6e7840e126e6dd791b1165188baf023e631a999cdd241d745 SHA512 ca62cb6d722e9edfcc855630dbaf06d7c549a071f376ea13637cd2f40be241cc3bc44d7112800c41c8aaaa95246f7904028902128578163d22477c35c63b30c2
-EBUILD bifunctors-4.2.1.ebuild 802 BLAKE2B c22224f0e6f2c27ac1ddcb7157fc96ca72a794a4153b8fbeaf1a5d63f93f8768a8003fe4676d27ee9c67ad588962ef4cecba8823568a08838c99614d941ff324 SHA512 a60bd1fc8d59307c6133ac72989bb38638ef85477922a406a8c779cecbc0fc877db82104fdc4a4f02acec97ce43f21e1828ed08ded5a0c5521de3487ef444fa2
-EBUILD bifunctors-5.4.1.ebuild 1469 BLAKE2B 95edefd9dbfee7993a184606b9eb43cab1be2264bf626b51db3728dbbd03cc166000714c02f25ddfa36de7412b96014b91c80a3774ad0854b8c422a2400fc442 SHA512 eb649141ec781887c117507e7091e0595a97e6e28289d11465ed57b8adfb7baaece4523d9bb015ef7f3e4b22e881f81ca9158c14e06d061d5c2619db8f88ed4e
-EBUILD bifunctors-5.ebuild 887 BLAKE2B d77d76feea4891417a5d00f29d1e61b73d2ac6bc1730a0109f4761fe22ccbb7afcaa9f2b2056a02144347fe80cdd20e3dbf4e3c20e0b2b2626fd39e37156564f SHA512 68d7481c0bb779699e3c7a4f59ba5544c4ed17596af3416da349183e841a961e23e1178b5d2d04367c2fa718b71427231bac2054a0b086da9c2fb219836193de
-MISC metadata.xml 891 BLAKE2B c13343571cc4e4d70526ee4c796971c829c1009166cce406865a1a2325fbe091323384fa3d1d3afe3c51f79a5bc4ed9d22324215e111e610c9076c1f92f80c39 SHA512 742eb245cf98b8c921f3ab3b0f41105303a7f657f16e96e652d80e3adb28722a38eaba4a1fa07afc60dedcc4ed6a0f3cf7dadef7e2a2e6dd6f1756f0b6f647dd
diff --git a/dev-haskell/bifunctors/bifunctors-3.2.0.1.ebuild b/dev-haskell/bifunctors/bifunctors-3.2.0.1.ebuild
deleted file mode 100644
index b66d19560331..000000000000
--- a/dev-haskell/bifunctors/bifunctors-3.2.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 bifunctors, bifoldables and bitraversables"
-HOMEPAGE="https://github.com/ekmett/bifunctors/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/semigroupoids-3*:=[profile?]
-		>=dev-haskell/semigroups-0.8.3.1:=[profile?]
-		>=dev-haskell/tagged-0.4.4:=[profile?]
-		<dev-haskell/tagged-1:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/bifunctors/bifunctors-4.1.1.1.ebuild b/dev-haskell/bifunctors/bifunctors-4.1.1.1.ebuild
deleted file mode 100644
index 070bf6c2b4cd..000000000000
--- a/dev-haskell/bifunctors/bifunctors-4.1.1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 bifunctors, bifoldables and bitraversables"
-HOMEPAGE="https://github.com/ekmett/bifunctors/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/bifunctors/bifunctors-4.2.1.ebuild b/dev-haskell/bifunctors/bifunctors-4.2.1.ebuild
deleted file mode 100644
index 8ee0a3ed682d..000000000000
--- a/dev-haskell/bifunctors/bifunctors-4.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 bifunctors, bifoldables and bitraversables"
-HOMEPAGE="https://github.com/ekmett/bifunctors/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/bifunctors/bifunctors-5.4.1.ebuild b/dev-haskell/bifunctors/bifunctors-5.4.1.ebuild
deleted file mode 100644
index f2500a5254bb..000000000000
--- a/dev-haskell/bifunctors/bifunctors-5.4.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 bifunctors, bifoldables and bitraversables"
-HOMEPAGE="https://github.com/ekmett/bifunctors/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+semigroups +tagged"
-
-RDEPEND=">=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] )
-	tagged? ( >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.8
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck          >= 2   && < 3,' 'QuickCheck          >= 2   && < 3, template-haskell,'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag semigroups semigroups) \
-		$(cabal_flag tagged tagged)
-}
diff --git a/dev-haskell/bifunctors/bifunctors-5.ebuild b/dev-haskell/bifunctors/bifunctors-5.ebuild
deleted file mode 100644
index f140b7d39c5b..000000000000
--- a/dev-haskell/bifunctors/bifunctors-5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 bifunctors, bifoldables and bitraversables"
-HOMEPAGE="https://github.com/ekmett/bifunctors/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+semigroups +tagged"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] )
-	tagged? ( >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag semigroups semigroups) \
-		$(cabal_flag tagged tagged)
-}
diff --git a/dev-haskell/bifunctors/metadata.xml b/dev-haskell/bifunctors/metadata.xml
deleted file mode 100644
index 7c41a8ab499b..000000000000
--- a/dev-haskell/bifunctors/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haskell 98 bifunctors
-	</longdescription>
-	<use>
-		<flag name="semigroups">
-			You can disable the use of the
-			`semigroups` package using `-f-semigroups`. Disabing this is
-			an unsupported configuration, but it may be useful for
-			accelerating builds in sandboxes for expert users.
-		</flag>
-		<flag name="tagged">
-			You can disable the use of the `tagged` package
-			using `-f-tagged`. Disabing this is an unsupported
-			configuration, but it may be useful for accelerating builds in
-			sandboxes for expert users.
-		</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ekmett/bifunctors</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/binary-0.5.1.1 b/dev-haskell/binary-0.5.1.1
new file mode 100644
index 000000000000..700fec372132
--- /dev/null
+++ b/dev-haskell/binary-0.5.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0815c275a314e20f92b4c33169b77e42
diff --git a/dev-haskell/binary-0.7.1.0 b/dev-haskell/binary-0.7.1.0
new file mode 100644
index 000000000000..057ae2142003
--- /dev/null
+++ b/dev-haskell/binary-0.7.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2.5 >=dev-haskell/random-1.0.1.0 dev-haskell/test-framework >=dev-haskell/test-framework-quickcheck2-0.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=852dfcbf1f94957d658471e99dee49ed
diff --git a/dev-haskell/binary-0.7.2.3 b/dev-haskell/binary-0.7.2.3
new file mode 100644
index 000000000000..b3eaba4c1cdb
--- /dev/null
+++ b/dev-haskell/binary-0.7.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2.7 >=dev-haskell/random-1.0.1.0 dev-haskell/test-framework >=dev-haskell/test-framework-quickcheck2-0.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5aadf1b5a1cdd8ae2a2a2167ce95c016
diff --git a/dev-haskell/binary-0.7.5.0 b/dev-haskell/binary-0.7.5.0
new file mode 100644
index 000000000000..d0d0fdda082c
--- /dev/null
+++ b/dev-haskell/binary-0.7.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2.8 >=dev-haskell/random-1.0.1.0 dev-haskell/test-framework >=dev-haskell/test-framework-quickcheck2-0.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binary serialisation for Haskell values using lazy ByteStrings
+EAPI=5
+HOMEPAGE=https://github.com/kolmodin/binary
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.5.0
+SRC_URI=mirror://hackage/packages/archive/binary/0.7.5.0/binary-0.7.5.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=169b7b4521cb7940966a12ce1794d0fe
diff --git a/dev-haskell/binary-0.7.6.1 b/dev-haskell/binary-0.7.6.1
new file mode 100644
index 000000000000..026692368298
--- /dev/null
+++ b/dev-haskell/binary-0.7.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2.8 >=dev-haskell/random-1.0.1.0 dev-haskell/test-framework >=dev-haskell/test-framework-quickcheck2-0.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.7.6.1
+SRC_URI=mirror://hackage/packages/archive/binary/0.7.6.1/binary-0.7.6.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=746bbf1ee418e9cefbcaf8c39f44ce54
diff --git a/dev-haskell/binary-0.8.3.0 b/dev-haskell/binary-0.8.3.0
new file mode 100644
index 000000000000..8808bfde4097
--- /dev/null
+++ b/dev-haskell/binary-0.8.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2.8 >=dev-haskell/random-1.0.1.0 dev-haskell/test-framework >=dev-haskell/test-framework-quickcheck2-0.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binary serialisation for Haskell values using lazy ByteStrings
+EAPI=6
+HOMEPAGE=https://github.com/kolmodin/binary
+IUSE=doc hscolour profile test
+KEYWORDS=~alpha ~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0/0.8.3.0
+SRC_URI=mirror://hackage/packages/archive/binary/0.8.3.0/binary-0.8.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b0ea1a0d64fbfe0d319551adf84fa610
diff --git a/dev-haskell/binary-orphans-0.1.6.0-r1 b/dev-haskell/binary-orphans-0.1.6.0-r1
new file mode 100644
index 000000000000..18eda4921207
--- /dev/null
+++ b/dev-haskell/binary-orphans-0.1.6.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-insensitive-1.2.1:=[profile?] >=dev-haskell/hashable-1.2.3.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/scientific-0.3.3.8:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.16.2.2:=[profile?] >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-0.8.6:=[profile?] >=dev-haskell/text-1.2.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/text-binary-0.1.0:=[profile?] <dev-haskell/text-binary-0.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10.12.3:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/vector-binary-instances-0.2.1.0:=[profile?] <dev-haskell/vector-binary-instances-0.3:=[profile?] >=dev-haskell/void-0.7:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.6.2:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9.3 >=dev-haskell/quickcheck-instances-0.3.11 <dev-haskell/quickcheck-instances-0.3.13 >=dev-haskell/tasty-0.10.1.2 <dev-haskell/tasty-0.12 >=dev-haskell/tasty-quickcheck-0.8.3.2 <dev-haskell/tasty-quickcheck-0.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Orphan instances for binary
+EAPI=6
+HOMEPAGE=https://github.com/phadej/binary-orphans#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-insensitive-1.2.1:=[profile?] >=dev-haskell/hashable-1.2.3.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/scientific-0.3.3.8:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.16.2.2:=[profile?] >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-0.8.6:=[profile?] >=dev-haskell/text-1.2.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/text-binary-0.1.0:=[profile?] <dev-haskell/text-binary-0.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10.12.3:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/vector-binary-instances-0.2.1.0:=[profile?] <dev-haskell/vector-binary-instances-0.3:=[profile?] >=dev-haskell/void-0.7:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.6.2:=
+SLOT=0/0.1.6.0
+SRC_URI=mirror://hackage/packages/archive/binary-orphans/0.1.6.0/binary-orphans-0.1.6.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3717002b488ed3ba34dc3a64a64b5e07
diff --git a/dev-haskell/binary-orphans/Manifest b/dev-haskell/binary-orphans/Manifest
deleted file mode 100644
index 08a7aa69ae88..000000000000
--- a/dev-haskell/binary-orphans/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST binary-orphans-0.1.6.0.tar.gz 5320 BLAKE2B 3e8393e64ee737316457ee7f36f740404b0f4adaac2134701c935608ac90714473148d8844c167262a058de607f86a2d8d0b2527e6cb07f50f054b77629df97d SHA512 646410b79d92a20ef7b6d6583fca38da672e7fe072d2d5a7a9d50bacd1fb3da20efd9ab42e74029279dcd5a2c4b80218b860ae8e45bef348a692b23bcc8ea351
-EBUILD binary-orphans-0.1.6.0-r1.ebuild 2046 BLAKE2B f8eb9a530204f5c0c4e0ad64f9477392137a6cba5540868b3d858575c3520e0afec8c8725d252859a7f8546804b79c4e9cfe8862e02def935aab62f1bf9315aa SHA512 0626c811c11ae897901d43d06729cd7a03b849328c2a5b7762abebde6ff173062ca746e09f227455be28dfd80026629cea238b2c60634e5b569679a16f246529
-MISC metadata.xml 368 BLAKE2B 980ea993294e02c8c2fd09b62f27b7885ff21e6458308003ef61078715b7f82fa784a10e99ca0b89e290ae84d3ce1e8bc97ce6fcb318818c3e6c45657594aaec SHA512 e5dc324c3ec28d21fa959b06947784d263dff0b6a7094ea1a19ef477cf235aa5b2655d72ce3c6ea87fa9e2f429f2e9a80858ca8fc8d61b5e263cb9bb13f7180a
diff --git a/dev-haskell/binary-orphans/binary-orphans-0.1.6.0-r1.ebuild b/dev-haskell/binary-orphans/binary-orphans-0.1.6.0-r1.ebuild
deleted file mode 100644
index d47e578a5ab3..000000000000
--- a/dev-haskell/binary-orphans/binary-orphans-0.1.6.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Orphan instances for binary"
-HOMEPAGE="https://github.com/phadej/binary-orphans#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.2:=[profile?]
-	>=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-insensitive-1.2.1:=[profile?]
-	>=dev-haskell/hashable-1.2.3.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/scientific-0.3.3.8:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.16.2.2:=[profile?]
-	>=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-0.8.6:=[profile?]
-	>=dev-haskell/text-1.2.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/text-binary-0.1.0:=[profile?] <dev-haskell/text-binary-0.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.5.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10.12.3:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/vector-binary-instances-0.2.1.0:=[profile?] <dev-haskell/vector-binary-instances-0.3:=[profile?]
-	>=dev-haskell/void-0.7:=[profile?] <dev-haskell/void-0.8:=[profile?]
-	>=dev-lang/ghc-7.6.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9.3
-		>=dev-haskell/quickcheck-instances-0.3.11 <dev-haskell/quickcheck-instances-0.3.13
-		>=dev-haskell/tasty-0.10.1.2 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-quickcheck-0.8.3.2 <dev-haskell/tasty-quickcheck-0.9 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'semigroups               >=0.16.2.2  && <0.18.3' 'semigroups               >=0.16.2.2'
-}
diff --git a/dev-haskell/binary-orphans/metadata.xml b/dev-haskell/binary-orphans/metadata.xml
deleted file mode 100644
index 3b512c102ba0..000000000000
--- a/dev-haskell/binary-orphans/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		`binary-orphans` defines orphan instances for types in some popular packages.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/binary-tagged-0.1.4.2-r1 b/dev-haskell/binary-tagged-0.1.4.2-r1
new file mode 100644
index 000000000000..646e0d6d445d
--- /dev/null
+++ b/dev-haskell/binary-tagged-0.1.4.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/aeson-0.8:=[profile?] <dev-haskell/aeson-1.1:=[profile?] >=dev-haskell/base16-bytestring-0.1.1.6:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/generics-sop-0.1:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/bifunctors >=dev-haskell/binary-orphans-0.1.1 dev-haskell/quickcheck-instances dev-haskell/tasty dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Tagged binary serialisation
+EAPI=6
+HOMEPAGE=https://github.com/phadej/binary-tagged#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.8:=[profile?] <dev-haskell/aeson-1.1:=[profile?] >=dev-haskell/base16-bytestring-0.1.1.6:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/generics-sop-0.1:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.1.4.2
+SRC_URI=mirror://hackage/packages/archive/binary-tagged/0.1.4.2/binary-tagged-0.1.4.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=51393c294a05d21ec16dcbadafb567e1
diff --git a/dev-haskell/binary-tagged/Manifest b/dev-haskell/binary-tagged/Manifest
deleted file mode 100644
index b3c696545fa9..000000000000
--- a/dev-haskell/binary-tagged/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST binary-tagged-0.1.4.2.tar.gz 9318 BLAKE2B 19a3878d755a57fbeebed38451c55c5695637ee136491ded830a127dcb4f33106bbaf7efb3d3101dc0c37f752e30e93c2ec1216a33343093431d0144c0dcff48 SHA512 381ac0833c13c9b50174d2c5d3695e4af9955631dbaa20719556084ce013973ea37993cb86ac4880f41044fbf178dabe6f100cc53c2d982037a2ca9826878706
-EBUILD binary-tagged-0.1.4.2-r1.ebuild 1758 BLAKE2B 52d8adce60ef80070ca9376fe4c5809b61e8094e6796599925c0bdf9617e3afd91b453cef4a251b380cb8f575ca90d302b4fabf025ecfba5011c65cc73826a3a SHA512 d40cc2d8348b4602629c10c58752650a1b2dab82a811d04d08e31252ca4d7874e6aae932fe48b9c3efbaf9b80a522a928e261463bf7cc63358d1620f8f3cf569
-MISC metadata.xml 368 BLAKE2B 4a2cfcab1db7331b6fb7a0af0a836cb4120311fd32945e54e38d15e2b41c660fe77ccb3ca06f0bd603925454df743d0009ff35306c588af05a8e4b256a4f5de0 SHA512 350883a8527ece2449b4eb86d119faa19ca697fd8c74967710dace371b04c3bda09df8870394c6fdb606aa8d07d9d7b36da355a21bd6abef67cd42ccecdd05ae
diff --git a/dev-haskell/binary-tagged/binary-tagged-0.1.4.2-r1.ebuild b/dev-haskell/binary-tagged/binary-tagged-0.1.4.2-r1.ebuild
deleted file mode 100644
index f85e9a698e53..000000000000
--- a/dev-haskell/binary-tagged/binary-tagged-0.1.4.2-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Tagged binary serialisation"
-HOMEPAGE="https://github.com/phadej/binary-tagged#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?] <dev-haskell/aeson-1.1:=[profile?]
-	>=dev-haskell/base16-bytestring-0.1.1.6:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
-	>=dev-haskell/generics-sop-0.1:=[profile?]
-	>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/bifunctors
-		>=dev-haskell/binary-orphans-0.1.1
-		dev-haskell/quickcheck-instances
-		dev-haskell/tasty
-		dev-haskell/tasty-quickcheck )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'generics-sop             >=0.1  && <0.3' 'generics-sop             >=0.1'
-}
diff --git a/dev-haskell/binary-tagged/metadata.xml b/dev-haskell/binary-tagged/metadata.xml
deleted file mode 100644
index 56b4888b6898..000000000000
--- a/dev-haskell/binary-tagged/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Check &lt;https://github.com/phadej/binary-tagged#readme README on Github&gt;
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/binary/Manifest b/dev-haskell/binary/Manifest
deleted file mode 100644
index 70ae55961b2c..000000000000
--- a/dev-haskell/binary/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-DIST binary-0.5.1.1.tar.gz 34239 BLAKE2B 8c55abeff9c02cadd18c62d9c38e5c344d7105be620f2db73066cb559f7755c72570b6898960377240e5b828a8fb3a4ace3efaa360cd1a8d35da6b1480d6da52 SHA512 a177770f2fc220402d2ab256f47ead219176709ecada9994ad5b70a22d9c613e98b4d3b513f45ec4f684d2458e8971c71b0b30cf2d76a79224a424f56360a334
-DIST binary-0.7.1.0.tar.gz 43647 BLAKE2B 7a2b9ed2ab23425318fcfd095beccb3f2c2870cc3687bc84c3adca24a5614b748c85f0252c2c36d37e95aa95b3ed4fa0f44735c670fce02d4ccff22141534316 SHA512 711d64c51cb6cf8811252fe3cbb0575dade897666566610f8dee51c2965d0e3dc1dc40df72713e9e6abbd0bfe494dd4feee70128d21f1ea16305bde3409557b3
-DIST binary-0.7.2.3.tar.gz 47622 BLAKE2B 8d98846d020af95624208ed841b84378ecfd09994bdacc3de8d67ddcb017cdc1acaa5ec8599ade4033d7c1f247dd930fad819212bfb6ef79356c8d931a20f4ef SHA512 1babe32d1c2c0537091c96a3191285f2f61a9c85ca503c89c57c32e60d8f16ee429dd8fb645563d96714122a06ca6c9f0ab1c04077b4f0ed22d4b0b41ef2c18f
-DIST binary-0.7.5.0.tar.gz 45764 BLAKE2B 824e3bc9c910ddb86d2799101bf8c76ad7e10f81911fed0da3d1ea07c5586a4ad645407b1fa53a853adf5e83bc1b77411e9812ebe7d15923e508e3376110e827 SHA512 232e7c3da1c0055f3e9f211a86e81c76bc44ab1b70cabd23c93634dbaa42eed8bd9314fbedc16b9703d3ca92b0bbf232e6c30bb1384687dad0e6e85c9abb8947
-DIST binary-0.7.6.1.tar.gz 47086 BLAKE2B 7d81b9c254902d5ff2bafbef4c31a6f6f0396202d8585690c1ae3b63ae6ed157db7221d65a62e393ee8f6725ffd5d80e51030c0351e954b06004fcb70e5867cd SHA512 655daa93a52b845a85d440810452933d7bc3398ad1b51e1e955b2d19a0a32679325a0d1751ad50d252531e493528262e14dab32af4b9a515855fe7f64e0730b2
-DIST binary-0.8.3.0.tar.gz 51900 BLAKE2B 47e7db8a79e19bbe8cfde3f0b5d3c1edd441606ec0d70f5f02cdad3856dbb35a451b667c33beaf26d8fb57497bde5f3a03df704c458337e065776bb98b308135 SHA512 9b16143067fc974d2dbb4bd42833454a4516eea7ead7674079911b969c42547ededb87f95cd5767553f2105e2f9bb5b2ba08b9666714aa30e56143e606711d44
-EBUILD binary-0.5.1.1.ebuild 712 BLAKE2B 9e149f4df6af8b85a7c7754c79458d4bdad893593433f913ef5099d89314162f59b3e5db3aa2cc2617b9e872aa2f011da1a8d782a3b4c31c672e42a926bf0db5 SHA512 1d35431a107b5c9768c169f3bd113d0a0a11e3cb05b938167816e9f20d64d3aedb39439fcb426f45bc5a52fda933c15f9285ee36eb76271050588b8084985ec2
-EBUILD binary-0.7.1.0.ebuild 1158 BLAKE2B 235574cdee69c11282c290aa5616a160d18d3acca1a646b8801e41060af4929d93ffadbbe371afe5df49e1ab6e69074c9d5fbf4b2146e8bcb4c3e7235b2fc936 SHA512 9b793ebf0836fac1d9ef902ca85c3de774872a5a1bf527f0874028aa6c7f2746733cfdd7cd26c9cba5c9c83d829b497b54d6bbb4d9d59f84e5813e5a74e135e8
-EBUILD binary-0.7.2.3.ebuild 900 BLAKE2B b16c179b2a1e05b2fca7291b2d422d7ded9c82fe8eaca363ae8f39ef546ce49994f9b54e6afeb9ed7a5113699d96c9e490bc498b0fb9c45c990934b3593c3a31 SHA512 c8c30f254713ded8c23378fe14812539094b02a6e578484120d77ae6b319482dd9ad223b365b5131e2646f3413f10f6cd1915b67470eee3b817fc1d977b77273
-EBUILD binary-0.7.5.0.ebuild 868 BLAKE2B 6b2d4d843a85cb572f3c72c40bb8f320f482bda6ee63ec4f9d579c610dd14b1f406bc80e2db8fdcdca5ac97f3457de02a1d04cbc32379b6515b87f569351d1e4 SHA512 9c4584bf2107a77ff9f78b3c8174752ce6817f83a1cf96741775b19e989575c5dcfd406da933004f0555c49aa112812feb7391c25db83bdc827a0ba72e0c2f58
-EBUILD binary-0.7.6.1.ebuild 914 BLAKE2B da002c4b90a0911d0760d66c1fcba675a47467da4e539561a2f9dc6bea12642de39c0a750840863856a660cb0cc2840e73fd28e71935d15f423d9b8886d563ee SHA512 a3e23f292683b483b414ee2724cae1aa71ba70feb7ecd92d01c1bb77dcb79ae33aac692b561956b34c9f12626e930d80b8394a925ac16c5e14e5691490ac3ad9
-EBUILD binary-0.8.3.0.ebuild 952 BLAKE2B 7caa191a5be1951aee9b6b564ee561a6be1ad3e4934da05e8981241aa2cae5da039b274b74b31badff77a915396970e219a9634f58b03dbc9da13b1ca7a0f122 SHA512 2f59a5423469b94bad20549963d5ff381403cdfb6b1fe7e694727ec2a51330a6ab8c7bfd10aed2670ac7276cb88d7405a371b3b712565cd7da0e2a805d700ff0
-MISC metadata.xml 677 BLAKE2B c28648a0dd6140c8763a604e7976bfc20b9b8174dabb66a63d64df2947ac5ad3d5ceffeb6c60143a88c1328f2b822505e5938161654246c3e33ca0cce4a8e811 SHA512 0b2e3503d82f796a6c3bef7dcaf307de19b3f7d0081690971e0b5f9c9b49451260e87d25e0bd2e311f1249ed111568bb62b246b6a1510b16138c6788aaccb563
diff --git a/dev-haskell/binary/binary-0.5.1.1.ebuild b/dev-haskell/binary/binary-0.5.1.1.ebuild
deleted file mode 100644
index bbefbb80beb1..000000000000
--- a/dev-haskell/binary/binary-0.5.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.2.19.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
-HOMEPAGE="http://code.haskell.org/binary/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-CABAL_CORE_LIB_GHC_PV="7.6.* 7.7.*"
diff --git a/dev-haskell/binary/binary-0.7.1.0.ebuild b/dev-haskell/binary/binary-0.7.1.0.ebuild
deleted file mode 100644
index a7f79eb6561c..000000000000
--- a/dev-haskell/binary/binary-0.7.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
-HOMEPAGE="https://github.com/kolmodin/binary"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/hunit
-			>=dev-haskell/quickcheck-2.5
-			>=dev-haskell/random-1.0.1.0
-			dev-haskell/test-framework
-			>=dev-haskell/test-framework-quickcheck2-0.3
-		)"
-
-CABAL_CORE_LIB_GHC_PV="7.7.2013* 7.8.20140130 7.8.0.20140228 7.8.1 7.8.2 7.8.3 7.8.4"
-
-src_prepare() {
-	if has_version ">=dev-lang/ghc-7.7"; then
-		sed -e '/test-suite read-write-file/,/ghc-options: -Wall/d' \
-			-i "${S}/${PN}.cabal" \
-			|| die "Could not remove test suite for ghc 7.7"
-	fi
-}
diff --git a/dev-haskell/binary/binary-0.7.2.3.ebuild b/dev-haskell/binary/binary-0.7.2.3.ebuild
deleted file mode 100644
index b6ca64a04cb2..000000000000
--- a/dev-haskell/binary/binary-0.7.2.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
-HOMEPAGE="https://github.com/kolmodin/binary"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.7
-		>=dev-haskell/random-1.0.1.0
-		dev-haskell/test-framework
-		>=dev-haskell/test-framework-quickcheck2-0.3 )
-"
-
-CABAL_CORE_LIB_GHC_PV="7.10.* 7.11.2015*"
diff --git a/dev-haskell/binary/binary-0.7.5.0.ebuild b/dev-haskell/binary/binary-0.7.5.0.ebuild
deleted file mode 100644
index 9047718c7446..000000000000
--- a/dev-haskell/binary/binary-0.7.5.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
-HOMEPAGE="https://github.com/kolmodin/binary"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with latest ghc-7.10
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.8
-		>=dev-haskell/random-1.0.1.0
-		dev-haskell/test-framework
-		>=dev-haskell/test-framework-quickcheck2-0.3 )
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:7.10.2_rc2 PM:7.10.2 PM:7.10.2-r1"
diff --git a/dev-haskell/binary/binary-0.7.6.1.ebuild b/dev-haskell/binary/binary-0.7.6.1.ebuild
deleted file mode 100644
index c35913aef133..000000000000
--- a/dev-haskell/binary/binary-0.7.6.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
-HOMEPAGE="https://github.com/kolmodin/binary"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # binary[test]->test-framework->text->xml->binary
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.8
-		>=dev-haskell/random-1.0.1.0
-		dev-haskell/test-framework
-		>=dev-haskell/test-framework-quickcheck2-0.3 )
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:7.10.3_rc1 PM:7.10.3"
diff --git a/dev-haskell/binary/binary-0.8.3.0.ebuild b/dev-haskell/binary/binary-0.8.3.0.ebuild
deleted file mode 100644
index 4e701733bb2b..000000000000
--- a/dev-haskell/binary/binary-0.8.3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
-HOMEPAGE="https://github.com/kolmodin/binary"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.0.1
-KEYWORDS="~alpha ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # binary[test]->test-framework->text->xml->binary
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.8
-		>=dev-haskell/random-1.0.1.0
-		dev-haskell/test-framework
-		>=dev-haskell/test-framework-quickcheck2-0.3 )
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.0.1 PM:8.0.2_rc1 PM:8.0.2_rc2 PM:8.0.2 PM:9999"
diff --git a/dev-haskell/binary/metadata.xml b/dev-haskell/binary/metadata.xml
deleted file mode 100644
index 550649f59ef4..000000000000
--- a/dev-haskell/binary/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Efficient, pure binary serialisation using lazy ByteStrings.
-		Haskell values may be encoded to and from binary formats,
-		written to disk as binary, or sent over the network.
-		Serialisation speeds of over 1 G\/sec have been observed,
-		so this library should be suitable for high performance
-		scenarios.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">kolmodin/binary</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/bio-0.5.3-r2 b/dev-haskell/bio-0.5.3-r2
new file mode 100644
index 000000000000..1f521bf0b421
--- /dev/null
+++ b/dev-haskell/bio-0.5.3-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/binary-0.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/parallel:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/quickcheck-2:2=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/tagsoup-0.8:=[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 bioinformatics library
+EAPI=5
+HOMEPAGE=http://biohaskell.org/Libraries/Bio
+IUSE=+examples test doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/binary-0.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/parallel:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/quickcheck-2:2=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/tagsoup-0.8:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.5.3
+SRC_URI=mirror://hackage/packages/archive/bio/0.5.3/bio-0.5.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8827d2498e170c054b930e7e7e55708c
diff --git a/dev-haskell/bio/Manifest b/dev-haskell/bio/Manifest
deleted file mode 100644
index 09849c9c8fd8..000000000000
--- a/dev-haskell/bio/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX bio-0.5.3-ghc-7.10.patch 266 BLAKE2B 2db06eaf40ef90741aca5c329e096a82f259c5c068728338d798ba083ab7cd194f95cb54d0b2eee1257b15b8cce534a270adfd4b01b21ecab7245eb88b5b1bb5 SHA512 58efe74d17f2233f43c43d56eaabb849bc7753e27b3499544856036984504add5a50f4d6e1cf43af64a19695c1ef44cdd82514ce5126d50815b659e20bd93785
-DIST bio-0.5.3.tar.gz 103707 BLAKE2B 31c9e354ba33f20d6129a20d6272063498bfd4b4ea2cba9eddab8ede62ee894659eb5e6383ef022f5e003deab8bb3c92a98bcadae44db22e7b0346471cad5e4d SHA512 fbe09240a600abbcac952f52f05f28f9b305a1ae3def8b4144bd73bdb160acfbe5457086ef829057d5a73df1df5061668487b2ca5621df73628c8c4990b6b544
-EBUILD bio-0.5.3-r2.ebuild 1404 BLAKE2B 434ee9037af79c29b9d4097a0eb34813187bd111e17619d4527959fc0fe4b4ff6008480d46801963c12cfc4db71a81fc9b8454f174f6cef8062e04ceb9f0a45f SHA512 14e47edc973b6fec1b552158be098e7349e35d9ed9285a3cec7d9a3e207bddf8c50adb9ce27e66330d04119adcd10f1045ae961787184e8678db71b83e757933
-MISC metadata.xml 1145 BLAKE2B 1b90a811913c7c6247ca1e2237a8d0ea8e0bd56f7e3310a5e61df90d6dadc365ed4a5c58829a94efe61f88c57270e7c715989f5b0ff02ad75395703e2d7bd596 SHA512 c91ebcc3b83ab7d9bbcaee0cff08cf212b3d77b1d2a34c70308d7bb3ff47f898668c1cb13c2e761ce25653bf167bce55fa9dd848d52e6ffd8e93021e173e8e7f
diff --git a/dev-haskell/bio/bio-0.5.3-r2.ebuild b/dev-haskell/bio/bio-0.5.3-r2.ebuild
deleted file mode 100644
index c2d94eaad256..000000000000
--- a/dev-haskell/bio/bio-0.5.3-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-DESCRIPTION="A bioinformatics library"
-HOMEPAGE="http://biohaskell.org/Libraries/Bio"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+examples test"
-
-RDEPEND=">=dev-haskell/binary-0.4:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		dev-haskell/old-time:=[profile?]
-		dev-haskell/parallel:=[profile?]
-		dev-haskell/parsec:=[profile?]
-		>=dev-haskell/quickcheck-2:2=[profile?]
-		dev-haskell/random:=[profile?]
-		>=dev-haskell/tagsoup-0.8:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-
-	cabal_chdeps \
-		'binary >=0.4 && <0.5' 'binary >=0.4'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples examples) \
-		$(cabal_flag test test)
-}
-
-src_test() {
-	dist/build/qc/qc || die
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	use test && rm "${ED}"/usr/bin/qc
-	# many examples collide with dev-haskell/flower
-	if use examples ; then
-		pushd "${ED}"/usr/bin
-		local example
-		for example in *
-		do
-			mv "${example}" "${PN}-example-${example}"
-		done
-		popd
-	fi
-}
diff --git a/dev-haskell/bio/files/bio-0.5.3-ghc-7.10.patch b/dev-haskell/bio/files/bio-0.5.3-ghc-7.10.patch
deleted file mode 100644
index d570d22917a7..000000000000
--- a/dev-haskell/bio/files/bio-0.5.3-ghc-7.10.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff --git a/Bio/Alignment/Bowtie.hs b/Bio/Alignment/Bowtie.hs
-index 883b057..3e58f0e 100644
---- a/Bio/Alignment/Bowtie.hs
-+++ b/Bio/Alignment/Bowtie.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE FlexibleContexts #-}
- {-| This module provides a data type to represent an alignment
diff --git a/dev-haskell/bio/metadata.xml b/dev-haskell/bio/metadata.xml
deleted file mode 100644
index 8927e5f99073..000000000000
--- a/dev-haskell/bio/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This is a collection of data structures and algorithms
-		useful for building bioinformatics-related tools
-		and utilities.
-		
-		Current list of features includes: a Sequence data type supporting
-		protein and nucleotide sequences and conversion between them.  As of version
-		0.4, different kinds of sequence have different types.  Support for quality
-		data, reading and writing Fasta formatted files, reading TwoBit and
-		phd formats, and Roche/454 SFF files.  Rudimentary (i.e. unoptimized) support
-		for doing alignments - including dynamic adjustment of scores based on sequence quality.
-		Also Blast output parsing.  Partly implemented single linkage clustering, and
-		multiple alignment.  Reading Gene Ontology (GO) annotations (GOA) and
-		definitions\/hierarchy.
-		
-		The Darcs repository is at: &lt;http://malde.org/~ketil/biohaskell/biolib&gt;.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/biocore-0.3.1 b/dev-haskell/biocore-0.3.1
new file mode 100644
index 000000000000..a89c99e6465b
--- /dev/null
+++ b/dev-haskell/biocore-0.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/stringable:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A bioinformatics library
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/biocore
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-haskell/stringable:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.3.1
+SRC_URI=mirror://hackage/packages/archive/biocore/0.3.1/biocore-0.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fb87ff60ec3bfc3ff11b12973063f94d
diff --git a/dev-haskell/biocore/Manifest b/dev-haskell/biocore/Manifest
deleted file mode 100644
index e33aa6bd1e97..000000000000
--- a/dev-haskell/biocore/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST biocore-0.3.1.tar.gz 2812 BLAKE2B ff94cbbb37c7f74c7d08e31a626336d4db621c468dd42df43ba20739224378b1ecd358e74111174eea6a30450e50091245490606da39781d92e905cb1e875db6 SHA512 0a9a3690aa0888c688c8429facd0a26ac94f639222568d2e68a0640714098a40fa38d196800900486d12b36ee735576519d98e4d45f0320261d3f5de9ab09311
-EBUILD biocore-0.3.1.ebuild 584 BLAKE2B 97a45bfaded1b8fa049a2ad4f17976988fba43bdcfd38e242d6a7805c3f0d3ff7762a0be5f0d70dee3880b0e34ac500904b3ab546027c8ebd1acc4a0d774c1af SHA512 22b9195739c7d4aee4827fe3dc46e863d3ae1e67100b949cbd4c223374932b34322a3b4bfbf6b7d0ba17b3163ab27fac9d5a6620e11b4b84e522f015d6d2d09a
-MISC metadata.xml 513 BLAKE2B 908cee4a5af32ebc521401f9537900ac0888dfcc8b26128e444f57b0f953482b95a0636ab2c6fb92f15dd3b7af1baf847d706b32d57f333edce2e8c98fce2c74 SHA512 156aec24385d099aa3b1b061938164d1a3b8f62e2ec71b3c99fa75d0a6d8a2ec3ce1ae666d9a2c09a107ef436b1abc2cabf13d6cb9a6e888d7f3487fbbe5acc9
diff --git a/dev-haskell/biocore/biocore-0.3.1.ebuild b/dev-haskell/biocore/biocore-0.3.1.ebuild
deleted file mode 100644
index 8ebe8159caee..000000000000
--- a/dev-haskell/biocore/biocore-0.3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A bioinformatics library"
-HOMEPAGE="http://hackage.haskell.org/package/biocore"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/stringable:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/biocore/metadata.xml b/dev-haskell/biocore/metadata.xml
deleted file mode 100644
index 769f8647ae51..000000000000
--- a/dev-haskell/biocore/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A set of core definitions and data structures
-		commonly used in bioinformatics.  The intention is that bioinformatics
-		libraries will use this as a common ground to avoid needless incompatibilities
-		and duplicated work.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/biofasta-0.0.3 b/dev-haskell/biofasta-0.0.3
new file mode 100644
index 000000000000..7668a40326f4
--- /dev/null
+++ b/dev-haskell/biofasta-0.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/biocore-0.3.1:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Library for reading fasta sequence files
+EAPI=5
+HOMEPAGE=https://patch-tag.com/r/dfornika/biofasta/home
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-haskell/biocore-0.3.1:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.0.3
+SRC_URI=mirror://hackage/packages/archive/biofasta/0.0.3/biofasta-0.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fe899cae4ccfa99cb1a81ca473cdef4d
diff --git a/dev-haskell/biofasta/Manifest b/dev-haskell/biofasta/Manifest
deleted file mode 100644
index 786767a8d337..000000000000
--- a/dev-haskell/biofasta/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST biofasta-0.0.3.tar.gz 14468 BLAKE2B 5df80e3ad74e1c7d5f5cd6538dcdae880829eb7bcef5eb009171e77a24a7705f91a8a7edc24bba1ecbdc73056bd5e9217a6d87cddac43f2bc470c041cddefaa2 SHA512 de50d2f499fc0ee532b5ca28dff868c3dd0d243eaadeb1a4e3a3ebb913812f3308f581aefbf79806d58535b1f78ae283660b5a2348da1a9535f4d48f96b8678e
-EBUILD biofasta-0.0.3.ebuild 606 BLAKE2B c7811b81dd80a356229585d8f1542e0bbd1557fde93eff8bc25c12e9470821fa95ec5f84b027aa0abf3d2bfdd90c33cfe0f3a57f5720070154c75853b31b1b5c SHA512 4985c696d17727ba3fcdf7052ade4f6d8f46f839405e5cd6cb661e7c46340c58253d27d7f0843f2fa9e8e163f1afed1e6ffaf6958f66af66e10b5f12d3560c4f
-MISC metadata.xml 331 BLAKE2B 920034ca8bd629667ade342e8eb9a053c185a0d4ec7d4fc34b3bed8343b6c2a8ac2ab195a0bc8ce0ecbc64ab0a7454eacdd9a0f7847e5d49e729cc987d1ee51d SHA512 3d6f29e2241e1c784a682b00cd6b5fd2577b1668d16101339818def7f1ec97f50541ee68146efd9d71d16dd082825c0f23b90ee1d14f636b5fcd7b7377a1c70a
diff --git a/dev-haskell/biofasta/biofasta-0.0.3.ebuild b/dev-haskell/biofasta/biofasta-0.0.3.ebuild
deleted file mode 100644
index 97f708a035c3..000000000000
--- a/dev-haskell/biofasta/biofasta-0.0.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Library for reading fasta sequence files"
-HOMEPAGE="https://patch-tag.com/r/dfornika/biofasta/home"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/biocore-0.3.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/biofasta/metadata.xml b/dev-haskell/biofasta/metadata.xml
deleted file mode 100644
index cb9fee2b4fef..000000000000
--- a/dev-haskell/biofasta/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Library for reading fasta sequence files
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/biosff-0.3.7.1 b/dev-haskell/biosff-0.3.7.1
new file mode 100644
index 000000000000..3abebcc8fec9
--- /dev/null
+++ b/dev-haskell/biosff-0.3.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/binary:=[profile?] >=dev-haskell/biocore-0.3:=[profile?] dev-haskell/cmdargs:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Library and executables for working with SFF files
+EAPI=5
+HOMEPAGE=http://biohaskell.org/
+IUSE=+fclip +flower +frecover doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-haskell/binary:=[profile?] >=dev-haskell/biocore-0.3:=[profile?] dev-haskell/cmdargs:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.7.1
+SRC_URI=mirror://hackage/packages/archive/biosff/0.3.7.1/biosff-0.3.7.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9ef1a8e57772367abeca0d53882f69a7
diff --git a/dev-haskell/biosff/Manifest b/dev-haskell/biosff/Manifest
deleted file mode 100644
index 71e95573583e..000000000000
--- a/dev-haskell/biosff/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX biosff-0.3.7.1-ghc-7.10.patch 214 BLAKE2B aeae844af1b934653223812838a01f6abb3b664d07e6abdf820e37c791b95d8020815744cac094a9ce2e9ce1c1133bf4439b0b903a54de02ec43e7666f87c455 SHA512 44d1f85fb4625114cf1d032a9f16b57a1602489100521e2801bc8aaa42b5bf6990fa3b849fe040f13ff19a13a0cde13ccc3965826d9673a191f4356d8c0cd96f
-DIST biosff-0.3.7.1.tar.gz 26705 BLAKE2B abf585342c14c01a8f202b34ec94e67138e345918b43a52dbf535c3690bca2039c977ee36ebef861d5f215174429f41702e84d440cf52316de0ec82722053f72 SHA512 ce075d734864b9a00999d5c37c824ece5ba475b583536eb842835b4a44ff56581f18ba8ddf065f2ea4416ff4f96279f6a46f5e57330a43d40164f4cabab2ab9f
-EBUILD biosff-0.3.7.1.ebuild 923 BLAKE2B d071ed43396e80ea08e73b4510bfcfdbbac8c0c5793831d801d3cc043ad2aac5fdfe84d239bf554bc34fdb9f34aec16a089e24f97fa42314736aa0f4823d19c1 SHA512 0089ac4b6ab86ed1d860a1b8885970d917e9b413d60d8b621931313030d4285e55ea420b70183e4d8216162ae3c5ff63f581f6cc7790f1d59c6a3f97be918b2b
-MISC metadata.xml 673 BLAKE2B 4235ed5755c459eaf862037e9f802efb13ffdbc6180bce6747ea6b8e899880549d262596bd8c94bd862667cbf1748c3ed1e47db760e5e9a55c4606c483dd8d19 SHA512 b344429da849558e9e0ae5814111e1fd1add4a4b0548eeb358aaa220ede1ac2dc284378b87ebc8c747c0d8dcbabb05d8d9e00c2bd5b3a2faccdfc7f5c625ff47
diff --git a/dev-haskell/biosff/biosff-0.3.7.1.ebuild b/dev-haskell/biosff/biosff-0.3.7.1.ebuild
deleted file mode 100644
index 3dd0b8133975..000000000000
--- a/dev-haskell/biosff/biosff-0.3.7.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Library and executables for working with SFF files"
-HOMEPAGE="http://biohaskell.org/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fclip +flower +frecover"
-
-RDEPEND="dev-haskell/binary:=[profile?]
-	>=dev-haskell/biocore-0.3:=[profile?]
-	dev-haskell/cmdargs:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag fclip fclip) \
-		$(cabal_flag flower flower) \
-		$(cabal_flag frecover frecover)
-}
diff --git a/dev-haskell/biosff/files/biosff-0.3.7.1-ghc-7.10.patch b/dev-haskell/biosff/files/biosff-0.3.7.1-ghc-7.10.patch
deleted file mode 100644
index 48c29358ca7c..000000000000
--- a/dev-haskell/biosff/files/biosff-0.3.7.1-ghc-7.10.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff --git a/src/Flower/Main.hs b/src/Flower/Main.hs
-index b0cbd1c..3428db5 100644
---- a/src/Flower/Main.hs
-+++ b/src/Flower/Main.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE FlexibleContexts #-}
- -- FlowEr - FLOWgram ExtractoR
diff --git a/dev-haskell/biosff/metadata.xml b/dev-haskell/biosff/metadata.xml
deleted file mode 100644
index d5fd876231a8..000000000000
--- a/dev-haskell/biosff/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The library contains the functionality for reading and writing
-		SFF files (sequencing data from 454 and Ion Torrent).  It duplicates
-		code from (and is incompatible with) the "bio" library.
-	</longdescription>
-	<use>
-		<flag name="fclip">Build the fclip executable.</flag>
-		<flag name="flower">Build the flower executable.</flag>
-		<flag name="frecover">Build the frecover executable.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/bitarray-0.0.1.1 b/dev-haskell/bitarray-0.0.1.1
new file mode 100644
index 000000000000..5cf1a8cfaf7c
--- /dev/null
+++ b/dev-haskell/bitarray-0.0.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Mutable and immutable bit arrays
+EAPI=6
+HOMEPAGE=http://code.haskell.org/~bkomuves/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.0.1.1
+SRC_URI=mirror://hackage/packages/archive/bitarray/0.0.1.1/bitarray-0.0.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8b7346ea6f3106802cce3a3cb5ddcc3a
diff --git a/dev-haskell/bitarray/Manifest b/dev-haskell/bitarray/Manifest
deleted file mode 100644
index ae02e61ae637..000000000000
--- a/dev-haskell/bitarray/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bitarray-0.0.1.1.tar.gz 3701 BLAKE2B f26a89d1999eaf851ffdb66d6e34c4047169fbf1c253acde0631101039ee6f6a7d0ab8640f25b8a1837df9974ac137c5ca1e7f64d537bdd059aaf3eae7e5c5aa SHA512 4b51ef2be989949e4ab8b9cab194c2bb5f3895abf9881ddf6009dd234c2c7d01edf01dc4ae96312a36f0b3d43f1b2b975eeaa738f66ccc2ab9a1a10e07582602
-EBUILD bitarray-0.0.1.1.ebuild 538 BLAKE2B 9aeae8c99b0b90e12d895f7dc0c13c3cf8c1ace986bbafdf4cf9170a9d7160973fedcb39dfad4f4ea0f92bcf40c9ffe70c9050f735956797ad77f7b2ebdf2d4b SHA512 2270c23bab9e225fed7c2428f5384fe832032a1d26403799f3ff6cb2f4bab9fa9e94492072b79ab52b5a4fc27c069ad8c9e4f727cc348397158c4624e8f271e4
-MISC metadata.xml 324 BLAKE2B e7cb928f9643c3d4aa31b9cd6b55a1f9eaf784fb2b921140958ab6b88659a3349e43d3213bca634a93e1b96be8bdd4670471e1a13e921de127994b49041e1fc2 SHA512 21442373239878b8212bb8344a3dbb49930f5d00485902d4e8050b12984c8cc1d7c15793d572ba15a9c10b000c32cc6bd7ba17017a9a2749763ecc1122466651
diff --git a/dev-haskell/bitarray/bitarray-0.0.1.1.ebuild b/dev-haskell/bitarray/bitarray-0.0.1.1.ebuild
deleted file mode 100644
index f321b1e47159..000000000000
--- a/dev-haskell/bitarray/bitarray-0.0.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Mutable and immutable bit arrays"
-HOMEPAGE="http://code.haskell.org/~bkomuves/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
diff --git a/dev-haskell/bitarray/metadata.xml b/dev-haskell/bitarray/metadata.xml
deleted file mode 100644
index 799ae0c2c099..000000000000
--- a/dev-haskell/bitarray/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Mutable and immutable bit arrays.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/bits-atomic-0.1.3-r1 b/dev-haskell/bits-atomic-0.1.3-r1
new file mode 100644
index 000000000000..9f0aeb4b6c0e
--- /dev/null
+++ b/dev-haskell/bits-atomic-0.1.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Atomic bit operations on memory locations for low-level synchronization
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/bits-atomic
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.3
+SRC_URI=mirror://hackage/packages/archive/bits-atomic/0.1.3/bits-atomic-0.1.3.tar.gz https://dev.gentoo.org/~slyfox/patches/bits-atomic-0.1.3-gcc-5.patch
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c1b1e24e209d3d133181e895bebbeac6
diff --git a/dev-haskell/bits-atomic/Manifest b/dev-haskell/bits-atomic/Manifest
deleted file mode 100644
index 237e1151bc6c..000000000000
--- a/dev-haskell/bits-atomic/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX bits-atomic-0.1.3-ghc-8.patch 353 BLAKE2B 14eaaac0e86a1be6911512bd6e77ee8124fa8aea14ac4af5aa4281e9b0b8b94e015e387cd5f6a50a21c6fa1917dffe20af57deaa8781381ec5f92293b1fbba0a SHA512 a33787a086dd72120b50d0fd78b80435e5c62f54daaadfc21177973119a75f0b0855311c655c0656aab8ad9712c34e8d60e4f371f2be244b283aee9f53c3aab2
-DIST bits-atomic-0.1.3-gcc-5.patch 30907 BLAKE2B 135d495f914af645de82c4d3cd491460dba6fee5293a591f9e83ad07efd7b47cedf32a841557eca0a852690e9367c6fd7a0d6722d6212193c7188fe70d673d77 SHA512 0a40015f225325db3716ac0a17e33eef3f2042b72f933000a52734b103ea3e316a0242a0b75c90a31d0d4c31d33da8d32b07f7c067d79ade51df66ea75a3b19c
-DIST bits-atomic-0.1.3.tar.gz 7982 BLAKE2B 4ac1e6c808c30fb8ad59509aefb9dcb32f98023b31efb2eabf59ea94cbc681aa94219a8389179c7755dfb8ad944bcab122676aca361502d030c85d04c7a4f113 SHA512 e13c21c81ebc6cce2f85a184a572eb1647439f605985a8344ff219cc685c7d0adcf5d2433ea75fa1560a807e329cab23b548435adc0087e6294417eb7a65fbf1
-EBUILD bits-atomic-0.1.3-r1.ebuild 912 BLAKE2B ab036599b856ab0e08822db97dc6a55f81a15763ba8e09d444276b8ca6c3fd94b8e76bac54b7e3958532cfed3e4feaea12d8b7275ac9875a4fcf8df2e9d87d04 SHA512 be3612ea8cf6c43c93d79c1612bbb10804aa3657224bae20c1b836d8c5df94190f4abdce31d85ae99a55cd9a687d68155df84494bd6ed90a3dd05fe203900e74
-MISC metadata.xml 1690 BLAKE2B 5e7ba5e0a6d3fa70320bebfae9b569a59eef36c2ba6c50cd9fdb45819b1e5de7c0212d00ff2dff1348bca081df414a7f628e59c23db10d286349787c025d878f SHA512 c96b9f74ab1f7e63f8595771535b9f6b020c5d355acc1875275839f07ff7a5141e8be09f8278aa49b10f291c945832ca4ef81a71f385ae71b2f664d1116f80e1
diff --git a/dev-haskell/bits-atomic/bits-atomic-0.1.3-r1.ebuild b/dev-haskell/bits-atomic/bits-atomic-0.1.3-r1.ebuild
deleted file mode 100644
index 59e62513134b..000000000000
--- a/dev-haskell/bits-atomic/bits-atomic-0.1.3-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Atomic bit operations on memory locations for low-level synchronization"
-HOMEPAGE="http://hackage.haskell.org/package/bits-atomic"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz
-	https://dev.gentoo.org/~slyfox/patches/${P}-gcc-5.patch"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
-
-src_prepare() {
-	epatch "${DISTDIR}"/${P}-gcc-5.patch
-	epatch "${FILESDIR}"/${P}-ghc-8.patch
-}
diff --git a/dev-haskell/bits-atomic/files/bits-atomic-0.1.3-ghc-8.patch b/dev-haskell/bits-atomic/files/bits-atomic-0.1.3-ghc-8.patch
deleted file mode 100644
index eb12edc2d4f3..000000000000
--- a/dev-haskell/bits-atomic/files/bits-atomic-0.1.3-ghc-8.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/test/test.hs b/test/test.hs
-index 38238b5..c3a99b0 100644
---- a/test/test.hs
-+++ b/test/test.hs
-@@ -35,3 +35,3 @@ testPattern = 0xdeadbeef
- 
--type PolyTest = (AtomicBits a, Storable a, Integral a, Bounded a, Show a) => a -> Assertion
-+type PolyTest = forall a . (AtomicBits a, Storable a, Integral a, Bounded a, Show a) => a -> Assertion
- 
diff --git a/dev-haskell/bits-atomic/metadata.xml b/dev-haskell/bits-atomic/metadata.xml
deleted file mode 100644
index b15af11b249b..000000000000
--- a/dev-haskell/bits-atomic/metadata.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Atomic operations including CAS (compare-and-swap), fetch &amp; add and variants
-		suitable for low-level shared-memory synchronization.
-		
-		The implementation is using GCC's builtin atomic operations (available in GCC &gt;=
-		4) in C wrappers called through the FFI. See these links for background:
-		
-		* GCC manual: &lt;https://gcc.gnu.org/onlinedocs/gcc/Atomic-Builtins.html&gt;
-		
-		* GCC wiki: &lt;https://gcc.gnu.org/wiki/Atomic&gt;
-		
-		/Portability/: This package is primarily developed on a Linux system, but
-		should work wherever GCC &gt;= 4 is available. It has been confirmed as working
-		on OSX. On Windows, it should work with Cygwin but currently fails for
-		vanilla Haskell-Platform 2010.1.0.0 as it still packages GCC 3.x. An
-		installer for updated versions of GCC is available at
-		&lt;http://www.mingw.org/&gt; and should make this package work in connection with
-		Haskell-Platform. Feedback on compatibility would be appreciated.
-		
-		/Testing:/ The following commands can be used to compile and run the test suite:
-		
-		&gt; cabal unpack bits-atomic &amp;&amp; cd bits-atomic-* # if not yet locally available
-		&gt; cabal configure -ftest
-		&gt; cabal build
-		&gt; cabal test
-		
-		/Recent changes/:
-		
-		* 0.1.3: Documentation updates, especially on portability. No functional
-		changes.
-		
-		* 0.1.2: Avoid using System.FilePath in Setup.hs to fix build failure on hackage
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/bitwise-0.1.1.1 b/dev-haskell/bitwise-0.1.1.1
new file mode 100644
index 000000000000..ec49aea92fc0
--- /dev/null
+++ b/dev-haskell/bitwise-0.1.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 test? ( >=dev-haskell/quickcheck-2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=fast multi-dimensional unboxed bit packed Bool arrays
+EAPI=6
+HOMEPAGE=http://code.mathr.co.uk/bitwise
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.1.1
+SRC_URI=mirror://hackage/packages/archive/bitwise/0.1.1.1/bitwise-0.1.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=45148cbabbf74ff4566080039e49a9ba
diff --git a/dev-haskell/bitwise/Manifest b/dev-haskell/bitwise/Manifest
deleted file mode 100644
index 5c5a20134002..000000000000
--- a/dev-haskell/bitwise/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bitwise-0.1.1.1.tar.gz 17107 BLAKE2B 0e4ef87c50a0505aa04f248eb3356b8c3311a8a85c67d13a50621cef0e77416bd1111fcf8823c0b8d35eccd48db5241571da2f0dac8b912e4a6fd2a8ca87217d SHA512 f599411c6ce68a0ac71045ade891ae9c70a2b94b79285cdbac9e694bf227df5f0e65f115321ac62ac2878232aa91b5a6a376ae43654671fda0de2f9b0b65c70e
-EBUILD bitwise-0.1.1.1.ebuild 703 BLAKE2B e8513f4b1fd511d625c882a9fae9e86a71a5626a66ead7c65dc657ee5689b9d43e896bbabfdf95f997e531fa6de6a439330f39c81e1ee6255103ba6af0b195ed SHA512 0333d532ce88bc6226409d1fd609aee5e9331fedd3f6d9ecd289d5162b892f57f91c76d88d44d31f83e6073bfd97e11aad295d20d02161e050774b123eeea7dd
-MISC metadata.xml 1712 BLAKE2B f33c499851f77b486e0c415c9fed8912871d9b0a06a9a9fbddd6ac232bc5bb345294a8fe116939f0d6226ab9ff7bad961d4965d6584079f1faef6160332b338b SHA512 3c845b956c5480cb7a2f57dfaf41f269564731c22f68e7e5d1cd2285210f39a2f4bb0a23b6a3efec6b7d26a0a3025f21bc5c97d0b4db924eba2c11227db92fc4
diff --git a/dev-haskell/bitwise/bitwise-0.1.1.1.ebuild b/dev-haskell/bitwise/bitwise-0.1.1.1.ebuild
deleted file mode 100644
index d67a8280c09b..000000000000
--- a/dev-haskell/bitwise/bitwise-0.1.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="fast multi-dimensional unboxed bit packed Bool arrays"
-HOMEPAGE="http://code.mathr.co.uk/bitwise"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( >=dev-haskell/quickcheck-2.4 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck >= 2.4 && < 2.9' 'QuickCheck >= 2.4'
-}
diff --git a/dev-haskell/bitwise/metadata.xml b/dev-haskell/bitwise/metadata.xml
deleted file mode 100644
index 4f0bc14cf689..000000000000
--- a/dev-haskell/bitwise/metadata.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Unboxed multidimensional bit packed Bool arrays with fast aggregate
-		operations based on lifting Bool operations to bitwise operations.
-		
-		There are many other bit packed structures out there, but none met
-		all of these requirements:
-		
-		(1) unboxed bit packed Bool array,
-		
-		(2) multi-dimensional indexing,
-		
-		(3) fast (de)serialization, or interoperable with foreign code,
-		
-		(4) fast aggregate operations (fold, map, zip).
-		
-		Quick tour of the bitwise library:
-		
-		[Data.Bits.Bitwise] Lift boolean operations on &#39;Bool&#39; to bitwise
-		operations on &#39;Data.Bits.Bits&#39;.
-		
-		[Data.Array.BitArray] Immutable bit arrays.
-		
-		[Data.Array.BitArray.ST] Mutable bit arrays in &#39;Control.Monad.ST.ST&#39;.
-		
-		[Data.Array.BitArray.IO] Mutable bit arrays in &#39;IO&#39;.
-		
-		[Data.Array.BitArray.ByteString] (De)serialization.
-		
-		[Codec.Image.PBM] Portable bitmap monochrome 2D image format.
-		
-		Very rough performance benchmarks:
-		
-		* immutable random access single bit reads:
-		@BitArray ix@ is about 40% slower than @UArray ix Bool@,
-		
-		* &#39;Control.Monad.ST.ST&#39; mutable random access single bit reads:
-		@STBitArray s ix@ is about the same as @STUArray s ix Bool@,
-		
-		* immutable map @Bool -&gt; Bool@:
-		@BitArray ix@ is about 85x faster than @UArray ix Bool@,
-		
-		* immutable zipWith @Bool -&gt; Bool -&gt; Bool@:
-		@BitArray ix@ is about 1300x faster than @UArray ix Bool@.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/blaze-builder-0.3.3.2 b/dev-haskell/blaze-builder-0.3.3.2
new file mode 100644
index 000000000000..5d0513d62eee
--- /dev/null
+++ b/dev-haskell/blaze-builder-0.3.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient buffered output
+EAPI=5
+HOMEPAGE=https://github.com/meiersi/blaze-builder
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.3.3.2
+SRC_URI=mirror://hackage/packages/archive/blaze-builder/0.3.3.2/blaze-builder-0.3.3.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d74fccfdb4e36817faf141aff9c0713a
diff --git a/dev-haskell/blaze-builder-0.3.3.4 b/dev-haskell/blaze-builder-0.3.3.4
new file mode 100644
index 000000000000..e157833b6ff4
--- /dev/null
+++ b/dev-haskell/blaze-builder-0.3.3.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient buffered output
+EAPI=5
+HOMEPAGE=https://github.com/meiersi/blaze-builder
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.3.4
+SRC_URI=mirror://hackage/packages/archive/blaze-builder/0.3.3.4/blaze-builder-0.3.3.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=74a8ae3566f087212823cd56793dfd17
diff --git a/dev-haskell/blaze-builder-0.4.0.1 b/dev-haskell/blaze-builder-0.4.0.1
new file mode 100644
index 000000000000..f8f87432ba91
--- /dev/null
+++ b/dev-haskell/blaze-builder-0.4.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 dev-haskell/utf8-string ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient buffered output
+EAPI=5
+HOMEPAGE=https://github.com/lpsmith/blaze-builder
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.0.1
+SRC_URI=mirror://hackage/packages/archive/blaze-builder/0.4.0.1/blaze-builder-0.4.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c305ce2132d900d9d62e951421ac9f70
diff --git a/dev-haskell/blaze-builder-0.4.0.2 b/dev-haskell/blaze-builder-0.4.0.2
new file mode 100644
index 000000000000..4665fb445bca
--- /dev/null
+++ b/dev-haskell/blaze-builder-0.4.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 dev-haskell/utf8-string ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient buffered output
+EAPI=6
+HOMEPAGE=https://github.com/lpsmith/blaze-builder
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.0.2
+SRC_URI=mirror://hackage/packages/archive/blaze-builder/0.4.0.2/blaze-builder-0.4.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c43135ed9d4201b1dc909f616ea5560f
diff --git a/dev-haskell/blaze-builder-conduit-1.0.0 b/dev-haskell/blaze-builder-conduit-1.0.0
new file mode 100644
index 000000000000..3c07429081c2
--- /dev/null
+++ b/dev-haskell/blaze-builder-conduit-1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] =dev-haskell/conduit-1.0*:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Convert streams of builders to streams of bytestrings
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] =dev-haskell/conduit-1.0*:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.0.0
+SRC_URI=mirror://hackage/packages/archive/blaze-builder-conduit/1.0.0/blaze-builder-conduit-1.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ef2a858884e33f8c8314e0a8a4d252f7
diff --git a/dev-haskell/blaze-builder-conduit-1.1.0 b/dev-haskell/blaze-builder-conduit-1.1.0
new file mode 100644
index 000000000000..a736af02531a
--- /dev/null
+++ b/dev-haskell/blaze-builder-conduit-1.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8
+DESCRIPTION=Convert streams of builders to streams of bytestrings. (deprecated)
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.1.0
+SRC_URI=mirror://hackage/packages/archive/blaze-builder-conduit/1.1.0/blaze-builder-conduit-1.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c29a84ee4fc7706802e733a2510a65f6
diff --git a/dev-haskell/blaze-builder-conduit/Manifest b/dev-haskell/blaze-builder-conduit/Manifest
deleted file mode 100644
index 5d66089405ac..000000000000
--- a/dev-haskell/blaze-builder-conduit/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST blaze-builder-conduit-1.0.0.tar.gz 3952 BLAKE2B 2dbd150aff77aa7926944203e26bf1f2436f65f823e5df62e988109c66a009b44a50ba4d67aa2b5d1ab6fbff4ca58270545b44255a581d856472b163676efdea SHA512 3facc034c7e09c8b83bed7ca80582d5ca454ef31f0f0fe3847d7150f9f9307fc8fc6bb8c870eadaccabb739069e19aee6c0db202a2429faa8bab4b41d684e7aa
-DIST blaze-builder-conduit-1.1.0.tar.gz 1367 BLAKE2B f62b2a5d8dcabec2d9173eb2cdd0569821735624bc8dd9c14779f9a3e2a2c6222d9c95666daac3884aa2edb8b1f2324a8e097d513e48f8479761597d4be570ab SHA512 99a558801dd0bfec495648dc1a964ddf7a53d363c82ddde794bb98b6c3d12ca74edc7d79257cbf83d8802d0197c75c9e71e637de32e30b76600ce9475b0ad797
-EBUILD blaze-builder-conduit-1.0.0.ebuild 897 BLAKE2B 40e2100521347d44fe1be0ec13c9a976b3d6cfa3b2aaaf643435e6074c407c23e0b670c8b319ad0dc970b2d7175623e1eecaa3a575f4c8ef5ff6604980d4263f SHA512 7e320706025e70b91759c6177d8f7f888d38b68142a7e976c851bd4af96288763f1ec0cee30ce8bcafc172c252f036fe658b094f40cb10cf73a42adda4d10e1d
-EBUILD blaze-builder-conduit-1.1.0.ebuild 588 BLAKE2B b964f2230ed54ca52ea00cddc1da8f1b59380da738ff20fdb6f0e596b202d39bdb68a1685ae9af3b296f9451136e11d11268ebd9cc7ff04b384797af5a117675 SHA512 e303ab99f8e05e26470c05b248d31ec951d7710cd4d4fcdf833587fe04b509479cd6d53b04e3009be8fd1c3942c9c07a5edc6b27208a1cd707f3e6d2601fb652
-MISC metadata.xml 426 BLAKE2B 13ce1ea0797a26d23ffa379cfee8ed66125599d2ac6669fcaae499fd03a30fbca9e6e0090758dfba55b09d87bd1d0822ecd7a92d334a990560397100dd381d40 SHA512 ebe81542606b31497a58de0056d6defda73507bb5aee8571c07b40e249c2587f492a0ec71407fdb2f9bf5321f33eb3cfd8b43fb43e00bebd0d0a7f18e1eff0e7
diff --git a/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.0.0.ebuild b/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.0.0.ebuild
deleted file mode 100644
index 745e7b1fa324..000000000000
--- a/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Convert streams of builders to streams of bytestrings"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-		<dev-haskell/blaze-builder-0.4:=[profile?]
-		=dev-haskell/conduit-1.0*:=[profile?]
-		>=dev-haskell/text-0.11:=[profile?]
-		>=dev-haskell/transformers-0.2.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/quickcheck
-		)"
diff --git a/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.1.0.ebuild b/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.1.0.ebuild
deleted file mode 100644
index 93e40a822c31..000000000000
--- a/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Convert streams of builders to streams of bytestrings. (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/blaze-builder-conduit/metadata.xml b/dev-haskell/blaze-builder-conduit/metadata.xml
deleted file mode 100644
index 6b756208dfdf..000000000000
--- a/dev-haskell/blaze-builder-conduit/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Convert streams of builders to streams of bytestrings.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/conduit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/blaze-builder-enumerator-0.2.1.0 b/dev-haskell/blaze-builder-enumerator-0.2.1.0
new file mode 100644
index 000000000000..05c1dba3add7
--- /dev/null
+++ b/dev-haskell/blaze-builder-enumerator-0.2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/enumerator-0.4.3.1:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/streaming-commons-0.1.10:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= newbuilder? ( >=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] ) !newbuilder? ( >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Enumeratees for the incremental conversion of builders to bytestrings
+EAPI=5
+HOMEPAGE=https://github.com/meiersi/blaze-builder-enumerator
+IUSE=+newbuilder doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/enumerator-0.4.3.1:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/streaming-commons-0.1.10:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= newbuilder? ( >=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] ) !newbuilder? ( >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] )
+SLOT=0/0.2.1.0
+SRC_URI=mirror://hackage/packages/archive/blaze-builder-enumerator/0.2.1.0/blaze-builder-enumerator-0.2.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=35df41f803c100a3e9bf567ae9d8155a
diff --git a/dev-haskell/blaze-builder-enumerator-0.2.1.0-r1 b/dev-haskell/blaze-builder-enumerator-0.2.1.0-r1
new file mode 100644
index 000000000000..b7afe61a9c22
--- /dev/null
+++ b/dev-haskell/blaze-builder-enumerator-0.2.1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/enumerator-0.4.3.1:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/streaming-commons-0.1.10:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= newbuilder? ( >=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] ) !newbuilder? ( >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Enumeratees for the incremental conversion of builders to bytestrings
+EAPI=5
+HOMEPAGE=https://github.com/meiersi/blaze-builder-enumerator
+IUSE=+newbuilder doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/enumerator-0.4.3.1:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/streaming-commons-0.1.10:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= newbuilder? ( >=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] ) !newbuilder? ( >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] )
+SLOT=0/0.2.1.0
+SRC_URI=mirror://hackage/packages/archive/blaze-builder-enumerator/0.2.1.0/blaze-builder-enumerator-0.2.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=35061e3808ef353f4b22fb33409d375d
diff --git a/dev-haskell/blaze-builder-enumerator/Manifest b/dev-haskell/blaze-builder-enumerator/Manifest
deleted file mode 100644
index e6c7c7a83246..000000000000
--- a/dev-haskell/blaze-builder-enumerator/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST blaze-builder-enumerator-0.2.1.0.tar.gz 4248 BLAKE2B 1d20ac8a07a949d9eae5e9180451519dfd48e7c3c8dc7c03d9fd8c2c87fa9965a129b31d76e7fe34b0f40e2a85a54da6cc47e32d115836e65d7754df1f111205 SHA512 e795a9ddf41b81ede30ccd0d698674c743ad3e8ccfb89e70184a7aa07e9437597b3a187a66538b8a865281582f17d1c9111add8f8505204b56c0db0fd05a0e1a
-EBUILD blaze-builder-enumerator-0.2.1.0-r1.ebuild 1333 BLAKE2B 2296481d8786542168feffeafee492ad5097854173d79dee75b4408f982f13dd9517eaefe96646052426ad0483550eb6e2ababd7f8faacd90caf0d3470afa553 SHA512 7ef53e1a9b055306bce42f93dbf4d0c3e23e84405ed97df0ea1591b3bd3c0a2f946fe3698d01ddd467ac1b6c779f5c693258d63e6402841bd38e393d5c2f7a06
-EBUILD blaze-builder-enumerator-0.2.1.0.ebuild 1279 BLAKE2B 2f033d1b67ee9c3fe65c714ed86865d5657fff4f6eadc59c370771374b41a8a832ad7fdb073146ba167919e8bfb99860b6f1a2a76991237cee2f0dcf44749715 SHA512 00eaaad0f763ba48063816a0ac222b037fb837564fbb67fdbb9d4f27774d2262f77c983afcd933f1164b5fa5b29d196e178db0a67092cf33834602343d78381c
-MISC metadata.xml 723 BLAKE2B b46543d204a696e250f762edb578dc1d8522dca6b9677e927ac6391687ea6d92a5d9b3b56b5068f33eadc4170b37ca31f4f5db15a7d5549cc3bafdb4902d305f SHA512 4f9bb4c0c3989b36cb897e1488899aed6fc514207c10184e78b6ae420b2dcd3e3aa73f99580fdecd2a3b56b85153880b1809a3dc7527a777c41bf48cd3c1384e
diff --git a/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0-r1.ebuild b/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0-r1.ebuild
deleted file mode 100644
index c483fbd0c9a1..000000000000
--- a/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Enumeratees for the incremental conversion of builders to bytestrings"
-HOMEPAGE="https://github.com/meiersi/blaze-builder-enumerator"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+newbuilder"
-
-RDEPEND=">=dev-haskell/enumerator-0.4.3.1:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.10:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	newbuilder? ( >=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-			>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] )
-	!newbuilder? ( >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'transformers  >= 0.2     && < 0.5' 'transformers  >= 0.2'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag newbuilder newbuilder)
-}
diff --git a/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0.ebuild b/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0.ebuild
deleted file mode 100644
index b1c0712d177a..000000000000
--- a/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Enumeratees for the incremental conversion of builders to bytestrings"
-HOMEPAGE="https://github.com/meiersi/blaze-builder-enumerator"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+newbuilder"
-
-RDEPEND=">=dev-haskell/enumerator-0.4.3.1:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.10:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	newbuilder? ( >=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-			>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] )
-	!newbuilder? ( >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag newbuilder newbuilder)
-}
diff --git a/dev-haskell/blaze-builder-enumerator/metadata.xml b/dev-haskell/blaze-builder-enumerator/metadata.xml
deleted file mode 100644
index 77a9cb2efcc6..000000000000
--- a/dev-haskell/blaze-builder-enumerator/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package integrates the builders from the blaze-builder package with
-		the enumerator package. It provides infrastructure and enumeratees for
-		incrementally executing builders and pass the filled chunks to a bytestring
-		iteratee.
-	</longdescription>
-	<use>
-		<flag name="newbuilder">use bytestring-builder instead of blaze-builder-0.3</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">meiersi/blaze-builder-enumerator</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/blaze-builder/Manifest b/dev-haskell/blaze-builder/Manifest
deleted file mode 100644
index 6accdd240f0a..000000000000
--- a/dev-haskell/blaze-builder/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST blaze-builder-0.3.3.2.tar.gz 67371 BLAKE2B a9982be738d47767f159cd6605d1331bc6a052dd81dac2df4dcfda364a2a7cf5ed888d5bad0de30b0deafda2a18845d83c219148efce57eba64ad17a41278bd4 SHA512 6caecca5f1976938f0536e00cdf305a3c3d1abf1fa4a4bc9c89743857940fc46d0f3b274a49acd1e5c0d4453c2d2b2f6f0f3b1deed87a01f72a61e21bc83787f
-DIST blaze-builder-0.3.3.4.tar.gz 67399 BLAKE2B 302edef237e923623b9a38f994d7aa6d8afbffe130572c53c48fabbe444ead90666e8e674a2ae776d65af17d8b9d0983a88e0896a5391a088bb0f1a31e58c727 SHA512 ed01adaa4fd4a95926d34fa785c9a1a127e1094f1891936256ae593fd492fa3a55ade6ad5d62610f3ecd6662f32facddc5053da63e4ab3e5f3c329ae6950bd23
-DIST blaze-builder-0.4.0.1.tar.gz 57113 BLAKE2B 34e3601e6ae41579ab538800a783964cd98209cdd903052a2d733482348bbaeed8501a7e62ea2a6721d66f7ca619ebc82e4b4a1bca707e4a7712e55798c5981f SHA512 876c12d75ede8876c834999a4a69794fbc1f56e888eea3a976cc85707456bb1439ac72bc41dea1c2400c6fe761d20a6b7b9eda61c10fc390fa5c5c0b22aa3ff0
-DIST blaze-builder-0.4.0.2.tar.gz 58681 BLAKE2B 713e932ccb404dadd9d4f7398ef10e26d7d452d1c56c4a617315d5f50ae1ffe18c3bbeba9ab1bf86442c966e0dbbb1056c7942b4e98fb6d1e42a457dde0af83b SHA512 ca0390d1e31d1fb65f5739a15b4604e67d01aa1ba2f98ac6e741b277e64e79e8d65eca581aba405b65136261654f3e116c21ae4b4018d74a784e481c2ee9d3a0
-EBUILD blaze-builder-0.3.3.2.ebuild 611 BLAKE2B dee4dac6aca09dc93f9bf3146a43c31b5aa7f541536701c563593c18d1f8d358b51b4ad48ae721986eaefecdd4a611d2c574b222d46097647586a84ac828882b SHA512 a430bd31ac5086867429aaad6dcf3693f67321107cc2f02d3a18d06f0c99150ebc4ab3c4b483681d268cb49f8b7bb7cc0da1f62ab7f783971464d5ed1b20e6d2
-EBUILD blaze-builder-0.3.3.4.ebuild 608 BLAKE2B 0e3fa7ff0ac32020854025322ec684a9cf4f3fa5cdff647d80407c3d6e0a22df66accbd2331f9cf456522d5b5b6b77a88a1c87ca2f5af07db56b122cc1a1d73b SHA512 a5766012a325c3083d2af0472b5e6597a21b8c951b72d43f9e6f6ab3fc420d758196c83de3e42ae7c11057823484dfb2676afec1284ea61b4fb8563374e2d217
-EBUILD blaze-builder-0.4.0.1.ebuild 846 BLAKE2B 8f7a2e8daa30cddd7903458874bfc1eb5ef33b3b85356f174f7e30914e49c4e2b2b7c19981dda6da1b45c8ddedc4f2337a65b4fa6495f2da81b3717437f8843e SHA512 63a44aa5195e219656d212e310957863c3250a710f1d9420d11d8540f72b26b192c1c94e775f45257c89bdf0c1bc9c7b5bb37a9a3ab695714692edb614eb4ded
-EBUILD blaze-builder-0.4.0.2.ebuild 848 BLAKE2B 6e12be8264da0121c8768df5cd723a66acf874758919f942930c34e212a570422b14d3b8d71cf2de5eca09ceaf0b5cb0a1106d20f2ee30eaf5d359ccaa17d161 SHA512 63b42393b95995c93a96151bae8f39eec1a3dc06c612ba369660e3649783cd975ca89429d009ca7d80932b92bb5ba2796bf8403b6b70932362187188699e613a
-MISC metadata.xml 869 BLAKE2B 8b303ed458de5f7c737fef499b4a8003eed954c6d88c3c11771211a2434c072aa0c71a60f8b460bc3a7f17346164219755f0742632cf6554cc45e4a9ef76a01e SHA512 12044b2ec31a87d6639aee82ab51439d5360aeb3db7f6ba44281fe5a96900b3c213e664c6c292dbd6252e296cd66f6d3c52b22d6f61ea0e100007889959b514a
diff --git a/dev-haskell/blaze-builder/blaze-builder-0.3.3.2.ebuild b/dev-haskell/blaze-builder/blaze-builder-0.3.3.2.ebuild
deleted file mode 100644
index 4cb8890b9b71..000000000000
--- a/dev-haskell/blaze-builder/blaze-builder-0.3.3.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient buffered output"
-HOMEPAGE="https://github.com/meiersi/blaze-builder"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/blaze-builder/blaze-builder-0.3.3.4.ebuild b/dev-haskell/blaze-builder/blaze-builder-0.3.3.4.ebuild
deleted file mode 100644
index f4b565d69aa1..000000000000
--- a/dev-haskell/blaze-builder/blaze-builder-0.3.3.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient buffered output"
-HOMEPAGE="https://github.com/meiersi/blaze-builder"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/blaze-builder/blaze-builder-0.4.0.1.ebuild b/dev-haskell/blaze-builder/blaze-builder-0.4.0.1.ebuild
deleted file mode 100644
index 6381d7433ef0..000000000000
--- a/dev-haskell/blaze-builder/blaze-builder-0.4.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient buffered output"
-HOMEPAGE="https://github.com/lpsmith/blaze-builder"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2
-		dev-haskell/utf8-string )
-"
diff --git a/dev-haskell/blaze-builder/blaze-builder-0.4.0.2.ebuild b/dev-haskell/blaze-builder/blaze-builder-0.4.0.2.ebuild
deleted file mode 100644
index db25e2c6f453..000000000000
--- a/dev-haskell/blaze-builder/blaze-builder-0.4.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient buffered output"
-HOMEPAGE="https://github.com/lpsmith/blaze-builder"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2
-		dev-haskell/utf8-string )
-"
diff --git a/dev-haskell/blaze-builder/metadata.xml b/dev-haskell/blaze-builder/metadata.xml
deleted file mode 100644
index be1f9908983d..000000000000
--- a/dev-haskell/blaze-builder/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library provides an abstraction of buffered output of
-		byte streams and several convenience functions to exploit
-		it. For example, it allows to efficiently serialize
-		Haskell values to lazy bytestrings with a large average
-		chunk size. The large average chunk size allows to make
-		good use of cache prefetching in later processing steps
-		(e.g. compression) and reduces the sytem call overhead
-		when writing the resulting lazy bytestring to a file or
-		sending it over the network.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">meiersi/blaze-builder</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/blaze-html-0.6.1.2 b/dev-haskell/blaze-html-0.6.1.2
new file mode 100644
index 000000000000..104d9e086ddf
--- /dev/null
+++ b/dev-haskell/blaze-html-0.6.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A blazingly fast HTML combinator library for Haskell
+EAPI=5
+HOMEPAGE=https://jaspervdj.be/blaze/
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.6.1.2
+SRC_URI=mirror://hackage/packages/archive/blaze-html/0.6.1.2/blaze-html-0.6.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=01f3000ed1f0847b07d680e69c516886
diff --git a/dev-haskell/blaze-html-0.6.1.3 b/dev-haskell/blaze-html-0.6.1.3
new file mode 100644
index 000000000000..23a05cd9ff30
--- /dev/null
+++ b/dev-haskell/blaze-html-0.6.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.7 >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A blazingly fast HTML combinator library for Haskell
+EAPI=5
+HOMEPAGE=https://jaspervdj.be/blaze/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.6.1.3
+SRC_URI=mirror://hackage/packages/archive/blaze-html/0.6.1.3/blaze-html-0.6.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=269bd8da51f4e7f063f2134f93de59ec
diff --git a/dev-haskell/blaze-html-0.7.1.0 b/dev-haskell/blaze-html-0.7.1.0
new file mode 100644
index 000000000000..349ed44818d0
--- /dev/null
+++ b/dev-haskell/blaze-html-0.7.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-markup-0.6.3:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8 >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A blazingly fast HTML combinator library for Haskell
+EAPI=5
+HOMEPAGE=https://jaspervdj.be/blaze/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-markup-0.6.3:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.1.0
+SRC_URI=mirror://hackage/packages/archive/blaze-html/0.7.1.0/blaze-html-0.7.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bb57658e9b8c503952acf52b0a9987ac
diff --git a/dev-haskell/blaze-html-0.8.1.1 b/dev-haskell/blaze-html-0.8.1.1
new file mode 100644
index 000000000000..c7c0723193af
--- /dev/null
+++ b/dev-haskell/blaze-html-0.8.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-markup-0.7:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9 >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A blazingly fast HTML combinator library for Haskell
+EAPI=5
+HOMEPAGE=https://jaspervdj.be/blaze/
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-markup-0.7:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.8.1.1
+SRC_URI=mirror://hackage/packages/archive/blaze-html/0.8.1.1/blaze-html-0.8.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0ed08bad08020bf093fc0992584613ff
diff --git a/dev-haskell/blaze-html-0.8.1.2 b/dev-haskell/blaze-html-0.8.1.2
new file mode 100644
index 000000000000..b06783cc1e7c
--- /dev/null
+++ b/dev-haskell/blaze-html-0.8.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-markup-0.7:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10 >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A blazingly fast HTML combinator library for Haskell
+EAPI=6
+HOMEPAGE=https://jaspervdj.be/blaze/
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-markup-0.7:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.8.1.2
+SRC_URI=mirror://hackage/packages/archive/blaze-html/0.8.1.2/blaze-html-0.8.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2a3dc62218505af807e199f27ddd6f67
diff --git a/dev-haskell/blaze-html/Manifest b/dev-haskell/blaze-html/Manifest
deleted file mode 100644
index f693b1f8d851..000000000000
--- a/dev-haskell/blaze-html/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST blaze-html-0.6.1.2.tar.gz 75673 BLAKE2B d272807970ae962247ad2a0c329ca21a88ea6174db2c417f011ae95cb4681709d4a71359805644bde5c5083d27346c14797cc190ad7384a320c97b61acba5413 SHA512 15b655ce35adc8e9a139780788a2b615ed095468bcb0be3074f0d90bcfe4966ea4705d088b9c9426a469e279c2a0da8081298c4f356194d5c8d7c4046d8e7f19
-DIST blaze-html-0.6.1.3.tar.gz 75658 BLAKE2B d75fcec101f424bde94647cdd314ffac2b60e223c07c3961858e19d547c534c891af97fad9a993a0c55745b4f24fe7d874275496f3b42ae78d0b4cbf96c20fd8 SHA512 2edfff6880d860201cc6de57c07ddee7875bdaca4e2a0a7a9373e080b15e2f6ad0dee1abd37eabce0ecc827bb3a0140358630497684760d636600c55bbf935ac
-DIST blaze-html-0.7.1.0.tar.gz 75872 BLAKE2B b118c4b7b4ae04bc2c02d7396478f971a9e0dff5096ac57851f68b1f62fdfd99745a5cd40dd0f2528b65c7a38b5e44c49cacb9d022ae2cb22a80c1de8847b091 SHA512 efc007089172b57493b0640e1484706f7b206ac9803699b0c8f5f6f74e74482dfc555d4a0e828fc2809d47b6015020268805b38109890f063b51c9f91d521896
-DIST blaze-html-0.8.1.1.tar.gz 76157 BLAKE2B 7bd5eb7d051a045e0dc0a3d48577da961deb90bd73e220c0556799018b178761cda13f636d37092d7f2e53b08a25391272b93862467210e92939b78e2e34d33b SHA512 0af9754c5cfd25757c5f1b8514ee37cecdd77a6397f513f6d4b6be301308c11c64d8649d2cc3e9d7ffb85cc9d9fcf18193a8bdf9e19466a6895243c4c338af91
-DIST blaze-html-0.8.1.2.tar.gz 77898 BLAKE2B 34cacaaaf68b81baa77a30e6a208dcb802071313d2d2ed3adecf2c48fff140426566e115984104c31e6a52faee2de1301022b8acca74951f092264c2b33abb62 SHA512 0b786b6fdec9c9e5c458eaf1a2504c0afb32293a8e1750d5e0413041f863a8c364675278d80075d9423387f4cbd50e1476016c1ab3d46a6cd27aec06d6899ea2
-EBUILD blaze-html-0.6.1.2.ebuild 1280 BLAKE2B 555b714a238932e2c546a58f43359d2806f7e7e111b4f5746565ac3d753d3253735214a802974f63a4cf0e07d3e3057772a7e9ee243e64db9557f3f7be9a9b61 SHA512 362a983fdf6a500dfee4c3e2b98f6953ca7aec8bba130fc055d078193f0cff04e29f034b51999be8bf239552ecdc9c4875dce016d66e3259159e3546d522153a
-EBUILD blaze-html-0.6.1.3.ebuild 1164 BLAKE2B fcd2f80dd9f7eb8aef7c1f6c0f4c824e080b27a70c3bd3da19f1a23181dcc395bf05ff0163eeff67e968ff22cd77b41d7333ae8ebdd17741376734ebaccbf9d3 SHA512 54b3f87f9df51fd8b45a70a07e6296c23aa354295d8f189afdf387793cd6f2bf8b5c31917cc851484eb955af79587aaa7a3a8fcc37c5e0dcc0b40faea8f91a6c
-EBUILD blaze-html-0.7.1.0.ebuild 1158 BLAKE2B 602855e709f659fbddb5b880e85b921d7ab16abe669141a75bb5207e1fffa682638b4985b66e59c81b24f815acf5982f3002c46668df4e9024fadb9a175c3151 SHA512 d7991afa740140a79c65c1449db81451964812d4cc018fef7a10784a0cf0e5757e905de55fbddea4a0ace554df644e698f3945f50405033a364497fab439283e
-EBUILD blaze-html-0.8.1.1.ebuild 1159 BLAKE2B f63a0a4c6c7e340154dc6c99574a38c25be17433f162e5ab98e9f0b0931246084f64d6126c1868b52b02bd0e6ee97e93471c1b6a28e884f802603dcd3d372727 SHA512 fa5a8fb4383ab343550908178e1ab92c2eb1e1a23de0c6ec7b56de5e22496b6e864b8d3e0c2a61fe7c2a513d263f8116a05bc21896f643477fd4f33213a123b4
-EBUILD blaze-html-0.8.1.2.ebuild 1158 BLAKE2B 1060fe50f1dc599d134ab152aeab5510f55dbc87006a3b03e6af34ec36a208fe371eb95957931fc2bf9ab1f74113ffafa1107ff8c316283b843f56f95556723d SHA512 24a0fd13705d908e59e8ab0baa85cee5e0a7ba74e17eb4d64607a990eabb42971dc2680d325a4b380ee0589f0b3a286799d0e0351bfd7a10edf0237bbd9d8326
-MISC metadata.xml 498 BLAKE2B add97de60cd5374c7cd17dcac5aa4bdf0f6433724a4abdbbcdcaaabdc2bf0b8ab1f191079c573b9569076bfb8c773e7a4b6cbe105905f57c101c8d15b1ad10b5 SHA512 73c9c4ea7f0678f756c41ec10ce6161ac4d4dbaaa260dd317da24308f57f70ea5317ffbbad3380724064c21820cfaf278a06129bb1a2dcb3f206b92f2f719a33
diff --git a/dev-haskell/blaze-html/blaze-html-0.6.1.2.ebuild b/dev-haskell/blaze-html/blaze-html-0.6.1.2.ebuild
deleted file mode 100644
index b76a91ae37bf..000000000000
--- a/dev-haskell/blaze-html/blaze-html-0.6.1.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A blazingly fast HTML combinator library for Haskell"
-HOMEPAGE="https://jaspervdj.be/blaze/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'QuickCheck                 >= 2.4 && < 2.7' 'QuickCheck                 >= 2.4' \
-		'text          >= 0.10  && < 1.1' 'text          >= 0.10'
-}
diff --git a/dev-haskell/blaze-html/blaze-html-0.6.1.3.ebuild b/dev-haskell/blaze-html/blaze-html-0.6.1.3.ebuild
deleted file mode 100644
index c3ed736da162..000000000000
--- a/dev-haskell/blaze-html/blaze-html-0.6.1.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A blazingly fast HTML combinator library for Haskell"
-HOMEPAGE="https://jaspervdj.be/blaze/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.7
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/blaze-html/blaze-html-0.7.1.0.ebuild b/dev-haskell/blaze-html/blaze-html-0.7.1.0.ebuild
deleted file mode 100644
index 6ff965298d4a..000000000000
--- a/dev-haskell/blaze-html/blaze-html-0.7.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A blazingly fast HTML combinator library for Haskell"
-HOMEPAGE="https://jaspervdj.be/blaze/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/blaze-markup-0.6.3:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/blaze-html/blaze-html-0.8.1.1.ebuild b/dev-haskell/blaze-html/blaze-html-0.8.1.1.ebuild
deleted file mode 100644
index a8dfd1906e32..000000000000
--- a/dev-haskell/blaze-html/blaze-html-0.8.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A blazingly fast HTML combinator library for Haskell"
-HOMEPAGE="https://jaspervdj.be/blaze/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.7:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/blaze-html/blaze-html-0.8.1.2.ebuild b/dev-haskell/blaze-html/blaze-html-0.8.1.2.ebuild
deleted file mode 100644
index 595d9c51b366..000000000000
--- a/dev-haskell/blaze-html/blaze-html-0.8.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A blazingly fast HTML combinator library for Haskell"
-HOMEPAGE="https://jaspervdj.be/blaze/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.7:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/blaze-html/metadata.xml b/dev-haskell/blaze-html/metadata.xml
deleted file mode 100644
index 85640c74809c..000000000000
--- a/dev-haskell/blaze-html/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A blazingly fast HTML combinator library for the Haskell
-		programming language. The Text.Blaze module is a good
-		starting point, as well as this tutorial:
-		&lt;http://jaspervdj.be/blaze/tutorial.html&gt;.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/blaze-markup-0.5.2.1 b/dev-haskell/blaze-markup-0.5.2.1
new file mode 100644
index 000000000000..700ae4a14f97
--- /dev/null
+++ b/dev-haskell/blaze-markup-0.5.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A blazingly fast markup combinator library for Haskell
+EAPI=5
+HOMEPAGE=https://jaspervdj.be/blaze
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.5.2.1
+SRC_URI=mirror://hackage/packages/archive/blaze-markup/0.5.2.1/blaze-markup-0.5.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cc384608260bbed3e0c2cbcdb337d353
diff --git a/dev-haskell/blaze-markup-0.6.3.0 b/dev-haskell/blaze-markup-0.6.3.0
new file mode 100644
index 000000000000..ef11e4a2d1e6
--- /dev/null
+++ b/dev-haskell/blaze-markup-0.6.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8 >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A blazingly fast markup combinator library for Haskell
+EAPI=5
+HOMEPAGE=https://jaspervdj.be/blaze
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.6.3.0
+SRC_URI=mirror://hackage/packages/archive/blaze-markup/0.6.3.0/blaze-markup-0.6.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=79cc8651ed1d843cee052099e2f150ff
diff --git a/dev-haskell/blaze-markup-0.7.0.3 b/dev-haskell/blaze-markup-0.7.0.3
new file mode 100644
index 000000000000..9efc60ba8dcf
--- /dev/null
+++ b/dev-haskell/blaze-markup-0.7.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9 >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A blazingly fast markup combinator library for Haskell
+EAPI=5
+HOMEPAGE=https://jaspervdj.be/blaze
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.0.3
+SRC_URI=mirror://hackage/packages/archive/blaze-markup/0.7.0.3/blaze-markup-0.7.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=193437f34d8dbc5ef6984f5d119efa04
diff --git a/dev-haskell/blaze-markup-0.7.1.0 b/dev-haskell/blaze-markup-0.7.1.0
new file mode 100644
index 000000000000..99de51e7a07c
--- /dev/null
+++ b/dev-haskell/blaze-markup-0.7.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10 >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A blazingly fast markup combinator library for Haskell
+EAPI=6
+HOMEPAGE=https://jaspervdj.be/blaze
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.1.0
+SRC_URI=mirror://hackage/packages/archive/blaze-markup/0.7.1.0/blaze-markup-0.7.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6bc80a8cc3f3d3249d503f554047b62b
diff --git a/dev-haskell/blaze-markup/Manifest b/dev-haskell/blaze-markup/Manifest
deleted file mode 100644
index 2f3e18a877d9..000000000000
--- a/dev-haskell/blaze-markup/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST blaze-markup-0.5.2.1.tar.gz 12069 BLAKE2B c67b14c238c20bf96f19387d0f08335c8c1c9d56fe5bf3a16d6650d2614f00415a20c976df5f2f1afa30d61abcf5e64bf4bc6092725e915eb061bfc59b390439 SHA512 ef59c658244ff29ac58a7855fa9e011acc719e0d0cc217c26e4f8bbaa48efeb69defda02761685cf0f93d80269e64afc86047c005b129cb3dfe281e7122927e0
-DIST blaze-markup-0.6.3.0.tar.gz 13348 BLAKE2B 5bac4df7cc3e982f1b79245470aca97f00d84e6bfcc9a3ac2e28d3eebde98148f3880a56d2d6f9b615acd56198b823bb8c821f8d2da522d59593b4064cd0b87b SHA512 01ce41593242ddd6effa4ee2edecf461f434992b85fd79e1df8bd766a5879bda545842ea84d30f0513035fc686aeb624373a1de2377d1f5cad52cc1482acc318
-DIST blaze-markup-0.7.0.3.tar.gz 13447 BLAKE2B 6934ab2c2711ec0dddc0068e5b523291d93b03ba9abe81761b9e39f95c9c45978c0c0347b0b5824251e6db0892590cd261af6dbdcbe6b10714452dd20364c02c SHA512 295188911304f32addd19ae8df5f69502cad65a09778c65fede6eb167842508769dae5a0b7eef7451fbcc767d3a0079484a3ed8d2caaa9a841fecc6d5dc4d482
-DIST blaze-markup-0.7.1.0.tar.gz 13548 BLAKE2B b914629cd9df285e6a552fad789aa0179725dba39ae5d0fb13ae669eeecefdb72bb438f4208f92585841c69d39470517794736fac0d3e0969c68f65f5125675b SHA512 42c3c0db1141b0f67f720795fef8d8cd5e4ae6d12851b6048caecbf57062f8422d3101f80264534d70eab21465c823ff29f037bde948da43478c9d9651feda77
-EBUILD blaze-markup-0.5.2.1.ebuild 1165 BLAKE2B e9db9ccbd0c44cb33379fa0666f57da07dbd7ede2c1ab8f49b9774c0049a13f2fe3e6797f3bd96a46255abe1081d1c9324af5c0c64e91b2286ee0bbd3e31f149 SHA512 887f8c1fcf7f38159361b69ed4e5cad195302f85c94141776d5259140b8dd6089822b4674f18da12f242a793e5e2dcbd8574269e57be5f5d13a53239fd448046
-EBUILD blaze-markup-0.6.3.0.ebuild 1076 BLAKE2B 34a1c48a226f1c4430585dad9a7cb79eeea1e21b9c4a1285d8aedf2fc4129242887975162dc42181c3e55cc2ecfd3dea6b11bfdca630082fd0c156627cd52c46 SHA512 5ddc9a9a4e3eab579b937dc2971e2d6722a2036ae60c568a37a1e422b50fd89c785fc74b480bc9f3d7f5be6c8998aad3b88921ee3ac101a0242cdd2c32e7d4b8
-EBUILD blaze-markup-0.7.0.3.ebuild 1074 BLAKE2B 578ae2c58582c97f6ea1ba11729eeaf7cd299d724a459fed3fc7ccd403f244da1db2ea297d7dacad6a5ef5a6413279cc988ba9bd668298d8663e2619e387d33b SHA512 79484796c1403f65bbc87b5d8df6e659eb0e2e38c66823202b601d7c72781a7afc3d2590bebd6797566c26d302431a5bca5b1e5c5ce9ed0749a7b335c0117c49
-EBUILD blaze-markup-0.7.1.0.ebuild 1073 BLAKE2B 066b6035cefe5f071b027349453a82d10c78b51e7cce0213c45ca359e245fd6fe1704b0186ac8e25bdd586246a7ffcb1861e10bee2d728cd340a57a1c3b10108 SHA512 b9c48c82692a1621c058c1f81717b46b4851dfcb3869a8316c54a265fec8719b84c88103e3d5b073a4e19ca46bf703bc0827053305c589e797083cacc2020146
-MISC metadata.xml 516 BLAKE2B 64cd165fc27b6c1570dae7190e0181a92bb43c54038760f7c843fbbbe0d6faeb783f0d3e2d58ab90214b15775dba7bbce88c6b5401cd4f9b165b2bbcdc76a080 SHA512 a3395d76bf164a2cde4217dce26e35e894fc53f0a977134da64959e857a8640d0cb22cb53c33ef0359d782abf68f8527f01b18f5f0ea3278ec9590d9024de1a0
diff --git a/dev-haskell/blaze-markup/blaze-markup-0.5.2.1.ebuild b/dev-haskell/blaze-markup/blaze-markup-0.5.2.1.ebuild
deleted file mode 100644
index 8fb6da676e87..000000000000
--- a/dev-haskell/blaze-markup/blaze-markup-0.5.2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A blazingly fast markup combinator library for Haskell"
-HOMEPAGE="https://jaspervdj.be/blaze"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'QuickCheck                 >= 2.4 && < 2.7' 'QuickCheck                 >= 2.4'
-}
diff --git a/dev-haskell/blaze-markup/blaze-markup-0.6.3.0.ebuild b/dev-haskell/blaze-markup/blaze-markup-0.6.3.0.ebuild
deleted file mode 100644
index f1fa17ef9a35..000000000000
--- a/dev-haskell/blaze-markup/blaze-markup-0.6.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A blazingly fast markup combinator library for Haskell"
-HOMEPAGE="https://jaspervdj.be/blaze"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/blaze-markup/blaze-markup-0.7.0.3.ebuild b/dev-haskell/blaze-markup/blaze-markup-0.7.0.3.ebuild
deleted file mode 100644
index 6d72887549e3..000000000000
--- a/dev-haskell/blaze-markup/blaze-markup-0.7.0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A blazingly fast markup combinator library for Haskell"
-HOMEPAGE="https://jaspervdj.be/blaze"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/blaze-markup/blaze-markup-0.7.1.0.ebuild b/dev-haskell/blaze-markup/blaze-markup-0.7.1.0.ebuild
deleted file mode 100644
index 26c0de6fadfa..000000000000
--- a/dev-haskell/blaze-markup/blaze-markup-0.7.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A blazingly fast markup combinator library for Haskell"
-HOMEPAGE="https://jaspervdj.be/blaze"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/blaze-markup/metadata.xml b/dev-haskell/blaze-markup/metadata.xml
deleted file mode 100644
index 30c5711bd3a3..000000000000
--- a/dev-haskell/blaze-markup/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Core modules of a blazingly fast markup combinator library for the Haskell
-		programming language. The Text.Blaze module is a good
-		starting point, as well as this tutorial:
-		&lt;http://jaspervdj.be/blaze/tutorial.html&gt;.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/bloomfilter-1.2.6.10-r2 b/dev-haskell/bloomfilter-1.2.6.10-r2
new file mode 100644
index 000000000000..00f048d63dbe
--- /dev/null
+++ b/dev-haskell/bloomfilter-1.2.6.10-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-6.8.2:= test? ( >=dev-haskell/quickcheck-2.4:2 <dev-haskell/quickcheck-2.8:2 dev-haskell/random dev-haskell/test-framework dev-haskell/test-framework-quickcheck2 ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pure and impure Bloom Filter implementations
+EAPI=5
+HOMEPAGE=https://github.com/bos/bloomfilter
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.8.2:=
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/bloomfilter/1.2.6.10/bloomfilter-1.2.6.10.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6a167d4eacf88324e8956bce43ca3c20
diff --git a/dev-haskell/bloomfilter-2.0.1.0 b/dev-haskell/bloomfilter-2.0.1.0
new file mode 100644
index 000000000000..14808a6895d8
--- /dev/null
+++ b/dev-haskell/bloomfilter-2.0.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/quickcheck-2.5 dev-haskell/random dev-haskell/test-framework dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pure and impure Bloom Filter implementations
+EAPI=5
+HOMEPAGE=https://github.com/bos/bloomfilter
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/2.0.1.0
+SRC_URI=mirror://hackage/packages/archive/bloomfilter/2.0.1.0/bloomfilter-2.0.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3954a62d88a2036e8ec9b55a0bf49575
diff --git a/dev-haskell/bloomfilter/Manifest b/dev-haskell/bloomfilter/Manifest
deleted file mode 100644
index e5ed70b41b0e..000000000000
--- a/dev-haskell/bloomfilter/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX bloomfilter-1.2.6.10-ghc-7.7.patch 1918 BLAKE2B aecd2bfceb74e31142e00fc372a30e8b36ccfb87c25cfb4dcff879d1e7e4630743372df36ecf9a2f130f0d0da79310397e77b166c954825bad715e215bfa8fe4 SHA512 a6b2d6eee30ede3756443c218418aa6caddfd24241b3bb0018f48bbb9c414dda4ab65ec291f895a3a58414116b3a2dceedf2cb285bb3897ce64f47a29d208f97
-AUX bloomfilter-1.2.6.10-quickcheck-2.6.patch 525 BLAKE2B b39890168c09a0f49c538f4f6334d8d70d0ad4ebd7ea3fb62c1a84fb589e5a7e53d79db437e43bb9e905e58e74bd868569fcda9b645a9f56e06b016dd8eb5fda SHA512 2c979315d63ee2481ea70b118d3936326775de6dbfda72040a54df3384ef6fc1b101223a34f7dbdad761cdefed41a7e6ce0ea4a65ec0a07af2039473c1dc07ee
-DIST bloomfilter-1.2.6.10.tar.gz 21533 BLAKE2B fda4bf7f45a1e6a13a6e1e6bdaf76c0a6cd75b7922dedfc9ee62ce5523868ab4b7e9350723a688e0e8489a035586638daef1daf5c7a0eb4d3a7bc937d7bf9c15 SHA512 c3bad38edf59bd59439c24385e300fab90f4ccd1b1faf7bea6c4b25b2bcabdfc806a7274d1cad40a711312b016d6fbb99a0ca9cf8b358ad874bbbabc14e1f454
-DIST bloomfilter-2.0.1.0.tar.gz 22100 BLAKE2B c00a904a32c2e16810b19e27d7adef365ecf48b62bcd8da871aa3b33cb9b6e18cb11771da5a7df7209ce048e2fa1176b9c3f015030d0349a10a32375f462df02 SHA512 1031cc28c5e5c1b7687355b709d436ebab1956ffd7591a010fa3852a1bc7412925a365f99937feeacf4b1a5d3c7b34bc0370707ad6e4533280dcac4ea3fa7c21
-EBUILD bloomfilter-1.2.6.10-r2.ebuild 1003 BLAKE2B 44a005053018431e7940d9cc5aec4485415002f0bdd5aa54dbcbf3c43d5edfca7b69c4897241a921d3cd9967f0bd1b94e16d6e539a76da36a177c2c42daa5a72 SHA512 db6a1c46bd9e5b66f757741ae032de95d327d1fec06106466f4b0055ebbfde39476ac37b167f71fd4e829b86d5650d3d30ca0b8de200f2bfbaf08b2f484eebf6
-EBUILD bloomfilter-2.0.1.0.ebuild 705 BLAKE2B c49de87adeb327952089aaf121a62e7fc23c2c7590ac69ed91b8d181efc1c3e27a52dffdde94fa0b9a383672012e8b445c4329712f0d3e5b075a7eaa68c1c31c SHA512 f6b8aafc9133f73950d41a1557fdd6554ae941729c6f68c49f7fb93f3ab2d56b96a092ce81f81109cbd55d41b0fa13dc45b7487f2a61abd6959a5d44eae3ffdd
-MISC metadata.xml 416 BLAKE2B 0e34d7016f92f2b57184402dab044df97edc58c7c79e645c0002ccd5d6608f62fc37b04e1a46ec41405ae12eafce5ef7129983ae6383cf0b24091a8ae2eb4ade SHA512 f9295c3298f5910c11f0c15539b4d5547cba7d60b9dd513d6bff157cdcb620cafc84f5552ae3c9032567f9f18a47d629b0bbfbfe4d8e7eafa81f827bad9d595a
diff --git a/dev-haskell/bloomfilter/bloomfilter-1.2.6.10-r2.ebuild b/dev-haskell/bloomfilter/bloomfilter-1.2.6.10-r2.ebuild
deleted file mode 100644
index 9db902020f23..000000000000
--- a/dev-haskell/bloomfilter/bloomfilter-1.2.6.10-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Pure and impure Bloom Filter implementations"
-HOMEPAGE="https://github.com/bos/bloomfilter"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2:="
-DEPEND="${RDEPEND}
-		test? ( >=dev-haskell/quickcheck-2.4:2
-			<dev-haskell/quickcheck-2.8:2
-			dev-haskell/random
-			dev-haskell/test-framework
-			dev-haskell/test-framework-quickcheck2
-		)
-		>=dev-haskell/cabal-1.8"
-
-src_prepare() {
-	cabal_chdeps \
-		'QuickCheck == 2.4.*' 'QuickCheck >= 2.4 && < 2.8'
-
-	if has_version ">=dev-haskell/quickcheck-2.5"; then
-		epatch "${FILESDIR}/${PN}-1.2.6.10-quickcheck-2.6.patch"
-	fi
-	epatch "${FILESDIR}/${PN}-1.2.6.10-ghc-7.7.patch"
-}
diff --git a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
deleted file mode 100644
index 9b1acb05d209..000000000000
--- a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure and impure Bloom Filter implementations"
-HOMEPAGE="https://github.com/bos/bloomfilter"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/quickcheck-2.5
-		dev-haskell/random
-		dev-haskell/test-framework
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-ghc-7.7.patch b/dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-ghc-7.7.patch
deleted file mode 100644
index 899fb4176aa2..000000000000
--- a/dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-ghc-7.7.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/Data/BloomFilter.hs b/Data/BloomFilter.hs
-index 69711ef..97a8348 100644
---- a/Data/BloomFilter.hs
-+++ b/Data/BloomFilter.hs
-@@ -93,7 +93,8 @@ import Control.Monad (liftM, forM_)
- import Control.Monad.ST (ST, runST)
- import Control.DeepSeq (NFData(..))
- import Data.Array.Base (unsafeAt, unsafeRead, unsafeWrite)
--import Data.Array.ST (STUArray, thaw, unsafeFreeze)
-+import Data.Array.ST (STUArray, thaw)
-+import qualified Data.Array.Unsafe as U (unsafeFreeze)
- import Data.Array.Unboxed (UArray)
- import Data.Bits ((.&.), (.|.))
- import Data.BloomFilter.Array (newArray)
-@@ -336,7 +337,7 @@ notElemB elt ub = any test (hashesU ub elt)
- -- occur.  For a safer creation interface, use 'createB'.
- unsafeFreezeMB :: MBloom s a -> ST s (Bloom a)
- unsafeFreezeMB mb = B (hashMB mb) (shiftMB mb) (maskMB mb) `liftM`
--                    unsafeFreeze (bitArrayMB mb)
-+                    U.unsafeFreeze (bitArrayMB mb)
- 
- -- | Copy an immutable Bloom filter to create a mutable one.  There is
- -- no non-copying equivalent.
-diff --git a/Data/BloomFilter/Array.hs b/Data/BloomFilter/Array.hs
-index e085bbe..5accde9 100644
---- a/Data/BloomFilter/Array.hs
-+++ b/Data/BloomFilter/Array.hs
-@@ -3,7 +3,8 @@
- 
- module Data.BloomFilter.Array (newArray) where
- 
--import Control.Monad.ST (ST, unsafeIOToST)
-+import Control.Monad.ST (ST)
-+import qualified Control.Monad.ST.Unsafe as U (unsafeIOToST)
- import Data.Array.Base (MArray, STUArray(..), unsafeNewArray_)
- #if __GLASGOW_HASKELL__ >= 704
- import Foreign.C.Types (CInt(..), CSize(..))
-@@ -18,7 +19,7 @@ newArray :: forall e s. (MArray (STUArray s) e (ST s)) =>
- {-# INLINE newArray #-}
- newArray numElems numBytes = do
-   ary@(STUArray _ _ _ marr#) <- unsafeNewArray_ (0, numElems - 1)
--  _ <- unsafeIOToST (memset marr# 0 (fromIntegral numBytes))
-+  _ <- U.unsafeIOToST (memset marr# 0 (fromIntegral numBytes))
-   return ary
- 
- foreign import ccall unsafe "memset"
diff --git a/dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-quickcheck-2.6.patch b/dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-quickcheck-2.6.patch
deleted file mode 100644
index 0b27043aed2f..000000000000
--- a/dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-quickcheck-2.6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- bloomfilter-1.2.6.10-orig/tests/QCSupport.hs	2012-06-16 09:59:56.000000000 +1000
-+++ bloomfilter-1.2.6.10/tests/QCSupport.hs	2012-07-14 19:00:06.035731133 +1000
-@@ -20,9 +20,6 @@
-     arbitrary = choose (epsilon, 1 - epsilon)
-         where epsilon = 1e-6 :: P
- 
--instance Arbitrary Ordering where
--    arbitrary = oneof [return LT, return GT, return EQ]
--
- -- For some reason, MIN_VERSION_random doesn't work here :-(
- #if __GLASGOW_HASKELL__ < 704
- integralRandomR :: (Integral a, RandomGen g) => (a, a) -> g -> (a, g)
diff --git a/dev-haskell/bloomfilter/metadata.xml b/dev-haskell/bloomfilter/metadata.xml
deleted file mode 100644
index 6122d1de3db3..000000000000
--- a/dev-haskell/bloomfilter/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Pure and impure Bloom Filter implementations.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bos/bloomfilter</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/boolean-0.2.3 b/dev-haskell/boolean-0.2.3
new file mode 100644
index 000000000000..7eea5313c947
--- /dev/null
+++ b/dev-haskell/boolean-0.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generalized booleans and numbers
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/Boolean
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.3
+SRC_URI=mirror://hackage/packages/archive/Boolean/0.2.3/Boolean-0.2.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8043e9e99abaa65c5a94a1a8ffde2466
diff --git a/dev-haskell/boolean/Manifest b/dev-haskell/boolean/Manifest
deleted file mode 100644
index fe430220c522..000000000000
--- a/dev-haskell/boolean/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Boolean-0.2.3.tar.gz 6608 BLAKE2B ded6dd8214b2228239c93bfc78ba33bd167354578dc97e323da65984a12671a06474089b20986fac53292e74c6fb3288249af8ef1d375140006a66744f15af59 SHA512 803af486e750ba52bc85f8d8599f6a1b36d3d91f2413ac9a7b038d1f091f9a4cee128b24a4de308430b291eb8be781eb100f495106b78f37697a845f8793ad98
-EBUILD boolean-0.2.3.ebuild 615 BLAKE2B 4c6f9fb553db1c1db8102e3bf4588b346f81cc1500b125afd99ec5191cb26a45d8b91b277061c4547b5ac86451db2152433284a36bc86883ef725492570cd395 SHA512 bcee5e8b88165351c64dc22f299483bb8bbde3d3ee8d3d2fc16e9aca45709b64e68f5c6c9d33202c604646031189a1ce3821ce6c2a8a09c6df926aa84ca92d46
-MISC metadata.xml 388 BLAKE2B 0c83c212e1e298bf294348d9bd095d608aa10245489dba0905116b3c6de225038f1fb5f81ef13d9207430a813a5e8101085735b2f8b7bd55446ef24414e849ad SHA512 47abe89754b9a3e77f5598ad7aa66d07037d283c7bfd90ffbfb9b5ee64a1cef1d96a3096c5f1f3c885665f1fff84f6dfe038da1d1e624397943f3ed527aff924
diff --git a/dev-haskell/boolean/boolean-0.2.3.ebuild b/dev-haskell/boolean/boolean-0.2.3.ebuild
deleted file mode 100644
index 5cd276fc9364..000000000000
--- a/dev-haskell/boolean/boolean-0.2.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Boolean"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Generalized booleans and numbers"
-HOMEPAGE="http://hackage.haskell.org/package/Boolean"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/boolean/metadata.xml b/dev-haskell/boolean/metadata.xml
deleted file mode 100644
index 4f0d65f8f410..000000000000
--- a/dev-haskell/boolean/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Some classes for generalized boolean operations.
-		
-		Copyright 2009 Conal Elliott; BSD3 license.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/boxes-0.1.4 b/dev-haskell/boxes-0.1.4
new file mode 100644
index 000000000000..452c2ea90bf0
--- /dev/null
+++ b/dev-haskell/boxes-0.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 test? ( dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=2D text pretty-printing library
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/boxes
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.4
+SRC_URI=mirror://hackage/packages/archive/boxes/0.1.4/boxes-0.1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d20716e8640beccb3bb229fcfebd5d2b
diff --git a/dev-haskell/boxes/Manifest b/dev-haskell/boxes/Manifest
deleted file mode 100644
index 1171b8a9e2c4..000000000000
--- a/dev-haskell/boxes/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST boxes-0.1.4.tar.gz 6481 BLAKE2B f3ecd92e3693aa5e0b93e21b255e57c1d79b05e5acc61810bc7dd8930a124c5afd8163ab7599c7e6e2e5dbe0d1b9215c52d9689cf43b0b6710e0b13a982de97d SHA512 b8afb3216208269883f173f57fc0b53be919e5fd171bf2b7d8d5ed2b0af9c3ca4f9005fc4df43ba8ba4ade694d59a83ff0d419cfbd32e54e80ba6fbe748e9524
-EBUILD boxes-0.1.4.ebuild 662 BLAKE2B 1d83ab64cd0480c3ad85befdac10c6edd0ebfbd458073eb3dfb7a4436ef8b7d9beaa02d9e120716f6bdd41111a60f3e9934dc874e06965759b4b47b05fd5ddbe SHA512 f5697e9d3d87ef2fd57112990d4c1a9fccf5350b6d80d13dc3a5f03da8097de9e333ee12e9fe65425f6133e363db12f9ea066a30fb307173a8778405f2684baf
-MISC metadata.xml 383 BLAKE2B ce3aaa3cdddb14a6846338bb09b5fedc5b69799f69a598db022278ead49f4282b711497ff54de9df858c9d7a7da2265e0dba1e8cb594f957156432e3c75b3d18 SHA512 0d283c92fd83e3fdf7d9e0598bf3ba4b3228e39b5c07dcc5cd897d29e32e77ac108d9aba71afee1b076d6a2c74b477636b8ae853496297cdda6cd7de74fe85be
diff --git a/dev-haskell/boxes/boxes-0.1.4.ebuild b/dev-haskell/boxes/boxes-0.1.4.ebuild
deleted file mode 100644
index 503c571c50e8..000000000000
--- a/dev-haskell/boxes/boxes-0.1.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="2D text pretty-printing library"
-HOMEPAGE="http://hackage.haskell.org/package/boxes"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/boxes/metadata.xml b/dev-haskell/boxes/metadata.xml
deleted file mode 100644
index 8229d6184393..000000000000
--- a/dev-haskell/boxes/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A pretty-printing library for laying out text in
-		two dimensions, using a simple box model.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/byteable-0.1.1 b/dev-haskell/byteable-0.1.1
new file mode 100644
index 000000000000..d2086b88ed06
--- /dev/null
+++ b/dev-haskell/byteable-0.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Type class for sequence of bytes
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-byteable
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.1.1
+SRC_URI=mirror://hackage/packages/archive/byteable/0.1.1/byteable-0.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3e807311cafc2fa0c9b3ae512991ea8d
diff --git a/dev-haskell/byteable/Manifest b/dev-haskell/byteable/Manifest
deleted file mode 100644
index 2095665bf733..000000000000
--- a/dev-haskell/byteable/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST byteable-0.1.1.tar.gz 2400 BLAKE2B 0da53566faeb934ffb63623dbc58f6f3b2e4499f6a5547ff6707b034e8e5ea097c4dea600d83421f7da47958cc54c0377d4f53e123480aba464ab5fcfe7780bb SHA512 f2e6225390be9f35ee6a4ce981aaa8c2683f1627a8401386b1abb7fff5fe1474ae0fa07e71a0c83694d7a18ca793943fe36b844d868c3e9c3387ce1a7b2bf54c
-EBUILD byteable-0.1.1.ebuild 542 BLAKE2B 306bbe6f065a665143e4f6ec5fdf1c3fedbfb70667442eafb2f1fd9a56487aa43d6c39ca0239f27f4d0c58dc27434988aa585615cd37eea5cde9d9955f3cfbc9 SHA512 c6db6ad6a6388ac96dc118fc7c83c8ed8fa5f91b7cf29bff9dbac95c0b358034b36cacd75cb913c8e0a53fbff8909c3f2453380d2cae1dc505087f3f335763ce
-MISC metadata.xml 643 BLAKE2B 0b7d1cdcd4ab0cbf6bb5188d998fd2f41ced93612c8040e1ef21a00223a3fc165593de53ac413baf9bcc31dcb5dfc4146fda3c41c93d4ed70177e175dff26828 SHA512 e13e4ca680397e42cc6b852af77fb8d48f55238bc9c5ff58469f3ae8815b3b2db8cf9055cc42c2f8f965e699301ee39dfce56b2fb9859a8aa06f64225bd4f0da
diff --git a/dev-haskell/byteable/byteable-0.1.1.ebuild b/dev-haskell/byteable/byteable-0.1.1.ebuild
deleted file mode 100644
index f80dc3aa42c2..000000000000
--- a/dev-haskell/byteable/byteable-0.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Type class for sequence of bytes"
-HOMEPAGE="https://github.com/vincenthz/hs-byteable"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/byteable/metadata.xml b/dev-haskell/byteable/metadata.xml
deleted file mode 100644
index 6b0f50e8e8e8..000000000000
--- a/dev-haskell/byteable/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Abstract class to manipulate sequence of bytes
-		
-		The use case of this class is abstracting manipulation of
-		types that are just wrapping a bytestring with stronger and
-		more meaniful name.
-		
-		Usual definition is of the form: newtype MyType = MyType ByteString
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-byteable</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/bytedump-1.0 b/dev-haskell/bytedump-1.0
new file mode 100644
index 000000000000..b17f802f83f5
--- /dev/null
+++ b/dev-haskell/bytedump-1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Flexible byte dump helpers for human readers
+EAPI=6
+HOMEPAGE=https://github.com/vincenthz/hs-bytedump
+IUSE=executable doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0
+SRC_URI=mirror://hackage/packages/archive/bytedump/1.0/bytedump-1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f2ca1b08a9838d03cb2c55a67faf76fe
diff --git a/dev-haskell/bytedump/Manifest b/dev-haskell/bytedump/Manifest
deleted file mode 100644
index 902898629297..000000000000
--- a/dev-haskell/bytedump/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bytedump-1.0.tar.gz 3812 BLAKE2B 37af60e27616c8b30e72e0f3260619ac5f7d76986fe75a2fc1b4f8749dfb636a67800ebe5be19494bb250d60a97316927bd5843a5492a8a6e463ce46c92808a4 SHA512 3bea638bc926fe8dc34d5ac20b5609a8b169562f266ccbaf73a9d95caf49ee368d5c516a0f52937bf6c48bbb585c8ad2819264e4109a57cebed0f836126705fe
-EBUILD bytedump-1.0.ebuild 656 BLAKE2B 998827a56db918bf06ec517026b4079f867fe6116c3e06dd5e97bbe29aa6de564de11bdd4e46ca2e0f6cc4f6e1a5e8eb46f99f256c742ad27d6f482ce133f3d7 SHA512 3d9e6313bc92a2460feb52856086627195970ac1e03b2864faee36da7002bf9631b5e1e621a44f9effb0cf1296d0c4903daadba5e883b547699a321acbb0499b
-MISC metadata.xml 461 BLAKE2B 021cfb58b65165d47403ed78e93c3b529ed40747e7d0c8dfc259ef7e670b81f84957e0a05491637764b1ef247b56cf08503a1784af06a05ffe5603d6e1f8371f SHA512 b506e9f179c6fd8a82acdf41280a32aeb5581c87d3df0fbbac199912b4faf39df6648a473d587f06b24fa80459516982b8dd54df130d0ba159c0276c6235e58a
diff --git a/dev-haskell/bytedump/bytedump-1.0.ebuild b/dev-haskell/bytedump/bytedump-1.0.ebuild
deleted file mode 100644
index 7d9aaaec020d..000000000000
--- a/dev-haskell/bytedump/bytedump-1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Flexible byte dump helpers for human readers"
-HOMEPAGE="https://github.com/vincenthz/hs-bytedump"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable)
-}
diff --git a/dev-haskell/bytedump/metadata.xml b/dev-haskell/bytedump/metadata.xml
deleted file mode 100644
index 218ff830841b..000000000000
--- a/dev-haskell/bytedump/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A set of helpers to dump bytes with lots of different output formats
-		easy to read for humans eyes.
-	</longdescription>
-	<use>
-		<flag name="executable">build executable file</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/byteorder-1.0.4 b/dev-haskell/byteorder-1.0.4
new file mode 100644
index 000000000000..e663e4db8ce8
--- /dev/null
+++ b/dev-haskell/byteorder-1.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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=Exposes the native endianness or byte ordering of the system
+EAPI=5
+HOMEPAGE=http://community.haskell.org/~aslatter/code/byteorder
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/1.0.4
+SRC_URI=mirror://hackage/packages/archive/byteorder/1.0.4/byteorder-1.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=92355f58505950407f53a84b537c8ccb
diff --git a/dev-haskell/byteorder/Manifest b/dev-haskell/byteorder/Manifest
deleted file mode 100644
index c06c59eedbdd..000000000000
--- a/dev-haskell/byteorder/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST byteorder-1.0.4.tar.gz 2030 BLAKE2B fbdf38993b9e4898a72592ef58579857082d8671460de97f6c458a7b953bbcb4958e62c4e726eff4744beb39def4042a000e9b5d88a3ccfcd6de7662cab32992 SHA512 970f74a394947b023ab88fa7bc713478b50565e3e9535479ec641283f18e04cb952788334b2ab38fafe723f2d398b1626af92f349abc11a6c6ca5a6974653025
-EBUILD byteorder-1.0.4.ebuild 583 BLAKE2B fb3210743358ce5a218426476971e0e3c21893cf5fd77950f54647263d75aa8b78818c6f3814a436904a678baa7efc28d178bafcfec58604cdf3539af644c6b1 SHA512 e2b9ed53e10a1f44e6d1296b6a929ef01296cccad4605903125b39e8059ea2621bb996d6c13cdc8f325ee8a79f92de69f857a6258b4c424baf985a70f00091a3
-MISC metadata.xml 365 BLAKE2B 7d53315681caabb89c2179bbc1ad762fd5c5994f77f0f855a39d3679754422a456b90071d961c193b61a708505175eace8a6e852f972541b201a687e0d916897 SHA512 4963d299854a52531c00482361b24d99af87733915c001a0031aad89245774191514c954a5bef4a89d436c2d364ba0a46a0ee2903e0d1217b296e6d84da10e7b
diff --git a/dev-haskell/byteorder/byteorder-1.0.4.ebuild b/dev-haskell/byteorder/byteorder-1.0.4.ebuild
deleted file mode 100644
index b554a37c93e5..000000000000
--- a/dev-haskell/byteorder/byteorder-1.0.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Exposes the native endianness or byte ordering of the system"
-HOMEPAGE="http://community.haskell.org/~aslatter/code/byteorder"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/byteorder/metadata.xml b/dev-haskell/byteorder/metadata.xml
deleted file mode 100644
index f47918b94f9a..000000000000
--- a/dev-haskell/byteorder/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package is for working with the native byte-ordering of
-		the system.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/bytes-0.15.2 b/dev-haskell/bytes-0.15.2
new file mode 100644
index 000000000000..e3aa02b934c7
--- /dev/null
+++ b/dev-haskell/bytes-0.15.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/binary-0.5.1:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/cereal-0.3.5:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/scientific-0.0:=[profile?] <dev-haskell/scientific-1:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Sharing code for serialization between binary and cereal
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/bytes
+IUSE=+test-doctests doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/binary-0.5.1:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/cereal-0.3.5:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/scientific-0.0:=[profile?] <dev-haskell/scientific-1:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.15.2
+SRC_URI=mirror://hackage/packages/archive/bytes/0.15.2/bytes-0.15.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=883124e69b307874b01d0954443dd380
diff --git a/dev-haskell/bytes/Manifest b/dev-haskell/bytes/Manifest
deleted file mode 100644
index 664481681651..000000000000
--- a/dev-haskell/bytes/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bytes-0.15.2.tar.gz 18834 BLAKE2B 18f0e2618a3ed7f4eefaabd0c4b4ca6b99e4493ae0b73dee9a7f0fe1c2e980a4e8714e50198177a657d6ac06c08227350dc342178f5565444ea9f23904d01585 SHA512 339da2fe49a6acd307057bfcc79e7ac09eefb9a93ec60cd52a8d425337e7bf355ca8aa42f304863df773b0ef2c459b53571920611cf1ef8f98e78d112cc6ad29
-EBUILD bytes-0.15.2.ebuild 1597 BLAKE2B 4496f10bb4c1c1ea5be4e9e7a11a447466711d82a2141e452c6909c4653ba87e615f17c99e83b7be1a0b01bd577925eb4915bd917d9ac534b71c44948c2c683b SHA512 105278f6df611871326d38e7cbd0d0f54c824c21e59ca7959c7bc7e510a0fd8ec1bc2169d5ffdafdcc3e1cd31bb27d16b61e4f746e5574bfd6f5472e069cd96e
-MISC metadata.xml 546 BLAKE2B cad0bd3e287b2b7837e477aefdd4a2e7fec6acc0ac4c9be876a089f48c31bd507c5fa6a037289153774b1d55adaff81926327e1ce6001dc5bb0ca790228a211a SHA512 1f54179d87820c310fb26f4b168bcb2cfbc5d668d6893867e19015a8def8afb08d6f40482b27237a858e80d6252ad793230e43a467a84d9ae8e87501b4acdca7
diff --git a/dev-haskell/bytes/bytes-0.15.2.ebuild b/dev-haskell/bytes/bytes-0.15.2.ebuild
deleted file mode 100644
index 7a476dc94709..000000000000
--- a/dev-haskell/bytes/bytes-0.15.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -lib-werror
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Sharing code for serialization between binary and cereal"
-HOMEPAGE="https://github.com/ekmett/bytes"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+test-doctests"
-
-RDEPEND=">=dev-haskell/binary-0.5.1:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	>=dev-haskell/cereal-0.3.5:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
-	>=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/scientific-0.0:=[profile?] <dev-haskell/scientific-1:=[profile?]
-	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-lib-werror \
-		$(cabal_flag test-doctests test-doctests)
-}
diff --git a/dev-haskell/bytes/metadata.xml b/dev-haskell/bytes/metadata.xml
deleted file mode 100644
index d66a19bf4f83..000000000000
--- a/dev-haskell/bytes/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="test-doctests">Enable the doctest suite when using the enable-tests option for cabal.</flag>
-	</use>
-	<longdescription>
-		Sharing code for serialization between binary and cereal
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/bytes</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/bytestring-builder-0.10.6.0.0 b/dev-haskell/bytestring-builder-0.10.6.0.0
new file mode 100644
index 000000000000..186fc7ef1f26
--- /dev/null
+++ b/dev-haskell/bytestring-builder-0.10.6.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8
+DESCRIPTION=The new bytestring builder, packaged outside of GHC
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/bytestring-builder
+IUSE=profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.10.6.0.0
+SRC_URI=mirror://hackage/packages/archive/bytestring-builder/0.10.6.0.0/bytestring-builder-0.10.6.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=caf6ecfa90a0786dfa90a87a92c66dae
diff --git a/dev-haskell/bytestring-builder-0.10.8.1.0 b/dev-haskell/bytestring-builder-0.10.8.1.0
new file mode 100644
index 000000000000..52b2980a0174
--- /dev/null
+++ b/dev-haskell/bytestring-builder-0.10.8.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8
+DESCRIPTION=The new bytestring builder, packaged outside of GHC
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/bytestring-builder
+IUSE=profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.10.8.1.0
+SRC_URI=mirror://hackage/packages/archive/bytestring-builder/0.10.8.1.0/bytestring-builder-0.10.8.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7c62a82c830e185cc920194b8ad5d02e
diff --git a/dev-haskell/bytestring-builder/Manifest b/dev-haskell/bytestring-builder/Manifest
deleted file mode 100644
index 7cba91a1af9a..000000000000
--- a/dev-haskell/bytestring-builder/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST bytestring-builder-0.10.6.0.0.tar.gz 44593 BLAKE2B 8b3834ae207f527e20d2cb32e125029196b8f7d3ac2bcf65826617ade820fbde3e9a43ee0a322a8632d1ab8a15548856b1e445ffc08bb62db13b8adf5a30f607 SHA512 1281aa8ef2f77fcc5a75a9cbb54506fb207e4fc9f6296213ab6a6389c83a53f6e08a6e929d3c456b7f099e18106e228416ca6d6269215f3e3c72cb29eb39bbe3
-DIST bytestring-builder-0.10.8.1.0.tar.gz 43904 BLAKE2B 220e323b0fc7b56b9cf984d268eb66541eac06202cd699107a9350a5edb6d57a388583c245a06a65c1f68e21a7de21d74388a39f4778ee5288af0eeff7ec1da9 SHA512 f01d440e55426b5f2836cc68087d367156adae7447409dff19ca334a8509c8731ce32539b76dbe33d1c9809c3e196dce9a1f3e00b1eff3bb177953cabd23c9b6
-EBUILD bytestring-builder-0.10.6.0.0.ebuild 545 BLAKE2B ab7d1649de6a19730d176035a6e0c639a67996b18c9a4595eae6e89330f71192278ddb8211e3914bdcc493419b7a466d2089339bb9ded86d618c04d17eece0e5 SHA512 0feef52b99088809a2d898b08194d2ec236a347866c9f695a3446c4982c99d15c344e38a27e1305951e7340cc045d7e19b347af91a8c0c87cec4987f8fcc234f
-EBUILD bytestring-builder-0.10.8.1.0.ebuild 550 BLAKE2B a8fb2ccecc0528da4811860c4c7c68920db2eb78f6a0860886510d9cf5b117e92aca3779b347454bcd50ec12720fce4c5178f754f9ee6529a6dbd064ed1e1cf9 SHA512 8d8a60b054eb588b2f8807e03b6c30ef24cb16ef79df8d22aa276731a09f1caf3a7143491459efb4d54ae07396a74a6f6467b73efe3b69553ebce6657e6af7ae
-MISC metadata.xml 1612 BLAKE2B 25d3bd6bf77c1253da3736dd3c9731a7613c392c2c9b1eaee6829fc01c492127408eb69be113cca4353441abe939dbf449e3a629432d01dadd391f165d08dbe0 SHA512 98c65c411de64a52485367b4263905b0893bcd358ca8c27398216df8ab6adfbd6fd85be34bae2fbe9583083e7ca4ef7838fe35c1ddf35f293d5bdb26dcead5bb
diff --git a/dev-haskell/bytestring-builder/bytestring-builder-0.10.6.0.0.ebuild b/dev-haskell/bytestring-builder/bytestring-builder-0.10.6.0.0.ebuild
deleted file mode 100644
index dd253e57275f..000000000000
--- a/dev-haskell/bytestring-builder/bytestring-builder-0.10.6.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="The new bytestring builder, packaged outside of GHC"
-HOMEPAGE="http://hackage.haskell.org/package/bytestring-builder"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.1.0.ebuild b/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.1.0.ebuild
deleted file mode 100644
index 22de4e5642d3..000000000000
--- a/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="The new bytestring builder, packaged outside of GHC"
-HOMEPAGE="http://hackage.haskell.org/package/bytestring-builder"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/bytestring-builder/metadata.xml b/dev-haskell/bytestring-builder/metadata.xml
deleted file mode 100644
index 018c423e9511..000000000000
--- a/dev-haskell/bytestring-builder/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This is the bytestring builder that is debuting in bytestring-0.10.4.0, which
-		should be shipping with GHC 7.8, probably late in 2013.  This builder has
-		several nice simplifications and improvements, and more out-of-box
-		functionality than the older blaze-builder.
-		
-		Note that this package detects which version of bytestring you are compiling
-		against,  and if you are compiling against bytestring-0.10.4 or later, will
-		be an empty package.
-		
-		This package lets the new interface and implementation be used with most
-		older compilers without upgrading bytestring, which can be rather
-		problematic.  In conjunction with blaze-builder-0.4 or later,  which
-		offers an implementation of blaze-builder in terms of bytestring-builder,
-		this should let most people try the new interface and implementation without
-		causing undue compatibility problems with packages that depend on
-		blaze-builder.
-		
-		GHC 7.6 did debut an almost identical interface and implementation, but with
-		slightly different module names and organization.   Trying to re-export/rename
-		the builder provided with 7.6 did not turn out to be very practical,  because
-		this interface includes new functions that rely on Builder internals,
-		which are not exported in 7.6.  Furthermore, these module names should be
-		deprecated in 7.10.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/bytestring-handle-0.1.0.4 b/dev-haskell/bytestring-handle-0.1.0.4
new file mode 100644
index 000000000000..7a41cffc6da9
--- /dev/null
+++ b/dev-haskell/bytestring-handle-0.1.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 >=dev-haskell/quickcheck-2.1.2 >=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.0 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.5 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=ByteString-backed Handles
+EAPI=6
+HOMEPAGE=https://hub.darcs.net/ganesh/bytestring-handle
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0.4
+SRC_URI=mirror://hackage/packages/archive/bytestring-handle/0.1.0.4/bytestring-handle-0.1.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=03c445f554b96bb0cb4c832e6c935ab6
diff --git a/dev-haskell/bytestring-handle/Manifest b/dev-haskell/bytestring-handle/Manifest
deleted file mode 100644
index 3abc47ab912e..000000000000
--- a/dev-haskell/bytestring-handle/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bytestring-handle-0.1.0.4.tar.gz 6204 BLAKE2B bcda8d126b5e60f1f78be576ec0233f8b0afe80409afd9a796c0a86e83f3b05702eb40ed09af1ebb2d2b8b194924084a0799ca6b498acd654a18d679b1184415 SHA512 17649968ffbebf1a567059ecf3f19e8d8f6a1bb53a0b491e35b62d572cff9f949822953452ee72d193546d8779d6d71dfd82ae5cfd2d3b7564ac73df7283facb
-EBUILD bytestring-handle-0.1.0.4.ebuild 984 BLAKE2B dacaa5be0d4287d9e974256aed93a72ead0854324311c4703e60bc09bde172c9be851f0db2ee6122ffc1b3b8ecde96aafcb6a23eeb63b1e35677a72457b60ab4 SHA512 e78a0733f0851495ee735e7d78bad9e33751ddc4c4adec8aac9c763e611f0a2ab5eba76348647d558dbb39e6344f174a5f122c3888117cbd7b519e4d2af48447
-MISC metadata.xml 316 BLAKE2B daa54860b18245646d20089598390b0fba4e618749bfdd5bd719773856b48ca0bccd48f320947293f570f251a43618282e25aa39a30a2486d52e71fae8dab186 SHA512 67707af77347270b5c525ece5a127ae66affc8ae3cb5860748950171e8d8416c294b0f1da5be25bbdba9fa75bc91878e2f04dc73bfc1d35af02f9635fcdc47f0
diff --git a/dev-haskell/bytestring-handle/bytestring-handle-0.1.0.4.ebuild b/dev-haskell/bytestring-handle/bytestring-handle-0.1.0.4.ebuild
deleted file mode 100644
index 47c8e26e2a71..000000000000
--- a/dev-haskell/bytestring-handle/bytestring-handle-0.1.0.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="ByteString-backed Handles"
-HOMEPAGE="https://hub.darcs.net/ganesh/bytestring-handle"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/quickcheck-2.1.2
-		>=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.0 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.5 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck >= 2.1.2 && < 2.9' 'QuickCheck >= 2.1.2'
-}
diff --git a/dev-haskell/bytestring-handle/metadata.xml b/dev-haskell/bytestring-handle/metadata.xml
deleted file mode 100644
index 1b3ffcef03d2..000000000000
--- a/dev-haskell/bytestring-handle/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		ByteString-backed Handles
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/bytestring-mmap-0.2.2-r1 b/dev-haskell/bytestring-mmap-0.2.2-r1
new file mode 100644
index 000000000000..211ee21800f7
--- /dev/null
+++ b/dev-haskell/bytestring-mmap-0.2.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=mmap support for strict ByteStrings
+EAPI=5
+HOMEPAGE=http://code.haskell.org/~dons/code/bytestring-mmap/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.2.2
+SRC_URI=mirror://hackage/packages/archive/bytestring-mmap/0.2.2/bytestring-mmap-0.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9c7bbf36aa638a6658ee2461a9b0ebf4
diff --git a/dev-haskell/bytestring-mmap/Manifest b/dev-haskell/bytestring-mmap/Manifest
deleted file mode 100644
index 0d78bdb95991..000000000000
--- a/dev-haskell/bytestring-mmap/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bytestring-mmap-0.2.2.tar.gz 7188 BLAKE2B d699e51f8f2416e30013dcf87fcfaa4d0ef129c1ca9951c320a7312a1ce73db14addedf47fc138b485197a4cfb115378a4544428ad974c70d89d7b3b467ace22 SHA512 0cde0bb36808d7086f6b3e3e94813c205a61ec1d0b2156a7fac98c1dc520dcdd1821a7873b7ecb9a77fdcd254b5ac1077da86865ade20a49bba0e0da1befcf46
-EBUILD bytestring-mmap-0.2.2-r1.ebuild 561 BLAKE2B 014d2f19de37ab3f32338300945bb8aa2c0b38f16507cd1fa26897d3583e82a4db965c376cab7156713faa00dda06ac2ab16ffd14e97ab463905eb97290fab7a SHA512 fafa2bfbee2e0275e3d154ad5d34c335343071727b19de9af4b83ffe1249cca95e1d03edf263a59b6295c45aa34327217f8f702b19ddfd125dddfc1a5b6fc9cf
-MISC metadata.xml 495 BLAKE2B 702d8a8fd8ecdc932de1540dfe740662957c2fa256fa230a129deb7226cfdd214a6edce80df1facd734531206a9c0dfbef3d5e4bb1662b570e93dd2dad4b0f33 SHA512 23cd61a8ebba8b77e92e29c4bbfe7279ea13131d151f1672d105de2239bf0cefb4f8ecd4c6500054c522deb3e5b39b04ebc4918463a4e4bdddca4d0eaa9d9a82
diff --git a/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild b/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild
deleted file mode 100644
index 4e70b8d13973..000000000000
--- a/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="mmap support for strict ByteStrings"
-HOMEPAGE="http://code.haskell.org/~dons/code/bytestring-mmap/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/bytestring-mmap/metadata.xml b/dev-haskell/bytestring-mmap/metadata.xml
deleted file mode 100644
index 2e6580f28d8a..000000000000
--- a/dev-haskell/bytestring-mmap/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		
-		This library provides a wrapper to mmap(2), allowing files or
-		devices to be lazily loaded into memory as strict or lazy
-		ByteStrings, using the virtual memory subsystem to do on-demand
-		loading.
-		
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/bytestring-show-0.3.5.6 b/dev-haskell/bytestring-show-0.3.5.6
new file mode 100644
index 000000000000..62a203cff196
--- /dev/null
+++ b/dev-haskell/bytestring-show-0.3.5.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=<dev-haskell/binary-0.8:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient conversion of values into readable byte strings
+EAPI=5
+HOMEPAGE=http://code.haskell.org/~dolio/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=<dev-haskell/binary-0.8:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.3.5.6
+SRC_URI=mirror://hackage/packages/archive/bytestring-show/0.3.5.6/bytestring-show-0.3.5.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ca48d24ae095d9e1c7f4498a5b416235
diff --git a/dev-haskell/bytestring-show-0.3.5.6-r1 b/dev-haskell/bytestring-show-0.3.5.6-r1
new file mode 100644
index 000000000000..a6cb13065ca8
--- /dev/null
+++ b/dev-haskell/bytestring-show-0.3.5.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/binary:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient conversion of values into readable byte strings
+EAPI=5
+HOMEPAGE=http://code.haskell.org/~dolio/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/binary:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.3.5.6
+SRC_URI=mirror://hackage/packages/archive/bytestring-show/0.3.5.6/bytestring-show-0.3.5.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0b0f449d524f85170b49cb1c086c767e
diff --git a/dev-haskell/bytestring-show/Manifest b/dev-haskell/bytestring-show/Manifest
deleted file mode 100644
index c51b51ab5e02..000000000000
--- a/dev-haskell/bytestring-show/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST bytestring-show-0.3.5.6.tar.gz 8145 BLAKE2B 421a6593e77f200db1f905a5e74071116327dd018fc8117c5c81fe0193891070f3b190b4d7ffd2e056ba4b1adb9e8eae87e2f905036a0f85ab94ab7d03602d05 SHA512 f59a041e30ec3b3eb9f971968606685ba5968dafc44d92ed50c9f7f124b891f48fc6612fdfc1a57f702e76e41f70c647e81c1919ab7fee194db9d97ddd73dd10
-EBUILD bytestring-show-0.3.5.6-r1.ebuild 658 BLAKE2B a11f560a0caabd5a7e64c77ee80f6c1c869afff035d1bb65d1a073e48d64b85d1daa1563a7562aa133c4a49b9fa1739859298bc1a366f08a6f72ac46557b4b0e SHA512 8c6e8e78bba4acb0948091cf79a8d4f2b4dcb3c6ea5316a458fa38fd835d4565a932d92d275bfed211edfae7976e3a894a1bb0d137a7270d83388b475e348eb3
-EBUILD bytestring-show-0.3.5.6.ebuild 602 BLAKE2B abb8a08185645243d4255cd5acb458e8bffef782262cad90aaae679736c5825dabbe9186797d0057df845147a90c465997854779ae055e9b434b40c6d2a37e3b SHA512 35bb225439830bae52e8cbab50ff923d21f7822872327519a588c55ad45908eb624900aceaff14561f9652c4eae3ffc57a4c0941eb04e1eed4a682cb592a124a
-MISC metadata.xml 349 BLAKE2B 504fc652944adae9b0c8fb5bcdc05e0fdbb148769fe6b60ced95fc64fdb444591e0793ab553b7c11be7b7b7e71b6390377b5a892ae2888fd387d67e0a7a1000a SHA512 36b8864806915993dd6018b5118cb5299860ee5110f3740ae204db2c5a7d0c0a708b1f9e4db1d4ae8bbe5a0c6f8f9ce28907ef6b4b534ada8690b2a36eb0165f
diff --git a/dev-haskell/bytestring-show/bytestring-show-0.3.5.6-r1.ebuild b/dev-haskell/bytestring-show/bytestring-show-0.3.5.6-r1.ebuild
deleted file mode 100644
index a19bb794d4c7..000000000000
--- a/dev-haskell/bytestring-show/bytestring-show-0.3.5.6-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient conversion of values into readable byte strings"
-HOMEPAGE="http://code.haskell.org/~dolio/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/binary:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'binary < 0.8' 'binary'
-}
diff --git a/dev-haskell/bytestring-show/bytestring-show-0.3.5.6.ebuild b/dev-haskell/bytestring-show/bytestring-show-0.3.5.6.ebuild
deleted file mode 100644
index f39671a4096c..000000000000
--- a/dev-haskell/bytestring-show/bytestring-show-0.3.5.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient conversion of values into readable byte strings"
-HOMEPAGE="http://code.haskell.org/~dolio/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/binary-0.8:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/bytestring-show/metadata.xml b/dev-haskell/bytestring-show/metadata.xml
deleted file mode 100644
index 60a115dcf1b6..000000000000
--- a/dev-haskell/bytestring-show/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Efficient conversion of values into readable byte strings.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/bzlib-0.5.0.5 b/dev-haskell/bzlib-0.5.0.5
new file mode 100644
index 000000000000..e13284a51c54
--- /dev/null
+++ b/dev-haskell/bzlib-0.5.0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=app-arch/bzip2 >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Compression and decompression in the bzip2 format
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/bzlib
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2 >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.5.0.5
+SRC_URI=mirror://hackage/packages/archive/bzlib/0.5.0.5/bzlib-0.5.0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7d47312f14497092b5f2b90a3e1c862f
diff --git a/dev-haskell/bzlib/Manifest b/dev-haskell/bzlib/Manifest
deleted file mode 100644
index 1bc55ecffc3c..000000000000
--- a/dev-haskell/bzlib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bzlib-0.5.0.5.tar.gz 46627 BLAKE2B e229e4c586c45e5ff440a043bf413c2a45a6b38b1a2d3ad529cbaeba5a4811953572a2be54a75cec24599f43c9393c71268c5c2ba0c54100fb6c43b2842169df SHA512 fe4b6e1a4d67573a9ff72808cfd0bf47a127885593e98debcaa505c488c76af364bed31cdb8ee9308295514f154536e958ff5e2a1c3157eeb5b16f8011424819
-EBUILD bzlib-0.5.0.5.ebuild 579 BLAKE2B dd54734ac622355d9a37a72de031da2386ca523d9ad0da30008e8ff7c149fcf56b3880c6b38d118453b6aae5c6eec463e639a088cfb9aa7127ee060ebc7d24f9 SHA512 428bc172a77c9ee8313e61b0771835e572680c0a93f788743cad139cf8e719498b84e7350bbd8d3e5af08383d38c52e87ffe99a560222c4073151f9c5459b935
-MISC metadata.xml 648 BLAKE2B b19b57bfd613858415a4e1e2c4d0e18c6aac26f6cbdbbd4094a72b29f7a7e4c034ed65e80c1cd9be33b523fa88627b4faec7309d39fd07c870dc3f41199463b9 SHA512 a6489b9f194b0eb41325f6ca11be1de566bd263bd3154c1080db87ed22a42e9820d8dd75b7fe8e7cf30b7fe2df59ab6b25a1b472a006b839dfb4644d6a864f0c
diff --git a/dev-haskell/bzlib/bzlib-0.5.0.5.ebuild b/dev-haskell/bzlib/bzlib-0.5.0.5.ebuild
deleted file mode 100644
index efe3fef50498..000000000000
--- a/dev-haskell/bzlib/bzlib-0.5.0.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Compression and decompression in the bzip2 format"
-HOMEPAGE="http://hackage.haskell.org/package/bzlib"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="app-arch/bzip2
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/bzlib/metadata.xml b/dev-haskell/bzlib/metadata.xml
deleted file mode 100644
index 7bf3770efebc..000000000000
--- a/dev-haskell/bzlib/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides a pure interface for compressing and
-		decompressing streams of data represented as lazy
-		'ByteString's. It uses the bz2 C library so it has high
-		performance.
-		
-		It provides a convenient high level API suitable for most
-		tasks and for the few cases where more control is needed it
-		provides access to the full bzip2 feature set.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/c2hs-0.16.4 b/dev-haskell/c2hs-0.16.4
new file mode 100644
index 000000000000..9a4e88720be7
--- /dev/null
+++ b/dev-haskell/c2hs-0.16.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-lang/ghc-6.10.4 >=dev-haskell/cabal-1.6 >=dev-haskell/language-c-0.3.1.1 <dev-haskell/language-c-0.5 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 )
+DESCRIPTION=C->Haskell FFI tool that gives some cross-language type safety
+EAPI=5
+HOMEPAGE=http://www.cse.unsw.edu.au/~chak/haskell/c2hs/
+IUSE=doc
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/c2hs/0.16.4/c2hs-0.16.4.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5c025aa61b0acfded78f20058f059adb
diff --git a/dev-haskell/c2hs-0.16.5 b/dev-haskell/c2hs-0.16.5
new file mode 100644
index 000000000000..63c37f687948
--- /dev/null
+++ b/dev-haskell/c2hs-0.16.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4 >=dev-haskell/cabal-1.6 >=dev-haskell/language-c-0.3.1.1 <dev-haskell/language-c-0.5 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 )
+DESCRIPTION=C->Haskell FFI tool that gives some cross-language type safety
+EAPI=5
+HOMEPAGE=http://www.cse.unsw.edu.au/~chak/haskell/c2hs/
+IUSE=doc
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/c2hs/0.16.5/c2hs-0.16.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bc6a3ee076d70fcc111fc65188a8ae13
diff --git a/dev-haskell/c2hs-0.17.2 b/dev-haskell/c2hs-0.17.2
new file mode 100644
index 000000000000..fb59e27939ae
--- /dev/null
+++ b/dev-haskell/c2hs-0.17.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cabal-1.8 >=dev-haskell/language-c-0.4.2 <dev-haskell/language-c-0.5 >=dev-lang/ghc-6.10.4 test? ( dev-haskell/hunit >=dev-haskell/shelly-1.0 dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/text >=dev-haskell/yaml-0.8 )
+DESCRIPTION=C->Haskell FFI tool that gives some cross-language type safety
+EAPI=5
+HOMEPAGE=https://github.com/haskell/c2hs
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/c2hs/0.17.2/c2hs-0.17.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9ed65a8187fc1227ff4862a0e430f9d2
diff --git a/dev-haskell/c2hs-0.20.1 b/dev-haskell/c2hs-0.20.1
new file mode 100644
index 000000000000..cfed89b85463
--- /dev/null
+++ b/dev-haskell/c2hs-0.20.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cabal-1.8 dev-haskell/dlist >=dev-haskell/language-c-0.4.7 <dev-haskell/language-c-0.5 >=dev-lang/ghc-7.4.1 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/transformers >=dev-haskell/shelly-1.0 dev-haskell/text >=dev-haskell/yaml-0.8 )
+DESCRIPTION=C->Haskell FFI tool that gives some cross-language type safety
+EAPI=5
+HOMEPAGE=https://github.com/haskell/c2hs
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/c2hs/0.20.1/c2hs-0.20.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ac80a9598120c1e0799dde727dfc3b57
diff --git a/dev-haskell/c2hs-0.25.2 b/dev-haskell/c2hs-0.25.2
new file mode 100644
index 000000000000..5ad6b2e0cfbe
--- /dev/null
+++ b/dev-haskell/c2hs-0.25.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/dlist:= >=dev-haskell/language-c-0.4.7:= <dev-haskell/language-c-0.5:= >=dev-lang/ghc-7.4.1:= regression? ( >=dev-haskell/shelly-1.0:= dev-haskell/text:= >=dev-haskell/yaml-0.8:= ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/transformers !regression? ( >=dev-haskell/shelly-1.0 dev-haskell/text ) )
+DESCRIPTION=C->Haskell FFI tool that gives some cross-language type safety
+EAPI=5
+HOMEPAGE=https://github.com/haskell/c2hs
+IUSE=regression test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/dlist:= >=dev-haskell/language-c-0.4.7:= <dev-haskell/language-c-0.5:= >=dev-lang/ghc-7.4.1:= regression? ( >=dev-haskell/shelly-1.0:= dev-haskell/text:= >=dev-haskell/yaml-0.8:= )
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/c2hs/0.25.2/c2hs-0.25.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e92ba946709a74b4651d9d8256272b98
diff --git a/dev-haskell/c2hs-0.27.1 b/dev-haskell/c2hs-0.27.1
new file mode 100644
index 000000000000..40cd23ffc7cd
--- /dev/null
+++ b/dev-haskell/c2hs-0.27.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/dlist:= >=dev-haskell/language-c-0.4.7:= <dev-haskell/language-c-0.5:= >=dev-lang/ghc-7.4.1:= regression? ( >=dev-haskell/shelly-1.0:= dev-haskell/text:= >=dev-haskell/yaml-0.8:= ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/transformers !regression? ( >=dev-haskell/shelly-1.0 dev-haskell/text ) )
+DESCRIPTION=C->Haskell FFI tool that gives some cross-language type safety
+EAPI=5
+HOMEPAGE=https://github.com/haskell/c2hs
+IUSE=regression test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/dlist:= >=dev-haskell/language-c-0.4.7:= <dev-haskell/language-c-0.5:= >=dev-lang/ghc-7.4.1:= regression? ( >=dev-haskell/shelly-1.0:= dev-haskell/text:= >=dev-haskell/yaml-0.8:= )
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/c2hs/0.27.1/c2hs-0.27.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c2933bf107a96fc909d07ae35fb32ce0
diff --git a/dev-haskell/c2hs-0.28.3 b/dev-haskell/c2hs-0.28.3
new file mode 100644
index 000000000000..4e07f1e28147
--- /dev/null
+++ b/dev-haskell/c2hs-0.28.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/dlist:= >=dev-haskell/language-c-0.7.1:= <dev-haskell/language-c-0.8:= >=dev-lang/ghc-7.4.1:= regression? ( >=dev-haskell/shelly-1.0:= dev-haskell/text:= >=dev-haskell/yaml-0.8:= ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/transformers !regression? ( >=dev-haskell/shelly-1.0 dev-haskell/text ) )
+DESCRIPTION=C->Haskell FFI tool that gives some cross-language type safety
+EAPI=6
+HOMEPAGE=https://github.com/haskell/c2hs
+IUSE=regression test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/dlist:= >=dev-haskell/language-c-0.7.1:= <dev-haskell/language-c-0.8:= >=dev-lang/ghc-7.4.1:= regression? ( >=dev-haskell/shelly-1.0:= dev-haskell/text:= >=dev-haskell/yaml-0.8:= )
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/c2hs/0.28.3/c2hs-0.28.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9aef423b24ba744facdaa0d95899a656
diff --git a/dev-haskell/c2hs/Manifest b/dev-haskell/c2hs/Manifest
deleted file mode 100644
index 14467d13e19f..000000000000
--- a/dev-haskell/c2hs/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-AUX c2hs-0.16.3-language-c-0.4.patch 790 BLAKE2B 73299015b4a88d4ee0fd69509e23748c1050651f6d0fad5828a5e908cc758b998421592656fe6871cdfae4982c9a3dfb95ab5a40603dc7f59b3f5277790cf734 SHA512 c7a3baacb08dd7fca8688f04e7cdd434c8a6e37c6ec98abbf1ea329842a9d4d8639b1a326fa73919f83557760d9b87c0467f2af6801408a7c6d6eb71ce85ef76
-AUX c2hs-0.16.4-ghc-7.6.patch 1412 BLAKE2B 8a9138f72fe2a59966a60128ee6bff8af317b08f09d20a0db8914da13b429201b289d7dd1f84ad385ff8546eaea2c3279e175e851533a296d1f3a19325fd2ac1 SHA512 d697baf43aa8b54abe292d7efff9907a1673b022cb2cc554ba44c3965fb1bfda979edadb46527325c431d7d727e86ce04c63c1dc235ed6b95d173d69829f24a0
-DIST c2hs-0.16.4.tar.gz 138114 BLAKE2B a8278aafa9ba27ba59b39745b4a2e169d7b32d4a3c139dc1fdcb4445cb0376beb791664c9b4790d7a11589f83c22e0fd3a4e5cb74b79fedbc0216492c8f52be8 SHA512 7dacfab1a469d6613b6acd6ebfb70efa275c4588bcaa6277aa411b90674c11ae031bb9edae6b7e648da6a1232fc6cb702af2fce5a68dd04124bf2f5ba9813329
-DIST c2hs-0.16.5.tar.gz 137294 BLAKE2B 685a8f9c98c5e0877893907cb7af9f8cd93e8559e49427bef757445547aa88c8c6dce0a81e115af5c1555ec7be67c250c088fd704cc4b96dc43c9eda68d72e37 SHA512 4ef187366da3ca33f10eb878b5f31603ebb038b9f02a6d22f284ad8212a0de2ce7f48bc1a9fe0fe94d52588594c9230ebd69cb4c17d0601b4d3326474220636b
-DIST c2hs-0.17.2.tar.gz 167739 BLAKE2B 50604da33333d235639789090798fa152688d77335a2237272bf086a2a75b7fbbc6c612d16428ca94e07da66cab16fd54eec115f88c79789071f9a87e3c8e416 SHA512 19ef7a589a1700af2e2f2426b43b454ab49467a97d85c3731da77a9b163709d09e4e58b31d13c0127b807764cff7c62c2b8675cf36d91198d83a9ea9ed4c402c
-DIST c2hs-0.20.1.tar.gz 184115 BLAKE2B fd55ee28918c41734096cfea50f40e1a5c56d212c4fbddce1a7bff81bead428144c232f4a7fb47dfa9d5914da78d78cb92330fd493b0facfc3f033ee96be347d SHA512 fe22257b6003d9133b7f0264c19070eee10200452f783a5c6f36eda44b96d80e5e728d91bca8349461c69de5ae93af3a9bbd67e67c30a182543ee3c79889c51a
-DIST c2hs-0.25.2.tar.gz 198733 BLAKE2B 853faa19ba91a4536bed691d0eb26969dc96ef6830512441a1d14e193f084e0ae36d846bfdc160abf6d08fda0d7e9706f9c78b9be627e4c2864e3d9d2e098576 SHA512 0f3b2df55277f9f44e39270cdc6a5695dd15e8095874406de5830c2d7d45dd364abcd5eafc9323e2a76eeb6622aa7da39734995be01e7f026d8f2395803c2ef3
-DIST c2hs-0.27.1.tar.gz 205108 BLAKE2B 268ed9f95e77d292626e0fff6e1ac8334204dd1a1b7474e62746f8be444e57b1f3eb22eb2a4e46f0682c687fa01683923f22542d6b7456566f22d8ad7cb0ed81 SHA512 22894e518512a53ed23b2d6e3395918a1fdfb60180a9ec489bb7fcb70d5d870bdb37c66e9a49f07ae5babf3808e57f1d932e13cf80132ab50666c6899d55d62a
-DIST c2hs-0.28.3.tar.gz 253559 BLAKE2B efc0965e955b05456385648750abeda3371cb0417c508bd8590158289d699b019d88454fd17bb7f9e49f450e581ca6367e08d958ccc1ad7ef56f8a354d33deb2 SHA512 17306b6ee41623d1c017581ed7aef6118a66c30a4698fa95d588b30ac625a6571906bb1fffecf7b86296667390d18cfe5ee2ade85098075f2ca982922b358b3a
-EBUILD c2hs-0.16.4.ebuild 1051 BLAKE2B da146623521b6cc38a6bd948a9b3eecff8694d9c2ff1cc5168dc7719b31ecab1cbecc898b900e91cf1f4fd765ba72c3f69e6af838074524543060b6a00969310 SHA512 c6c6fceb00e3e07d320659510a60e6d30fc10a704c6ef157068c218bfd24b190a9e5cf3a7366f98840d06cc69779d986cef482b32ac656fdd9634bbf2d098a01
-EBUILD c2hs-0.16.5.ebuild 950 BLAKE2B f003fb1c65c26aa09b88d72df79dd7c2a1d46c96d3e61c5309e422dec149137ff687ac6cf6fe014d7d3b65a6bb6a4b0bbacdfcbc367d92ecbad3ea9fdbd88f93 SHA512 c6b6c615ea0b4760701f490d5ce0f6bb9d80125869da1beec69304fb795011e9865ad6182d99c514b0097667bff77c31b954e22ba0905366ea7c3a2258f94309
-EBUILD c2hs-0.17.2.ebuild 780 BLAKE2B f8621dffb3e6b34c2269cc42e8efece56f7e78f5ccf4ff2ed742dc94ee4d5391edde477c77f47f0d6f4b193329130d92d556a631c6840bc9a26242603de0add1 SHA512 113c47fb00c2aade18ff5453504ee095aeb20df447b28821eeaa2ac5216b3f9d44101b499c19eeafa057715ca4dd8bca592c7a3531302038a2d59136897688a7
-EBUILD c2hs-0.20.1.ebuild 804 BLAKE2B 7f0926836c5d69a0585a965dc120fa823eec82c8dc823a84b15cd0f49366b1bea4e6434dcb8a7032a9c5b8a169ee9723765245bb5498a8cf601ae3bbe0a32539 SHA512 dedf09e1c4c7658cc4df559eac2a3bb92cb17467e418110401805d4f8e3eb2b7ecbcf6880732c26e1db0b6498a329a1b9587fd1bb6098166eb4483bfe28afa59
-EBUILD c2hs-0.25.2.ebuild 1004 BLAKE2B 5b780fdf37d7311015584d55de7b344a1e81d0e3d78de9d26fd2866a48bf7057d1f85d3c5bc0d9d4e36a9f63680fc018083a4ba24337fff0e222f2ea80b9385d SHA512 a64ab98bb59e183f3a3e9155887567d2c1400d80c8e3bbe0d2e2e924ef2a23a0d744b9b22939a79f9b074d4bc52a8413df543ac1f60baba72f021fea40aa43dd
-EBUILD c2hs-0.27.1.ebuild 1002 BLAKE2B a03b9643fb8c073dbe73eda6961463283e13dba0ce3c87e530ad65ecfe8637584a3fd144afb2ba8020dfd0f8fb5a181a7945945340459cf1e128868f6ec6e57a SHA512 9b258f39804514459f8f03d5aa334a28c9e1303849ed2d03a631e3a8cd24ab8012d2984ce9ba69a10979f63520df92f5fdc90cb8be3fbdf3ca371e3e8911eb09
-EBUILD c2hs-0.28.3.ebuild 1000 BLAKE2B b6f30230c3d815f2d667d07b4dfdfb27e9629ffd7014f590511371e3fbb0ff84372e1ca7024180fe384482ea0a55c7160483cfb43a72a636af71d184b61657f5 SHA512 ce13ee39018d58b873fcbea9235e671414ea18696b1445acc0ae30fae540400223cbde9974ece118d09039bb6b647de95351f325ffb3d06eabd8b2feeba1649d
-MISC metadata.xml 774 BLAKE2B 0da02d79142cc144b8bfb9096ee19c6f1715f1431ae4205e4727157ee110d1bd363cc33d59cd08436391b65ff4af5a8cd5cd0134500c1b71d0fa4f8731ea9478 SHA512 386edcd02a6773727944eff89793daaf36bc88678123ba3b047086acdf6a89743fde55ce2afbd26a26601fccf497dc477871dd01013bdf21f00ca869fe5b2a05
diff --git a/dev-haskell/c2hs/c2hs-0.16.4.ebuild b/dev-haskell/c2hs/c2hs-0.16.4.ebuild
deleted file mode 100644
index f155caac2f45..000000000000
--- a/dev-haskell/c2hs/c2hs-0.16.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="bin"
-inherit base haskell-cabal
-
-DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
-HOMEPAGE="http://www.cse.unsw.edu.au/~chak/haskell/c2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="doc"
-
-DEPEND=">=dev-lang/ghc-6.10.4
-		>=dev-haskell/cabal-1.6
-		>=dev-haskell/language-c-0.3.1.1
-		<dev-haskell/language-c-0.5
-		doc? (  ~app-text/docbook-xml-dtd-4.2
-				app-text/docbook-xsl-stylesheets
-				>=dev-libs/libxslt-1.1.2 )"
-RDEPEND="dev-libs/gmp"
-
-PATCHES=("${FILESDIR}/${PN}"-0.16.3-language-c-0.4.patch
-	"${FILESDIR}/${PN}"-0.16.4-ghc-7.6.patch)
-
-src_compile() {
-	cabal_src_compile
-
-	if use doc; then
-		emake -C doc
-	fi
-}
-
-src_install() {
-	cabal_src_install
-
-	doman "${S}/doc/man1/c2hs.1"
-
-	if use doc; then
-		dohtml "${S}/doc/users_guide/"*
-	fi
-}
diff --git a/dev-haskell/c2hs/c2hs-0.16.5.ebuild b/dev-haskell/c2hs/c2hs-0.16.5.ebuild
deleted file mode 100644
index 881f9ea1e06f..000000000000
--- a/dev-haskell/c2hs/c2hs-0.16.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
-HOMEPAGE="http://www.cse.unsw.edu.au/~chak/haskell/c2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="doc"
-
-DEPEND=">=dev-lang/ghc-6.10.4
-		>=dev-haskell/cabal-1.6
-		>=dev-haskell/language-c-0.3.1.1
-		<dev-haskell/language-c-0.5
-		doc? (  ~app-text/docbook-xml-dtd-4.2
-				app-text/docbook-xsl-stylesheets
-				>=dev-libs/libxslt-1.1.2 )"
-RDEPEND="dev-libs/gmp"
-
-src_compile() {
-	cabal_src_compile
-
-	if use doc; then
-		emake -C doc
-	fi
-}
-
-src_install() {
-	cabal_src_install
-
-	doman "${S}/doc/man1/c2hs.1"
-
-	if use doc; then
-		dohtml "${S}/doc/users_guide/"*
-	fi
-}
diff --git a/dev-haskell/c2hs/c2hs-0.17.2.ebuild b/dev-haskell/c2hs/c2hs-0.17.2.ebuild
deleted file mode 100644
index 14d1f3248bf3..000000000000
--- a/dev-haskell/c2hs/c2hs-0.17.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
-HOMEPAGE="https://github.com/haskell/c2hs"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	>=dev-haskell/language-c-0.4.2 <dev-haskell/language-c-0.5
-	>=dev-lang/ghc-6.10.4
-	test? ( dev-haskell/hunit
-		>=dev-haskell/shelly-1.0
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/text
-		>=dev-haskell/yaml-0.8 )
-"
diff --git a/dev-haskell/c2hs/c2hs-0.20.1.ebuild b/dev-haskell/c2hs/c2hs-0.20.1.ebuild
deleted file mode 100644
index 0e3334cbf25c..000000000000
--- a/dev-haskell/c2hs/c2hs-0.20.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="bin test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
-HOMEPAGE="https://github.com/haskell/c2hs"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	dev-haskell/dlist
-	>=dev-haskell/language-c-0.4.7 <dev-haskell/language-c-0.5
-	>=dev-lang/ghc-7.4.1
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/transformers
-		>=dev-haskell/shelly-1.0
-		dev-haskell/text
-		>=dev-haskell/yaml-0.8 )
-"
diff --git a/dev-haskell/c2hs/c2hs-0.25.2.ebuild b/dev-haskell/c2hs/c2hs-0.25.2.ebuild
deleted file mode 100644
index 38b1c7d671c0..000000000000
--- a/dev-haskell/c2hs/c2hs-0.25.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
-HOMEPAGE="https://github.com/haskell/c2hs"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="regression"
-
-RDEPEND="dev-haskell/dlist:=
-	>=dev-haskell/language-c-0.4.7:= <dev-haskell/language-c-0.5:=
-	>=dev-lang/ghc-7.4.1:=
-	regression? ( >=dev-haskell/shelly-1.0:=
-			dev-haskell/text:=
-			>=dev-haskell/yaml-0.8:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/transformers
-		!regression? ( >=dev-haskell/shelly-1.0
-				dev-haskell/text ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag regression regression)
-}
diff --git a/dev-haskell/c2hs/c2hs-0.27.1.ebuild b/dev-haskell/c2hs/c2hs-0.27.1.ebuild
deleted file mode 100644
index 4b19c3274fc3..000000000000
--- a/dev-haskell/c2hs/c2hs-0.27.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
-HOMEPAGE="https://github.com/haskell/c2hs"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="regression"
-
-RDEPEND="dev-haskell/dlist:=
-	>=dev-haskell/language-c-0.4.7:= <dev-haskell/language-c-0.5:=
-	>=dev-lang/ghc-7.4.1:=
-	regression? ( >=dev-haskell/shelly-1.0:=
-			dev-haskell/text:=
-			>=dev-haskell/yaml-0.8:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/transformers
-		!regression? ( >=dev-haskell/shelly-1.0
-				dev-haskell/text ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag regression regression)
-}
diff --git a/dev-haskell/c2hs/c2hs-0.28.3.ebuild b/dev-haskell/c2hs/c2hs-0.28.3.ebuild
deleted file mode 100644
index 6f90dfcac03d..000000000000
--- a/dev-haskell/c2hs/c2hs-0.28.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4.9999
-
-CABAL_FEATURES="test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
-HOMEPAGE="https://github.com/haskell/c2hs"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="regression"
-
-RDEPEND="dev-haskell/dlist:=
-	>=dev-haskell/language-c-0.7.1:= <dev-haskell/language-c-0.8:=
-	>=dev-lang/ghc-7.4.1:=
-	regression? ( >=dev-haskell/shelly-1.0:=
-			dev-haskell/text:=
-			>=dev-haskell/yaml-0.8:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/transformers
-		!regression? ( >=dev-haskell/shelly-1.0
-				dev-haskell/text ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag regression regression)
-}
diff --git a/dev-haskell/c2hs/files/c2hs-0.16.3-language-c-0.4.patch b/dev-haskell/c2hs/files/c2hs-0.16.3-language-c-0.4.patch
deleted file mode 100644
index cdf0fbe547d6..000000000000
--- a/dev-haskell/c2hs/files/c2hs-0.16.3-language-c-0.4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/c2hs.cabal b/c2hs.cabal
-index 89f978f..53a96e5 100644
---- a/c2hs.cabal
-+++ b/c2hs.cabal
-@@ -41,7 +41,7 @@ flag base3
- 
- Executable c2hs
-     Build-Depends:  base >= 2 && < 5,
--                    language-c >= 0.3.1.1 && < 0.4.0,
-+                    language-c >= 0.3.1.1 && < 0.5,
-                     filepath
- 
-     if flag(base3)
-diff --git a/src/C2HS/Gen/Bind.hs b/src/C2HS/Gen/Bind.hs
-index 1fd2acc..9c25b42 100644
---- a/src/C2HS/Gen/Bind.hs
-+++ b/src/C2HS/Gen/Bind.hs
-@@ -117,6 +117,7 @@ import Control.Monad (when, unless, liftM, mapAndUnzipM)
- import Language.C.Data.Position
- import Language.C.Data.Ident
- import Language.C.Pretty
-+import Language.C.Syntax.AST
- import Text.PrettyPrint.HughesPJ (render)
- import Data.Errors
- import Data.Attributes (newAttrsOnlyPos)
diff --git a/dev-haskell/c2hs/files/c2hs-0.16.4-ghc-7.6.patch b/dev-haskell/c2hs/files/c2hs-0.16.4-ghc-7.6.patch
deleted file mode 100644
index e6d808bb98a5..000000000000
--- a/dev-haskell/c2hs/files/c2hs-0.16.4-ghc-7.6.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- c2hs-0.16.4-orig/src/C2HS/Config.hs	2012-11-01 08:02:48.000000000 +1100
-+++ c2hs-0.16.4/src/C2HS/Config.hs	2012-11-03 12:12:15.754353409 +1100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- --                                                                -*-haskell-*-
- --  ** @configure_input@ **
- --  ===========================================================================
---- c2hs-0.16.4-orig/src/Control/StateTrans.hs	2012-11-01 08:02:48.000000000 +1100
-+++ c2hs-0.16.4/src/Control/StateTrans.hs	2012-11-03 12:12:15.755353436 +1100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP, ScopedTypeVariables #-}
- --  The HiPar Toolkit: state transformer routines
- --
- --  Author : Manuel M. T. Chakravarty
-@@ -80,6 +81,10 @@
- -- Launchbury/Peyton-Jones' texts before entering. Otherwise,
- -- your mental health my be in danger.  You have been warned!
- 
-+#if !MIN_VERSION_base(4,6,0)
-+import Prelude hiding (catch)
-+#endif
-+import Control.Exception (catch, IOException)
- 
- -- state transformer base and its monad operations
- -- -----------------------------------------------
-@@ -298,7 +303,7 @@
-                                   ioError err
-               Right _a         -> return state
-             )
--            `catch` (\err -> let
-+            `catch` (\(err :: IOException) -> let
-                                STB handler' = handler err
-                              in
-                              handler' bs gs)
diff --git a/dev-haskell/c2hs/metadata.xml b/dev-haskell/c2hs/metadata.xml
deleted file mode 100644
index 807fa1b6c176..000000000000
--- a/dev-haskell/c2hs/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		C-&gt;Haskell assists in the development of Haskell bindings to C
-		libraries. It extracts interface information from C header
-		files and generates Haskell code with foreign imports and
-		marshaling. Unlike writing foreign imports by hand (or using
-		hsch2s), this ensures that C functions are imported with the
-		correct Haskell types.
-	</longdescription>
-	<use>
-		<flag name="regression">run regression tests</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">haskell/c2hs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cabal-1.18.1.2 b/dev-haskell/cabal-1.18.1.2
new file mode 100644
index 000000000000..5dcc771d6afa
--- /dev/null
+++ b/dev-haskell/cabal-1.18.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-6.12.1:= test? ( dev-haskell/extensible-exceptions dev-haskell/hunit >=dev-haskell/quickcheck-2.1.0.1 dev-haskell/regex-posix dev-haskell/test-framework dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2.12 )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=856a52d197aa59dd7c5737fb93f3aa64
diff --git a/dev-haskell/cabal-1.18.1.3 b/dev-haskell/cabal-1.18.1.3
new file mode 100644
index 000000000000..c239534a0d07
--- /dev/null
+++ b/dev-haskell/cabal-1.18.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-6.12.1:= test? ( dev-haskell/extensible-exceptions dev-haskell/hunit >=dev-haskell/quickcheck-2.1.0.1 dev-haskell/regex-posix dev-haskell/test-framework dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2.12 )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b6cd084987f78c1a6f44bdc2ad53efe4
diff --git a/dev-haskell/cabal-1.18.1.5 b/dev-haskell/cabal-1.18.1.5
new file mode 100644
index 000000000000..3912806d81ae
--- /dev/null
+++ b/dev-haskell/cabal-1.18.1.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-6.12.1:= test? ( dev-haskell/extensible-exceptions dev-haskell/hunit >=dev-haskell/quickcheck-2.1.0.1 dev-haskell/regex-posix dev-haskell/test-framework dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2.12 )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dbbbc9afc2022ef1953cb85889cfe01a
diff --git a/dev-haskell/cabal-1.20.0.2 b/dev-haskell/cabal-1.20.0.2
new file mode 100644
index 000000000000..ff892d2a96be
--- /dev/null
+++ b/dev-haskell/cabal-1.20.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= test? ( dev-haskell/extensible-exceptions dev-haskell/hunit >=dev-haskell/quickcheck-2.1.0.1:2 <dev-haskell/quickcheck-2.8:2 dev-haskell/regex-posix dev-haskell/test-framework dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2.12 )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c65b417ae060f2544a0c7098f8dd3119
diff --git a/dev-haskell/cabal-1.22.8.0 b/dev-haskell/cabal-1.22.8.0
new file mode 100644
index 000000000000..626373f5f9ed
--- /dev/null
+++ b/dev-haskell/cabal-1.22.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.8.1:= test? ( dev-haskell/extensible-exceptions dev-haskell/hunit >=dev-haskell/quickcheck-2.1.0.1:2 <dev-haskell/quickcheck-2.9:2 dev-haskell/regex-posix dev-haskell/test-framework dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2.12 )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e6b6283ada90aef133eeaf1ea20ca4a8
diff --git a/dev-haskell/cabal-1.24.2.0 b/dev-haskell/cabal-1.24.2.0
new file mode 100644
index 000000000000..3cf4841469a6
--- /dev/null
+++ b/dev-haskell/cabal-1.24.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.8.1:=
+DESCRIPTION=A framework for packaging Haskell software
+EAPI=6
+HOMEPAGE=http://www.haskell.org/cabal/
+IUSE=profile test
+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.24.2.0
+SRC_URI=mirror://hackage/packages/archive/Cabal/1.24.2.0/Cabal-1.24.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=25d63cb65b6ec5928da7702398b87dfc
diff --git a/dev-haskell/cabal-2.0.0.2 b/dev-haskell/cabal-2.0.0.2
new file mode 100644
index 000000000000..8db1d955ea9c
--- /dev/null
+++ b/dev-haskell/cabal-2.0.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.8.1:=
+DESCRIPTION=A framework for packaging Haskell software
+EAPI=6
+HOMEPAGE=http://www.haskell.org/cabal/
+IUSE=profile test
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.8.1:=
+RESTRICT=test
+SLOT=0/2.0.0.2
+SRC_URI=mirror://hackage/packages/archive/Cabal/2.0.0.2/Cabal-2.0.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5db3a9b4634be26d5d435c9352115b00
diff --git a/dev-haskell/cabal-doctest-1 b/dev-haskell/cabal-doctest-1
new file mode 100644
index 000000000000..b127885119bf
--- /dev/null
+++ b/dev-haskell/cabal-doctest-1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-2.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Setup.hs helper for doctests running
+EAPI=6
+HOMEPAGE=https://github.com/phadej/cabal-doctest
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-2.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1
+SRC_URI=mirror://hackage/packages/archive/cabal-doctest/1/cabal-doctest-1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=408e7ee05cfba0c5ac77535e657006ea
diff --git a/dev-haskell/cabal-doctest/Manifest b/dev-haskell/cabal-doctest/Manifest
deleted file mode 100644
index d45b758f1f2b..000000000000
--- a/dev-haskell/cabal-doctest/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cabal-doctest-1.tar.gz 5056 BLAKE2B c73c636d4aa6c23a3d12cae969430405ed7ee8a3ebd27498c92712719c0111d64a200e28a8a17fb262d4627179b765757b9d041322fdba2fdc6f6b6f787f90d2 SHA512 2360f44b072123bfc9aeb23352f96777e5e2acbefd38659af26b17e7b8a4d3d332eb4bb3da7c1cb354660bb019c2a30e4323d295dbaf1356e2d6a8ffab51f82e
-EBUILD cabal-doctest-1.ebuild 621 BLAKE2B 8e2675b8a185e7d634359ab1ab37d64b5c7ec1782ecb3ca8d327f72204e0a1d33a6e739d7d4bb447f6a8ce416df2f82cf6a418746b2b7840df678420e1a71793 SHA512 ea3bbf8efa07ea8c060ee806135162f0f9e6231e299d0946830106277afbb3b1a63cd8c0b75d12545113a9de8310fb6712dc59e0d4dc3d2581570f3a1bfe5483
-MISC metadata.xml 723 BLAKE2B db4d3a4ba2f8356000273e0c98e91fdd1c781f48639075b8ca3ab59ce32e92d16c32e416c5421815ebd5fb1602aa0f485636c675fc7eace97f7d6da56c30c6b8 SHA512 916c984fc5af470538d6960698608f85e34b679f1ae72074d3b81dbd3e50418e6722d7897419dc669aeea52828d3b8577ba68cc21e5bf42fda287fe3a0d643a8
diff --git a/dev-haskell/cabal-doctest/cabal-doctest-1.ebuild b/dev-haskell/cabal-doctest/cabal-doctest-1.ebuild
deleted file mode 100644
index 803741073962..000000000000
--- a/dev-haskell/cabal-doctest/cabal-doctest-1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Setup.hs helper for doctests running"
-HOMEPAGE="https://github.com/phadej/cabal-doctest"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-2.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/cabal-doctest/metadata.xml b/dev-haskell/cabal-doctest/metadata.xml
deleted file mode 100644
index 90bd0c4b51cc..000000000000
--- a/dev-haskell/cabal-doctest/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Currently (beginning of 2017), there isn't @cabal doctest@
-		command. Yet, to properly work doctest needs plenty of configuration.
-		This library provides the common bits for writing custom Setup.hs
-		See &lt;https://github.com/haskell/cabal/issues/2327 Cabal/2327&gt; for the progress
-		of @cabal doctest@, i.e. whether this library is obsolete.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">phadej/cabal-doctests</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cabal-helper-0.6.1.0 b/dev-haskell/cabal-helper-0.6.1.0
new file mode 100644
index 000000000000..4aa893bd3bb8
--- /dev/null
+++ b/dev-haskell/cabal-helper-0.6.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-1.23:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/temporary:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/extra:2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple interface to some of Cabal's configuration state used by ghc-mod
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/cabal-helper
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=>=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-1.23:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/temporary:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.6.1.0
+SRC_URI=mirror://hackage/packages/archive/cabal-helper/0.6.1.0/cabal-helper-0.6.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2f5761927403b6c1afa59b952d4d77c6
diff --git a/dev-haskell/cabal-helper-0.6.3.1 b/dev-haskell/cabal-helper-0.6.3.1
new file mode 100644
index 000000000000..621e0a4c6b56
--- /dev/null
+++ b/dev-haskell/cabal-helper-0.6.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-1.23:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/temporary:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/extra ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple interface to some of Cabal's configuration state used by ghc-mod
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/cabal-helper
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=>=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-1.23:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/temporary:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.6.3.1
+SRC_URI=mirror://hackage/packages/archive/cabal-helper/0.6.3.1/cabal-helper-0.6.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8f0a9b34a313f1bb2e3fc4c0901b3667
diff --git a/dev-haskell/cabal-helper-0.7.3.0 b/dev-haskell/cabal-helper-0.7.3.0
new file mode 100644
index 000000000000..f50d7f877add
--- /dev/null
+++ b/dev-haskell/cabal-helper-0.7.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-1.26:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/temporary-1.2.0.4:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/utf8-string-1.0.1.1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/extra-1.4.10 <dev-haskell/extra-1.6 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple interface to some of Cabal's configuration state used by ghc-mod
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/cabal-helper
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=>=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-1.26:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/temporary-1.2.0.4:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/utf8-string-1.0.1.1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0/0.7.3.0
+SRC_URI=mirror://hackage/packages/archive/cabal-helper/0.7.3.0/cabal-helper-0.7.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=55dbfa6d5669e04ef2f58e041f5de638
diff --git a/dev-haskell/cabal-helper/Manifest b/dev-haskell/cabal-helper/Manifest
deleted file mode 100644
index 5d560a2fb828..000000000000
--- a/dev-haskell/cabal-helper/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST cabal-helper-0.6.1.0.tar.gz 32694 BLAKE2B 6f9aba9e128d2f2f0ba1a18b78b9cef69e866c79d0a38c7a5acb4398377766cfae77babacd5b3fe956761d917045325b4aa17345063f578699c60ef6aaef14c5 SHA512 8c85b5e49f95acb74dc743a57e428ffe3f98555501a9020e4601f28f10bd3e3f98910dc90d8b611162e61cda0eec06a48ab09bd23eaf82093a85427a4c8330f7
-DIST cabal-helper-0.6.3.1.tar.gz 41668 BLAKE2B 8100cbe79b9d1f7f84a937727d820a15be3955093af15abf6543568ac65f65f70810044370d0bdce543300796401d0bfc7b89d6c80323189e527062b00817c93 SHA512 7a0833cee229286904ff1304944100df33d975f1df0df5ab439f28d1ce28ae3fe86cc7d208ff04ba9980aff26f77f260d4f2893c7d528395555faeccf7041cca
-DIST cabal-helper-0.7.3.0.tar.gz 35745 BLAKE2B be54313453564fdcbedf7f7450afa2282af90c47cd6ff6ea9be3e76ccb4fb30f558e20bad73633754c914b4574c82b6d3b35b8d41579c72f1e9c7dbec6587a11 SHA512 612c7589a9f8eb4056ae5cf3365d5ee2d52357554a012c9a4515c2adefd5275153ff24fc80aac7b7f37e397a583f22808e4554fcde8a0f72cc0306ffe811600f
-EBUILD cabal-helper-0.6.1.0.ebuild 853 BLAKE2B 8b51c1321dff86ecca8c3e4ea85532621fb3b9ede9d6aa25f740f5e93b042eb8110956e9b68d30fee47b9a6cd8fc34f2c353a2c3bc28040befb3a575adb6dc9a SHA512 0b95a5a0a1eb2bde8c3145a03721ad52b5f59609df516a6659edafb8b20c1542fdade1bdf5f58b24cdd24856085969a9c159bfa1f77c25519abd21ab63980abb
-EBUILD cabal-helper-0.6.3.1.ebuild 904 BLAKE2B 1fb85f130bbc467be0309ae3498158446c6fb893f85cb0b81cbd6f5d30f2460ef303edd286ea776ca2bc606b9896bee25477c3938cf07beaf077cf524d8840c3 SHA512 e63eb8f76404f93451bb5a3f87a744e62b1e9fd227ce23cd7f59252409a2981c7d6e6bf76d892bb82e51abca0f002f68529f8a5a8b203040f95e2ace8eb56b06
-EBUILD cabal-helper-0.7.3.0.ebuild 1042 BLAKE2B 9e58b6c31a68464ff991661407220dbba101cc5ce6463aaacba1610a9d4f042507ff5cf48db8821edbcdbef7c2859c68bcf3edfa0ea5d37d31fca232374db69e SHA512 9f0c201ac513ae8493b14bc2890e94b736e72b30d19ad2b475abe36d3585bcef054d7c9ad50683a3dd4207ca624530c8a8a2e7693a921d1db2cfb8b1e8e217fd
-MISC metadata.xml 1443 BLAKE2B ea9c664144d2726fe071b7baa7fcbef225851ee64ce81761ee294a7187251d795ffe568d7d711b0fccf164314eaeceff8068e18beb3a3c2c496e945f5dce70f2 SHA512 c7586526dcb26b3824220498702a0ed48c8ffdd4141d92dbc1b2a991a07f67849df4fa5f137041a7777bdf296544c490d2c9611f3da72425710897ab6a367a0a
diff --git a/dev-haskell/cabal-helper/cabal-helper-0.6.1.0.ebuild b/dev-haskell/cabal-helper/cabal-helper-0.6.1.0.ebuild
deleted file mode 100644
index 410e98eeacea..000000000000
--- a/dev-haskell/cabal-helper/cabal-helper-0.6.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Simple interface to some of Cabal's configuration state used by ghc-mod"
-HOMEPAGE="http://hackage.haskell.org/package/cabal-helper"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-1.23:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/temporary:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/extra:2 )
-"
diff --git a/dev-haskell/cabal-helper/cabal-helper-0.6.3.1.ebuild b/dev-haskell/cabal-helper/cabal-helper-0.6.3.1.ebuild
deleted file mode 100644
index a5c7a56ebbb4..000000000000
--- a/dev-haskell/cabal-helper/cabal-helper-0.6.3.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Simple interface to some of Cabal's configuration state used by ghc-mod"
-HOMEPAGE="http://hackage.haskell.org/package/cabal-helper"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # runs external cabal and downloads things
-
-RDEPEND=">=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-1.23:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/temporary:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/extra )
-"
diff --git a/dev-haskell/cabal-helper/cabal-helper-0.7.3.0.ebuild b/dev-haskell/cabal-helper/cabal-helper-0.7.3.0.ebuild
deleted file mode 100644
index 60dcdac84436..000000000000
--- a/dev-haskell/cabal-helper/cabal-helper-0.7.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Simple interface to some of Cabal's configuration state used by ghc-mod"
-HOMEPAGE="http://hackage.haskell.org/package/cabal-helper"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # runs external cabal and downloads things
-
-RDEPEND=">=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-1.26:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/temporary-1.2.0.4:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
-	>=dev-haskell/utf8-string-1.0.1.1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/extra-1.4.10 <dev-haskell/extra-1.6 )
-"
diff --git a/dev-haskell/cabal-helper/metadata.xml b/dev-haskell/cabal-helper/metadata.xml
deleted file mode 100644
index b6837b40dcda..000000000000
--- a/dev-haskell/cabal-helper/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		@cabal-helper@ provides a library which wraps the internal use of executables
-		to lift the restrictions imposed by linking against versions of GHC before
-		@7.10@.
-		
-		@cabal-helper@ uses a wrapper executable to compile the actual cabal-helper
-		executable at runtime while linking against an arbitrary version of
-		Cabal. This runtime-compiled helper executable is then used to extract
-		various bits and peices from Cabal\'s on disk state (dist/setup-config)
-		written by it's configure command.
-		
-		In addition to this the wrapper executable also supports installing any
-		version of Cabal from hackage in case it cannot be found in any available
-		package database. The wrapper installs these instances of the Cabal library
-		into a private package database so as to not interfere with the user's
-		packages.
-		
-		Furthermore the wrapper supports one special case namely reading a state
-		file for Cabal itself. This is needed as Cabal compiles it's Setup.hs using
-		itself and not using any version of Cabal installed in any package database.
-		
-		@cabal-helper@ can compile with @Cabal &gt;= 1.14@ but requires @Cabal &gt;= 1.16@
-		at runtime.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/cabal-install-1.18.1.0 b/dev-haskell/cabal-install-1.18.1.0
new file mode 100644
index 000000000000..67c67595cfeb
--- /dev/null
+++ b/dev-haskell/cabal-install-1.18.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/cabal-1.18.0 <dev-haskell/cabal-1.19 >=dev-haskell/http-4000.0.8 <dev-haskell/http-4001 >=dev-haskell/mtl-2.0 <dev-haskell/mtl-3 >=dev-haskell/network-1 <dev-haskell/network-3 dev-haskell/network-uri >=dev-haskell/random-1 <dev-haskell/random-1.1 >=dev-haskell/stm-2.0 <dev-haskell/stm-3 >=dev-haskell/zlib-0.5.3 <dev-haskell/zlib-0.6 >=dev-lang/ghc-6.12.1 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2.5 dev-haskell/test-framework dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.3 )
+DESCRIPTION=The command-line interface for Cabal and Hackage
+EAPI=5
+HOMEPAGE=http://www.haskell.org/cabal/
+IUSE=+noprefs test
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/cabal-install/1.18.1.0/cabal-install-1.18.1.0.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5a400448cd67c8e7e40f59d89b0daa23
diff --git a/dev-haskell/cabal-install-1.20.0.3-r2 b/dev-haskell/cabal-install-1.20.0.3-r2
new file mode 100644
index 000000000000..0c645708805c
--- /dev/null
+++ b/dev-haskell/cabal-install-1.20.0.3-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/cabal-1.20.0 <dev-haskell/cabal-1.21 >=dev-haskell/http-4000.2.5 <dev-haskell/http-4000.3 >=dev-haskell/mtl-2.0 <dev-haskell/mtl-3 >=dev-haskell/network-2.0 <dev-haskell/network-2.7 dev-haskell/network-uri >=dev-haskell/random-1 <dev-haskell/random-1.2 >=dev-haskell/stm-2.0 <dev-haskell/stm-3 >=dev-haskell/zlib-0.5.3 <dev-haskell/zlib-0.6 >=dev-lang/ghc-7.4.1 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2.5 dev-haskell/test-framework dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.3 )
+DESCRIPTION=The command-line interface for Cabal and Hackage
+EAPI=5
+HOMEPAGE=http://www.haskell.org/cabal/
+IUSE=+noprefs test
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/cabal-install/1.20.0.3/cabal-install-1.20.0.3.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f0ed295977c4a5b46343e7cae6b499e9
diff --git a/dev-haskell/cabal-install-1.22.7.0 b/dev-haskell/cabal-install-1.22.7.0
new file mode 100644
index 000000000000..e95da74248b0
--- /dev/null
+++ b/dev-haskell/cabal-install-1.22.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/cabal-1.22.2:= <dev-haskell/cabal-1.23:= >=dev-haskell/http-4000.2.5:= <dev-haskell/http-4000.3:= >=dev-haskell/mtl-2.0:= <dev-haskell/mtl-3:= >=dev-haskell/old-time-1:= <dev-haskell/old-time-1.2:= >=dev-haskell/random-1:= <dev-haskell/random-1.2:= >=dev-haskell/stm-2.0:= <dev-haskell/stm-3:= >=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:= >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= ) !network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= ) >=dev-haskell/cabal-1.10 test? ( dev-haskell/extensible-exceptions dev-haskell/hunit >=dev-haskell/quickcheck-2.5 dev-haskell/regex-posix dev-haskell/test-framework dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.3 !network-uri? ( <dev-haskell/network-uri-2.6 ) )
+DESCRIPTION=The command-line interface for Cabal and Hackage
+EAPI=5
+HOMEPAGE=http://www.haskell.org/cabal/
+IUSE=+network-uri +noprefs test
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cabal-1.22.2:= <dev-haskell/cabal-1.23:= >=dev-haskell/http-4000.2.5:= <dev-haskell/http-4000.3:= >=dev-haskell/mtl-2.0:= <dev-haskell/mtl-3:= >=dev-haskell/old-time-1:= <dev-haskell/old-time-1.2:= >=dev-haskell/random-1:= <dev-haskell/random-1.2:= >=dev-haskell/stm-2.0:= <dev-haskell/stm-3:= >=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:= >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= ) !network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/cabal-install/1.22.7.0/cabal-install-1.22.7.0.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=715826f7e653c7ef1e6ff244b85d8275
diff --git a/dev-haskell/cabal-install-1.24.0.2 b/dev-haskell/cabal-install-1.24.0.2
new file mode 100644
index 000000000000..f747bdb705ed
--- /dev/null
+++ b/dev-haskell/cabal-install-1.24.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/async-2.0:= <dev-haskell/async-3:= >=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-0.2:= >=dev-haskell/bytestring-builder-0.10:= <dev-haskell/bytestring-builder-1:= >=dev-haskell/cabal-1.24.2:= <dev-haskell/cabal-1.25:= >=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:= >=dev-haskell/hackage-security-0.5.2.2:= <dev-haskell/hackage-security-0.6:= >=dev-haskell/hashable-1.0:= <dev-haskell/hashable-2:= >=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:= >=dev-haskell/mtl-2.0:= <dev-haskell/mtl-3:= >=dev-haskell/old-time-1:= <dev-haskell/old-time-1.2:= >=dev-haskell/random-1:= <dev-haskell/random-1.2:= >=dev-haskell/stm-2.0:= <dev-haskell/stm-3:= >=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:= >=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:= >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:= <dev-haskell/network-2.7:= >=dev-haskell/network-uri-2.6:= <dev-haskell/network-uri-2.7:= ) !network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= ) >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.8.2 dev-haskell/regex-posix dev-haskell/tagged dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck !network-uri? ( <dev-haskell/network-uri-2.6 ) )
+DESCRIPTION=The command-line interface for Cabal and Hackage
+EAPI=6
+HOMEPAGE=http://www.haskell.org/cabal/
+IUSE=+network-uri +noprefs test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/async-2.0:= <dev-haskell/async-3:= >=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-0.2:= >=dev-haskell/bytestring-builder-0.10:= <dev-haskell/bytestring-builder-1:= >=dev-haskell/cabal-1.24.2:= <dev-haskell/cabal-1.25:= >=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:= >=dev-haskell/hackage-security-0.5.2.2:= <dev-haskell/hackage-security-0.6:= >=dev-haskell/hashable-1.0:= <dev-haskell/hashable-2:= >=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:= >=dev-haskell/mtl-2.0:= <dev-haskell/mtl-3:= >=dev-haskell/old-time-1:= <dev-haskell/old-time-1.2:= >=dev-haskell/random-1:= <dev-haskell/random-1.2:= >=dev-haskell/stm-2.0:= <dev-haskell/stm-3:= >=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:= >=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:= >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:= <dev-haskell/network-2.7:= >=dev-haskell/network-uri-2.6:= <dev-haskell/network-uri-2.7:= ) !network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/cabal-install/1.24.0.2/cabal-install-1.24.0.2.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=738c1ca6cda6bf75685144fd5a23863e
diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest
deleted file mode 100644
index 88086fb1946e..000000000000
--- a/dev-haskell/cabal-install/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX cabal-install-0.13.3-nopref.patch 775 BLAKE2B c2c9478da820ffd22ab5450a38f54d74249b8b5000732be2e9cb68229876cdd50062ad7a668bef860be53161b2a820d0e31e3701f5c5f28602e964267a8ad30b SHA512 e0abaebca3d85bf09cffe76a7cdc0dc4df9ef7d0b13950932cbb0bedaeea59173cbf28b2a89f3f1b9e8ea15cb5c611678cf79ea63ea5a3f5acb4417082de19e5
-AUX cabal-install-1.24.0.0-nopref.patch 651 BLAKE2B baf9f0b75bdfe0c49c0c54f9cfb63a917c778a4983db9d79672244b3c424488686914e0a3fee58e249510e489d45f358f33645a427762583c65c5233c0e4905a SHA512 052241ec023ffd24fdb45902835f79d639ea8ae0bb745b1456e5a730448880739f3a050a48f5af1715b7669f1168f52c28f967fb8a6c7a47d5064efcad501d48
-DIST cabal-install-1.18.1.0.tar.gz 257577 BLAKE2B ea5d1eb3458657b81f04b2de1bd17b3f006912d0eb9a4d6e1bd23f0ecea5560912409603e8a58154c64f6863165fbc850e1015243b727e4d9bdc4bcb4006d7f0 SHA512 252304480ebde673fba873b9d7f709e47d1acfc7ab936a2b19f663d8e3c8ef7a20abeaac0cf9bbdb4bf0d1c30688e8a9b1cf1f73c27ce8f47845c3431de6752e
-DIST cabal-install-1.20.0.3.tar.gz 274779 BLAKE2B 4b46e3722305566e9671677292a3ef64df9ca018dc54c088759a396b04bbbfbe28a72dc058cc98cf8ec552846d47a07d9d792a02a5834aa7808052183b4a93b0 SHA512 a272c7eb1c87a933b30697afa7bf78f95fb0afa203e791448d5e96d5c62105533347b8b777af7a7e6db5703654c319045e089d46d2263a09ed5ada10144ce12f
-DIST cabal-install-1.22.7.0.tar.gz 302579 BLAKE2B e8a92bc69f0b00e5fc12145277216652fa52fb1de9ce3458b5fc3d9bc6f89cfe3a95d26dd7585566b55c55c2a9b2d021336baa10694aa39ca442bdb58c6997e7 SHA512 a88895ee38bf7451ba6a2e929ff224643ea0a536a9633d463d91a471e41b6aae302af2c3ca4fc914e4b3401fcadb137bb0c68c9fb7d0f768835374aef1b22766
-DIST cabal-install-1.24.0.2.tar.gz 499937 BLAKE2B c2e1ea88e20b1a43064010117e1830b052c339464f3188a931e7ca72220287a2862ea25423e5190e8f3fe6ed6b38dc7b688474796faf3d049626b04cf6c191cc SHA512 bd055a52ff0ac697e6f21a588d53dd811d50ee9410659a242c00a5665b360ef10c024df4872b9070c33aa49f779c8817b883b40087d3f4e0be4096a54b2ad5f0
-EBUILD cabal-install-1.18.1.0.ebuild 1436 BLAKE2B 0546f0dcf49ac06d2116fbffc73df5141d08c909107fe49a42d697fc16655aebb87bbf484bc0e1e2ab623e2a9f1eb1519004622b9e75166e358f6564f2e5b439 SHA512 82ef1131f400f7adc5556a143ae4afa1bdb95e9207f7d7f1a52674316387f642f2dbad5e5b267c946b1259949756dc7958438ce5ef24f717378a441bb5c1308b
-EBUILD cabal-install-1.20.0.3-r2.ebuild 1656 BLAKE2B f472b04bc884f0560c8aff0ab65260832419533f1e13329cd4c4149dd9f44474cb4d4775a05e00a6e62f523c4082dde6ab8d929998853bdc93475b1b835ddbb5 SHA512 2d286c5acdbc6559735b2200e212431247636206d398f2d6240b9807ef48cb98de5a8bb6176660c964c5f5b4ed1503e63ff923bd4abf0b7e21a2aeaaad4a672e
-EBUILD cabal-install-1.22.7.0.ebuild 1908 BLAKE2B 1f87b2d0821fb498de0bd32ab55df30d18c2068d95b84c101204a526cedaeb4caa9b56fcc4fb1dfa7c84fc33a0fa76fbc30cca3489a400bc91f1be5dee8768e0 SHA512 71baf6a677b9137e737d900b321b082d44e86d6d99a013b724d034c6fd734f5ee4d94424934d5a2fb72dc4206ce1c1082fa7334079ec11167344b8624c695962
-EBUILD cabal-install-1.24.0.2.ebuild 2413 BLAKE2B 3c0d3dca33fbf06f4a799dfcca795f10fa55f3dc289a42f1be0200eea1ad7916f18cda4e7c7fcabc4ad0890c2612169fdd221b6ad901fa885376031989ae935f SHA512 8f64c5126e138baf995bb769aa9361bb2eb6115d5c8ab85905d91b817e163e2304c186e8869e7dc8dfb027c6cd58824655b1faa01d3dc343f91f5ae259d7d481
-MISC metadata.xml 668 BLAKE2B acbff9d85af49bb29555d6a9d98d0b4342c5617e19bbb087d767bd5d1167df74e804890b4b1cd4d93f06b6565fa73f66e6f3d9b53e2923312fb6ceaa75a494d1 SHA512 fcf0bad8448b59a5019e8cb993952fb1f073ca0a7f78a41d83d403759837099900fcb03ce2a38c800515c4e88ee5fe49fa108b6b8b384eda0d28e08b2d3d2e13
diff --git a/dev-haskell/cabal-install/cabal-install-1.18.1.0.ebuild b/dev-haskell/cabal-install/cabal-install-1.18.1.0.ebuild
deleted file mode 100644
index fcd25ce5adfa..000000000000
--- a/dev-haskell/cabal-install/cabal-install-1.18.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit bash-completion-r1 eutils haskell-cabal
-
-DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="http://www.haskell.org/cabal/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="+noprefs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.0 <dev-haskell/cabal-1.19
-	>=dev-haskell/http-4000.0.8 <dev-haskell/http-4001
-	>=dev-haskell/mtl-2.0 <dev-haskell/mtl-3
-	>=dev-haskell/network-1 <dev-haskell/network-3
-	dev-haskell/network-uri
-	>=dev-haskell/random-1 <dev-haskell/random-1.1
-	>=dev-haskell/stm-2.0 <dev-haskell/stm-3
-	>=dev-haskell/zlib-0.5.3 <dev-haskell/zlib-0.6
-	>=dev-lang/ghc-6.12.1
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.5
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.3 )
-"
-
-src_prepare() {
-	if use noprefs; then
-		epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
-	fi
-
-	# no chance to link to -threaded on ppc64, alpha and others
-	# who use UNREG, not only ARM
-	if ! ghc-supports-threaded-runtime; then
-		cabal_chdeps '-threaded' ' '
-	fi
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	dobashcomp "${S}/bash-completion/cabal"
-}
diff --git a/dev-haskell/cabal-install/cabal-install-1.20.0.3-r2.ebuild b/dev-haskell/cabal-install/cabal-install-1.20.0.3-r2.ebuild
deleted file mode 100644
index fa0e9c1806fb..000000000000
--- a/dev-haskell/cabal-install/cabal-install-1.20.0.3-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit bash-completion-r1 eutils haskell-cabal
-
-DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="http://www.haskell.org/cabal/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+noprefs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.20.0 <dev-haskell/cabal-1.21
-	>=dev-haskell/http-4000.2.5 <dev-haskell/http-4000.3
-	>=dev-haskell/mtl-2.0 <dev-haskell/mtl-3
-	>=dev-haskell/network-2.0 <dev-haskell/network-2.7
-	dev-haskell/network-uri
-	>=dev-haskell/random-1 <dev-haskell/random-1.2
-	>=dev-haskell/stm-2.0 <dev-haskell/stm-3
-	>=dev-haskell/zlib-0.5.3 <dev-haskell/zlib-0.6
-	>=dev-lang/ghc-7.4.1
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.5
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.3 )
-"
-
-src_prepare() {
-	if use noprefs; then
-		epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
-	fi
-
-	# no chance to link to -threaded on ppc64, alpha and others
-	# who use UNREG, not only ARM
-	if ! ghc-supports-threaded-runtime; then
-		cabal_chdeps '-threaded' ' '
-	fi
-
-	cabal_chdeps \
-		'network    >= 2.0      && < 2.6' 'network    >= 2.0      && < 2.7, network-uri' \
-		'network,' 'network,network-uri,' \
-		'random     >= 1        && < 1.1' 'random     >= 1        && < 1.2'
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	dobashcomp "${S}/bash-completion/cabal"
-}
diff --git a/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild b/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild
deleted file mode 100644
index ad649a3ad7e3..000000000000
--- a/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit bash-completion-r1 eutils haskell-cabal
-
-DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="http://www.haskell.org/cabal/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+network-uri +noprefs"
-
-RESTRICT=test # missing files
-
-RDEPEND=">=dev-haskell/cabal-1.22.2:= <dev-haskell/cabal-1.23:=
-	>=dev-haskell/http-4000.2.5:= <dev-haskell/http-4000.3:=
-	>=dev-haskell/mtl-2.0:= <dev-haskell/mtl-3:=
-	>=dev-haskell/old-time-1:= <dev-haskell/old-time-1.2:=
-	>=dev-haskell/random-1:= <dev-haskell/random-1.2:=
-	>=dev-haskell/stm-2.0:= <dev-haskell/stm-3:=
-	>=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:=
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=
-			>=dev-haskell/network-uri-2.6:= )
-	!network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/extensible-exceptions
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.5
-		dev-haskell/regex-posix
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.3
-		!network-uri? ( <dev-haskell/network-uri-2.6 ) )
-"
-
-src_prepare() {
-	if use noprefs; then
-		epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
-	fi
-
-	# no chance to link to -threaded on ppc64, alpha and others
-	# who use UNREG, not only ARM
-	if ! ghc-supports-threaded-runtime; then
-		cabal_chdeps '-threaded' ' '
-	fi
-
-	cabal_chdeps \
-		'QuickCheck >= 2.1.0.1 && < 2.9' 'QuickCheck >= 2.1.0.1'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-
-	dobashcomp "${S}/bash-completion/cabal"
-}
diff --git a/dev-haskell/cabal-install/cabal-install-1.24.0.2.ebuild b/dev-haskell/cabal-install/cabal-install-1.24.0.2.ebuild
deleted file mode 100644
index 14f9f6461f84..000000000000
--- a/dev-haskell/cabal-install/cabal-install-1.24.0.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="test-suite"
-inherit bash-completion-r1 haskell-cabal
-
-DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="http://www.haskell.org/cabal/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+network-uri +noprefs"
-
-RESTRICT=test
-
-RDEPEND=">=dev-haskell/async-2.0:= <dev-haskell/async-3:=
-	>=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-0.2:=
-	>=dev-haskell/bytestring-builder-0.10:= <dev-haskell/bytestring-builder-1:=
-	>=dev-haskell/cabal-1.24.2:= <dev-haskell/cabal-1.25:=
-	>=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:=
-	>=dev-haskell/hackage-security-0.5.2.2:= <dev-haskell/hackage-security-0.6:=
-	>=dev-haskell/hashable-1.0:= <dev-haskell/hashable-2:=
-	>=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:=
-	>=dev-haskell/mtl-2.0:= <dev-haskell/mtl-3:=
-	>=dev-haskell/old-time-1:= <dev-haskell/old-time-1.2:=
-	>=dev-haskell/random-1:= <dev-haskell/random-1.2:=
-	>=dev-haskell/stm-2.0:= <dev-haskell/stm-3:=
-	>=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:=
-	>=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:=
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:= <dev-haskell/network-2.7:=
-			>=dev-haskell/network-uri-2.6:= <dev-haskell/network-uri-2.7:= )
-	!network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.8.2
-		dev-haskell/regex-posix
-		dev-haskell/tagged
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck
-		!network-uri? ( <dev-haskell/network-uri-2.6 ) )
-"
-
-src_prepare() {
-	default
-	if use noprefs; then
-		epatch "${FILESDIR}/${PN}"-1.24.0.0-nopref.patch
-	fi
-
-	# no chance to link to -threaded on ppc64, alpha and others
-	# who use UNREG, not only ARM
-	if ! ghc-supports-threaded-runtime; then
-		cabal_chdeps '-threaded' ' '
-	fi
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	dobashcomp "${S}/bash-completion/cabal"
-
-	# fixup perms in such an an awkward way
-	mv "${ED}/usr/share/man/man1/cabal.1" "${S}/cabal.1" || die
-	doman "${S}/cabal.1"
-}
diff --git a/dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch b/dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch
deleted file mode 100644
index c36582680a56..000000000000
--- a/dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/Distribution/Client/IndexUtils.hs b/Distribution/Client/IndexUtils.hs
-index 48d8d49..3a38ee1 100644
---- a/Distribution/Client/IndexUtils.hs
-+++ b/Distribution/Client/IndexUtils.hs
-@@ -312,10 +312,15 @@ extractPkg entry = case Tar.entryContent entry of
- 
- extractPrefs :: Tar.Entry -> Maybe [Dependency]
- extractPrefs entry = case Tar.entryContent entry of
-+{-
-+ -- get rid of hackage's preferred-versions
-+ -- I'd like to have bleeding-edge packages in system and I don't fear of
-+ -- broken packages with improper depends
-   Tar.NormalFile content _
-      | takeFileName (Tar.entryPath entry) == "preferred-versions"
-     -> Just . parsePreferredVersions
-      . BS.Char8.unpack $ content
-+-}
-   _ -> Nothing
- 
- parsePreferredVersions :: String -> [Dependency]
diff --git a/dev-haskell/cabal-install/files/cabal-install-1.24.0.0-nopref.patch b/dev-haskell/cabal-install/files/cabal-install-1.24.0.0-nopref.patch
deleted file mode 100644
index 40b281073c0e..000000000000
--- a/dev-haskell/cabal-install/files/cabal-install-1.24.0.0-nopref.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Distribution/Client/IndexUtils.hs b/Distribution/Client/IndexUtils.hs
-index 95545fc..a9c8417 100644
---- a/Distribution/Client/IndexUtils.hs
-+++ b/Distribution/Client/IndexUtils.hs
-@@ -345,2 +345,6 @@ extractPrefs :: Tar.Entry -> Maybe [Dependency]
- extractPrefs entry = case Tar.entryContent entry of
-+{-
-+ -- get rid of hackage's preferred-versions
-+ -- I'd like to have bleeding-edge packages in system and I don't fear of
-+ -- broken packages with improper depends
-   Tar.NormalFile content _
-@@ -351,2 +355,3 @@ extractPrefs entry = case Tar.entryContent entry of
-       prefs     = parsePreferredVersions content
-+-}
-   _ -> Nothing
diff --git a/dev-haskell/cabal-install/metadata.xml b/dev-haskell/cabal-install/metadata.xml
deleted file mode 100644
index 31f7b7e26dba..000000000000
--- a/dev-haskell/cabal-install/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The 'cabal' command-line program simplifies the process of managing
-		Haskell software by automating the fetching, configuration, compilation
-		and installation of Haskell libraries and programs.
-	</longdescription>
-	<use>
-		<flag name="noprefs">Ignore 'preferred-versions' file from hackage's tarball.</flag>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
deleted file mode 100644
index 5ff4a5b7b6b3..000000000000
--- a/dev-haskell/cabal/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-AUX cabal-2.0.0.2-no-bootstrap.patch 255 BLAKE2B 49b913ac6c5c43c92aab70abfb39059731f636e3a23064c7ca5d8773b28409fc834b480985d9ac4b402af5c4dd6c11000f6d7f90fd8b7c2d2268789764d4522a SHA512 b09d267b1099233aa0fc2a17afe3ade979f263f113ae3b70c5f2e9663c1a88860ca09fdbae489779851efab07f897579714da80a955e9a70f30ad0811f168c9f
-DIST Cabal-1.18.1.2.tar.gz 323545 BLAKE2B d9e88f8f512b6bf23f8c57b6719fcf560b24aa2b20a0be3aeaba455dbea79c7320cfec495f31524a098b2d0298fe04cdd29c65f8c527066fcac82ba1f592e761 SHA512 a91abbdb86bcb7a47e871e9b9a2cb4720b41f2cf6998416cc557460ff821e9b711cf8c346bf16c7b07c180815cb901f7b27e5cda3701f3ace554613ceb27e3c6
-DIST Cabal-1.18.1.3.tar.gz 705715 BLAKE2B 46d6c446e9410d7bd3e3f2e68e2e950e180f8fde4332ba3c4657add30dd721d7e2887b830e9c2954d3ce8e521e42d7db90d87150804589ad5fbea5c08b6b3fca SHA512 3c6f2d3be36384140007ca1146edcca5461bf0e93cde8d2b32bd9d69f74df51975bfbc91ec7cce92d9c78929f91f9e7e8b595488bc1c328dbed313a6fcd76708
-DIST Cabal-1.18.1.5.tar.gz 706722 BLAKE2B ff1b301882d39c0388f6ecd39ad73cadebdc9096b0e185fcf1299897e536be23714ba9126033d98b60558272fc28e9d72f638ee94d9f769e61d00c2d2bd1a092 SHA512 a5bb21bcb0a95f22572a1d6d4338415bf00eab9b77c2fb4775c81f7554d282fea9160646687bd903197cb5d429f0fcd28b30b577a8915ec92740a91fa13c68ef
-DIST Cabal-1.20.0.2.tar.gz 717941 BLAKE2B 38aa5742a1f0137b3f81af6543d7810b98f15b6aeb6e83ea169aacab0bcb1d14629df885cc9c02bb64567069e475497cf2ac716731bf84ee89bdf177404cc5e0 SHA512 6dfe30ebe5859ccd934f76fc32bd4757d89e3bcb02a528bebaa0a63f22c0494eb4a941b2fed2e004671875586fed113860e82413bed99f70be565f4f343ac3d3
-DIST Cabal-1.22.8.0.tar.gz 405552 BLAKE2B 9484ba4b485f6119a7b9e27565ac26ea403b407711a8dcfcee127e03f3cce6a0e96165126a996b39a8f29e97e65eff4f5ec308fb3f53c53cb795cb8ba1ab0daf SHA512 3666e8a66751ea8ae93109c1e33c2909c00c65ddcd77458c41303481e06ebd7230215e12c133cc2fca47ba352c61411ff72ca0994b6d45b5987156bce2fbcdf3
-DIST Cabal-1.24.2.0.tar.gz 441440 BLAKE2B b4ce800ab35c0771b9da1947b459bae7cf6236724b6073bff3eb51732b08b71f65596f9f3fb7a09eacea4a1ee88d9bd6350298919f095fb2479770f98539faf5 SHA512 707015930d6bd463290c59ef043a5acea79f22d43920ac249d2391c0b8960a10261a83c8aa1a326b6e95311edb048c9edbdc211dc1b79aee86884061af6c8b36
-DIST Cabal-2.0.0.2.tar.gz 1551128 BLAKE2B bc053a31ddd966577b1c4d5b80bd778fe0b5aadef08d3eee1f8613ab2dd9bc3a0371ad1687033a4489bfced3b46926b0cbdea20d53ada4ed1ab615c7e080de39 SHA512 0eac73132dbee80cce8bf6ce95d531526c983e90dde3348edf6ee583e7fe352393dc6806eb7f35cd38729d979dd418267f1884ec49b4c9e7d858d9b17dff900f
-EBUILD cabal-1.18.1.2.ebuild 1310 BLAKE2B c6490c92d19e9f84fd33b859865170b083cbe0726337965311d5e17ffac9e7a8ffbc24a8137207ad07fdb3ac0c9b72c48b1fcfe7b9acb6910622de2281c1eb67 SHA512 79d6d4fea74176190c4cf9b37be79790c0d1f340b3f4c29a3e0ed3cbb19d048b04b3d4c3a7769bfe3eaf4707613725afba7452f28132ce30b14494c8b49b9e21
-EBUILD cabal-1.18.1.3.ebuild 1489 BLAKE2B d1ef02de7c0517988a8c6bef39520b5068b67f329fcfbccbc43b7006232ffbd5303ece6aee2bc69509d7d058070016c540a7543b3d3152a4ce72bf62d2b9bfd2 SHA512 312fbc3f713bfd170a1a5825c374f8fb81b59b242c8b6c7e516d1f10f47eb62b8ff26af1907bb45d7b0701cc3a4a913af837bd7a237fd7dde32b673a0b090f4b
-EBUILD cabal-1.18.1.5.ebuild 1504 BLAKE2B d1abcbbebf88b2860178efa5c996fcc0834bf6e1317279d21224bec54adefc628764b8149b8053457226c3ae8aa19d4448b78f624e4a35fe11c3a5dda308c56b SHA512 6631bc5ac5017b5167e9830370a1d37fb39c5411ef0daa8cc1454cd24a99f3b9e3bca7edd9c154b132f42a46ade7f04dd48de05bc2babd53c779ad26ea5caeb0
-EBUILD cabal-1.20.0.2.ebuild 1566 BLAKE2B a94e9df84ae92684444d10916d01ebbed387ebd7b414b6434405c43cb9e98b53e2325fabe8548b05c64efe1f42c7cb71f0ddfb533ce8fe91df5493ba698e41ea SHA512 43a24a9d1f800fa4267808ad85c156e602916c156e380fad32ec9abe987e72eb2126c31a05881cdaf357b62bff61dcc325e3aae06bcbf4cda427405130fecfcd
-EBUILD cabal-1.22.8.0.ebuild 1453 BLAKE2B d728a8fafe08b4240e025eda34cae7def1000300749ca0d931a9df406b275904d9a3ff7287d98a665881fc1b8dec4a051675da90741e0e37623554109fb34322 SHA512 2ab65a807e81402a63d215f1876da576c7ac3e23d40e37789dc2af40a7062f7f408f6721180f8f089832973c3548b478f5b09752bc99544621132a1599f0fc3d
-EBUILD cabal-1.24.2.0.ebuild 936 BLAKE2B fde47bbeb66732209eaa9b4389420b0c8130ed77f9c5744d4829ba8cb62f91ac27a8fa56108c564154a67c5f8908152cc8b65d0f3e28b090e8e63041cbb983a0 SHA512 50796827840967c4ba091ddc63e1dc854feabefc7dd0b87abf4ba57f0766fe8692a32f4350647c28b06db74d7b3aa1c4014e4c2aff6fee9a76071cb4597f04e7
-EBUILD cabal-2.0.0.2.ebuild 1014 BLAKE2B ad1f0e55d1ca91f0ae260ab0e130d3dd579e9bca7fc919366a3911ec397e76f325758a3b3b574a3e2c1e0e20b5d9bbdc36ca54f5c78fe2c6941a6f82ae6fc893 SHA512 8b78c7509cdfbfff4e682079c97ce9d68c679de981f5e211ac426ebae16dd259c54093b4f9ca56ce9bd1057cbdbe462a43e7c329c7dfb78caac1a32d1ce89bb5
-MISC metadata.xml 620 BLAKE2B c506aec421eed73838acb77891628cece6a7e8045069b51325669067f8900bd3028aaa93a784a5c4f0383909ff46ffa4044d09e091518e0bf207eea0f1594c4c SHA512 e52cb4657e879d3a4d384daa3fcb8c109e61278ca2875b3fbc6c55b5e4ff9c98716eb7d740ef425634130d13639f92cdde7b04f88e266f112d393b99ce389b0b
diff --git a/dev-haskell/cabal/cabal-1.18.1.2.ebuild b/dev-haskell/cabal/cabal-1.18.1.2.ebuild
deleted file mode 100644
index 8307ff8adf4e..000000000000
--- a/dev-haskell/cabal/cabal-1.18.1.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CABAL_FEATURES="bootstrap lib profile test-suite"
-inherit haskell-cabal versionator
-
-MY_PN=Cabal
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="http://www.haskell.org/cabal/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-	test? ( dev-haskell/extensible-exceptions
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.1.0.1
-		dev-haskell/regex-posix
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.12 )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	if [[ -n ${LIVE_EBUILD} ]]; then
-		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
-	fi
-}
-
-src_configure() {
-	cabal-is-dummy-lib && return
-
-	einfo "Bootstrapping Cabal..."
-	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
-		-o setup || die "compiling Setup.hs failed"
-	cabal-configure
-}
-
-src_compile() {
-	cabal-is-dummy-lib && return
-
-	cabal-build
-}
diff --git a/dev-haskell/cabal/cabal-1.18.1.3.ebuild b/dev-haskell/cabal/cabal-1.18.1.3.ebuild
deleted file mode 100644
index d8b10b3f2ad2..000000000000
--- a/dev-haskell/cabal/cabal-1.18.1.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile test-suite"
-CABAL_FEATURES+=" bootstrap" # does not beed cabal to build itself
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="http://www.haskell.org/cabal/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-	test? ( dev-haskell/extensible-exceptions
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.1.0.1
-		dev-haskell/regex-posix
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.12 )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-CABAL_CORE_LIB_GHC_PV="7.8.2014* 7.8.0.2014* 7.8.1 7.8.2 7.8.3 7.8.3.20141119"
-
-src_prepare() {
-	if [[ -n ${LIVE_EBUILD} ]]; then
-		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
-	fi
-}
-
-src_configure() {
-	cabal-is-dummy-lib && return
-
-	einfo "Bootstrapping Cabal..."
-	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
-		-o setup || die "compiling Setup.hs failed"
-	cabal-configure
-}
-
-src_compile() {
-	cabal-is-dummy-lib && return
-
-	cabal-build
-}
diff --git a/dev-haskell/cabal/cabal-1.18.1.5.ebuild b/dev-haskell/cabal/cabal-1.18.1.5.ebuild
deleted file mode 100644
index 51e35e9f0a67..000000000000
--- a/dev-haskell/cabal/cabal-1.18.1.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile test-suite"
-CABAL_FEATURES+=" bootstrap" # does not beed cabal to build itself
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="http://www.haskell.org/cabal/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RESTRICT=test # circular depend: cabal[test]->quickcheck[test]->cabal
-
-RDEPEND=">=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-	test? ( dev-haskell/extensible-exceptions
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.1.0.1
-		dev-haskell/regex-posix
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.12 )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-CABAL_CORE_LIB_GHC_PV="7.8.4"
-
-src_prepare() {
-	if [[ -n ${LIVE_EBUILD} ]]; then
-		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
-	fi
-}
-
-src_configure() {
-	cabal-is-dummy-lib && return
-
-	einfo "Bootstrapping Cabal..."
-	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
-		-o setup || die "compiling Setup.hs failed"
-	cabal-configure
-}
-
-src_compile() {
-	cabal-is-dummy-lib && return
-
-	cabal-build
-}
diff --git a/dev-haskell/cabal/cabal-1.20.0.2.ebuild b/dev-haskell/cabal/cabal-1.20.0.2.ebuild
deleted file mode 100644
index d3af93e70694..000000000000
--- a/dev-haskell/cabal/cabal-1.20.0.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile test-suite"
-CABAL_FEATURES+=" bootstrap" # does not beed cabal to build itself
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="http://www.haskell.org/cabal/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-haskell/extensible-exceptions
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.1.0.1:2 <dev-haskell/quickcheck-2.8:2
-		dev-haskell/regex-posix
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.12 )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	if [[ -n ${LIVE_EBUILD} ]]; then
-		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
-	fi
-
-	cabal_chdeps \
-		'QuickCheck < 2.7' 'QuickCheck < 2.8' \
-		'QuickCheck >= 2.1.0.1 && < 2.7' 'QuickCheck >= 2.1.0.1 && < 2.8'
-}
-
-src_configure() {
-	cabal-is-dummy-lib && return
-
-	einfo "Bootstrapping Cabal..."
-	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
-		-o setup || die "compiling Setup.hs failed"
-	cabal-configure
-}
-
-src_compile() {
-	cabal-is-dummy-lib && return
-
-	cabal-build
-}
diff --git a/dev-haskell/cabal/cabal-1.22.8.0.ebuild b/dev-haskell/cabal/cabal-1.22.8.0.ebuild
deleted file mode 100644
index 1126e67f6751..000000000000
--- a/dev-haskell/cabal/cabal-1.22.8.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile test-suite"
-CABAL_FEATURES+=" bootstrap" # does not need cabal to build itself
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="http://www.haskell.org/cabal/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RESTRICT=test
-
-RDEPEND=">=dev-lang/ghc-7.8.1:="
-DEPEND="${RDEPEND}
-	test? ( dev-haskell/extensible-exceptions
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.1.0.1:2 <dev-haskell/quickcheck-2.9:2
-		dev-haskell/regex-posix
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.12 )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	if [[ -n ${LIVE_EBUILD} ]]; then
-		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
-	fi
-}
-
-src_configure() {
-	cabal-is-dummy-lib && return
-
-	einfo "Bootstrapping Cabal..."
-	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
-		-o setup || die "compiling Setup.hs failed"
-	cabal-configure
-}
-
-src_compile() {
-	cabal-is-dummy-lib && return
-
-	cabal-build
-}
diff --git a/dev-haskell/cabal/cabal-1.24.2.0.ebuild b/dev-haskell/cabal/cabal-1.24.2.0.ebuild
deleted file mode 100644
index c98a9733edd2..000000000000
--- a/dev-haskell/cabal/cabal-1.24.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -bundled-binary-generic
-
-CABAL_FEATURES="lib profile test-suite"
-CABAL_FEATURES+=" nocabaldep" # in case installed Cabal is broken
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="http://www.haskell.org/cabal/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RESTRICT=test # circular dependencies
-
-RDEPEND=">=dev-lang/ghc-7.8.1:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.0.2_rc2 PM:8.0.2"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bundled-binary-generic
-}
diff --git a/dev-haskell/cabal/cabal-2.0.0.2.ebuild b/dev-haskell/cabal/cabal-2.0.0.2.ebuild
deleted file mode 100644
index 6940bc3c4e4d..000000000000
--- a/dev-haskell/cabal/cabal-2.0.0.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-#hackport: flags: -parsec-struct-diff
-
-CABAL_FEATURES="lib profile test-suite"
-CABAL_FEATURES+=" nocabaldep" # in case installed Cabal is broken
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="http://www.haskell.org/cabal/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-#not keyworded yet: many packages are broken
-#KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RESTRICT=test # circular dependencies
-
-RDEPEND=">=dev-lang/ghc-7.8.1:="
-DEPEND="${RDEPEND}"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.2.1"
-
-PATCHES=("${FILESDIR}"/${P}-no-bootstrap.patch)
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-parsec-struct-diff
-}
diff --git a/dev-haskell/cabal/files/cabal-2.0.0.2-no-bootstrap.patch b/dev-haskell/cabal/files/cabal-2.0.0.2-no-bootstrap.patch
deleted file mode 100644
index 2eed504b5654..000000000000
--- a/dev-haskell/cabal/files/cabal-2.0.0.2-no-bootstrap.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/Setup.hs b/Setup.hs
-index 42784ab..6bb3f8a 100644
---- a/Setup.hs
-+++ b/Setup.hs
-@@ -1,2 +1,4 @@
--import Distribution.Simple
-+{-# LANGUAGE PackageImports #-}
-+-- forces not to use local files
-+import "Cabal" Distribution.Simple
- main :: IO ()
diff --git a/dev-haskell/cabal/metadata.xml b/dev-haskell/cabal/metadata.xml
deleted file mode 100644
index 97bee0727e40..000000000000
--- a/dev-haskell/cabal/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The Haskell Common Architecture for Building Applications and
-		Libraries: a framework defining a common interface for authors to more
-		easily build their Haskell applications in a portable way.
-		
-		The Haskell Cabal is part of a larger infrastructure for distributing,
-		organizing, and cataloging Haskell libraries and tools.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/cairo-0.12.5.3 b/dev-haskell/cairo-0.12.5.3
new file mode 100644
index 000000000000..ebbfed9123dd
--- /dev/null
+++ b/dev-haskell/cairo-0.12.5.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] >=dev-lang/ghc-6.10.4:= x11-libs/cairo[svg?] >=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0= virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binding to the Cairo library
+EAPI=5
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=+pdf +postscript +svg doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] >=dev-lang/ghc-6.10.4:= x11-libs/cairo[svg?]
+SLOT=0/0.12.5.3
+SRC_URI=mirror://hackage/packages/archive/cairo/0.12.5.3/cairo-0.12.5.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8563962056c3737223f58a71210d2a23
diff --git a/dev-haskell/cairo-0.13.1.1 b/dev-haskell/cairo-0.13.1.1
new file mode 100644
index 000000000000..d3bbffb3f028
--- /dev/null
+++ b/dev-haskell/cairo-0.13.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/cairo >=dev-haskell/cabal-1.18 dev-haskell/gtk2hs-buildtools virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binding to the Cairo library
+EAPI=5
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=+pdf +postscript +svg doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/cairo
+SLOT=0/0.13.1.1
+SRC_URI=mirror://hackage/packages/archive/cairo/0.13.1.1/cairo-0.13.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1ab03060e8d01bbf8b2eb8f6e34677ef
diff --git a/dev-haskell/cairo-0.13.3.1 b/dev-haskell/cairo-0.13.3.1
new file mode 100644
index 000000000000..106d50eb6def
--- /dev/null
+++ b/dev-haskell/cairo-0.13.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/cairo >=dev-haskell/cabal-1.24 dev-haskell/gtk2hs-buildtools virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binding to the Cairo library
+EAPI=6
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=+pdf +postscript +svg doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/cairo
+SLOT=0/0.13.3.1
+SRC_URI=mirror://hackage/packages/archive/cairo/0.13.3.1/cairo-0.13.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=634fa7a677130084950624d1005d7be0
diff --git a/dev-haskell/cairo/Manifest b/dev-haskell/cairo/Manifest
deleted file mode 100644
index 83962f2536e6..000000000000
--- a/dev-haskell/cairo/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST cairo-0.12.5.3.tar.gz 53447 BLAKE2B c8087afedec5992f475e5d2d53baf77d315594df22a1e9c487143567604b0a35d0d374138066640e612f63eecf383bb30242e39a3b39d1c65c69f37d0f6406e8 SHA512 1dca628c4052df667130590d963f3b26e1c7df958654dbc18cb76cc471ee60b19fa3fc65a3b9042990943cc95a4af05d8993d853e859f03e457a8a6963113433
-DIST cairo-0.13.1.1.tar.gz 54029 BLAKE2B 055843b909ac6c48ea041e90a7502ca63eae438bd588e6ff07bf507593691222c692beefd0fc75fcde5cd1ae19ab289b61453c87482965a7c2431ac75bfc2387 SHA512 bf621799f2615e93f0151282772fc01f370060e3454810aa3e205eab16804637acbaded0c1feb6f45adbf75384ccade9b11b5ea70cb79397e7815c59ca570e29
-DIST cairo-0.13.3.1.tar.gz 45033 BLAKE2B 528e457d0e631497052431a65f8f712ae2e292ffe1422447b45cd2448a508bc306968a1e609d5f52a4a6293e7efed16b5f55654e56708b2e51b348cdd3ea3b78 SHA512 5878f90e4cfd69452b1819d27c9ae85205c2b75f831b7bedb05d5b8e4964ec90ec16c3611218c3a794d5ae54ccae5a592102b95326be348c59ab14239b60f33b
-EBUILD cairo-0.12.5.3.ebuild 1159 BLAKE2B a02e56b787653eb492c39e514acbee1cab0e5b6bb86315a0aff1ab36fddfdf78a739483b5d9ab3c3c5a12c1ffd2d294af7d9def98c38b56582224c451500ae20 SHA512 205f4cbc0e4d809d8135e5ab9879785e153deeb527f773e7fe82cddf14f745ee25b6aeb517fb2d384d03f7c15b8910144c0418b3a4a5a69070eb40d52bbb7ff9
-EBUILD cairo-0.13.1.1.ebuild 1058 BLAKE2B 42dbf055fd72f23ac08343df253e9e0ed0890949576b9270aa545fe09c62ad4af1594072bcd993d72216ddfa4b38afc689ac109a605cbe8ea1becb9f132bd57f SHA512 a9d6d83a22ab83c9625c78993fd32620bdb0c3d142675ffc29702f026f0ea83af761860d32c188ac7e931a8a4b1ccba5b2f5aad54ac070222132b35f3d2841b6
-EBUILD cairo-0.13.3.1.ebuild 1056 BLAKE2B 6c7f11f7f7235dbe2cbe4ac50b363b54af71b74260930444ba2777716dbf70918a3cd78b994751a6ce772ef3f1f58517192805fab7bc650f65f84582ee8a2eb8 SHA512 f0fd1d5a6d2eb3ccf335c51139e733bf04665cf3f8a0bc23d976d285dd1eafa62b0ac7a073b96321618d0af24f41cb14c5d9b62714232645216f51f7393518ad
-MISC metadata.xml 468 BLAKE2B 04053766d0971041ea0c68c8945622845833dee8fac5b144799ea1c21874fc739f9c60ee5f418a9a4e94e12f9bd8d621a8419fa6b916bf8fc518aa0cebab90cf SHA512 30c5d32612972f08d6d51603a6972b6a084b2f68e644c72ceb4472bbac83122916070ffc597b8199874c62fc80dcee775ca6632a45e82619d9927669559c79a9
diff --git a/dev-haskell/cairo/cairo-0.12.5.3.ebuild b/dev-haskell/cairo/cairo-0.12.5.3.ebuild
deleted file mode 100644
index 3f1422c5274f..000000000000
--- a/dev-haskell/cairo/cairo-0.12.5.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Cairo library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="+pdf +postscript +svg"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	x11-libs/cairo[svg?]"
-DEPEND="${RDEPEND}
-	>=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0=
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed -e "s@#include<cairo-features.h>@#define $(usex amd64 __x86_64__ __i386__)\n#include<cairo-features.h>@" \
-		-i "${S}"/Graphics/Rendering/Cairo.hs \
-		|| die "Could not define ABI in Graphics/Rendering/Cairo.hs"
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag pdf cairo_pdf) \
-		$(cabal_flag postscript cairo_ps) \
-		$(cabal_flag svg cairo_svg)
-}
diff --git a/dev-haskell/cairo/cairo-0.13.1.1.ebuild b/dev-haskell/cairo/cairo-0.13.1.1.ebuild
deleted file mode 100644
index bb6542c8f88a..000000000000
--- a/dev-haskell/cairo/cairo-0.13.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: cairo_ps:postscript,cairo_pdf:pdf,cairo_svg:svg
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Cairo library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+pdf +postscript +svg"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	x11-libs/cairo
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-	dev-haskell/gtk2hs-buildtools
-	virtual/pkgconfig
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag pdf cairo_pdf) \
-		$(cabal_flag postscript cairo_ps) \
-		$(cabal_flag svg cairo_svg)
-}
diff --git a/dev-haskell/cairo/cairo-0.13.3.1.ebuild b/dev-haskell/cairo/cairo-0.13.3.1.ebuild
deleted file mode 100644
index 29e75c471e15..000000000000
--- a/dev-haskell/cairo/cairo-0.13.3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: cairo_ps:postscript,cairo_pdf:pdf,cairo_svg:svg
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Cairo library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+pdf +postscript +svg"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	x11-libs/cairo
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24
-	dev-haskell/gtk2hs-buildtools
-	virtual/pkgconfig
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag pdf cairo_pdf) \
-		$(cabal_flag postscript cairo_ps) \
-		$(cabal_flag svg cairo_svg)
-}
diff --git a/dev-haskell/cairo/metadata.xml b/dev-haskell/cairo/metadata.xml
deleted file mode 100644
index 77b5ad73a8af..000000000000
--- a/dev-haskell/cairo/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Cairo is a library to render high quality vector graphics. There
-		exist various backends that allows rendering to Gtk windows, PDF,
-		PS, PNG and SVG documents, amongst others.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/case-insensitive-1.0.0.2-r1 b/dev-haskell/case-insensitive-1.0.0.2-r1
new file mode 100644
index 000000000000..9bc7469c0edc
--- /dev/null
+++ b/dev-haskell/case-insensitive-1.0.0.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/text-0.3:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.3 >=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Case insensitive string comparison
+EAPI=5
+HOMEPAGE=https://github.com/basvandijk/case-insensitive
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/text-0.3:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.0.0.2
+SRC_URI=mirror://hackage/packages/archive/case-insensitive/1.0.0.2/case-insensitive-1.0.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f115b0dd4615424c30a64fe660efec16
diff --git a/dev-haskell/case-insensitive-1.1.0.3 b/dev-haskell/case-insensitive-1.1.0.3
new file mode 100644
index 000000000000..6e1756e33347
--- /dev/null
+++ b/dev-haskell/case-insensitive-1.1.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/text-0.3:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.3 >=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Case insensitive string comparison
+EAPI=5
+HOMEPAGE=https://github.com/basvandijk/case-insensitive
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/text-0.3:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.0.3
+SRC_URI=mirror://hackage/packages/archive/case-insensitive/1.1.0.3/case-insensitive-1.1.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e2f92e797ed76b8318a13766b537dbc4
diff --git a/dev-haskell/case-insensitive-1.2.0.5 b/dev-haskell/case-insensitive-1.2.0.5
new file mode 100644
index 000000000000..38024fb504de
--- /dev/null
+++ b/dev-haskell/case-insensitive-1.2.0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/text-0.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.4 >=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Case insensitive string comparison
+EAPI=5
+HOMEPAGE=https://github.com/basvandijk/case-insensitive
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/text-0.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.0.5
+SRC_URI=mirror://hackage/packages/archive/case-insensitive/1.2.0.5/case-insensitive-1.2.0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=14bee5ecf43dac5571b206ea9ad455ae
diff --git a/dev-haskell/case-insensitive-1.2.0.7 b/dev-haskell/case-insensitive-1.2.0.7
new file mode 100644
index 000000000000..cb37be530138
--- /dev/null
+++ b/dev-haskell/case-insensitive-1.2.0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.4 >=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Case insensitive string comparison
+EAPI=6
+HOMEPAGE=https://github.com/basvandijk/case-insensitive
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.0.7
+SRC_URI=mirror://hackage/packages/archive/case-insensitive/1.2.0.7/case-insensitive-1.2.0.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=37edffc33a01f9547e14f22ec23ad9c9
diff --git a/dev-haskell/case-insensitive/Manifest b/dev-haskell/case-insensitive/Manifest
deleted file mode 100644
index 787dd63b9e8f..000000000000
--- a/dev-haskell/case-insensitive/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST case-insensitive-1.0.0.2.tar.gz 4803 BLAKE2B 53e45eaa6f6381138369601c7f46abcc166d8fbed8f50839b580410242c3d09c6c7f33abb6c0dbcaae07dc6d2caab0a94a86c6d84dcfea94007ab65f6e536464 SHA512 101ab558b4359da40320293c5ffafaf2f69bf9289ea0fde1ea9775847ef7e31959b71c2c86c7d150d1ed6e0c71209c10d7c83bd416e170f233fad31f81ff7e7f
-DIST case-insensitive-1.1.0.3.tar.gz 5188 BLAKE2B 3acc26c4841600aba43d852ff1783323543246c7eb2610a6039df57b33ffab7f4dc039b16befbb6c0dad5cb4483a8e42b4a4b0c5d43b163e5288e23340430914 SHA512 d9b21c31e65224e5ce181fa680ee7f67371ae03248a51a2329e46ba27b22e0f426e02cbc872af7ca42c84d56450ffac2ff62ffaf41e7055abcb43aa97e3c404c
-DIST case-insensitive-1.2.0.5.tar.gz 53404 BLAKE2B 7683f3f985b59ddbcb872a58690dbcf20011191ac26ad8834782cedc83bbdd43ad3192768f71c9e205b8acb13a1cf8f2a7dc155750c6f81ee3d6e6071b9636ad SHA512 8b43fb205cac13f36c4f22ece3672478cac940a23552fc61534beedf12dfaf22107c982513560be154882efd1e4b615f581bd318b3df177a3b1c7477ce4501a5
-DIST case-insensitive-1.2.0.7.tar.gz 53615 BLAKE2B 836e8e100bbde7a39dda408a626b9304b5f3b50302da86f91bd1f18fe42deea5c055dee94c031ceef50dc7f761d7aec7201d4f08f0b5067296bf223fe0a13c36 SHA512 abd46a77981fda54b6542620a48801779e9f782c8575c6dcaedf442c0781720e572f8e7a012ad2787ae65e647311d8f7c91892e0d1b50fa93fd6382c256ccb1e
-EBUILD case-insensitive-1.0.0.2-r1.ebuild 1055 BLAKE2B 88a2b481199b27ef87e8708aa477a59531aac957ba325b16bc0c9398a67b7d92d900c6990d4ea76494cb7fe02a4ea3cdea839f8afba1d7302f1d3ef7fec733dc SHA512 e19bee9cab5cfa4038ded97fd2d24a6fea4e5e3e9db052de2e3b12904175f54a7a9dd0ec055d28513b9d2d6b87c8f5e554230791911f902611f55cc1e310d046
-EBUILD case-insensitive-1.1.0.3.ebuild 921 BLAKE2B 1df23f40fa45f0e4aad2fe34da17ebf0ae24f29c0feedd0be30fcfd2f56026af43a3b21a3b553473610716830af79f206f5a2c5e3ecfa6a84998f53757f435bd SHA512 328bcc0fa9fb3abad4859cbba5e4b9d0563f6aa3adaf6b2bd69c83f1240d690f3a5e6777a2a24c4fa2d47b655d8d89f6de1210443b31c5001aff8af4914149f3
-EBUILD case-insensitive-1.2.0.5.ebuild 919 BLAKE2B 3899816f336059b6c01d7943d427a5ca37157cdc4c4452fc0deacb98fba2cd9296c121a59db6a87f9b51e7da56c68ffea0f42d615b9a8992a2665363f0a21929 SHA512 ccd45ad5290388bb8a5dc8b73d53cca44a7d7971f738afd5849153addb5e4555f92b0734c661c3d78aaa0e4b29a2c6fbc1f434f62da8fb74b5c50527d792dba9
-EBUILD case-insensitive-1.2.0.7.ebuild 1001 BLAKE2B eceda614b95d815ae03bcc7119f792756678bacd11e2dc438517137bb05a907b3c7617d2604f74458cfad0ef9717f0aff07d09b2f98408ce770ac08a9315a375 SHA512 c92fbe412cbfeb5e87ee730eb9f77d1732d7a927a539b548694adfaf335ea67fbcb01fb299dba7593e6fc2ccf5e31aa70c09a3d0f80dbd34f5d27abaa99e82b5
-MISC metadata.xml 626 BLAKE2B e9dc5be2cb3f7fb2ab130876af4d516dbadf5af192e362d78e5c184d28328637976eab0198e238bdc5d3213a9fead79618a23c4232e3858960b1ad3073b8e3a3 SHA512 70e1884bd4380cc54462df82c8087812bef88dd63825454f73e5554608dfd4abdf98a838aa862bed1495b891c9dbff5a7b311c29f2828296f151552eed4ae692
diff --git a/dev-haskell/case-insensitive/case-insensitive-1.0.0.2-r1.ebuild b/dev-haskell/case-insensitive/case-insensitive-1.0.0.2-r1.ebuild
deleted file mode 100644
index 7c631bcce0e6..000000000000
--- a/dev-haskell/case-insensitive/case-insensitive-1.0.0.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Case insensitive string comparison"
-HOMEPAGE="https://github.com/basvandijk/case-insensitive"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-		>=dev-haskell/text-0.3:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.3
-			>=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9
-			>=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4
-		)"
-
-src_prepare() {
-	cabal_chdeps \
-		'text       >= 0.3 && < 0.12' 'text       >= 0.3' \
-		'text                 >= 0.3   && < 0.12' 'text                 >= 0.3'
-}
diff --git a/dev-haskell/case-insensitive/case-insensitive-1.1.0.3.ebuild b/dev-haskell/case-insensitive/case-insensitive-1.1.0.3.ebuild
deleted file mode 100644
index 3f35e62b7459..000000000000
--- a/dev-haskell/case-insensitive/case-insensitive-1.1.0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Case insensitive string comparison"
-HOMEPAGE="https://github.com/basvandijk/case-insensitive"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/text-0.3:=[profile?] <dev-haskell/text-1.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4 )
-"
diff --git a/dev-haskell/case-insensitive/case-insensitive-1.2.0.5.ebuild b/dev-haskell/case-insensitive/case-insensitive-1.2.0.5.ebuild
deleted file mode 100644
index 944c7b382e93..000000000000
--- a/dev-haskell/case-insensitive/case-insensitive-1.2.0.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Case insensitive string comparison"
-HOMEPAGE="https://github.com/basvandijk/case-insensitive"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/text-0.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4 )
-"
diff --git a/dev-haskell/case-insensitive/case-insensitive-1.2.0.7.ebuild b/dev-haskell/case-insensitive/case-insensitive-1.2.0.7.ebuild
deleted file mode 100644
index c54822c71378..000000000000
--- a/dev-haskell/case-insensitive/case-insensitive-1.2.0.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Case insensitive string comparison"
-HOMEPAGE="https://github.com/basvandijk/case-insensitive"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/text-0.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4 )
-"
diff --git a/dev-haskell/case-insensitive/metadata.xml b/dev-haskell/case-insensitive/metadata.xml
deleted file mode 100644
index c2ca97261beb..000000000000
--- a/dev-haskell/case-insensitive/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The module @Data.CaseInsensitive@ provides the 'CI' type
-		constructor which can be parameterised by a string-like
-		type like: 'String', 'ByteString', 'Text',
-		etc.. Comparisons of values of the resulting type will be
-		insensitive to cases.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">basvandijk/case-insensitive</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cassava-0.4.4.0 b/dev-haskell/cassava-0.4.4.0
new file mode 100644
index 000000000000..e6cd45ea8da5
--- /dev/null
+++ b/dev-haskell/cassava-0.4.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2.0 dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A CSV parsing and encoding library
+EAPI=5
+HOMEPAGE=https://github.com/tibbe/cassava
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.10.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.4.0
+SRC_URI=mirror://hackage/packages/archive/cassava/0.4.4.0/cassava-0.4.4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8a04a909982bb8564c2b5ebc8be08c98
diff --git a/dev-haskell/cassava-0.4.5.0 b/dev-haskell/cassava-0.4.5.0
new file mode 100644
index 000000000000..561b8a84673e
--- /dev/null
+++ b/dev-haskell/cassava-0.4.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2.0 dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A CSV parsing and encoding library
+EAPI=5
+HOMEPAGE=https://github.com/hvr/cassava
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.10.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/0.4.5.0
+SRC_URI=mirror://hackage/packages/archive/cassava/0.4.5.0/cassava-0.4.5.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=189a4492f123de65f0a890035c6440ce
diff --git a/dev-haskell/cassava/Manifest b/dev-haskell/cassava/Manifest
deleted file mode 100644
index fec7e1f4d433..000000000000
--- a/dev-haskell/cassava/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST cassava-0.4.4.0.tar.gz 32631 BLAKE2B dd7bf6e4b4378ffd0dad3c402465b20f8a830d1dd156826fbb0eedced28598297d0f5056d25acc1e2c8457934f077a4ac34b2caa1852397d9d0fe17b875ac3b9 SHA512 af0954754bbcfe8068ccd029417327770c60a62ecc5503b3cce5a58962940a804e167688760aec7ead42ec99b404295715d2f8fd65e4b4ed2918e1c5e063b36b
-DIST cassava-0.4.5.0.tar.gz 33104 BLAKE2B 0b0726f3060f0857ecb4135bbf71cba7e6a8b108268f948b29d6a0f61d09336097689f24bcbe77e913b5461e3872b07f6ba2d0a9e35738dc125add0a05d2650d SHA512 24f017ac44f48cdf000cab4108023d6f30a67638964831f0d7cd167bcd96ba85337d3aec6855128d370b9b383394042b3adf8dfd7299e616a385fd09125005a5
-EBUILD cassava-0.4.4.0.ebuild 1007 BLAKE2B 78a502b69a01dbeb02c3848b99308cc85e1f49fd0e880fd3f3dbdab73421e29abd657b059973857937b2a61e1ffa414429f0cfd947f73f7579cd25381ef444cb SHA512 cf13e36af2db0abab31b2abdc4e2484579f6fc17f728f3282846589adb40f4529deafd90684d3f5345e3a1b157db839ed13644166385dfd21900cded1342c30a
-EBUILD cassava-0.4.5.0.ebuild 1008 BLAKE2B fcd4ba4e7811a58e8bd7ddfa27e458d0cc53e85ad83fcf2e7acc62be2a6cd723b4932bc6961616efc2eaa4b8e97964fb0fb3dc7cdc91f7bc95e8a5f6fc2d6bb5 SHA512 8292d3557bef6360431bd2edf3602166ba18d940e8e94176bcc8f44357c4acf4bea7e7d11a9ecc717ff4f39a0273a02ff928d8739469d0d1809982282f7e7a72
-MISC metadata.xml 453 BLAKE2B 2f110faaa86a46be8651cad7690c2d5e78d4da4444ea265b4bde6ae0f5fc2743b186ffe4156475db8dd18c77865d3dab5026b8424005af7e55b401dc7c451af2 SHA512 16a89e4c5a73d93b130ca0d05328a7fbfa0759a39f80e1c80ad2d103bb26e0e0b70950b28d858aa2e366ece90991300ef0c61f43dcbcc7ec05497a77ab665438
diff --git a/dev-haskell/cassava/cassava-0.4.4.0.ebuild b/dev-haskell/cassava/cassava-0.4.4.0.ebuild
deleted file mode 100644
index d848f1373122..000000000000
--- a/dev-haskell/cassava/cassava-0.4.4.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A CSV parsing and encoding library"
-HOMEPAGE="https://github.com/tibbe/cassava"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	<dev-haskell/blaze-builder-0.5:=[profile?]
-	<dev-haskell/hashable-1.3:=[profile?]
-	<dev-haskell/text-1.3:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	<dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.0
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/cassava/cassava-0.4.5.0.ebuild b/dev-haskell/cassava/cassava-0.4.5.0.ebuild
deleted file mode 100644
index 09b24247000a..000000000000
--- a/dev-haskell/cassava/cassava-0.4.5.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A CSV parsing and encoding library"
-HOMEPAGE="https://github.com/hvr/cassava"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	<dev-haskell/blaze-builder-0.5:=[profile?]
-	<dev-haskell/hashable-1.3:=[profile?]
-	<dev-haskell/text-1.3:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	<dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.0
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/cassava/metadata.xml b/dev-haskell/cassava/metadata.xml
deleted file mode 100644
index f74f33a503ee..000000000000
--- a/dev-haskell/cassava/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A CSV parsing and encoding library optimized for ease of use and high
-		performance.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">tibbe/cassava</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cereal-0.3.5.2 b/dev-haskell/cereal-0.3.5.2
new file mode 100644
index 000000000000..83bb6a9f2caf
--- /dev/null
+++ b/dev-haskell/cereal-0.3.5.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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 binary serialization library
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/cereal
+IUSE=doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.3.5.2
+SRC_URI=mirror://hackage/packages/archive/cereal/0.3.5.2/cereal-0.3.5.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b6a7062a444acf6bdde560e2eef796a4
diff --git a/dev-haskell/cereal-0.4.0.1 b/dev-haskell/cereal-0.4.0.1
new file mode 100644
index 000000000000..653498c9d752
--- /dev/null
+++ b/dev-haskell/cereal-0.4.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A binary serialization library
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/cereal
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ia64 ppc ~ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.4.0.1
+SRC_URI=mirror://hackage/packages/archive/cereal/0.4.0.1/cereal-0.4.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7a4ba5b40ed67df1e917c3477aa1d2c1
diff --git a/dev-haskell/cereal-0.4.1.1 b/dev-haskell/cereal-0.4.1.1
new file mode 100644
index 000000000000..e1ea27e7d041
--- /dev/null
+++ b/dev-haskell/cereal-0.4.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 test? ( dev-haskell/quickcheck:2=[profile?] ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A binary serialization library
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/cereal
+IUSE=test doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.1.1
+SRC_URI=mirror://hackage/packages/archive/cereal/0.4.1.1/cereal-0.4.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=749a092c4cb872f54883e4aa1ecf3ab1
diff --git a/dev-haskell/cereal-vector-0.2.0.1 b/dev-haskell/cereal-vector-0.2.0.1
new file mode 100644
index 000000000000..bba7a3726c00
--- /dev/null
+++ b/dev-haskell/cereal-vector-0.2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Serialize instances for Data.Vector types
+EAPI=6
+HOMEPAGE=https://github.com/acfoltzer/cereal-vector
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.0.1
+SRC_URI=mirror://hackage/packages/archive/cereal-vector/0.2.0.1/cereal-vector-0.2.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6913cbd4a164a564eb0cd5eb84f13be7
diff --git a/dev-haskell/cereal-vector/Manifest b/dev-haskell/cereal-vector/Manifest
deleted file mode 100644
index 2f6c5892f603..000000000000
--- a/dev-haskell/cereal-vector/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cereal-vector-0.2.0.1.tar.gz 3337 BLAKE2B d1829bf26bc7d54c0dcd45355c3fff957e2ff7b6e779102be021fb1be780104636a87d1e7c2f7a590a4302b9755867224c7d1f49cb26578748438f7e79774a5a SHA512 8e54e349b61e7e8f56e1f2029afd03e5b6677afaf79756771efdeb1b01364befa5a170b5caea445dae7342d71cc51f8fd3bf4300b0707252535e2e4d31213f00
-EBUILD cereal-vector-0.2.0.1.ebuild 674 BLAKE2B 7302dcdaeb293095770a4d876306d97e15be347fe5fcf2fb9304c7cc5629480569fa0e407462969ec488e5c1332bf1cd9baabdbe830eedec913f3ac6535a53e8 SHA512 42a75a300f134951266364ae653155a9bb3862958e73b771affea0486135e88b8d2f2a9f8d222ac87ffe04f7c8dfa81e6cfb09875eec5ca2bf20cc87667ea51d
-MISC metadata.xml 333 BLAKE2B 94f5f1f8207afce53b4186faeb07f9d2ffb8d8d8837cabdad383d488901ed40e18f8f140c2bd5de0c4c3071d2cc0ff548d751814ef68f7f2c3a2f8a1b850e264 SHA512 872243017c278121a4db0df30bce1c6f77211b0ef9b852889cfbdcc1c693c3f1a9bdac4318b526053ee51561a6f360ba13f135bb1c71d49a89cdc34e6c798907
diff --git a/dev-haskell/cereal-vector/cereal-vector-0.2.0.1.ebuild b/dev-haskell/cereal-vector/cereal-vector-0.2.0.1.ebuild
deleted file mode 100644
index 37187b1128a4..000000000000
--- a/dev-haskell/cereal-vector/cereal-vector-0.2.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Serialize instances for Data.Vector types"
-HOMEPAGE="https://github.com/acfoltzer/cereal-vector"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cereal-0.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/cereal-vector/metadata.xml b/dev-haskell/cereal-vector/metadata.xml
deleted file mode 100644
index 62b7f047cd62..000000000000
--- a/dev-haskell/cereal-vector/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Serialize instances for Data.Vector types.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/cereal/Manifest b/dev-haskell/cereal/Manifest
deleted file mode 100644
index f03682ceb08f..000000000000
--- a/dev-haskell/cereal/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST cereal-0.3.5.2.tar.gz 22047 BLAKE2B f20de060898d2c5906e46704989d59557258455358e2370d560ccc4a7b7684481ea9faa64cd32f51782d6ee1ad6b71401e766902174821db3bc7ef00a9951847 SHA512 d77b0362757a6dda60d67e762a1509dd925d6c79d6280d73d34e2ce7f60ff0271975003e0c44cb95a4e4d72aade7833c839dad6774ac81439a703b570547bc11
-DIST cereal-0.4.0.1.tar.gz 22305 BLAKE2B 04867fc50e60684f47b609c3fc01a0c8ce4acbd80b3c7fb055ca29e19d2cc34341c287d9835eab7ea001d7273f825a54f23f49a9494a35c7b65497b29d149526 SHA512 9ea997af2cd84ecbd0660b5799a2d1fd4f6e5715ff5191922b69b98eee0664fbc4e5e6f2d67af808517a3f5e85931fdef093360a1d693bb81ea9cb430be6d21f
-DIST cereal-0.4.1.1.tar.gz 22656 BLAKE2B 72f7ffa9c3cbcff11b62a97eb9df5421f6776c09349fbd762a6896403cf89a5ffee6d0e56cc1c4df4894a8c4fda3aace91cc2db5b6cbbf8b8aedd966ac91b8bc SHA512 dcc0604ff78ea2d9e8c5a163d832879d5fad63f9cbc798ab2a785aa6b04f7a6262f42a478f61351cf9fc18f0eadaa83bc83146b614c286316a824787cd70b8a2
-EBUILD cereal-0.3.5.2.ebuild 568 BLAKE2B 0a6849051cef7e2b57fe4a95e519a8ab1a02199039d5cf946e39797d066e988b009292f54ed3e3559289228ff4c6e745668d004708901899bd9b5c170d5e254b SHA512 a80163eb2476be3ae0922328d6fb6e8b8d1650950c98cee8eca0c4efcaed2f2492b9e047e65676ee055c570921042c55d10ba0cd8016814a9e08895435c61f2f
-EBUILD cereal-0.4.0.1.ebuild 574 BLAKE2B d7e42c9b443c1c1fd08a54994e7b985da7bf1302d2023838ffcfe68e76c6b4e00849836c2279d5f3a7ae6abbb940cf3d80357d05fdc3bc399c2aec77c108f3f2 SHA512 61ab1dcb02b00324c3720dd11b9554cb8a5642ab93b6e2dcdffea2bae35923fa86f199cdba9a18c070b770eeabb02854746b0e2b7d56975d2fe47109259844e2
-EBUILD cereal-0.4.1.1.ebuild 940 BLAKE2B ad9243f609774ac6ade62aa73097618878b57a285093a6d8a37fc66f4c786af32d43d38d5e72166c0a051f4f2a4a4b83fed871dab4470b65ec8f64aab271ea04 SHA512 a9a3a12799f81450e95b9ee341c362bd19d947bff3bdae0a3d23296bac2f346759466b7be39f4cb6362b9c6b6ca98248895e468a0d38197470881a25e32281fa
-MISC metadata.xml 626 BLAKE2B 8b17332c2cb03e9e7da8eaafc943fb0440eae0ed4907e8eb59f0cfb5d835dbf04d0b5405a260e296be197ea7876e031798edd3e9936ccf624378d3fe550aeadc SHA512 482536773d4b76e43a1057fdb5ffc27b8b4b346fa6a6384716d0867076d514ad9cf91b94e1df6b9722d63b1c473ab21267061567413d355e0a9626310c064f3b
diff --git a/dev-haskell/cereal/cereal-0.3.5.2.ebuild b/dev-haskell/cereal/cereal-0.3.5.2.ebuild
deleted file mode 100644
index 3e2d048aed68..000000000000
--- a/dev-haskell/cereal/cereal-0.3.5.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A binary serialization library"
-HOMEPAGE="http://hackage.haskell.org/package/cereal"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/cereal/cereal-0.4.0.1.ebuild b/dev-haskell/cereal/cereal-0.4.0.1.ebuild
deleted file mode 100644
index e9b51e7285a6..000000000000
--- a/dev-haskell/cereal/cereal-0.4.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A binary serialization library"
-HOMEPAGE="http://hackage.haskell.org/package/cereal"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/cereal/cereal-0.4.1.1.ebuild b/dev-haskell/cereal/cereal-0.4.1.1.ebuild
deleted file mode 100644
index e0a99e9eb296..000000000000
--- a/dev-haskell/cereal/cereal-0.4.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A binary serialization library"
-HOMEPAGE="http://hackage.haskell.org/package/cereal"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="test"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-	test? ( dev-haskell/quickcheck:2=[profile?] )
-"
-
-src_test() {
-	# The test suite isn't integrated with cabal. There's a Makefile
-	# under the "tests" directory that will build and run some
-	# tests.
-	#
-	# In v0.4.1.1, the test suite won't fail if a property does. This
-	# should be fixed in,
-	#
-	#   https://github.com/GaloisInc/cereal/pull/29
-	#
-	emake -C tests
-}
diff --git a/dev-haskell/cereal/metadata.xml b/dev-haskell/cereal/metadata.xml
deleted file mode 100644
index cb146bb1c29d..000000000000
--- a/dev-haskell/cereal/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A binary serialization library, similar to binary, that introduces an isolate
-		primitive for parser isolation, and replaces the asynchronous errors with a
-		user-handleable Either type.  Similar to binary in performance, but uses a
-		strict ByteString instead of a lazy ByteString, thus restricting it to
-		operating on finite inputs.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/certificate-1.3.9 b/dev-haskell/certificate-1.3.9
new file mode 100644
index 000000000000..5ef5ca6bee9d
--- /dev/null
+++ b/dev-haskell/certificate-1.3.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/asn1-data-0.7.1:=[profile?] <dev-haskell/asn1-data-0.8.0:=[profile?] >=dev-haskell/crypto-pubkey-types-0.4:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?] dev-haskell/cryptohash:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-lang/ghc-6.12.1:= executable? ( dev-haskell/cmdargs:=[profile?] dev-haskell/crypto-pubkey:=[profile?] >=dev-haskell/text-0.11:=[profile?] ) >=dev-haskell/cabal-1.8.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Certificates and Key Reader/Writer
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-certificate
+IUSE=executable test doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/asn1-data-0.7.1:=[profile?] <dev-haskell/asn1-data-0.8.0:=[profile?] >=dev-haskell/crypto-pubkey-types-0.4:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?] dev-haskell/cryptohash:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-lang/ghc-6.12.1:= executable? ( dev-haskell/cmdargs:=[profile?] dev-haskell/crypto-pubkey:=[profile?] >=dev-haskell/text-0.11:=[profile?] )
+RESTRICT=test
+SLOT=0/1.3.9
+SRC_URI=mirror://hackage/packages/archive/certificate/1.3.9/certificate-1.3.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cade742fd9e6db4fd5a7b90ca9b51d6e
diff --git a/dev-haskell/certificate/Manifest b/dev-haskell/certificate/Manifest
deleted file mode 100644
index 49b4857da8db..000000000000
--- a/dev-haskell/certificate/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX certificate-1.3.6/Tests/Unit.hs 1401 BLAKE2B da9e592386db1953a1bf2e8026623af5b4497f8b6cb721125eb7dd7e3a3878f022c91a29f646ba486651f377be48082622f90e3a9ab5297c6ce931bdfb880a55 SHA512 a254749781292c2c4a86e9feef03168db5809472581e6f87a0d7e3af97031598f598c696242ecac4dc15b5e526936b3a3bab8a83a544fd97a182bcb4ec6b72be
-AUX certificate-1.3.9-ghc-7.10.patch 548 BLAKE2B 406925966374309faabae0772572440db390c337f292a4a8c3e9c827934dfeff2e1ff7d5ab67267a0009e7e51e333ee181b11d4554b22c5bdebf3479b3fbd697 SHA512 2ee1038e6e5b41fc08268e5c0b8d5e0cf810bd6bd4c51b01b8d1077dde5bf21f45ab6074140f8e8175cc70ae118849ddcc5865c42c9d91ca755cc768a99132a7
-DIST certificate-1.3.9.tar.gz 15018 BLAKE2B a89c5cf680a752dbc69f7510eae10bfa1e340090b512f1341db0742d44c13c5171cdeb3b8f0352b53ebe5fb018cb957501b01ff9d297b1a67ddeaf8cce52f265 SHA512 85ad7d1f3def68152824d0be4ccc3fb991903867fac68927eac34db366ce6f8201468a3e73c336fef6feae1ce550f614fc3ab89447b4ec7a67ac279902a815f9
-EBUILD certificate-1.3.9.ebuild 1246 BLAKE2B a92f8a1bb4e28c0511729385e73132018b4ddca52b2374301d96a48d9fb50be55e64eb2a985472423a3a698b099708c540a96109b7019f8e3f255161165746a8 SHA512 eb1b1bd6b290162e431f6d89c730a5eb6c7f362d85d651c4fa6160fea7c73afa0eb4dee667dc62a5985ee20bf08cdc27397cc7af5406c4ff2da57b3a9b0603c6
-MISC metadata.xml 625 BLAKE2B 5347d26e31920b59a5d9f71f083e37559f1d078d81eeb2848d64ff5ab90d269772dabb09746cbe1099d756290ac3390df36adf3d6ce383525387ee560b8eeb9b SHA512 b49ed9a3c937752b192e3d2f9d129732d30104db488b75b85207cbe4257d5aaefa57570f9ca2af744a6b6ef04eb1ff5b86341fa4a6c37bacc988d7ab43c24edd
diff --git a/dev-haskell/certificate/certificate-1.3.9.ebuild b/dev-haskell/certificate/certificate-1.3.9.ebuild
deleted file mode 100644
index 89e8f4aab7d8..000000000000
--- a/dev-haskell/certificate/certificate-1.3.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Certificates and Key Reader/Writer"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="executable test"
-RESTRICT="test" # due missing tests
-
-RDEPEND=">=dev-haskell/asn1-data-0.7.1:=[profile?] <dev-haskell/asn1-data-0.8.0:=[profile?]
-	>=dev-haskell/crypto-pubkey-types-0.4:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?]
-	dev-haskell/cryptohash:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-	executable? ( dev-haskell/cmdargs:=[profile?]
-			dev-haskell/crypto-pubkey:=[profile?]
-			>=dev-haskell/text-0.11:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3.9-ghc-7.10.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag test test)
-}
diff --git a/dev-haskell/certificate/files/certificate-1.3.6/Tests/Unit.hs b/dev-haskell/certificate/files/certificate-1.3.6/Tests/Unit.hs
deleted file mode 100644
index d97947f2b233..000000000000
--- a/dev-haskell/certificate/files/certificate-1.3.6/Tests/Unit.hs
+++ /dev/null
@@ -1,46 +0,0 @@
-module Tests.Unit
-	( runTests
-	) where
-
-import System.Directory
-import Test.HUnit
-import Control.Monad
-import Control.Applicative ((<$>))
-import Control.Exception
-import qualified Data.ByteString as B
-import qualified Data.ByteString.Lazy as L
-import Data.Certificate.X509
-import Data.List (isPrefixOf)
-
--- FIXME : make unit tests portable to run on osX and windows
-import System.Certificate.X509
-import Data.CertificateStore
-
-checkCert (X509 c mraw rawCert sigalg sigbits) = do
-	let errs =
-		(checkSigAlg $ certSignatureAlg c) ++
-		(checkPubKey $ certPubKey c) ++
-		(checkExtensions $ certExtensions c) ++
-		(checkBodyRaw rawCert mraw)
-	when (errs /= []) $ do
-		putStrLn ("error decoding")
-		mapM_ (putStrLn . ("  " ++))  errs
-	where
-		checkExtensions ext = []
-
-		checkSigAlg (SignatureALG_Unknown oid) = ["unknown signature algorithm " ++ show oid]
-		checkSigAlg _                          = []
-
-		checkPubKey (PubKeyUnknown oid _) = ["unknown public key alg " ++ show (certPubKey c)]
-		checkPubKey _                     = []
-
-		checkBodyRaw (Just x) (Just y) = if findsubstring y x then [] else ["cannot find body cert in original raw file"]
-		checkBodyRaw _ _  = []
-
-		findsubstring a b
-			| L.null b        = False
-			| a `L.isPrefixOf` b = True
-			| otherwise          = findsubstring a (L.drop 1 b)
-
-runTests :: IO ()
-runTests = getSystemCertificateStore >>= mapM_ checkCert . listCertificates
diff --git a/dev-haskell/certificate/files/certificate-1.3.9-ghc-7.10.patch b/dev-haskell/certificate/files/certificate-1.3.9-ghc-7.10.patch
deleted file mode 100644
index 07a53256ded8..000000000000
--- a/dev-haskell/certificate/files/certificate-1.3.9-ghc-7.10.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Data/Certificate/X509/Cert.hs b/Data/Certificate/X509/Cert.hs
-index 4abfadf..15e7bf8 100644
---- a/Data/Certificate/X509/Cert.hs
-+++ b/Data/Certificate/X509/Cert.hs
-@@ -1,2 +1,3 @@
-+{-# LANGUAGE FlexibleContexts #-}
- module Data.Certificate.X509.Cert
-         (
-diff --git a/Data/Certificate/X509/Ext.hs b/Data/Certificate/X509/Ext.hs
-index 7595f14..8963a55 100644
---- a/Data/Certificate/X509/Ext.hs
-+++ b/Data/Certificate/X509/Ext.hs
-@@ -1,2 +1,3 @@
-+{-# LANGUAGE FlexibleContexts #-}
- -- |
- -- Module      : Data.Certificate.X509.Ext
diff --git a/dev-haskell/certificate/metadata.xml b/dev-haskell/certificate/metadata.xml
deleted file mode 100644
index 3ba11e2cb4c8..000000000000
--- a/dev-haskell/certificate/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Certificates and Key reader/writer
-		
-		At the moment only X509 certificate and unencrypted private key are supported,
-		but will include PGP certificate and pkcs8 private keys
-	</longdescription>
-	<use>
-		<flag name="executable">Build the executable</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-certificate</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cgi-3001.1.8.3 b/dev-haskell/cgi-3001.1.8.3
new file mode 100644
index 000000000000..33e04c25d169
--- /dev/null
+++ b/dev-haskell/cgi-3001.1.8.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/extensible-exceptions:=[profile?] dev-haskell/monadcatchio-mtl:=[profile?] >=dev-haskell/mtl-1.0:=[profile?] >=dev-haskell/network-2.0:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] >=dev-haskell/xhtml-3000.0.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A library for writing CGI programs
+EAPI=5
+HOMEPAGE=http://andersk.mit.edu/haskell/cgi/
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ppc sparc x86
+LICENSE=BSD
+RDEPEND=dev-haskell/extensible-exceptions:=[profile?] dev-haskell/monadcatchio-mtl:=[profile?] >=dev-haskell/mtl-1.0:=[profile?] >=dev-haskell/network-2.0:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] >=dev-haskell/xhtml-3000.0.0:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/3001.1.8.3
+SRC_URI=mirror://hackage/packages/archive/cgi/3001.1.8.3/cgi-3001.1.8.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e7935bc78c97193ca479a4b720da9b6d
diff --git a/dev-haskell/cgi-3001.1.8.4 b/dev-haskell/cgi-3001.1.8.4
new file mode 100644
index 000000000000..3c60d45754d6
--- /dev/null
+++ b/dev-haskell/cgi-3001.1.8.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/monadcatchio-mtl:=[profile?] >=dev-haskell/mtl-1.0:=[profile?] >=dev-haskell/network-2.0:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] >=dev-haskell/xhtml-3000.0.0:=[profile?] >=dev-lang/ghc-6.10.4:= !extensible-exceptions-in-base? ( dev-haskell/extensible-exceptions:=[profile?] ) >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A library for writing CGI programs
+EAPI=5
+HOMEPAGE=http://andersk.mit.edu/haskell/cgi/
+IUSE=+extensible-exceptions-in-base doc hscolour profile
+KEYWORDS=~alpha amd64 ~ppc ~sparc x86
+LICENSE=BSD
+RDEPEND=dev-haskell/monadcatchio-mtl:=[profile?] >=dev-haskell/mtl-1.0:=[profile?] >=dev-haskell/network-2.0:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] >=dev-haskell/xhtml-3000.0.0:=[profile?] >=dev-lang/ghc-6.10.4:= !extensible-exceptions-in-base? ( dev-haskell/extensible-exceptions:=[profile?] )
+SLOT=0/3001.1.8.4
+SRC_URI=mirror://hackage/packages/archive/cgi/3001.1.8.4/cgi-3001.1.8.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e5c9d541bc7f82dd0c74161f4e69aa78
diff --git a/dev-haskell/cgi-3001.1.8.4-r1 b/dev-haskell/cgi-3001.1.8.4-r1
new file mode 100644
index 000000000000..a9429e3cce9d
--- /dev/null
+++ b/dev-haskell/cgi-3001.1.8.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=dev-haskell/monadcatchio-mtl:=[profile?] >=dev-haskell/mtl-1.0:=[profile?] >=dev-haskell/network-2.0:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] >=dev-haskell/xhtml-3000.0.0:=[profile?] >=dev-lang/ghc-6.10.4:= !extensible-exceptions-in-base? ( dev-haskell/extensible-exceptions:=[profile?] ) >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A library for writing CGI programs
+EAPI=5
+HOMEPAGE=http://andersk.mit.edu/haskell/cgi/
+IUSE=+extensible-exceptions-in-base doc hscolour profile
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/monadcatchio-mtl:=[profile?] >=dev-haskell/mtl-1.0:=[profile?] >=dev-haskell/network-2.0:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] >=dev-haskell/xhtml-3000.0.0:=[profile?] >=dev-lang/ghc-6.10.4:= !extensible-exceptions-in-base? ( dev-haskell/extensible-exceptions:=[profile?] )
+SLOT=0/3001.1.8.4
+SRC_URI=mirror://hackage/packages/archive/cgi/3001.1.8.4/cgi-3001.1.8.4.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=516d21437d24c8fbcb549c7bc56027b3
diff --git a/dev-haskell/cgi-3001.2.2.2 b/dev-haskell/cgi-3001.2.2.2
new file mode 100644
index 000000000000..0a1c1d04859e
--- /dev/null
+++ b/dev-haskell/cgi-3001.2.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=<dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/mtl-2.1.3.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/mtl-compat:= >=dev-haskell/multipart-0.1.2:=[profile?] <dev-haskell/multipart-0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/xhtml-3000.0.0:=[profile?] <dev-haskell/xhtml-3000.3:=[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?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A library for writing CGI programs
+EAPI=5
+HOMEPAGE=https://github.com/cheecheeo/haskell-cgi
+IUSE=+network-uri doc hscolour profile
+KEYWORDS=alpha amd64 ppc sparc x86
+LICENSE=BSD
+RDEPEND=<dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/mtl-2.1.3.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/mtl-compat:= >=dev-haskell/multipart-0.1.2:=[profile?] <dev-haskell/multipart-0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/xhtml-3000.0.0:=[profile?] <dev-haskell/xhtml-3000.3:=[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/3001.2.2.2
+SRC_URI=mirror://hackage/packages/archive/cgi/3001.2.2.2/cgi-3001.2.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6867db1f129ae1fba58a075b5aef2a0d
diff --git a/dev-haskell/cgi/Manifest b/dev-haskell/cgi/Manifest
deleted file mode 100644
index f35824f2aeea..000000000000
--- a/dev-haskell/cgi/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX cgi-3001.1.8.4-mci.patch 713 BLAKE2B d8e83e9b012048577c27eb5133d94507717ec79711d4078391c18ac982d6db245e1552f33e9ecad2f851150edf8ab4918676770899342896a340a62b39211c7d SHA512 4aed38d7b8c8cd90018c00220799d947287ce81fdd41a550a4cfada40df151f9248f9b76a02795f2724af5e440f865f662aea5de4168d742ae63a32784ab6d82
-DIST cgi-3001.1.8.3.tar.gz 21319 BLAKE2B 68bb0a52f7664830d486f5ca09713944473088372292148d52790973c401a8aae8f56915f683d3d3a483763c11981569dcfb7d41cd05532bb985ce6227490295 SHA512 421ed1a7c7548f1785a693074807fab91cdf4c86b9085a0520b0ffc6127cf53b095dfc07e6f9ed65d475445a28e485ec219d742de369e6271c0c6fe5e7599957
-DIST cgi-3001.1.8.4.tar.gz 21421 BLAKE2B fe94e59621df341d943124d66615304607803a52d4efa032c0474f187f444a919c6da636ef6861dbc65fe3de2c16d4e4e8ee449e762f7fb753cbfb11dbe2f8a7 SHA512 0ccbad2b1393cf4149c84eaf9d5601ce976998554cf9240a61a72348eee917869c7b1e00286b22dcac3280c79c551e2947c1040ddeac3c1ec91483dbe2c18ed0
-DIST cgi-3001.2.2.2.tar.gz 17270 BLAKE2B d9ba0d6bae5e93600b8d7c6f8650f726baa27f3859138a180cbbf6a708fc9c65b3fa7804d97e7b3dc33fde7e2bc84a29237e62ba85230a38d9d0b1c12ed63f70 SHA512 cc59574d6f8711977e2f733c9a58378b6775b20de1ca07fb343f6b989a787e54bbeddb76ab8f6248cf80aebf007d8c31fbfaa03bbbde503d4402a7769957126d
-EBUILD cgi-3001.1.8.3.ebuild 802 BLAKE2B d239500f3bbd8ab5840b9e8955101970f1adbaec2858ded74bab26892c9323ea4066025239b95cdcb43bf58d3973ff64ae3ff8c207a2e34c4f49aa209ccaee8a SHA512 eb22a306ef1a784592ba9e46ba855ba8730609bb199816f84cc83f7dec38861128d1747c1a8a9855ae1097fac649e0e33934fe8c6c4eaa2ef2eaa9a73e340e36
-EBUILD cgi-3001.1.8.4-r1.ebuild 1050 BLAKE2B 6499c94d95383a04e2880bbaa6a355b8f83fe363b6ea4a1f3642e42d5c2605d20bda46b27dda2312e2be0e5fa2817cc33e3bc74c8cd991244ea39d163d33a551 SHA512 d07d4a54d0f934e854cd3b6724973d6ecf2db48dda9440a8a4e620c91de04194994981c66c9916d341f4df0697c3dd4da78fb5ff247baa1f5c1a8e639d25e7e7
-EBUILD cgi-3001.1.8.4.ebuild 1003 BLAKE2B 33d2d6d0c3c24339fd0279acdaeeb41149a61920ea52fd09b3f921a343a26ee0a20de43f17f28e7ea1ede2f595057c6e7c2f6a38ddfaa5024887a5be7a7b0be9 SHA512 c7eb93c4c0ec3f88fa5541f89bc2281172e15beacb5e8df66ac03293b5e7373dafe6eb7e6d08db43cc1891d8833acb2a9e5e32a3975245154e17605ba7ff1854
-EBUILD cgi-3001.2.2.2.ebuild 1485 BLAKE2B fed1711628b64ec9a84d6d45d9f081b17e7dcef10e5bbd418a010503b51623ac5307230530d8071e0e15e30a8e7b545b5f666351ed3a6ce9df0ee1f89da146be SHA512 dcb5ed9865234e95548a09ebd0d0bff2fbdcda062600a5337cfa23e7241df24b9538ab2d5e278b57bc292bffd4af37756ba6b02587d7bd0f1668e32aa2a502a7
-MISC metadata.xml 623 BLAKE2B 952d247f294bb195b63cf2b413a916fa5b7ee2c30591c44181de33fc61cb1a3f8408a9444b669bf1e0c3ce4562303214d76249ef6834004eabe9d0a220cdd87b SHA512 5b99b7382f56cbdab3e82ca501851e647744ea0b7195463b4a18fc6b42a620452f3bf1117c5758598a194abb3d06401b9e20687da4785ac958bfdbb9719b3b94
diff --git a/dev-haskell/cgi/cgi-3001.1.8.3.ebuild b/dev-haskell/cgi/cgi-3001.1.8.3.ebuild
deleted file mode 100644
index 3b6a6a4a6110..000000000000
--- a/dev-haskell/cgi/cgi-3001.1.8.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A library for writing CGI programs"
-HOMEPAGE="http://andersk.mit.edu/haskell/cgi/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
-		dev-haskell/monadcatchio-mtl:=[profile?]
-		>=dev-haskell/mtl-1.0:=[profile?]
-		>=dev-haskell/network-2.0:=[profile?]
-		>=dev-haskell/parsec-2.0:=[profile?]
-		>=dev-haskell/xhtml-3000.0.0:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/cgi/cgi-3001.1.8.4-r1.ebuild b/dev-haskell/cgi/cgi-3001.1.8.4-r1.ebuild
deleted file mode 100644
index 1ed79f923185..000000000000
--- a/dev-haskell/cgi/cgi-3001.1.8.4-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="A library for writing CGI programs"
-HOMEPAGE="http://andersk.mit.edu/haskell/cgi/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="+extensible-exceptions-in-base"
-
-RDEPEND="dev-haskell/monadcatchio-mtl:=[profile?]
-		>=dev-haskell/mtl-1.0:=[profile?]
-		>=dev-haskell/network-2.0:=[profile?]
-		>=dev-haskell/parsec-2.0:=[profile?]
-		>=dev-haskell/xhtml-3000.0.0:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		!extensible-exceptions-in-base? ( dev-haskell/extensible-exceptions:=[profile?]
-		)"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-PATCHES=("${FILESDIR}"/${P}-mci.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag extensible-exceptions-in-base extensible-exceptions-in-base)
-}
diff --git a/dev-haskell/cgi/cgi-3001.1.8.4.ebuild b/dev-haskell/cgi/cgi-3001.1.8.4.ebuild
deleted file mode 100644
index ec762a995711..000000000000
--- a/dev-haskell/cgi/cgi-3001.1.8.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A library for writing CGI programs"
-HOMEPAGE="http://andersk.mit.edu/haskell/cgi/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
-IUSE="+extensible-exceptions-in-base"
-
-RDEPEND="dev-haskell/monadcatchio-mtl:=[profile?]
-		>=dev-haskell/mtl-1.0:=[profile?]
-		>=dev-haskell/network-2.0:=[profile?]
-		>=dev-haskell/parsec-2.0:=[profile?]
-		>=dev-haskell/xhtml-3000.0.0:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		!extensible-exceptions-in-base? ( dev-haskell/extensible-exceptions:=[profile?]
-		)"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag extensible-exceptions-in-base extensible-exceptions-in-base)
-}
diff --git a/dev-haskell/cgi/cgi-3001.2.2.2.ebuild b/dev-haskell/cgi/cgi-3001.2.2.2.ebuild
deleted file mode 100644
index 8281b8497809..000000000000
--- a/dev-haskell/cgi/cgi-3001.2.2.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -old-mtl
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A library for writing CGI programs"
-HOMEPAGE="https://github.com/cheecheeo/haskell-cgi"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ppc sparc x86"
-IUSE="+network-uri"
-
-RDEPEND="<dev-haskell/exceptions-0.9:=[profile?]
-	>=dev-haskell/mtl-2.1.3.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	dev-haskell/mtl-compat:=
-	>=dev-haskell/multipart-0.1.2:=[profile?] <dev-haskell/multipart-0.2:=[profile?]
-	<dev-haskell/old-locale-1.1:=[profile?]
-	<dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/xhtml-3000.0.0:=[profile?] <dev-haskell/xhtml-3000.3:=[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?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	local mtl_arg=()
-
-	has_version '<dev-haskell/mtl-2.2' && \
-		mtl_arg+=(--flag=old-mtl)
-
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri) \
-		${mtl_arg}
-}
diff --git a/dev-haskell/cgi/files/cgi-3001.1.8.4-mci.patch b/dev-haskell/cgi/files/cgi-3001.1.8.4-mci.patch
deleted file mode 100644
index b672947ab1f9..000000000000
--- a/dev-haskell/cgi/files/cgi-3001.1.8.4-mci.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Gentoo-bug: https://bugs.gentoo.org/show_bug.cgi?id=497496
-Gentoo-Haskell-bug: https://github.com/gentoo-haskell/gentoo-haskell/issues/297
-diff --git a/Network/CGI/Monad.hs b/Network/CGI/Monad.hs
-index 758ab03..9c41fc3 100644
---- a/Network/CGI/Monad.hs
-+++ b/Network/CGI/Monad.hs
-@@ -119,7 +119,7 @@ catchCGI = catch
- 
- -- | Catches any exception thrown by an CGI action, and returns either
- --   the exception, or if no exception was raised, the result of the action.
--tryCGI :: (MonadCGI m, MonadCatchIO m) => m a -> m (Either SomeException a)
-+tryCGI :: (MonadCGI m, MonadCatchIO m, Functor m) => m a -> m (Either SomeException a)
- tryCGI = try
- 
- {-# DEPRECATED handleExceptionCGI "Use catchCGI instead." #-}
diff --git a/dev-haskell/cgi/metadata.xml b/dev-haskell/cgi/metadata.xml
deleted file mode 100644
index 4bd303b28a73..000000000000
--- a/dev-haskell/cgi/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This is a Haskell library for writing CGI programs.
-	</longdescription>
-	<use>
-		<flag name="extensible-exceptions-in-base">Required to be enabled for &gt;=dev-lang/ghc-7.</flag>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">cheecheeo/haskell-cgi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/chaselev-deque-0.4 b/dev-haskell/chaselev-deque-0.4
new file mode 100644
index 000000000000..7b41cf7e5e27
--- /dev/null
+++ b/dev-haskell/chaselev-deque-0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/abstract-deque-0.2.2:=[profile?] <dev-haskell/abstract-deque-0.3:=[profile?] >=dev-haskell/atomic-primops-0.4:=[profile?] <dev-haskell/atomic-primops-0.5:=[profile?] dev-haskell/bits-atomic:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit )
+DESCRIPTION=Chase & Lev work-stealing lock-free double-ended queues (deques)
+EAPI=5
+HOMEPAGE=https://github.com/rrnewton/haskell-lockfree-queue/wiki
+IUSE=debug profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/abstract-deque-0.2.2:=[profile?] <dev-haskell/abstract-deque-0.3:=[profile?] >=dev-haskell/atomic-primops-0.4:=[profile?] <dev-haskell/atomic-primops-0.5:=[profile?] dev-haskell/bits-atomic:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.4
+SRC_URI=mirror://hackage/packages/archive/chaselev-deque/0.4/chaselev-deque-0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ed68ee9f9935740f8203fac1c7c4f0c6
diff --git a/dev-haskell/chaselev-deque-0.5.0.5 b/dev-haskell/chaselev-deque-0.5.0.5
new file mode 100644
index 000000000000..b0aa6f53ee86
--- /dev/null
+++ b/dev-haskell/chaselev-deque-0.5.0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/abstract-deque-0.3:=[profile?] <dev-haskell/abstract-deque-0.4:=[profile?] >=dev-haskell/atomic-primops-0.5.0.2:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/abstract-deque-tests-0.3 dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Chase & Lev work-stealing lock-free double-ended queues (deques)
+EAPI=5
+HOMEPAGE=https://github.com/rrnewton/haskell-lockfree/wiki
+IUSE=debug doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/abstract-deque-0.3:=[profile?] <dev-haskell/abstract-deque-0.4:=[profile?] >=dev-haskell/atomic-primops-0.5.0.2:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.5.0.5
+SRC_URI=mirror://hackage/packages/archive/chaselev-deque/0.5.0.5/chaselev-deque-0.5.0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6666fa468c51aea83fb4b3691d90fb45
diff --git a/dev-haskell/chaselev-deque/Manifest b/dev-haskell/chaselev-deque/Manifest
deleted file mode 100644
index 70901d5c37a8..000000000000
--- a/dev-haskell/chaselev-deque/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST chaselev-deque-0.4.tar.gz 10323 BLAKE2B b8e47560586b9fbde66be5499e1bb42d44e15c5c2992ef4f6f14653dfc6e51021377d2becace5a7b4079cd50d527c85965f5bb38872433130c65486ddfa79d27 SHA512 40145d86c4664d192eac0c264f6371b8f894b5aa0ab8d3179d6fe3b6d336f8062ebbfb83a39836069d7eb90baf2a5d7d3d75aba73adf67547a29824793084cc7
-DIST chaselev-deque-0.5.0.5.tar.gz 12451 BLAKE2B 79ee460eb84286bbbe0dcd58431d5ab0b7aef1d0d186c2c919b566c6b169ab4069917a61e8bb800af3857c7e3cca09c6f698c6f9a6b5d8efdbdd5902a7042310 SHA512 1561208ec92d7765b126684677cab02ee71bd1f7d2cdc6f2acac065972c241d085a538e14f51c87555f464aadbac2795c64f9063075acdf29217fb2d70a47dfd
-EBUILD chaselev-deque-0.4.ebuild 1134 BLAKE2B 150fb8e5e420bb99594909bc130a56b988485c7c9df4acadec6fdbaa2622e8c6581b80d97df381a5c3d1a777a0b122e997b20f3e2e9b57c307d40831a23e764b SHA512 c731cfa72f6e94f5e3e163891b06a737e91c761be0bc657f1c31958b6455760b9523899750f6de58cb6bbfce4ad026bed2676b516cef2d269a567bffc8f746bb
-EBUILD chaselev-deque-0.5.0.5.ebuild 1025 BLAKE2B a1a836d9ef83d34b36f1226e3226797cb85b46e934acb5daa746901ae10c71622c73ddcd7eb101ebcadfab9921d8df0866b2e9ea81b6a0965182ef251e246e0b SHA512 f02888bdfb3f864eae21ff2771c9b32914606e0505f44371409c4664de27207a3d1809fdb117922476a1ede6915fa8d68184278acd02378af254ee80909480d0
-MISC metadata.xml 450 BLAKE2B 687396764385a78c84169677319e33815e449cbc38b61489058e8aebdb43b708759e91b2449ca5cd9ff7ae0d710c5623c65b4c57e9d04e7755818f3586226713 SHA512 3fdab91a32cc60d1b79d309e4285d17494057fc11e470c6683eefe412cf9ed8a720d659c2b841f493f9c7259842c044856c8264714b5590d2bef270003b3c71d
diff --git a/dev-haskell/chaselev-deque/chaselev-deque-0.4.ebuild b/dev-haskell/chaselev-deque/chaselev-deque-0.4.ebuild
deleted file mode 100644
index ea65da54185a..000000000000
--- a/dev-haskell/chaselev-deque/chaselev-deque-0.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile test-suite" # haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Chase & Lev work-stealing lock-free double-ended queues (deques)"
-HOMEPAGE="https://github.com/rrnewton/haskell-lockfree-queue/wiki"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RESTRICT=test # missing files
-
-RDEPEND=">=dev-haskell/abstract-deque-0.2.2:=[profile?] <dev-haskell/abstract-deque-0.3:=[profile?]
-	>=dev-haskell/atomic-primops-0.4:=[profile?] <dev-haskell/atomic-primops-0.5:=[profile?]
-	dev-haskell/bits-atomic:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug) \
-		--disable-tests
-}
diff --git a/dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild b/dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild
deleted file mode 100644
index 252e56e76f85..000000000000
--- a/dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Chase & Lev work-stealing lock-free double-ended queues (deques)"
-HOMEPAGE="https://github.com/rrnewton/haskell-lockfree/wiki"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-haskell/abstract-deque-0.3:=[profile?] <dev-haskell/abstract-deque-0.4:=[profile?]
-	>=dev-haskell/atomic-primops-0.5.0.2:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/abstract-deque-tests-0.3
-		dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug)
-}
diff --git a/dev-haskell/chaselev-deque/metadata.xml b/dev-haskell/chaselev-deque/metadata.xml
deleted file mode 100644
index 9f0030f4e5fd..000000000000
--- a/dev-haskell/chaselev-deque/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Chase &amp; Lev work-stealing lock-free double-ended queues (deques).
-	</longdescription>
-	<upstream>
-		<remote-id type="github">rrnewton/haskell-lockfree</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/chasingbottoms-1.3.0.11-r1 b/dev-haskell/chasingbottoms-1.3.0.11-r1
new file mode 100644
index 000000000000..9dcd69579272
--- /dev/null
+++ b/dev-haskell/chasingbottoms-1.3.0.11-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/quickcheck-2.1:2=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=For testing partial and infinite values
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/ChasingBottoms
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/quickcheck-2.1:2=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/1.3.0.11
+SRC_URI=mirror://hackage/packages/archive/ChasingBottoms/1.3.0.11/ChasingBottoms-1.3.0.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=239a5a2b1ee06f773894643b1f40ca8a
diff --git a/dev-haskell/chasingbottoms-1.3.0.13 b/dev-haskell/chasingbottoms-1.3.0.13
new file mode 100644
index 000000000000..db5b919a6b82
--- /dev/null
+++ b/dev-haskell/chasingbottoms-1.3.0.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/quickcheck-2.1:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=For testing partial and infinite values
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/ChasingBottoms
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/quickcheck-2.1:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/1.3.0.13
+SRC_URI=mirror://hackage/packages/archive/ChasingBottoms/1.3.0.13/ChasingBottoms-1.3.0.13.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ce258de0df6ffc710f73fda893be0a28
diff --git a/dev-haskell/chasingbottoms-1.3.0.14 b/dev-haskell/chasingbottoms-1.3.0.14
new file mode 100644
index 000000000000..6b35e7d90e7a
--- /dev/null
+++ b/dev-haskell/chasingbottoms-1.3.0.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/quickcheck-2.1:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=For testing partial and infinite values
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/ChasingBottoms
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/quickcheck-2.1:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.3.0.14
+SRC_URI=mirror://hackage/packages/archive/ChasingBottoms/1.3.0.14/ChasingBottoms-1.3.0.14.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2e57465ad9d831cb538331748452eebb
diff --git a/dev-haskell/chasingbottoms-1.3.1.2 b/dev-haskell/chasingbottoms-1.3.1.2
new file mode 100644
index 000000000000..8394a4c5aff9
--- /dev/null
+++ b/dev-haskell/chasingbottoms-1.3.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/quickcheck-2.1:2=[profile?] <dev-haskell/quickcheck-2.10:2=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=For testing partial and infinite values
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/ChasingBottoms
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/quickcheck-2.1:2=[profile?] <dev-haskell/quickcheck-2.10:2=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.3.1.2
+SRC_URI=mirror://hackage/packages/archive/ChasingBottoms/1.3.1.2/ChasingBottoms-1.3.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8d4029671ab36eea54afedceb73505f3
diff --git a/dev-haskell/chasingbottoms/Manifest b/dev-haskell/chasingbottoms/Manifest
deleted file mode 100644
index 22c1d9c01216..000000000000
--- a/dev-haskell/chasingbottoms/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST ChasingBottoms-1.3.0.11.tar.gz 31437 BLAKE2B 9db3ffe3b2c6d896138d826b093678988685a078f29cd4b03365d7860238ff309c9f50a5729a5347eb927005f5be0bc58e109e5435489eb8307d919265675add SHA512 acf939e4060b08a02fd1bd15473911551e834373b8e4e50f36cd832b64ec3798e9a41d3b26fdc9e9b84648862617da8ba859ee453086240f566ce4ae8bc0301e
-DIST ChasingBottoms-1.3.0.13.tar.gz 31474 BLAKE2B dcb059a1501933e477d09ecaba51b08aa30cf9ec97370e6c0d7f01c358b6a2c8c62a3529ccf8d39b6790bfafcc66acd7f1c089cfc5c5e6e176c7572c136da138 SHA512 050d66670a77de274f16d70dfbc231ab469067ce34af962a851c7f041b7e0812bb6480e3b3166e4ceda2509454ff3d1d85fdd977f63471d6f45c1162184aeb7d
-DIST ChasingBottoms-1.3.0.14.tar.gz 31485 BLAKE2B de7f8ec14712d7ae534de4b98d417c6939e837968a0c7575068dd222aeff5b2ea62f9edc5b5f6e31f266beee71dd2916787d687923acbde88f207fa8c47542e3 SHA512 672dbfb236b14cedd7c0039476c7d799b1718843336a60905816faf6f5d80491eaef59bdf4a8b000f0104ab452760964b64c5f09293535d517b3a33e6d382e13
-DIST ChasingBottoms-1.3.1.2.tar.gz 31555 BLAKE2B 106413449aaa4d88e140be3692a4eb37d340e6d73e91166e0da8ce1b9477e8868fa975e57e14642d01fcb2474df6d3d653cc617ab3b387f279d7a2560764680d SHA512 84d05b26916bda14bd0b33ff90154da88b5a8c01cae692a8cc11339aea2259b8d0001f3c3b21199ef59efbfb028dfd877f11f8543b55828ecf563f7c5cd711e0
-EBUILD chasingbottoms-1.3.0.11-r1.ebuild 1124 BLAKE2B f9d4699793386bd633e70530507ba825a12a2651b96724a02e8eb203189049dfab005fb1d6ead65c653628a3496c2c3043345fd62781861aed3d8ccd5b47f458 SHA512 ed3604103258a011cfc46c197e46c891635d91676f1f37b3d2550d3c460166f0ca72d8f650ceb6d2aa13c62c9da8dde7aa050cd946b6bd39bb829d1477408d4c
-EBUILD chasingbottoms-1.3.0.13.ebuild 1081 BLAKE2B 10eb8c3dec6817e501ea24d1ba4c08881ad143639b757cc32066e9044452bae7221da0b858a9bb71e44aa8e9860f3379425d792cb52cc06f5d1dd29f100cd7b4 SHA512 975f528910ead3595ecb3d8d7bfb956fbf32fabf725aae40dc8e6b65a06528fca2040f8f8fc6b7329aa8735e4c008dabbe7e23362fb38878da0cf41df3e55356
-EBUILD chasingbottoms-1.3.0.14.ebuild 1052 BLAKE2B e35d7df1c10e5739d5252c77c06907e814f11abe8e64914ae2b4f64adf348fc9e4e8dc6b95d8327a6942d635ab667f037d772769da278108e21e89b8d41976cf SHA512 9338f4ab5ebef00e7cf741cdbba770b6b977d29cd027249ed468478047ef67453aa5bbebfce302bc6a7b82536a275fb1f67eeb2c521b94974b34ac5a74b5ca7d
-EBUILD chasingbottoms-1.3.1.2.ebuild 1134 BLAKE2B 6a9881076864ed9c00678fff5631007d5a4208bd629d33c5c06e618bd46bedee4ea5bcda06456fc3234e24f20636be406f659afdbaf19c6ffe2cdbf61529001c SHA512 dd6d7de4e69335251beb6d85880c5a802bffbe7f6f529562c6fe8e8a895445d6c45f65c8de6b3325993d142eadc089140f879298062a54e2d64c1f3d22c6fbdb
-MISC metadata.xml 4089 BLAKE2B 82600e43001f4c9f567021394ff94cbadf8cb3e00259ea6e5fcc9035413823ee6ffbb49dabe0b64fc694aa549594d5f3b342b1a06424bd7b6d3fe640903d45c3 SHA512 d4423f7dbf1b4dc0e8a4b6803c55bec2a82ba31fe2609c5e68a7708b8a7bd8a65ae58db306772a9772e6b1e89752c918e2a04e3a914cf40ddebc286c3b98414c
diff --git a/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.11-r1.ebuild b/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.11-r1.ebuild
deleted file mode 100644
index beb123919b92..000000000000
--- a/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.11-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -build-tests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ChasingBottoms"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="For testing partial and infinite values"
-HOMEPAGE="http://hackage.haskell.org/package/ChasingBottoms"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RESTRICT=test # takes a lot
-
-RDEPEND=">=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/quickcheck-2.1:2=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cabal_chdeps \
-		'QuickCheck >= 2.1 && < 2.8' 'QuickCheck >= 2.1'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-build-tests
-}
diff --git a/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.13.ebuild b/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.13.ebuild
deleted file mode 100644
index 1b1f14687b0b..000000000000
--- a/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.13.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -build-tests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ChasingBottoms"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="For testing partial and infinite values"
-HOMEPAGE="http://hackage.haskell.org/package/ChasingBottoms"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # takes a lot
-
-RDEPEND=">=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/quickcheck-2.1:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-build-tests
-}
diff --git a/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.14.ebuild b/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.14.ebuild
deleted file mode 100644
index cdc5d93dcc76..000000000000
--- a/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.14.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -build-tests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ChasingBottoms"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="For testing partial and infinite values"
-HOMEPAGE="http://hackage.haskell.org/package/ChasingBottoms"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/quickcheck-2.1:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-build-tests
-}
diff --git a/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.2.ebuild b/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.2.ebuild
deleted file mode 100644
index dd2b4df038a7..000000000000
--- a/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -build-tests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ChasingBottoms"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="For testing partial and infinite values"
-HOMEPAGE="http://hackage.haskell.org/package/ChasingBottoms"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/quickcheck-2.1:2=[profile?] <dev-haskell/quickcheck-2.10:2=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4.0 && < 4.10' 'base >= 4.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-build-tests
-}
diff --git a/dev-haskell/chasingbottoms/metadata.xml b/dev-haskell/chasingbottoms/metadata.xml
deleted file mode 100644
index ec83e2946e46..000000000000
--- a/dev-haskell/chasingbottoms/metadata.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Do you ever feel the need to test code involving bottoms (e.g. calls to
-		the @error@ function), or code involving infinite values? Then this
-		library could be useful for you.
-		
-		It is usually easy to get a grip on bottoms by showing a value and
-		waiting to see how much gets printed before the first exception is
-		encountered. However, that quickly gets tiresome and is hard to automate
-		using e.g. QuickCheck
-		(&lt;http://www.cse.chalmers.se/~rjmh/QuickCheck/&gt;). With this library you
-		can do the tests as simply as the following examples show.
-		
-		Testing explicitly for bottoms:
-		
-		[@&gt; isBottom (head [\])@] @True@
-		
-		[@&gt; isBottom bottom@] @True@
-		
-		[@&gt; isBottom (\\_ -&gt; bottom)@] @False@
-		
-		[@&gt; isBottom (bottom, bottom)@] @False@
-		
-		Comparing finite, partial values:
-		
-		[@&gt; ((bottom, 3) :: (Bool, Int)) ==! (bottom, 2+5-4)@] @True@
-		
-		[@&gt; ((bottom, bottom) :: (Bool, Int)) &lt;! (bottom, 8)@] @True@
-		
-		Showing partial and infinite values (@\\\/!@ is join and @\/\\!@ is meet):
-		
-		[@&gt; approxShow 4 $ (True, bottom) \\\/! (bottom, \'b\')@] @\"Just (True, \'b\')\"@
-		
-		[@&gt; approxShow 4 $ (True, bottom) \/\\! (bottom, \'b\')@] @\"(_|_, _|_)\"@
-		
-		[@&gt; approxShow 4 $ ([1..\] :: [Int\])@] @\"[1, 2, 3, _\"@
-		
-		[@&gt; approxShow 4 $ (cycle [bottom\] :: [Bool\])@] @\"[_|_, _|_, _|_, _\"@
-		
-		Approximately comparing infinite, partial values:
-		
-		[@&gt; approx 100 [2,4..\] ==! approx 100 (filter even [1..\] :: [Int\])@] @True@
-		
-		[@&gt; approx 100 [2,4..\] \/=! approx 100 (filter even [bottom..\] :: [Int\])@] @True@
-		
-		The code above relies on the fact that @bottom@, just as @error
-		\"...\"@, @undefined@ and pattern match failures, yield
-		exceptions. Sometimes we are dealing with properly non-terminating
-		computations, such as the following example, and then it can be nice to
-		be able to apply a time-out:
-		
-		[@&gt; timeOut' 1 (reverse [1..5\])@] @Value [5,4,3,2,1]@
-		
-		[@&gt; timeOut' 1 (reverse [1..\])@] @NonTermination@
-		
-		The time-out functionality can be used to treat \"slow\" computations as
-		bottoms:
-		
-		[@&gt; let tweak = Tweak &amp;#x7b; approxDepth = Just 5, timeOutLimit = Just 2 &amp;#x7d;@]
-		
-		[@&gt; semanticEq tweak (reverse [1..\], [1..\]) (bottom :: [Int\], [1..\] :: [Int\])@] @True@
-		
-		[@&gt; let tweak = noTweak &amp;#x7b; timeOutLimit = Just 2 &amp;#x7d;@]
-		
-		[@&gt; semanticJoin tweak (reverse [1..\], True) ([\] :: [Int\], bottom)@] @Just ([],True)@
-		
-		This can of course be dangerous:
-		
-		[@&gt; let tweak = noTweak &amp;#x7b; timeOutLimit = Just 0 &amp;#x7d;@]
-		
-		[@&gt; semanticEq tweak (reverse [1..100000000\]) (bottom :: [Integer\])@] @True@
-		
-		Timeouts can also be applied to @IO@ computations:
-		
-		[@&gt; let primes = unfoldr (\\(x:xs) -&gt; Just (x, filter ((\/= 0) . (\`mod\` x)) xs)) [2..\]@]
-		
-		[@&gt; timeOutMicro 100 (print $ filter ((== 1) . (\`mod\` 83)) primes)@] @[167,499,9NonTermination@
-		
-		[@&gt; timeOutMicro 100 (print $ take 6 $ filter ((== 1) . (\`mod\` 83)) primes)@] @[167,499,997,1163,1993NonTermination@
-		
-		[@&gt; timeOutMicro 100 (print $ take 6 $ filter ((== 1) . (\`mod\` 83)) primes)@] @[167,499,997,1163,1993,2657]@
-		
-		[@ @] @Value ()@
-		
-		For the underlying theory and a larger example involving use of
-		QuickCheck, see the article \"Chasing Bottoms, A Case Study in Program
-		Verification in the Presence of Partial and Infinite Values\"
-		(&lt;http://www.cse.chalmers.se/~nad/publications/danielsson-jansson-mpc2004.html&gt;).
-		
-		The code has been tested using GHC. Most parts can probably be
-		ported to other Haskell compilers, but this would require some work.
-		The @TimeOut@ functions require preemptive scheduling, and most of
-		the rest requires @Data.Generics@; @isBottom@ only requires
-		exceptions, though.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/chell-0.4.0.1 b/dev-haskell/chell-0.4.0.1
new file mode 100644
index 000000000000..eca5b1b1c674
--- /dev/null
+++ b/dev-haskell/chell-0.4.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/options-1.0:=[profile?] <dev-haskell/options-2.0:=[profile?] >=dev-haskell/patience-0.1:=[profile?] <dev-haskell/patience-0.2:=[profile?] >=dev-haskell/random-1.0:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= color-output? ( >=dev-haskell/ansi-terminal-0.5:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A simple and intuitive library for automated testing
+EAPI=5
+HOMEPAGE=https://john-millikin.com/software/chell/
+IUSE=+color-output doc hscolour profile
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/options-1.0:=[profile?] <dev-haskell/options-2.0:=[profile?] >=dev-haskell/patience-0.1:=[profile?] <dev-haskell/patience-0.2:=[profile?] >=dev-haskell/random-1.0:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= color-output? ( >=dev-haskell/ansi-terminal-0.5:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?] )
+SLOT=0/0.4.0.1
+SRC_URI=mirror://hackage/packages/archive/chell/0.4.0.1/chell-0.4.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fac54899bdf47f71b2e513040634571d
diff --git a/dev-haskell/chell-quickcheck-0.2.5 b/dev-haskell/chell-quickcheck-0.2.5
new file mode 100644
index 000000000000..64495bdc4f63
--- /dev/null
+++ b/dev-haskell/chell-quickcheck-0.2.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/chell-0.3:=[profile?] <dev-haskell/chell-0.5:=[profile?] >=dev-haskell/quickcheck-2.3:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=QuickCheck support for the Chell testing library
+EAPI=5
+HOMEPAGE=https://john-millikin.com/software/chell/
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/chell-0.3:=[profile?] <dev-haskell/chell-0.5:=[profile?] >=dev-haskell/quickcheck-2.3:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.5
+SRC_URI=mirror://hackage/packages/archive/chell-quickcheck/0.2.5/chell-quickcheck-0.2.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=23b8a4c4d770eacb6c5c66bce393089c
diff --git a/dev-haskell/chell-quickcheck-0.2.5-r1 b/dev-haskell/chell-quickcheck-0.2.5-r1
new file mode 100644
index 000000000000..82d039586d53
--- /dev/null
+++ b/dev-haskell/chell-quickcheck-0.2.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/chell-0.3:=[profile?] <dev-haskell/chell-0.5:=[profile?] >=dev-haskell/quickcheck-2.3:2=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=QuickCheck support for the Chell testing library
+EAPI=6
+HOMEPAGE=https://john-millikin.com/software/chell/
+IUSE=doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/chell-0.3:=[profile?] <dev-haskell/chell-0.5:=[profile?] >=dev-haskell/quickcheck-2.3:2=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.5
+SRC_URI=mirror://hackage/packages/archive/chell-quickcheck/0.2.5/chell-quickcheck-0.2.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=aaa64a741573175be9533fdad2a4fe90
diff --git a/dev-haskell/chell-quickcheck/Manifest b/dev-haskell/chell-quickcheck/Manifest
deleted file mode 100644
index 1baab59c7916..000000000000
--- a/dev-haskell/chell-quickcheck/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX chell-quickcheck-0.2.5-QC-2.9.patch 566 BLAKE2B c36509d0600899e5ad8586282efb6ae83fdd22deb818ca40f567c3b6a6ec8f3e85dcc733c7931c10dec117cc1339c09e10efb20a92caceb8497c48a145a26e02 SHA512 8b3d986a6a00e89af6858641bbb515388c3bece7f3d8f72f14f0028f37a900a12618b918e901c96471a96f53b943cb1c877b016f0580d71871a49d06dd1c9009
-DIST chell-quickcheck-0.2.5.tar.gz 2450 BLAKE2B 97620bd1d8411cb1ac612615cdf3eed168c718257ca00e6777086590ce861147a56fc6113040bdaeea5dfbd0856cd66c401e2308af968c85148a6d5607e0f925 SHA512 df2ae72b51c7999fa6febbb9b72637d6fd63f2c31de94de37c51fc1691de6047e1f5b29be60175dd9677fd8190759400c1eeada0602532e2840bce1c36529fd7
-EBUILD chell-quickcheck-0.2.5-r1.ebuild 877 BLAKE2B 59b4c2887d45984cfd11d7cfb465dafa39703b8447f05cf44e07c1ce764aae6aa58ee84697c9557d40358aca8e79170f4502d1b416a85149e7f23e8c59193469 SHA512 b7ba64f1053434d6f2d638a09bf84cda4b4e29de934279e64a5d8077dd28735e8b577edda3a64023cfe94bf7ae553264dfd1547fefda21498f15a320b38136d1
-EBUILD chell-quickcheck-0.2.5.ebuild 774 BLAKE2B 8c66d69e98913e7f05c0f3a1b3b4d607ee4b1ec886941ddc5586ee3dfd687ea0d3174553b45f889da4c0abfe3a0309ff6ca332a0f2305e0cc33c1a5d16d48db9 SHA512 5570f62b7d2fc33971ba191b2f613b1976009a7220f7d520ddd8166a961e51c5d5606888dd147ec3c910b66e18c62a64c78286dabe6ffaf4843c75853cad8313
-MISC metadata.xml 339 BLAKE2B 689793b66e973524bb1d81e96ce1dc02e5ed98f138db76928e833cf35fab90762747e69ca43c2c260f2c5b8863193ae729de6c22a686107f4b15c06a7e062b49 SHA512 e2d5234bfbec665d51585fcf3611d9e80fe3bcb01555940b0f05a670f30babf76d3d5a3c22de193f7d11c700a312d587dc0b81eec478f46e7ca9aa6d69d9fa0e
diff --git a/dev-haskell/chell-quickcheck/chell-quickcheck-0.2.5-r1.ebuild b/dev-haskell/chell-quickcheck/chell-quickcheck-0.2.5-r1.ebuild
deleted file mode 100644
index ea9d0c66afc5..000000000000
--- a/dev-haskell/chell-quickcheck/chell-quickcheck-0.2.5-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck support for the Chell testing library"
-HOMEPAGE="https://john-millikin.com/software/chell/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/chell-0.3:=[profile?] <dev-haskell/chell-0.5:=[profile?]
-	>=dev-haskell/quickcheck-2.3:2=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-PATCHES=("${FILESDIR}"/${P}-QC-2.9.patch)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck >= 2.3 && < 2.9' 'QuickCheck >= 2.3'
-}
diff --git a/dev-haskell/chell-quickcheck/chell-quickcheck-0.2.5.ebuild b/dev-haskell/chell-quickcheck/chell-quickcheck-0.2.5.ebuild
deleted file mode 100644
index afb146b444fb..000000000000
--- a/dev-haskell/chell-quickcheck/chell-quickcheck-0.2.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck support for the Chell testing library"
-HOMEPAGE="https://john-millikin.com/software/chell/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/chell-0.3:=[profile?] <dev-haskell/chell-0.5:=[profile?]
-	>=dev-haskell/quickcheck-2.3:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/chell-quickcheck/files/chell-quickcheck-0.2.5-QC-2.9.patch b/dev-haskell/chell-quickcheck/files/chell-quickcheck-0.2.5-QC-2.9.patch
deleted file mode 100644
index 50a2d07f3caa..000000000000
--- a/dev-haskell/chell-quickcheck/files/chell-quickcheck-0.2.5-QC-2.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/lib/Test/Chell/QuickCheck.hs b/lib/Test/Chell/QuickCheck.hs
-index 56cbd04..c630320 100644
---- a/lib/Test/Chell/QuickCheck.hs
-+++ b/lib/Test/Chell/QuickCheck.hs
-@@ -103,5 +103,3 @@ maxDiscardedTests :: QuickCheck.Testable prop => QuickCheck.Args -> prop -> Int
- #if MIN_VERSION_QuickCheck(2,5,0)
--maxDiscardedTests args p = if QuickCheck.exhaustive p
--	then QuickCheck.maxDiscardRatio args
--	else QuickCheck.maxDiscardRatio args * QuickCheck.maxSuccess args
-+maxDiscardedTests args _ = QuickCheck.maxDiscardRatio args * QuickCheck.maxSuccess args
- #else
diff --git a/dev-haskell/chell-quickcheck/metadata.xml b/dev-haskell/chell-quickcheck/metadata.xml
deleted file mode 100644
index 7e621418d8d3..000000000000
--- a/dev-haskell/chell-quickcheck/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		QuickCheck support for the Chell testing library
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/chell/Manifest b/dev-haskell/chell/Manifest
deleted file mode 100644
index 1f5e99a0c246..000000000000
--- a/dev-haskell/chell/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST chell-0.4.0.1.tar.gz 12441 BLAKE2B 450827af0cfe005b6c6c17e59229d7aceef6b4609b9c81672829d4c4818e5d9ab03752e6b44efc73fd0a614c881e0326faec881613e8f2ce68c75bcbd1e06e69 SHA512 5a11e38fdd6c4f323d077dc3adc35c9626229a49f6ed32a0202031094f2612ec3e26a28f96819366439c1ec97ddfd839050f207d03c90a749890ef2bb345b8c3
-EBUILD chell-0.4.0.1.ebuild 1069 BLAKE2B b7b382b11efccbceac8dcc1b058fe0c4340bf3fa7f75d5bd5bd643d52c1a63ed302dd008230823713bd7cecdec2cbe0605d80664bdd9b55ec2034bad29dd1783 SHA512 017e138b1d88f077f39ea34c6fbb44ad616250b2db4dd854eb23010a5b0f891694d90cc7f16ba4948f93e360b64cc04b560516f4aced486e46455cee57e06866
-MISC metadata.xml 1348 BLAKE2B 7a683e9440cbb07cc4d3546f3b8727801ed177136eb20a3df82a0ce11589e4f236bd175b68b796d447e6b9eec4a87238050d88371d8c92d8a054b01f4c71e9f7 SHA512 4c6e16171c20c2f2e21ca663a5c9b76d57e202ee1cb99317417de758b6fcefe0a7b44ea0177c20f8549ca7f48e4238d8b854a0d12548d9041c2265a4b9138ad5
diff --git a/dev-haskell/chell/chell-0.4.0.1.ebuild b/dev-haskell/chell/chell-0.4.0.1.ebuild
deleted file mode 100644
index a89b0baa6803..000000000000
--- a/dev-haskell/chell/chell-0.4.0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A simple and intuitive library for automated testing"
-HOMEPAGE="https://john-millikin.com/software/chell/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="+color-output"
-
-RDEPEND=">=dev-haskell/options-1.0:=[profile?] <dev-haskell/options-2.0:=[profile?]
-	>=dev-haskell/patience-0.1:=[profile?] <dev-haskell/patience-0.2:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	color-output? ( >=dev-haskell/ansi-terminal-0.5:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag color-output color-output)
-}
diff --git a/dev-haskell/chell/metadata.xml b/dev-haskell/chell/metadata.xml
deleted file mode 100644
index bc57a63871b2..000000000000
--- a/dev-haskell/chell/metadata.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Chell is a simple and intuitive library for automated testing. It natively
-		supports assertion-based testing, and can use companion libraries
-		such as @chell-quickcheck@ to support more complex testing strategies.
-		
-		An example test suite, which verifies the behavior of artithmetic operators.
-		
-		@
-		&amp;#x7b;-\# LANGUAGE TemplateHaskell \#-&amp;#x7d;
-		
-		import Test.Chell
-		
-		tests_Math :: Suite
-		tests_Math = suite \"math\"
-		&amp;#x20;   test_Addition
-		&amp;#x20;   test_Subtraction
-		
-		test_Addition :: Test
-		test_Addition = assertions \"addition\" $ do
-		&amp;#x20;   $expect (equal (2 + 1) 3)
-		&amp;#x20;   $expect (equal (1 + 2) 3)
-		
-		test_Subtraction :: Test
-		test_Subtraction = assertions \"subtraction\" $ do
-		&amp;#x20;   $expect (equal (2 - 1) 1)
-		&amp;#x20;   $expect (equal (1 - 2) (-1))
-		
-		main :: IO ()
-		main = defaultMain [tests_Math]
-		@
-		
-		@
-		$ ghc --make chell-example.hs
-		$ ./chell-example
-		PASS: 2 tests run, 2 tests passed
-		@
-	</longdescription>
-	<use>
-		<flag name="color-output">use colors in program output</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/chunked-data-0.1.0.1 b/dev-haskell/chunked-data-0.1.0.1
new file mode 100644
index 000000000000..fa11e60f7469
--- /dev/null
+++ b/dev-haskell/chunked-data-0.1.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/blaze-builder:=[profile?] >=dev-haskell/mono-traversable-0.2:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/system-filepath:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Typeclasses for dealing with various chunked data representations
+EAPI=5
+HOMEPAGE=https://github.com/fpco/chunked-data
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/blaze-builder:=[profile?] >=dev-haskell/mono-traversable-0.2:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/system-filepath:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.1.0.1
+SRC_URI=mirror://hackage/packages/archive/chunked-data/0.1.0.1/chunked-data-0.1.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cc49c94232c735ce0dac7912e634a976
diff --git a/dev-haskell/chunked-data-0.3.0 b/dev-haskell/chunked-data-0.3.0
new file mode 100644
index 000000000000..558b028668e0
--- /dev/null
+++ b/dev-haskell/chunked-data-0.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/semigroups:=[profile?] >=dev-haskell/text-1.2:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Typeclasses for dealing with various chunked data representations
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/mono-traversable
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/semigroups:=[profile?] >=dev-haskell/text-1.2:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.3.0
+SRC_URI=mirror://hackage/packages/archive/chunked-data/0.3.0/chunked-data-0.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=12329902b06a909e0bfcd805db5dc7ab
diff --git a/dev-haskell/chunked-data/Manifest b/dev-haskell/chunked-data/Manifest
deleted file mode 100644
index c6d8206afe0a..000000000000
--- a/dev-haskell/chunked-data/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST chunked-data-0.1.0.1.tar.gz 4815 BLAKE2B 5446228f7625618cd98b92eedea5218255e599a336d61ab3e716e23321384feca59e626caba4a26a5eadcf1082ff2a1bf3c17be4a8d19c03afbd315f5f7be51b SHA512 c976a73d508f4fe5689e49945a07174a8aa7ac05afdc302b7b6dd6746c8d6158d8092fdd25d42a83a9bd47014326a5d9d322b21f65fe2af5a4684f39714beb3e
-DIST chunked-data-0.3.0.tar.gz 4349 BLAKE2B f2392f2ba4bdc3f3cccd7a2a45be51e70da388be39ff35fc7688c9825c70c058c03f80252ffad388d0f5768bd941aa9d04024bf2b511439fac7d6298b7d1a76a SHA512 cbce790f1898b2aed6309d8eee14c3461bf99e8adbb27bfb563be86ccbcb3f4b3bca55e82b71e87c2b451ccad829cd4cf276c5b1a40934f32b065e176bbb5617
-EBUILD chunked-data-0.1.0.1.ebuild 845 BLAKE2B d45efaffe105a2cf088231def46c9845798fec7e0d04c329f4f44387f3e2f8cb99c9459033d046e480976990a36307df2a1517fb7d3972c1ee76ab0cf84336ac SHA512 570eb9735037e3750971d344a5da3fd409e2a3d20c39fbbcdfb775da35ee650e2531310142280ec262314884cb927e1633f086f00ff18d0ebd6c88937f39becf
-EBUILD chunked-data-0.3.0.ebuild 685 BLAKE2B 1f367ff922e20696f15ab3a5f431fcc762db84b0afe653248e88e162b712575529777a80d99fe97b59e1651b1378819fa8723ce1bdc1da3223ca6a6c72a849eb SHA512 12d3d68657420e067cccfbe4428cea12becea7357f5adf7ba60bdfc9f4752046a8ed3c8389f4abf301c5d9385ce10d49da4f6733fd7db4b4c9ec8ef473ba47d9
-MISC metadata.xml 410 BLAKE2B 25ae18f64ad32900cdca600b09cfa4680be8c5590e1291776801ba2838f4b399f52e211092cc3f334ffd792855a0e23cd51e46d5acae1887d29402eb8a5d83ef SHA512 dac8e51b4c548108ff089e99fa661dfac6aecf6c08d37d9d1b359eca5e37c9088f303dc63bd1ebbe0e897e3cc482a3602768f77531154c7f152ad5a27be5b7e8
diff --git a/dev-haskell/chunked-data/chunked-data-0.1.0.1.ebuild b/dev-haskell/chunked-data/chunked-data-0.1.0.1.ebuild
deleted file mode 100644
index 5c3c5d483691..000000000000
--- a/dev-haskell/chunked-data/chunked-data-0.1.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Typeclasses for dealing with various chunked data representations"
-HOMEPAGE="https://github.com/fpco/chunked-data"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/mono-traversable-0.2:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/system-filepath:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/chunked-data/chunked-data-0.3.0.ebuild b/dev-haskell/chunked-data/chunked-data-0.3.0.ebuild
deleted file mode 100644
index a79ec00c2b15..000000000000
--- a/dev-haskell/chunked-data/chunked-data-0.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Typeclasses for dealing with various chunked data representations"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/semigroups:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/chunked-data/metadata.xml b/dev-haskell/chunked-data/metadata.xml
deleted file mode 100644
index b7a4384c75f4..000000000000
--- a/dev-haskell/chunked-data/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Originally present in classy-prelude.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">fpco/chunked-data</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cipher-aes-0.2.11 b/dev-haskell/cipher-aes-0.2.11
new file mode 100644
index 000000000000..8fc393e86b51
--- /dev/null
+++ b/dev-haskell/cipher-aes-0.2.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.6:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/crypto-cipher-tests-0.0.8 >=dev-haskell/quickcheck-2 >=dev-haskell/test-framework-0.3.3 >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast AES cipher implementation with advanced mode of operations
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-cipher-aes
+IUSE=cpu_flags_x86_aes cpu_flags_x86_ssse3 doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.6:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.11
+SRC_URI=mirror://hackage/packages/archive/cipher-aes/0.2.11/cipher-aes-0.2.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3826869625c2c5f5427d64764674b087
diff --git a/dev-haskell/cipher-aes-0.2.5 b/dev-haskell/cipher-aes-0.2.5
new file mode 100644
index 000000000000..33e1333abc95
--- /dev/null
+++ b/dev-haskell/cipher-aes-0.2.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/crypto-cipher-tests >=dev-haskell/quickcheck-2 >=dev-haskell/test-framework-0.3.3 >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast AES cipher implementation with advanced mode of operations
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-cipher-aes
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.2.5
+SRC_URI=mirror://hackage/packages/archive/cipher-aes/0.2.5/cipher-aes-0.2.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=afd73bd54839d19e6be3ee840042692c
diff --git a/dev-haskell/cipher-aes/Manifest b/dev-haskell/cipher-aes/Manifest
deleted file mode 100644
index 534870b430a6..000000000000
--- a/dev-haskell/cipher-aes/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST cipher-aes-0.2.11.tar.gz 33939 BLAKE2B 98f065baeea41684fe3a59366dba70ffac2f7539710e67648952820e38affb12588b471070def1b4f2bc0c9a6f9ad1155bd22c6182db384cc0349ddb8945a854 SHA512 d0c9b94e93903d0a3ea5587a4ac4ee5124b5189842070dd11c99182ba7396c982aa8c3eae2f8a1fd5b906f8ab3306e4b49ae9276a837e871278d6fe591bbd816
-DIST cipher-aes-0.2.5.tar.gz 29934 BLAKE2B 7b588a8284335f072dc3be65170f5a8727ea3f7ab08251298d19183b619a2c33158bae3100e77b1e9465cd3ece01dbde8af920e7f540e59ec9b4a58c7043ea30 SHA512 61a3ebcf02c9a6bb2a6ad0386414003922355bc76cdce7df915c2fe98fc1a647cf8a0a950155482564b8310c76b7b0612320e8c586c1dc08be27317dd80537e7
-EBUILD cipher-aes-0.2.11.ebuild 1202 BLAKE2B 3bef5248c0377f147d24f7828dfaf070c2e45b7ee741ba5379b51efa9bce99788163cee96b3a179d0e3bedf509c547485d74b81f594e5f3b84a067f5ad670cc2 SHA512 366580e8365128ccc3713118330d9943d812f11464dcc918617df533808eb50d314f006f438d567014757c359fa91031034112da7cdeb07df9c5c93b7f1c3d3f
-EBUILD cipher-aes-0.2.5.ebuild 875 BLAKE2B 46489da5bad61ef6981c26dc3c0f00821e4f1d9f28bfb2f0a707169e524ec1917353663c1707a7f4bd667b776c33ef372ad70fc95c9cce335eca8e77e98977c5 SHA512 feb9ee7c8c4c6805e22d4157cc5012070f4d04a48857bf8b5afc7b6348f743d7d8685f89e074059e9b960dcb9fd04a1b5ef53fbe4632376a18866aba28e7cb05
-MISC metadata.xml 442 BLAKE2B cb6c8694057436c3621982cba65a361059217f8f7839eea6348e862f3a0e8834f3989bbe3440d61dd5bc2f74e05588b84e5cd6c057f81592ac5b4523bfedd949 SHA512 a0e254a3f9dda18888e941d74e4932cfcca9a6effabdfcd234d667f8fe888764a281ecc1fb67baa00f844d92e5b47481032bc460d7cc90be7557ebc6e6f5f1b8
diff --git a/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild b/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild
deleted file mode 100644
index 920726217d88..000000000000
--- a/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: support_aesni:cpu_flags_x86_aes
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast AES cipher implementation with advanced mode of operations"
-HOMEPAGE="https://github.com/vincenthz/hs-cipher-aes"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_aes cpu_flags_x86_ssse3"
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-haskell/crypto-cipher-types-0.0.6:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
-	>=dev-haskell/securemem-0.1.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/crypto-cipher-tests-0.0.8
-		>=dev-haskell/quickcheck-2
-		>=dev-haskell/test-framework-0.3.3
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
-
-src_configure() {
-	local want_aes="-"
-
-	use cpu_flags_x86_aes && \
-		use cpu_flags_x86_ssse3 && \
-			want_aes=""
-
-	haskell-cabal_src_configure \
-		--flag=${want_aes}support_aesni
-}
diff --git a/dev-haskell/cipher-aes/cipher-aes-0.2.5.ebuild b/dev-haskell/cipher-aes/cipher-aes-0.2.5.ebuild
deleted file mode 100644
index 0ae5f95208f9..000000000000
--- a/dev-haskell/cipher-aes/cipher-aes-0.2.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast AES cipher implementation with advanced mode of operations"
-HOMEPAGE="https://github.com/vincenthz/hs-cipher-aes"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-haskell/crypto-cipher-types-0.0.3:=[profile?]
-	>=dev-haskell/securemem-0.1.2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/crypto-cipher-tests
-		>=dev-haskell/quickcheck-2
-		>=dev-haskell/test-framework-0.3.3
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
diff --git a/dev-haskell/cipher-aes/metadata.xml b/dev-haskell/cipher-aes/metadata.xml
deleted file mode 100644
index f8871dfd2dce..000000000000
--- a/dev-haskell/cipher-aes/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Fast AES cipher implementation with advanced mode of operations
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-cipher-aes</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cipher-blowfish-0.0.3 b/dev-haskell/cipher-blowfish-0.0.3
new file mode 100644
index 000000000000..5f5114de8c68
--- /dev/null
+++ b/dev-haskell/cipher-blowfish-0.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/crypto-cipher-tests >=dev-haskell/quickcheck-2 >=dev-haskell/test-framework-0.3.3 >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Blowfish cipher
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-crypto-cipher
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.0.3
+SRC_URI=mirror://hackage/packages/archive/cipher-blowfish/0.0.3/cipher-blowfish-0.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6a2fec81cea8ad6bb6c303d40bdaccab
diff --git a/dev-haskell/cipher-blowfish/Manifest b/dev-haskell/cipher-blowfish/Manifest
deleted file mode 100644
index bdb46d873138..000000000000
--- a/dev-haskell/cipher-blowfish/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cipher-blowfish-0.0.3.tar.gz 12876 BLAKE2B 56eb4c925055b8ddac187ad36a7f1fb2f28ff337812eef81fadeb5cd519df6fdd8e41b0047d4e15eea5e567c0440ca5c5c9fb65887b3687d85f9a8fae68308fe SHA512 5fcccde71c1324b34e54c01c41d878150ab8db48728d1bfc21406eda58e4a363de8397f395eaa25a6fb26e4d8c95683abafe0c6bf42d7853db07d768ed245cc0
-EBUILD cipher-blowfish-0.0.3.ebuild 913 BLAKE2B f20b490131b08cdc5c8e918382e86a281f28275e39d1013965741f3640ba83abec38355305b5c0b9c1501ea2ec75e87206dd22bbad91ed10802442c18bd1ab4e SHA512 b32109b7663cfc58177245a0cdfc155b6cf978da80f0bb4e0fbaac3e3c346ef2a354aaab94c83025d7eb32c35a0ea39d8e6d294c17254d9bf485818bae38f5c8
-MISC metadata.xml 408 BLAKE2B 9c472f3cb9f87473130090ec2540adb6cab96a52f1a65312e2dc81a52205f295960aa3115cbdcd452697028401727327cc7f912ce67fac1287b4479178ecddcf SHA512 2bd4a2e2002e6eee912a1752cd5f410cf11e0a47dc21de116f832aac90f715afc5e32b4d8a37866a095ec73bab6f1a13d3acb92f9353791dde32eeaf1a08fc67
diff --git a/dev-haskell/cipher-blowfish/cipher-blowfish-0.0.3.ebuild b/dev-haskell/cipher-blowfish/cipher-blowfish-0.0.3.ebuild
deleted file mode 100644
index f34e3c4e54d0..000000000000
--- a/dev-haskell/cipher-blowfish/cipher-blowfish-0.0.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Blowfish cipher"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-cipher"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
-	>=dev-haskell/securemem-0.1.2:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/crypto-cipher-tests
-		>=dev-haskell/quickcheck-2
-		>=dev-haskell/test-framework-0.3.3
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
diff --git a/dev-haskell/cipher-blowfish/metadata.xml b/dev-haskell/cipher-blowfish/metadata.xml
deleted file mode 100644
index 61f93ec8edbc..000000000000
--- a/dev-haskell/cipher-blowfish/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Blowfish cipher primitives
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-cipher</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cipher-camellia-0.0.2 b/dev-haskell/cipher-camellia-0.0.2
new file mode 100644
index 000000000000..c6da8a15aa54
--- /dev/null
+++ b/dev-haskell/cipher-camellia-0.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/crypto-cipher-tests >=dev-haskell/quickcheck-2 >=dev-haskell/test-framework-0.3.3 >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Camellia block cipher primitives
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-crypto-cipher
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.0.2
+SRC_URI=mirror://hackage/packages/archive/cipher-camellia/0.0.2/cipher-camellia-0.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3b1313a1a297081996dd14b493ec5b49
diff --git a/dev-haskell/cipher-camellia/Manifest b/dev-haskell/cipher-camellia/Manifest
deleted file mode 100644
index 87624d6e497b..000000000000
--- a/dev-haskell/cipher-camellia/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cipher-camellia-0.0.2.tar.gz 6230 BLAKE2B d40fc1cc549d6150a10154fc68e134dbad0c451a60632be081e94c95b75053ff64a26ffca7fc899b3df88294341b4a9f209e10ac91f39de368dd3466cf017717 SHA512 d3094d2b190023b6afbab20f7d1c01826f56b7c99ea0c9613fcb14c8d3f3f3c3e16b57c2643a9df2bcf12cc97596cd32dd717fedf81fd84a9cdb9f46f308e130
-EBUILD cipher-camellia-0.0.2.ebuild 930 BLAKE2B db70b78a128a7c4a592cc41486a516af8f480a4bc88ae10c123eb9dce0d72044c99c197425c8e1595e313c8d5afe234d11b48c4844b4d34cbfd854fac1ddea1e SHA512 66a0b6deb2c36d4f20bc2ee0d4e8587c22c81e0b7d95fec796dcfc3d071844b3852adb40c3d3bb2b531bd0fcd568341b14e5f400677d5fb72d8a252330e2da4e
-MISC metadata.xml 414 BLAKE2B 79bb406cf93aa27872179afc1dea23f5cf7e8ce0c9b3aa49c509e04bd5c15c2cf3157f7954ab6b4f2f17684b7bd52ca355461c307bbe6c403f191907f7ecf335 SHA512 aa0bcb0a6d99a83c78d92b813a4471b32c87b7a8170a5792040d133f0b79a465c19f1fe887f7cf6828447d9920e6866f2d1e88a6cab213ace9111453cfb3aa58
diff --git a/dev-haskell/cipher-camellia/cipher-camellia-0.0.2.ebuild b/dev-haskell/cipher-camellia/cipher-camellia-0.0.2.ebuild
deleted file mode 100644
index 01d2a713640c..000000000000
--- a/dev-haskell/cipher-camellia/cipher-camellia-0.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Camellia block cipher primitives"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-cipher"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
-	>=dev-haskell/securemem-0.1.2:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/crypto-cipher-tests
-		>=dev-haskell/quickcheck-2
-		>=dev-haskell/test-framework-0.3.3
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
diff --git a/dev-haskell/cipher-camellia/metadata.xml b/dev-haskell/cipher-camellia/metadata.xml
deleted file mode 100644
index cdc15b1eda25..000000000000
--- a/dev-haskell/cipher-camellia/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Camellia block cipher primitives
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-cipher</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cipher-des-0.0.6 b/dev-haskell/cipher-des-0.0.6
new file mode 100644
index 000000000000..37e3ee2af931
--- /dev/null
+++ b/dev-haskell/cipher-des-0.0.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/crypto-cipher-tests >=dev-haskell/quickcheck-2 >=dev-haskell/test-framework-0.3.3 >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=DES and 3DES primitives
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-crypto-cipher
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.0.6
+SRC_URI=mirror://hackage/packages/archive/cipher-des/0.0.6/cipher-des-0.0.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7cef0a5ae8cf53a41608c695836354a7
diff --git a/dev-haskell/cipher-des/Manifest b/dev-haskell/cipher-des/Manifest
deleted file mode 100644
index 8344abf4e858..000000000000
--- a/dev-haskell/cipher-des/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cipher-des-0.0.6.tar.gz 7857 BLAKE2B 333c629ba2e4c9ca80d3caf29400e805abd774a23f9823fbededc74e3997602702b78066034e24d32313a42e7409d430835f918e1c8c5baf62ef404fe9792f91 SHA512 290b72fb9d6da58450e43742b313ff295cf3bf88242de33069e3183df7f726b69174dae35572a3d7d3a356aef4d4067104c41c1bd06fead8fec227ff92ba10c9
-EBUILD cipher-des-0.0.6.ebuild 887 BLAKE2B 569e8f9ee6b43a5a27162c044dd4ce18fa92c43a756e9528d28424c437a0a56083172c443f972fa7fabb82950f065fa4a955960f270300665fc776b910898619 SHA512 57fa3e4fd4a3e55ea6f6ac35ad04582bca17a8720780c79e02b0c9d6da901a1ac98549ad7dfc0b1015f53318569621317fbbe604109c38452ed7567d23bcd38a
-MISC metadata.xml 405 BLAKE2B 361cac5029ecdd6a059ae04a2155cc329078582f42b2f40b6bf0e380ea9914cd45d60f1f5285b7e9d003fb97f7da1a3c71c32cdcfb7870b81b281b4018180cd5 SHA512 b3bac88d6e2e60487af9058916c8e25d408a2a93455aba8cca31b2545305379bfe6e58ce912c108185a9fbbefe28e14dedd87fa0ae90401cf97aa8951afe21f2
diff --git a/dev-haskell/cipher-des/cipher-des-0.0.6.ebuild b/dev-haskell/cipher-des/cipher-des-0.0.6.ebuild
deleted file mode 100644
index 31535dcc0a2e..000000000000
--- a/dev-haskell/cipher-des/cipher-des-0.0.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="DES and 3DES primitives"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-cipher"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
-	>=dev-haskell/securemem-0.1.2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/crypto-cipher-tests
-		>=dev-haskell/quickcheck-2
-		>=dev-haskell/test-framework-0.3.3
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
diff --git a/dev-haskell/cipher-des/metadata.xml b/dev-haskell/cipher-des/metadata.xml
deleted file mode 100644
index 431c6a3f3e39..000000000000
--- a/dev-haskell/cipher-des/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		DES and 3DES primitives
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-cipher</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cipher-rc4-0.1.4 b/dev-haskell/cipher-rc4-0.1.4
new file mode 100644
index 000000000000..41f0f120b91f
--- /dev/null
+++ b/dev-haskell/cipher-rc4-0.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.5:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/crypto-cipher-tests-0.0.7 >=dev-haskell/quickcheck-2 >=dev-haskell/test-framework-0.3.3 >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast RC4 cipher implementation
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-cipher-rc4
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.5:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.1.4
+SRC_URI=mirror://hackage/packages/archive/cipher-rc4/0.1.4/cipher-rc4-0.1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=02acac90e94f531934d8153b1f22961e
diff --git a/dev-haskell/cipher-rc4/Manifest b/dev-haskell/cipher-rc4/Manifest
deleted file mode 100644
index 5d229d95d636..000000000000
--- a/dev-haskell/cipher-rc4/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cipher-rc4-0.1.4.tar.gz 4315 BLAKE2B 1af510c3689d578efcd84830a9d0cbebefcb6c78436be384fc73367d62b559ad0bba77b767a106cf97928cccfc282f85b4e8d16fdeb348cad913dccf78a2e735 SHA512 68415b4327371b4ea6fec9064f76c3a3372e223c3c717ee066941823cbbcdc50a7cd02c3fa7268dce4128e7b088e8a88012dd8478126d3f9d6a4e5b99f990d95
-EBUILD cipher-rc4-0.1.4.ebuild 856 BLAKE2B 0eeff03ba2b2a122ef155df017199b8732a38233e52d95aa88a5a65b777d4ec0fcca9f68c740c7d3e8fa8ad36abc45f3412506743f74c835e8fe593380ce599d SHA512 2d0b7394abdb9495c987f99b519340f9a1457b15c681b63a4aa090d86ced6d2db0023f8b80d7e73f16555040ea6f5bcbc98abd02e3830d660c82c7a2c066c1af
-MISC metadata.xml 409 BLAKE2B 747149a525afc2841325363f163e309232faa6a577fd466e2465938c75e862b594fc74275d56db7d7bdd73c49691ca96c87b58981432d78dbf2ca18dff35f79a SHA512 48080c105c5ae6192f7578956dae003c3ffa03e31b89b4d29c5be33465cf82ee86480f363108ea4b214634a97a9b0a5e8ba91d201131b4e8aec69e89f9fbad68
diff --git a/dev-haskell/cipher-rc4/cipher-rc4-0.1.4.ebuild b/dev-haskell/cipher-rc4/cipher-rc4-0.1.4.ebuild
deleted file mode 100644
index 8571950a0b97..000000000000
--- a/dev-haskell/cipher-rc4/cipher-rc4-0.1.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast RC4 cipher implementation"
-HOMEPAGE="https://github.com/vincenthz/hs-cipher-rc4"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-haskell/crypto-cipher-types-0.0.5:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/crypto-cipher-tests-0.0.7
-		>=dev-haskell/quickcheck-2
-		>=dev-haskell/test-framework-0.3.3
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
diff --git a/dev-haskell/cipher-rc4/metadata.xml b/dev-haskell/cipher-rc4/metadata.xml
deleted file mode 100644
index 1f72d7ba0f75..000000000000
--- a/dev-haskell/cipher-rc4/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Fast RC4 cipher implementation
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-cipher-rc4</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/citeproc-hs-0.3.10 b/dev-haskell/citeproc-hs-0.3.10
new file mode 100644
index 000000000000..1d5db7c08baa
--- /dev/null
+++ b/dev-haskell/citeproc-hs-0.3.10
@@ -0,0 +1,13 @@
+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	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=de1944268ad3a345f4dea9f5f717879d
diff --git a/dev-haskell/citeproc-hs-0.3.10-r1 b/dev-haskell/citeproc-hs-0.3.10-r1
new file mode 100644
index 000000000000..b16efb667752
--- /dev/null
+++ b/dev-haskell/citeproc-hs-0.3.10-r1
@@ -0,0 +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 )
+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/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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0310f34bc3badb92041a43c6ae66706c
diff --git a/dev-haskell/citeproc-hs/Manifest b/dev-haskell/citeproc-hs/Manifest
deleted file mode 100644
index 811afffc3a1b..000000000000
--- a/dev-haskell/citeproc-hs/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX citeproc-hs-0.3.10-ghc-7.10.patch 1106 BLAKE2B 77333b6784814b212c6ba40e378f2524dbe87610d4aabe47a83747dfaa413697cb952f3c9362d5f7135777f195043ec80f42519a50016641743c5649e0104ec5 SHA512 99743acfe916238dfbd7ed3e7bd680787e48eee38300243be284a8d20632957f9c52dd3b3574a96423a7f9f921eb2531a1495fc7975ef83d7a65748393013a97
-AUX citeproc-hs-0.3.10-pandoc-1.16.patch 5933 BLAKE2B 9fcfc937118b24f6e3e130b51e681278179c94df2941c404d925eac4c4b2175507026c16d0f090436441159070a1e0c3cf992cca97258f825c0304c06416f733 SHA512 9ac93221d544c4db306e71c33daa4583485704bae6a4800776fcf2b6950583d385cf91877418b8efd9c8dbb5feb14c329c8667b853bc8e322e60b39b78a4f303
-DIST citeproc-hs-0.3.10.tar.gz 115588 BLAKE2B f4b62c40dfe8abaa2eded4d2440915670cd1903eb326f86f3451764ef249ff1226facd77d2b68f2f875460f3beeabc07dd3c231f47581d57d867c77fafa4d81c SHA512 961c97fb82a0d497946695ef71dcbf0072dd9522a0f3b8e44975348b9ccf3ee703e2923408b3c3f1c58de04665418f54b95773865ed9cb16ad31a548a18b8b6f
-EBUILD citeproc-hs-0.3.10-r1.ebuild 1679 BLAKE2B 291f4a404b13bc88027beb897aeb2ff99de6702cb6bb7b481c38f7aa170df0ff81710af49d0924d138d50b0f575c88bb3e8a03377d14c58c58cc69a1864d40b9 SHA512 b06ea9af05983e5d8383a796ba892c13ac254586f81e0b0b661474f8b1c4f54791b1b8c1e468ec37a5f061ecadbe010d5016efd04e1c0059601f1f7db25619ee
-EBUILD citeproc-hs-0.3.10.ebuild 1666 BLAKE2B e7362ef03355437bafea4c7d1b27716c47566101dae167a02e06b375791df6645fe439a5b269c741aa2ea615432999193072ea15a949a636022d73c8704195a8 SHA512 c7e07bd867c5644525e7e4070981cb56a1dcc151358cc201c6f06c3c561d025933032741937eb020b310cb621f435b8107e1bad572f442af75e2886e02ce0c9a
-MISC metadata.xml 1205 BLAKE2B e7adee3236a1337af4b419da21dafc59f23076eac19758fb603d2e522a616d327f5b63e1a955099222595fbdfc69063175666295e6f89d1beb0b83c087c3867a SHA512 d9fda9c1af0a2d6de9887004834d65cbdb2456a600856e83ee2bff02b535bbdcbe219a4f16b7a9a836995f5533ee6ada05c845a6bcb6b22b5f9faef3864178f7
diff --git a/dev-haskell/citeproc-hs/citeproc-hs-0.3.10-r1.ebuild b/dev-haskell/citeproc-hs/citeproc-hs-0.3.10-r1.ebuild
deleted file mode 100644
index 1c7f1a2bf920..000000000000
--- a/dev-haskell/citeproc-hs/citeproc-hs-0.3.10-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Citation Style Language implementation in Haskell"
-HOMEPAGE="http://istitutocolli.org/repos/citeproc-hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils embed_data_files +hexpat +network +small_base unicode_collation"
-
-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?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-	epatch "${FILESDIR}"/${P}-pandoc-1.16.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bibutils bibutils) \
-		$(cabal_flag embed_data_files embed_data_files) \
-		$(cabal_flag hexpat hexpat) \
-		$(cabal_flag network network) \
-		$(cabal_flag small_base small_base) \
-		$(cabal_flag unicode_collation unicode_collation)
-}
diff --git a/dev-haskell/citeproc-hs/citeproc-hs-0.3.10.ebuild b/dev-haskell/citeproc-hs/citeproc-hs-0.3.10.ebuild
deleted file mode 100644
index 5765a67367bb..000000000000
--- a/dev-haskell/citeproc-hs/citeproc-hs-0.3.10.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="A Citation Style Language implementation in Haskell"
-HOMEPAGE="http://istitutocolli.org/repos/citeproc-hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils embed_data_files +hexpat +network +small_base unicode_collation"
-
-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?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-PATCHES=("${FILESDIR}/${P}-ghc-7.10.patch")
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bibutils bibutils) \
-		$(cabal_flag embed_data_files embed_data_files) \
-		$(cabal_flag hexpat hexpat) \
-		$(cabal_flag network network) \
-		$(cabal_flag small_base small_base) \
-		$(cabal_flag unicode_collation unicode_collation)
-}
diff --git a/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-ghc-7.10.patch b/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-ghc-7.10.patch
deleted file mode 100644
index 0ea6ce4e4313..000000000000
--- a/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-ghc-7.10.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- citeproc-hs-0.3.10-orig/src/Text/CSL/Eval.hs	2015-03-17 21:32:38.000000000 +1100
-+++ citeproc-hs-0.3.10/src/Text/CSL/Eval.hs	2015-04-04 11:18:45.018893632 +1100
-@@ -1,4 +1,5 @@
- {-# LANGUAGE PatternGuards #-}
-+{-# LANGUAGE FlexibleContexts #-}
- -----------------------------------------------------------------------------
- -- |
- -- Module      :  Text.CSL.Eval
---- citeproc-hs-0.3.10-orig/src/Text/CSL/Eval/Names.hs	2015-03-17 21:32:38.000000000 +1100
-+++ citeproc-hs-0.3.10/src/Text/CSL/Eval/Names.hs	2015-04-04 11:18:28.823909497 +1100
-@@ -1,4 +1,5 @@
- {-# LANGUAGE PatternGuards #-}
-+{-# LANGUAGE FlexibleContexts #-}
- -----------------------------------------------------------------------------
- -- |
- -- Module      :  Text.CSL.Eval.Names
---- citeproc-hs-0.3.10-orig/src/Text/CSL/Test.hs	2015-03-17 21:32:38.000000000 +1100
-+++ citeproc-hs-0.3.10/src/Text/CSL/Test.hs	2015-04-04 11:21:42.164719120 +1100
-@@ -29,7 +29,9 @@
- import Data.Maybe (isJust)
- import Data.Time
- import System.Directory
-+#if !MIN_VERSION_time(1,5,0)
- import System.Locale
-+#endif
- 
- import Text.ParserCombinators.Parsec
- 
diff --git a/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-pandoc-1.16.patch b/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-pandoc-1.16.patch
deleted file mode 100644
index ab95388748d4..000000000000
--- a/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-pandoc-1.16.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff --git a/citeproc-hs.cabal b/citeproc-hs.cabal
-index 542f893..606ec05 100644
---- a/citeproc-hs.cabal
-+++ b/citeproc-hs.cabal
-@@ -119,3 +119,3 @@ library
-     build-depends:    containers, directory, mtl, json, utf8-string,
--                      bytestring, filepath, pandoc-types >= 1.8 && < 1.13
-+                      bytestring, filepath, pandoc-types >= 1.8
- 
-diff --git a/src/Text/CSL/Output/Pandoc.hs b/src/Text/CSL/Output/Pandoc.hs
-index 0f2cdfb..74e698f 100644
---- a/src/Text/CSL/Output/Pandoc.hs
-+++ b/src/Text/CSL/Output/Pandoc.hs
-@@ -1,2 +1,2 @@
--{-# LANGUAGE PatternGuards, DeriveDataTypeable #-}
-+{-# LANGUAGE PatternGuards, DeriveDataTypeable, CPP #-}
- -----------------------------------------------------------------------------
-@@ -78,2 +78,10 @@ tailFO (f:fs)
- 
-+#if MIN_VERSION_pandoc_types(1,16,0)
-+#    define P16_ATTRS nullAttr
-+#    define P16_ATTRS_ _attrs
-+#else
-+#    define P16_ATTRS
-+#    define P16_ATTRS_
-+#endif
-+
- renderFo :: Style -> FormattedOutput -> [Inline]
-@@ -85,3 +93,3 @@ renderFo sty fo
-     | FO     fm xs <- fo = toPandoc fm $ rest xs
--    | FUrl u fm    <- fo = toPandoc fm [Link (toStr $ snd u) u]
-+    | FUrl u fm    <- fo = toPandoc fm [Link P16_ATTRS (toStr $ snd u) u]
-     | otherwise = []
-@@ -109,3 +117,3 @@ renderFo sty fo
-       setCase' f i
--          | Link s r <- i = Link (map (setCase f) s) r
-+          | Link P16_ATTRS_ s r <- i = Link P16_ATTRS_ (map (setCase f) s) r
-           | otherwise     = setCase f i
-@@ -148,3 +156,3 @@ renderFo sty fo
-       rmZeros = dropWhile (== '0')
--      escape s x = Link x (s,s) -- we use a link to store some data
-+      escape s x = Link P16_ATTRS x (s,s) -- we use a link to store some data
- 
-@@ -181,3 +189,4 @@ clean s b (i:is)
-     | Strong      x <- i = split (isLink' "strong"  ) (return . Strong     ) x ++ clean s b is
--    | Link      x t <- i = clean' s b (Link x t : clean s b is)
-+    | Link P16_ATTRS_ x t <- i = clean'
-+                                        s b (Link P16_ATTRS_ x t : clean s b is)
-     | otherwise          = clean' s b (i        : clean s b is)
-@@ -185,10 +194,10 @@ clean s b (i:is)
-       unwrap f ls
--          | Link x _ : _ <- ls = clean' s b x
--          |        _ : _ <- ls = f ls
-+          | Link P16_ATTRS_ x _ : _ <- ls = clean' s b x
-+          |                   _ : _ <- ls = f ls
-           | otherwise          = []
-       isLink l il
--          | Link _ (x,y) <- il = x == l && x == y
-+          | Link P16_ATTRS_ _ (x,y) <- il = x == l && x == y
-           | otherwise          = False
-       isLink' l il
--          | Link _ (x,y) <- il = (x == l || x == "nodecor") && x == y
-+          | Link P16_ATTRS_ _ (x,y) <- il = (x == l || x == "nodecor") && x == y
-           | otherwise          = False
-@@ -201,3 +210,3 @@ clean' _ _   []  = []
- clean' s b (i:is)
--    | Link inls (y,z) <- i, y == "inquote"
-+    | Link P16_ATTRS_ inls (y,z) <- i, y == "inquote"
-     , y == z    = case headInline is of
-@@ -235,7 +244,7 @@ flipFlop (i:is)
-             reverseEmph' e
--                | bo, Emph inls <- e = Link (reverseEmph False inls) ("emph","emph")
-+                | bo, Emph inls <- e = Link P16_ATTRS (reverseEmph False inls) ("emph","emph")
-                 | Emph     inls <- e = Emph (reverseEmph True  inls)
--                | Link ls (x,y) <- e = if x == "nodecor" && x == y
--                                       then Link ls ("emph","emph")
--                                       else e
-+                | Link P16_ATTRS_ ls (x,y) <- e = if x == "nodecor" && x == y
-+                                                  then Link P16_ATTRS_ ls ("emph","emph")
-+                                                  else e
-                 | otherwise          = e
-@@ -244,7 +253,7 @@ flipFlop (i:is)
-             reverseStrong' e
--                | bo, Strong inls <- e = Link   (reverseStrong False inls) ("strong","strong")
-+                | bo, Strong inls <- e = Link P16_ATTRS  (reverseStrong False inls) ("strong","strong")
-                 | Strong     inls <- e = Strong (reverseStrong True  inls)
--                | Link   ls (x,y) <- e = if x == "nodecor" && x == y
--                                         then Link ls ("strong","strong")
--                                         else e
-+                | Link P16_ATTRS_  ls (x,y) <- e = if x == "nodecor" && x == y
-+                                                     then Link P16_ATTRS_ ls ("strong","strong")
-+                                                     else e
-                 | otherwise            = e
-@@ -306,3 +315,3 @@ initInline (i:[])
-     | Strikeout   is <- i = return $ Strikeout   (initInline is)
--    | Link      is t <- i = return $ Link        (initInline is) t
-+    | Link P16_ATTRS_ is t <- i = return $ Link P16_ATTRS_ (initInline is) t
-     | otherwise           = []
-@@ -336,3 +345,3 @@ mapHeadInline f (i:xs)
-     | Strikeout   is <- i = Strikeout   (mapHeadInline f is)   : xs
--    | Link      is t <- i = Link        (mapHeadInline f is) t : xs
-+    | Link P16_ATTRS_ is t <- i = Link P16_ATTRS_ (mapHeadInline f is) t : xs
-     | otherwise           = i : xs
-@@ -348,3 +357,3 @@ getInline i
-     | SmallCaps   is <- i = is
--    | Link      is _ <- i = is
-+    | Link P16_ATTRS_ is _ <- i = is
-     | otherwise           = []
-diff --git a/src/Text/CSL/Test.hs b/src/Text/CSL/Test.hs
-index 1a470cf..2d9befa 100644
---- a/src/Text/CSL/Test.hs
-+++ b/src/Text/CSL/Test.hs
-@@ -166,2 +166,8 @@ pandocBib s
- 
-+#if MIN_VERSION_pandoc_types(1,16,0)
-+#    define P16_ATTRS_ _attrs
-+#else
-+#    define P16_ATTRS_
-+#endif
-+
- pandocToHTML :: [Inline] -> String
-@@ -179,3 +185,3 @@ pandocToHTML (i:xs)
-                               SingleQuote -> "‘" ++ pandocToHTML is ++ "’" ++ pandocToHTML xs
--    | Link     is x  <- i = case snd x of
-+    | Link P16_ATTRS_ is x  <- i = case snd x of
-                               "emph"     -> "<span style=\"font-style:normal;\">" ++
diff --git a/dev-haskell/citeproc-hs/metadata.xml b/dev-haskell/citeproc-hs/metadata.xml
deleted file mode 100644
index a27651833e76..000000000000
--- a/dev-haskell/citeproc-hs/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="bibutils">use Chris Putnam's <pkg>app-text/bibutils</pkg></flag>
-		<flag name="embed_data_files">Embed locale files into the library (needed for windows packaging)</flag>
-		<flag name="network">use <pkg>dev-haskell/network</pkg> and <pkg>dev-haskell/http</pkg> to retrieve CSL file from URIs</flag>
-		<flag name="hexpat">use <pkg>dev-haskell/hexpat</pkg> instead of <pkg>dev-haskell/xml</pkg> for XML parsing</flag>
-		<flag name="small_base">Choose the new smaller, split-up base package.</flag>
-		<flag name="unicode_collation">Use Haskell bindings to the <pkg>dev-libs/icu</pkg></flag>
-	</use>
-	<longdescription>
-		citeproc-hs is a library for rendering
-		bibliographic reference citations into a variety
-		of styles using a macro language called Citation
-		Style Language (CSL). More details on CSL can be
-		found here:
-		&lt;http://citationstyles.org/&gt;.
-		
-		For the API documentation please see "Text.CSL".
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/classy-prelude-0.10.2 b/dev-haskell/classy-prelude-0.10.2
new file mode 100644
index 000000000000..03dbad19850e
--- /dev/null
+++ b/dev-haskell/classy-prelude-0.10.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/basic-prelude-0.3.10:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?] dev-haskell/bifunctors:=[profile?] dev-haskell/chunked-data:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] >=dev-haskell/mono-traversable-0.6.2:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A typeclass-based Prelude
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/classy-prelude
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/basic-prelude-0.3.10:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?] dev-haskell/bifunctors:=[profile?] dev-haskell/chunked-data:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] >=dev-haskell/mono-traversable-0.6.2:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.10.2
+SRC_URI=mirror://hackage/packages/archive/classy-prelude/0.10.2/classy-prelude-0.10.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=464509c68a940fcd9a5fd62a7a61c0fb
diff --git a/dev-haskell/classy-prelude-0.12.0 b/dev-haskell/classy-prelude-0.12.0
new file mode 100644
index 000000000000..dc2ee355bfdd
--- /dev/null
+++ b/dev-haskell/classy-prelude-0.12.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/basic-prelude-0.4:=[profile?] <dev-haskell/basic-prelude-0.5:=[profile?] dev-haskell/bifunctors:=[profile?] dev-haskell/chunked-data:=[profile?] >=dev-haskell/dlist-0.7:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] >=dev-haskell/mono-traversable-0.9.1:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/mutable-containers-0.3:=[profile?] <dev-haskell/mutable-containers-0.4:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/text:=[profile?] dev-haskell/time-locale-compat:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A typeclass-based Prelude
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/classy-prelude
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/basic-prelude-0.4:=[profile?] <dev-haskell/basic-prelude-0.5:=[profile?] dev-haskell/bifunctors:=[profile?] dev-haskell/chunked-data:=[profile?] >=dev-haskell/dlist-0.7:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] >=dev-haskell/mono-traversable-0.9.1:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/mutable-containers-0.3:=[profile?] <dev-haskell/mutable-containers-0.4:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/text:=[profile?] dev-haskell/time-locale-compat:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.12.0
+SRC_URI=mirror://hackage/packages/archive/classy-prelude/0.12.0/classy-prelude-0.12.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3a8767a2aacb2de438b323c308752eff
diff --git a/dev-haskell/classy-prelude-0.12.7 b/dev-haskell/classy-prelude-0.12.7
new file mode 100644
index 000000000000..e4d3d4b3d39b
--- /dev/null
+++ b/dev-haskell/classy-prelude-0.12.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/basic-prelude-0.4:=[profile?] <dev-haskell/basic-prelude-0.6:=[profile?] dev-haskell/bifunctors:=[profile?] dev-haskell/chunked-data:=[profile?] >=dev-haskell/dlist-0.7:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] >=dev-haskell/mono-traversable-0.9.3:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/mutable-containers-0.3:=[profile?] <dev-haskell/mutable-containers-0.4:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/text:=[profile?] dev-haskell/time-locale-compat:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A typeclass-based Prelude
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/classy-prelude
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/basic-prelude-0.4:=[profile?] <dev-haskell/basic-prelude-0.6:=[profile?] dev-haskell/bifunctors:=[profile?] dev-haskell/chunked-data:=[profile?] >=dev-haskell/dlist-0.7:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] >=dev-haskell/mono-traversable-0.9.3:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/mutable-containers-0.3:=[profile?] <dev-haskell/mutable-containers-0.4:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/text:=[profile?] dev-haskell/time-locale-compat:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.12.7
+SRC_URI=mirror://hackage/packages/archive/classy-prelude/0.12.7/classy-prelude-0.12.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=823d8a04cc23212ab28ae8445053b6c8
diff --git a/dev-haskell/classy-prelude-0.5.8 b/dev-haskell/classy-prelude-0.5.8
new file mode 100644
index 000000000000..c03d20fcc962
--- /dev/null
+++ b/dev-haskell/classy-prelude-0.5.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/basic-prelude-0.3.4:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] dev-haskell/monad-control:=[profile?] =dev-haskell/system-filepath-0.4*:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A typeclass-based Prelude
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/classy-prelude
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/basic-prelude-0.3.4:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] dev-haskell/monad-control:=[profile?] =dev-haskell/system-filepath-0.4*:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.5.8
+SRC_URI=mirror://hackage/packages/archive/classy-prelude/0.5.8/classy-prelude-0.5.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dab32dd2aa9f354d220b7322d307def5
diff --git a/dev-haskell/classy-prelude-0.5.9 b/dev-haskell/classy-prelude-0.5.9
new file mode 100644
index 000000000000..a4ed1cf38f19
--- /dev/null
+++ b/dev-haskell/classy-prelude-0.5.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/async-2.0:=[profile?] >=dev-haskell/basic-prelude-0.3.4:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] dev-haskell/monad-control:=[profile?] =dev-haskell/system-filepath-0.4*:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A typeclass-based Prelude
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/classy-prelude
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/async-2.0:=[profile?] >=dev-haskell/basic-prelude-0.3.4:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] dev-haskell/monad-control:=[profile?] =dev-haskell/system-filepath-0.4*:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.5.9
+SRC_URI=mirror://hackage/packages/archive/classy-prelude/0.5.9/classy-prelude-0.5.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=97a4b54c40a689e52b10f2f2d2c0194d
diff --git a/dev-haskell/classy-prelude-0.6.0 b/dev-haskell/classy-prelude-0.6.0
new file mode 100644
index 000000000000..733661ff098f
--- /dev/null
+++ b/dev-haskell/classy-prelude-0.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/async-2.0:=[profile?] >=dev-haskell/basic-prelude-0.3.6:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/mono-traversable:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A typeclass-based Prelude
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/classy-prelude
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/async-2.0:=[profile?] >=dev-haskell/basic-prelude-0.3.6:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/mono-traversable:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.6.0
+SRC_URI=mirror://hackage/packages/archive/classy-prelude/0.6.0/classy-prelude-0.6.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d0adbe3d78c89bf46ea0dccdfdf8789e
diff --git a/dev-haskell/classy-prelude-0.8.0.1 b/dev-haskell/classy-prelude-0.8.0.1
new file mode 100644
index 000000000000..1fea6c84a36f
--- /dev/null
+++ b/dev-haskell/classy-prelude-0.8.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/basic-prelude-0.3.6:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?] dev-haskell/chunked-data:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] >=dev-haskell/mono-traversable-0.3:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A typeclass-based Prelude
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/classy-prelude
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/basic-prelude-0.3.6:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?] dev-haskell/chunked-data:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] >=dev-haskell/mono-traversable-0.3:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.8.0.1
+SRC_URI=mirror://hackage/packages/archive/classy-prelude/0.8.0.1/classy-prelude-0.8.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7bd937b46f44d2919ada330ff8bff670
diff --git a/dev-haskell/classy-prelude-0.9.2 b/dev-haskell/classy-prelude-0.9.2
new file mode 100644
index 000000000000..abc3d0ccf4af
--- /dev/null
+++ b/dev-haskell/classy-prelude-0.9.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/basic-prelude-0.3.8:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?] dev-haskell/chunked-data:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] >=dev-haskell/mono-traversable-0.6:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A typeclass-based Prelude
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/classy-prelude
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/basic-prelude-0.3.8:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?] dev-haskell/chunked-data:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] >=dev-haskell/mono-traversable-0.6:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.9.2
+SRC_URI=mirror://hackage/packages/archive/classy-prelude/0.9.2/classy-prelude-0.9.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bbe8cc56c9024d7aabec0b68dae7e474
diff --git a/dev-haskell/classy-prelude-1.0.2 b/dev-haskell/classy-prelude-1.0.2
new file mode 100644
index 000000000000..cb4c767388e2
--- /dev/null
+++ b/dev-haskell/classy-prelude-1.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/basic-prelude-0.4:=[profile?] <dev-haskell/basic-prelude-0.7:=[profile?] dev-haskell/bifunctors:=[profile?] >=dev-haskell/chunked-data-0.3:=[profile?] >=dev-haskell/dlist-0.7:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/lifted-async-0.3:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] >=dev-haskell/monad-unlift-0.2:=[profile?] >=dev-haskell/mono-traversable-1.0:=[profile?] dev-haskell/mono-traversable-instances:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/mutable-containers-0.3:=[profile?] <dev-haskell/mutable-containers-0.4:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/safe-exceptions-0.1.1:=[profile?] dev-haskell/say:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/stm-chans-3:=[profile?] dev-haskell/text:=[profile?] dev-haskell/time-locale-compat:=[profile?] dev-haskell/transformers-base:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A typeclass-based Prelude
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/mono-traversable
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/basic-prelude-0.4:=[profile?] <dev-haskell/basic-prelude-0.7:=[profile?] dev-haskell/bifunctors:=[profile?] >=dev-haskell/chunked-data-0.3:=[profile?] >=dev-haskell/dlist-0.7:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/lifted-async-0.3:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] >=dev-haskell/monad-unlift-0.2:=[profile?] >=dev-haskell/mono-traversable-1.0:=[profile?] dev-haskell/mono-traversable-instances:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/mutable-containers-0.3:=[profile?] <dev-haskell/mutable-containers-0.4:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/safe-exceptions-0.1.1:=[profile?] dev-haskell/say:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/stm-chans-3:=[profile?] dev-haskell/text:=[profile?] dev-haskell/time-locale-compat:=[profile?] dev-haskell/transformers-base:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.0.2
+SRC_URI=mirror://hackage/packages/archive/classy-prelude/1.0.2/classy-prelude-1.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bcb93eca788539fa79da7a7a630c3fe6
diff --git a/dev-haskell/classy-prelude/Manifest b/dev-haskell/classy-prelude/Manifest
deleted file mode 100644
index 913a4561e3ca..000000000000
--- a/dev-haskell/classy-prelude/Manifest
+++ /dev/null
@@ -1,20 +0,0 @@
-AUX classy-prelude-0.12.0-mt-0.9.3.patch 351 BLAKE2B fad1d3d84cff71fb6c4746eeed5fd738dacd4ef58dcc11172db235a82eaa3e2a3fbe91243789184cdc688d04a7fd2f1a6ab80d29ec692b3f0bf0099d29f80b35 SHA512 5ee9d323330ac50b7305ac3f725428b3f674fcab0e74741ab92e0bed550660ca86733472c61a9ae8f5c4e53b7f0cb57a3f5305beea2a29e8402eca6685d5f76e
-DIST classy-prelude-0.10.2.tar.gz 9730 BLAKE2B bbc5d9d70f0d90b86b9aaeb25234bcf4720f87c95097d0b2a664d1529fa911936d308fdc40b82126c6ab265c40238f8395263f2e816068ffe83bd69d0a2f4878 SHA512 dd75cdc4cfc522c3c86191ef7495bebebb4ac4a33c5100f723d1d8c789167ef670bb789e2fdfe7c3cb412f54cb61c9e53955e0c4f149272cf9a92f7d9095c9ab
-DIST classy-prelude-0.12.0.tar.gz 10148 BLAKE2B d0218386c954adddcbe1e4162bbdd97025ace4a2414715139c88950c4e558c51701a348a5823b13d4866f11fc49bf9b6263f620aec7e35e28b58fb229c5d9f98 SHA512 cbb9cbedbecd15b9c9e179c18a5b53949cfa416bcbe1fef4cfa380a3f785b9696e6c5a8ad1d1373c588a3c1095c625d7d68018e351bba169e368480aafd32888
-DIST classy-prelude-0.12.7.tar.gz 10737 BLAKE2B a46a1e72a741022ca538db0c5a27c4c1220cb30c8a58d9b3fcfb94bfa9fba1534c1ed8dc111fa024f50ed6df4aaceaa73b0742f38acb34f3957d91a03cb435a1 SHA512 39dd412a0b9d1d30eaf08e246ef2a5636e5e16ed0859d61db8ee3fbd119fa07d6955221a77485d02e0358da52048f673ea74b52a470ba204be7e09562193f072
-DIST classy-prelude-0.5.8.tar.gz 16700 BLAKE2B 7e6256901fb1952515d133e9f502a2f51c9aea30e273382fcfb60be909da6231aba3325e92bf545b37e88bf22cfacb6ed8d34fef7e73288eb36f472de3d59827 SHA512 27b23aeae6f53f2bbf4c310c9b6f89a5e150a172f03afbc11aa5f3d4a7d3ff1edaa125e7f191f0fe394f1e01b37337a32304ca8a6c7ef6403c095826556f0996
-DIST classy-prelude-0.5.9.tar.gz 17632 BLAKE2B 358709599c9f561044b7829ef7c6cb797aa085d2b4273141f09db9b59537416def03b6c2266f63a2f4dc852125ef9fa45e62833ad0b0c0ecd9c2642525d0d069 SHA512 4938b83b77923eec8a52a14d253a21800afbf83bf9413e11bebf963beaca11a520a7f9cefeb7827590e65d050df772222cbb004fa70e1b08767c7f4658980ea6
-DIST classy-prelude-0.6.0.tar.gz 9852 BLAKE2B 19e486e95902df93d3e13baf8dff3fafc8871d9681485083b562de1e190c419d6754745a7425e66d416b9bcaf0becb17aa6db6c89962ea7efcf7c0cb55569fa3 SHA512 2903147a27c34c1c72022e61a89b26e8a64a4247af1c1ad0120434766c6a186c8e743794ce954519c5a6d8fabf98dbb02a584cbdf9325666af8c7c45e7eef877
-DIST classy-prelude-0.8.0.1.tar.gz 8750 BLAKE2B 5eae77d218783e634887b71d1dde12ee227a00192b1ee62bf3d5f28f095bae9af530f4ddcb4e649443b9c256be79f9e6cbf6af2ddca1898f38c98c12831e08ca SHA512 2c2cc5e4faac8169f970c001158865b760324ff743c3fcf0f183625bf432db6a22c89002a849e7996c42e6bfcd27d253760a921ded84b4bef537d969bbdfd604
-DIST classy-prelude-0.9.2.tar.gz 9333 BLAKE2B 7156ea43d2f075f54b571116d341a1ead418d38e4115a538b91f5e34d55a7daa66ffcc21c5e6b28aee41e5a23e10843ea8f43d261f236c3484aedcd857247600 SHA512 8cda5453fefde018a1a15f6c42f650a035a734741e83078e1a7a8426aaa6c80342b4b13e389096278fa9df018892bd22aebef924dfa06e0c5a206a9815f56d6e
-DIST classy-prelude-1.0.2.tar.gz 11404 BLAKE2B 46ca086079734c35200021a0efd66962a7c88459cb869c61313766895e29eccf668d03e839b822c8d47cba29493d0f44620d929686c0af501745fe165c34fd73 SHA512 859602dea474c49307041dda9c79eb1fb01178c9f6136c754008392969ca6d09e3a9a4a3177615ffbe39553ea421d0f94fd97474c2b11b4937decbeeab42d444
-EBUILD classy-prelude-0.10.2.ebuild 1393 BLAKE2B f15901a638bcf967ae6d51203aac28d65ca931144ebd3ae3280af339c337c479618c2b0b19a176c1a371a25c8ea7686a24e04a3b3c020092eab7420e68f667ad SHA512 dff5e1cce78b5b8054f80f4d4bb04428aca8a2d07e267a02a3b2d735596ecf1d2654d8116d7c7a2507ec35d1e451dca44611ce22929dc63036813ad48f808887
-EBUILD classy-prelude-0.12.0.ebuild 1543 BLAKE2B f93e7521cfcbc12fb61d2c7aa33eddeda56470f508878f5ec13601df9e695c2c80b60de031ad52a67663dff0aa2da49d2040a405b2fcfe04624c348a9469f113 SHA512 f0dbf533b30aef8580dffffb0470392474b5ef8e9e4be37c7716efdf149ce87099e6ac270a40f12ab43b05d43ae30dd26814d00c734461dbf8fb2ad4744a0d3d
-EBUILD classy-prelude-0.12.7.ebuild 1525 BLAKE2B e61dba180f428d69a9627debdf666f9416c38f41f1c2d8d69f6ad3394d383a16d921bc382661d20ea13eeae7fa1b5304ed1a8eaf89e5cd70df66f5df4260429b SHA512 0eb71c278ca8582f7368bad33aee7a1a2ed5f05bfa3922973ae06c7aa1bfc78bf943ad2d7769c9f17bb490cc982e55453f8ce3a27f79399fd89088c4dd79314b
-EBUILD classy-prelude-0.5.8.ebuild 1023 BLAKE2B 4eb95979f849d79d307a0b7fd232656c66f23dd59f0d07edb4a9f3c60922fc9f26e50c291cd88a750d32ae43a99297550968eee6a5880c4589790f42108dfc8b SHA512 2f6f6199489522cf44000bbd081ae5aa7705f12f8054da5be705453ae4049b832d193e6eab0ef7e3143416f7566df2a28ce7ecfbcd2e8948f30d803617f0b17c
-EBUILD classy-prelude-0.5.9.ebuild 1061 BLAKE2B b8685e3523c0b83d9faf70789f6486c0748bfaee15089b39fce9ff33f7b08d021cf1ec15affa302d4179f894c8d13f400523c30717ef6b0b6b1347fd86ac7c01 SHA512 c7cdf9c0ce5425fc8ccfd8e4c7624d75ac88fe0202b73bd8ddbd4173682b1fdd0ae9198c944e5bc406987bac2c973c083531b6759a22af79273af65441a83593
-EBUILD classy-prelude-0.6.0.ebuild 1211 BLAKE2B d6f712ebb69ed82b38ce854893623fb2c9578b53015be37f75a63ceb219067adb4650f084d737dcba6f068a78415379596300935762a327d39bc5db86394d0fe SHA512 46dcb99f20c713eebb602a3666f8ad724c546cc01fe3d1d03e81d7285d671c3bc7d6d0b2b2240e583b3057f630f1ddfc4609abb111ba7a8b051d7e2de87520b5
-EBUILD classy-prelude-0.8.0.1.ebuild 1330 BLAKE2B 3a24f7001a20f38de8c5d899ac6fea617b972996bd94be109c7580ecaf9e59b6e108ea65b619cefffd27df8dea5146496555bff98e6d206ba6da4c7eab8b6572 SHA512 4c18a4d4720cdde701a97235adfa468faf70d5fa26f461f9886a2a21e0b55672218955a4c6b91d1703b79e3c8e19b8726f82c5a7e9734fdf22f50380998cf8fe
-EBUILD classy-prelude-0.9.2.ebuild 1295 BLAKE2B 790b548ddc86145ebc0f7427cff27c5c6ba3c9be057f66ef0f827c39e5d093b75d37af0ad53bec94b73dfc8846c7844dca851c3ec4ca33b4ad0c2a9b62465ccd SHA512 4b5c0de06ff8f7706c06f60079aed34bd5e305613d9080aeeb5fbc05f0a626bdf5deefce627baa0a89a05f642551f6713897d97de518a9bd10360584bc3d8742
-EBUILD classy-prelude-1.0.2.ebuild 1741 BLAKE2B 0e3bec8421ee8dcba7dbe343ef66720d3ba6d801a019b16598fe68f2be984a6d6feda2d23fb0a1a5de331ca70f2da955ca52ccc75458181d69d61ed3d78e132a SHA512 4a8d8471c31db72d67ff9f486b67cc31156b3463b8aaa0a080027be45781fed72bbea0f65cda44f0d36559e0283103c67b328a46796fcf3ae4f10c2d5e363982
-MISC metadata.xml 606 BLAKE2B 335d0b0014d95c4755e63c02d04b71f77529fb9f725e903d91e8c66ece9f8104a8fa115c8fa48865cd5513265da2505845b2e2f6928ad9371fdc80967adc08ea SHA512 6a47c85d77e11f174242cc69d45c7d181f2f1c980917f2d9454dbbe8c92049f391341f168fab6c19c0c15d51fc19f9f3ed85019a7ad356423604f5df6c052c28
diff --git a/dev-haskell/classy-prelude/classy-prelude-0.10.2.ebuild b/dev-haskell/classy-prelude/classy-prelude-0.10.2.ebuild
deleted file mode 100644
index 36d748d6deb8..000000000000
--- a/dev-haskell/classy-prelude/classy-prelude-0.10.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass-based Prelude"
-HOMEPAGE="https://github.com/snoyberg/classy-prelude"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/basic-prelude-0.3.10:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?]
-	dev-haskell/bifunctors:=[profile?]
-	dev-haskell/chunked-data:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/exceptions-0.5:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?]
-	>=dev-haskell/mono-traversable-0.6.2:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/stm:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/classy-prelude/classy-prelude-0.12.0.ebuild b/dev-haskell/classy-prelude/classy-prelude-0.12.0.ebuild
deleted file mode 100644
index 76555a8c9f48..000000000000
--- a/dev-haskell/classy-prelude/classy-prelude-0.12.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass-based Prelude"
-HOMEPAGE="https://github.com/snoyberg/classy-prelude"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/basic-prelude-0.4:=[profile?] <dev-haskell/basic-prelude-0.5:=[profile?]
-	dev-haskell/bifunctors:=[profile?]
-	dev-haskell/chunked-data:=[profile?]
-	>=dev-haskell/dlist-0.7:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/exceptions-0.5:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?]
-	>=dev-haskell/mono-traversable-0.9.1:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/mutable-containers-0.3:=[profile?] <dev-haskell/mutable-containers-0.4:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/stm:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/time-locale-compat:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-mt-0.9.3.patch
-}
diff --git a/dev-haskell/classy-prelude/classy-prelude-0.12.7.ebuild b/dev-haskell/classy-prelude/classy-prelude-0.12.7.ebuild
deleted file mode 100644
index 5e5ff06ac76d..000000000000
--- a/dev-haskell/classy-prelude/classy-prelude-0.12.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass-based Prelude"
-HOMEPAGE="https://github.com/snoyberg/classy-prelude"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/basic-prelude-0.4:=[profile?] <dev-haskell/basic-prelude-0.6:=[profile?]
-	dev-haskell/bifunctors:=[profile?]
-	dev-haskell/chunked-data:=[profile?]
-	>=dev-haskell/dlist-0.7:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/exceptions-0.5:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?]
-	>=dev-haskell/mono-traversable-0.9.3:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/mutable-containers-0.3:=[profile?] <dev-haskell/mutable-containers-0.4:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/stm:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/time-locale-compat:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/classy-prelude/classy-prelude-0.5.8.ebuild b/dev-haskell/classy-prelude/classy-prelude-0.5.8.ebuild
deleted file mode 100644
index aeacd4cb69eb..000000000000
--- a/dev-haskell/classy-prelude/classy-prelude-0.5.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass-based Prelude"
-HOMEPAGE="https://github.com/snoyberg/classy-prelude"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/basic-prelude-0.3.4:=[profile?]
-		<dev-haskell/basic-prelude-0.4:=[profile?]
-		dev-haskell/hashable:=[profile?]
-		>=dev-haskell/lifted-base-0.2:=[profile?]
-		dev-haskell/monad-control:=[profile?]
-		=dev-haskell/system-filepath-0.4*:=[profile?]
-		dev-haskell/text:=[profile?]
-		dev-haskell/transformers:=[profile?]
-		dev-haskell/unordered-containers:=[profile?]
-		dev-haskell/vector:=[profile?]
-		>=dev-lang/ghc-7.4.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/quickcheck
-		)"
diff --git a/dev-haskell/classy-prelude/classy-prelude-0.5.9.ebuild b/dev-haskell/classy-prelude/classy-prelude-0.5.9.ebuild
deleted file mode 100644
index 332569467758..000000000000
--- a/dev-haskell/classy-prelude/classy-prelude-0.5.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass-based Prelude"
-HOMEPAGE="https://github.com/snoyberg/classy-prelude"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/async-2.0:=[profile?]
-		>=dev-haskell/basic-prelude-0.3.4:=[profile?]
-		<dev-haskell/basic-prelude-0.4:=[profile?]
-		dev-haskell/hashable:=[profile?]
-		>=dev-haskell/lifted-base-0.2:=[profile?]
-		dev-haskell/monad-control:=[profile?]
-		=dev-haskell/system-filepath-0.4*:=[profile?]
-		dev-haskell/text:=[profile?]
-		dev-haskell/transformers:=[profile?]
-		dev-haskell/unordered-containers:=[profile?]
-		dev-haskell/vector:=[profile?]
-		>=dev-lang/ghc-7.4.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/quickcheck
-		)"
diff --git a/dev-haskell/classy-prelude/classy-prelude-0.6.0.ebuild b/dev-haskell/classy-prelude/classy-prelude-0.6.0.ebuild
deleted file mode 100644
index 70634e214a23..000000000000
--- a/dev-haskell/classy-prelude/classy-prelude-0.6.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass-based Prelude"
-HOMEPAGE="https://github.com/snoyberg/classy-prelude"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/async-2.0:=[profile?]
-	>=dev-haskell/basic-prelude-0.3.6:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/mono-traversable:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/classy-prelude/classy-prelude-0.8.0.1.ebuild b/dev-haskell/classy-prelude/classy-prelude-0.8.0.1.ebuild
deleted file mode 100644
index d3188fbb6b3f..000000000000
--- a/dev-haskell/classy-prelude/classy-prelude-0.8.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass-based Prelude"
-HOMEPAGE="https://github.com/snoyberg/classy-prelude"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/basic-prelude-0.3.6:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?]
-	dev-haskell/chunked-data:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?]
-	>=dev-haskell/mono-traversable-0.3:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
-
-src_prepare() {
-	# don't let builds hang
-	[[ $(ghc-version) == 7.6.* ]] && replace-hcflags -O[2-9] -O1
-}
diff --git a/dev-haskell/classy-prelude/classy-prelude-0.9.2.ebuild b/dev-haskell/classy-prelude/classy-prelude-0.9.2.ebuild
deleted file mode 100644
index 8a5c4240bfaf..000000000000
--- a/dev-haskell/classy-prelude/classy-prelude-0.9.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass-based Prelude"
-HOMEPAGE="https://github.com/snoyberg/classy-prelude"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/basic-prelude-0.3.8:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?]
-	dev-haskell/chunked-data:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/exceptions-0.5:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?]
-	>=dev-haskell/mono-traversable-0.6:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/stm:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/classy-prelude/classy-prelude-1.0.2.ebuild b/dev-haskell/classy-prelude/classy-prelude-1.0.2.ebuild
deleted file mode 100644
index 489b53455452..000000000000
--- a/dev-haskell/classy-prelude/classy-prelude-1.0.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass-based Prelude"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/basic-prelude-0.4:=[profile?] <dev-haskell/basic-prelude-0.7:=[profile?]
-	dev-haskell/bifunctors:=[profile?]
-	>=dev-haskell/chunked-data-0.3:=[profile?]
-	>=dev-haskell/dlist-0.7:=[profile?]
-	>=dev-haskell/exceptions-0.5:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/lifted-async-0.3:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?]
-	>=dev-haskell/monad-unlift-0.2:=[profile?]
-	>=dev-haskell/mono-traversable-1.0:=[profile?]
-	dev-haskell/mono-traversable-instances:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/mutable-containers-0.3:=[profile?] <dev-haskell/mutable-containers-0.4:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	>=dev-haskell/safe-exceptions-0.1.1:=[profile?]
-	dev-haskell/say:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/stm:=[profile?]
-	>=dev-haskell/stm-chans-3:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/time-locale-compat:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/classy-prelude/files/classy-prelude-0.12.0-mt-0.9.3.patch b/dev-haskell/classy-prelude/files/classy-prelude-0.12.0-mt-0.9.3.patch
deleted file mode 100644
index 17cddcd3975c..000000000000
--- a/dev-haskell/classy-prelude/files/classy-prelude-0.12.0-mt-0.9.3.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-https://bugs.gentoo.org/575244
-diff --git a/ClassyPrelude.hs b/ClassyPrelude.hs
-index a6c0db4..27173aa 100644
---- a/ClassyPrelude.hs
-+++ b/ClassyPrelude.hs
-@@ -193,3 +193,3 @@ import Data.ChunkedZip
- import qualified Data.Char as Char
--import Data.Sequences hiding (elem)
-+import Data.Sequences hiding (elem, intercalate)
- import Data.MonoTraversable
diff --git a/dev-haskell/classy-prelude/metadata.xml b/dev-haskell/classy-prelude/metadata.xml
deleted file mode 100644
index d246f7a45985..000000000000
--- a/dev-haskell/classy-prelude/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Focuses on using common typeclasses when possible, and creating new ones to avoid name clashing. Exposes many recommended datastructures (Map, ByteString, etc) directly without requiring long import lists and qualified modules.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/classy-prelude</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/clientsession-0.9.1.1 b/dev-haskell/clientsession-0.9.1.1
new file mode 100644
index 000000000000..27199897209a
--- /dev/null
+++ b/dev-haskell/clientsession-0.9.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base64-bytestring-0.1.1.1:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/cipher-aes-0.1.7:=[profile?] >=dev-haskell/cprng-aes-0.2:=[profile?] >=dev-haskell/crypto-api-0.8:=[profile?] dev-haskell/crypto-random:=[profile?] >=dev-haskell/entropy-0.2.1:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/skein-1.0:=[profile?] <dev-haskell/skein-1.1:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit >=dev-haskell/quickcheck-2 dev-haskell/transformers ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Securely store session data in a client-side cookie
+EAPI=5
+HOMEPAGE=https://github.com/yesodweb/clientsession/tree/master
+IUSE=test doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base64-bytestring-0.1.1.1:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/cipher-aes-0.1.7:=[profile?] >=dev-haskell/cprng-aes-0.2:=[profile?] >=dev-haskell/crypto-api-0.8:=[profile?] dev-haskell/crypto-random:=[profile?] >=dev-haskell/entropy-0.2.1:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/skein-1.0:=[profile?] <dev-haskell/skein-1.1:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.9.1.1
+SRC_URI=mirror://hackage/packages/archive/clientsession/0.9.1.1/clientsession-0.9.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=031d824458f7493fcabaa90a9fd9f073
diff --git a/dev-haskell/clientsession/Manifest b/dev-haskell/clientsession/Manifest
deleted file mode 100644
index badf4bd02bd2..000000000000
--- a/dev-haskell/clientsession/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST clientsession-0.9.1.1.tar.gz 7928 BLAKE2B f947dc1945f887fbb20227294b4c264366bfcc0d8ef415a11536f83d41d07186c70dbde616dabff99f1e0b3b06422c1c7810780d01ae4c9ece154b8566eee973 SHA512 dae2c63fe20bfaf3b6521dbfb48d6b79254d5365903766e75406dec94325572c22dbf85cdbf9dc6abe6c6a7dc496436a5d46a16826036de71b2a5f58eec53e62
-EBUILD clientsession-0.9.1.1.ebuild 1224 BLAKE2B e5111c1a34f3ad90201e9886b137bf083c8ad3c1aa04be28dea12cc1bedcd6a3c6634f29447fbdad540acca620526f47918062de5f9f703292def203dce7f712 SHA512 dcd559e852ebe509813b9d8f4fd0964f4086b4ea5f4a30df2a37f5a4eeecda79e6afbc865a3423e46492aa3a6e8d501985134911f90c048673dd99a18b12ed0a
-MISC metadata.xml 523 BLAKE2B bf34b990b137ae3e1ca4e0b18aacb7af6e983c5c0faceea4ddf81f158cf804403b0008a942ab56474be2953069d604ec8e8254aee2ab4f6ebbb67085e5ed4942 SHA512 8c31387efaed429d6b4d64476ea03f2c28d6b47c1b2a72f1aa8515483ac349266308b3468987dccb7e185c65ad511fbfe80d5d884ed23a99c2cc8f010026ffe6
diff --git a/dev-haskell/clientsession/clientsession-0.9.1.1.ebuild b/dev-haskell/clientsession/clientsession-0.9.1.1.ebuild
deleted file mode 100644
index a9a3a056724e..000000000000
--- a/dev-haskell/clientsession/clientsession-0.9.1.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Securely store session data in a client-side cookie"
-HOMEPAGE="https://github.com/yesodweb/clientsession/tree/master"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-haskell/base64-bytestring-0.1.1.1:=[profile?]
-	>=dev-haskell/cereal-0.3:=[profile?]
-	>=dev-haskell/cipher-aes-0.1.7:=[profile?]
-	>=dev-haskell/cprng-aes-0.2:=[profile?]
-	>=dev-haskell/crypto-api-0.8:=[profile?]
-	dev-haskell/crypto-random:=[profile?]
-	>=dev-haskell/entropy-0.2.1:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/skein-1.0:=[profile?] <dev-haskell/skein-1.1:=[profile?]
-	>=dev-haskell/tagged-0.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2
-		dev-haskell/transformers )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test test)
-}
diff --git a/dev-haskell/clientsession/metadata.xml b/dev-haskell/clientsession/metadata.xml
deleted file mode 100644
index 32fb1787e3a3..000000000000
--- a/dev-haskell/clientsession/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Achieves security through AES-CTR encryption and
-		Skein-MAC-512-256 authentication.  Uses Base64
-		encoding to avoid any issues with characters.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">yesodweb/clientsession</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/clock-0.4.1.3 b/dev-haskell/clock-0.4.1.3
new file mode 100644
index 000000000000..d52a9406e79a
--- /dev/null
+++ b/dev-haskell/clock-0.4.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=High-resolution clock functions: monotonic, realtime, cputime
+EAPI=5
+HOMEPAGE=https://corsis.github.com/clock/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.1.3
+SRC_URI=mirror://hackage/packages/archive/clock/0.4.1.3/clock-0.4.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1cda8e5806bb1e25d605603674d102a2
diff --git a/dev-haskell/clock-0.5.1 b/dev-haskell/clock-0.5.1
new file mode 100644
index 000000000000..90c838c51d62
--- /dev/null
+++ b/dev-haskell/clock-0.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/tasty-0.10 dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=High-resolution clock functions: monotonic, realtime, cputime
+EAPI=5
+HOMEPAGE=https://github.com/corsis/clock
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.5.1
+SRC_URI=mirror://hackage/packages/archive/clock/0.5.1/clock-0.5.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=098f60a9c9ad9863dd71299f52694426
diff --git a/dev-haskell/clock-0.7.2 b/dev-haskell/clock-0.7.2
new file mode 100644
index 000000000000..d2deeb231540
--- /dev/null
+++ b/dev-haskell/clock-0.7.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/tasty-0.10 dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=High-resolution clock functions: monotonic, realtime, cputime
+EAPI=6
+HOMEPAGE=https://github.com/corsis/clock
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.7.2
+SRC_URI=mirror://hackage/packages/archive/clock/0.7.2/clock-0.7.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=240c5ee0b60f1dbbaad8d6cdc84cd2a3
diff --git a/dev-haskell/clock/Manifest b/dev-haskell/clock/Manifest
deleted file mode 100644
index 9bd3dca54a51..000000000000
--- a/dev-haskell/clock/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST clock-0.4.1.3.tar.gz 5084 BLAKE2B 9e560ec6f62dc968e4482ff253430c35b52bc81e0bd2287907a493d85038a7af6f4a6e7ed42f9bf5b8af2f1c0f12bfb093bb8b57bd2e94c1be39f2dc78570226 SHA512 515b5393e4db132a0cc201031f79d871b3e91d058fc59dd97d96e013d2d9b59cfc75ca76723d2dd90795bb855daf5b09f5b57384a75cfcf9251f41e3434eae35
-DIST clock-0.5.1.tar.gz 6720 BLAKE2B 0516afe7a2e4711d46453792e3fa40dba0eb32db47675e5c18c0adbad26d0369a22ae4b325bbd268d9abd9e9e8ef5a2e722c3eda5c10b793011685bc19e03576 SHA512 767ee279453838af962392a0d9f05e385d20877af79cd95f0444f6adbdec6cf14f7a6f60933df1ccd9e964725b057ecbc869ae270225adf495a87ec4c09a80b2
-DIST clock-0.7.2.tar.gz 7465 BLAKE2B 209e720ba6e856fb5e56cc2d2dd48aa4e7b63ab15f356bcddbd5ee0936495a158ecd2c1cbdf9ce54ed89bcbd047091b3a515bcb04b6a30796bc9d659d610f187 SHA512 cf44dfca6c0825a003018c68266ef0fe503a9b147aaf784435f6297b365c6d18fc71b63b77a23ee2a3298ace638a35de0c6118e361d43b418a45d4fdd24d57cf
-EBUILD clock-0.4.1.3.ebuild 656 BLAKE2B 45b6f3f4fca50eddce3a48ffa356f980e68ed2a90156b483cdc05d25c5b3522ca6050c903023bdc9a7f2a9a6eeb7648b156cec90d9e0cdd2abfac8d0f6ac0565 SHA512 855dca31d1aced1b1a488b8b3900c70b1efb5d215156296b747cc6fe62f2069eaf38f530be64e6934bc826cacda6983aa67c671709545da98c318ddeef438b9e
-EBUILD clock-0.5.1.ebuild 733 BLAKE2B 90fc91f83ab88013f1e3ec3bb7d07ca96936a7d721663c8dd3dd1b05af9b969955d3241d1a6f0e0eea431a6f350ddfc1a41660c13644825e08d461138819ca19 SHA512 9bc954de08ae814caa258fcaeb27a94e9623e3024473c7f58d728530e7f4b9989c0419ce7a3f5ca1d64e8a761733c551c90c1960a16f1104112b15112de9fae1
-EBUILD clock-0.7.2.ebuild 791 BLAKE2B 99ebbcab266d7247bdf936da8e84ace4201527a04536a356dc35e75b5878e8b6df8f9bcfa2809c9446ef12bf49c7bc04b873e6c0ee090892ba9596a5235bc28c SHA512 1dca334e89e69f255f99ff46115c5cb34cdd9c314abfd5381df6458859f0efc81bc3d26cf02d3b86b00f134de5fa876367b9faea5412ba487b014edbcc6f728b
-MISC metadata.xml 1121 BLAKE2B e6c4ec9b3b756d458cb26b8de6803795150b1c06098bd86324259c2b63ca68aafd213df66f9da96c58b399cbf6fc57409ac0fa92c7706ce1b4ed26ff825c8ec2 SHA512 e216043158a3f54c2af217e1976adbc1bb1806b41577aa70cb2d4d061a35a4c87d0eb9060035e0eabbadee072a4f7f6266ebc0b4b81d1685fad9baeb0c0dda51
diff --git a/dev-haskell/clock/clock-0.4.1.3.ebuild b/dev-haskell/clock/clock-0.4.1.3.ebuild
deleted file mode 100644
index a8eb687c90ee..000000000000
--- a/dev-haskell/clock/clock-0.4.1.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -llvm
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="High-resolution clock functions: monotonic, realtime, cputime"
-HOMEPAGE="https://corsis.github.com/clock/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-llvm
-}
diff --git a/dev-haskell/clock/clock-0.5.1.ebuild b/dev-haskell/clock/clock-0.5.1.ebuild
deleted file mode 100644
index 9a2f0539b117..000000000000
--- a/dev-haskell/clock/clock-0.5.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -llvm
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="High-resolution clock functions: monotonic, realtime, cputime"
-HOMEPAGE="https://github.com/corsis/clock"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/tasty-0.10
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-llvm
-}
diff --git a/dev-haskell/clock/clock-0.7.2.ebuild b/dev-haskell/clock/clock-0.7.2.ebuild
deleted file mode 100644
index 2af0bdd7d9e9..000000000000
--- a/dev-haskell/clock/clock-0.7.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -llvm
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="High-resolution clock functions: monotonic, realtime, cputime"
-HOMEPAGE="https://github.com/corsis/clock"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RESTRICT=test # circular depend: tasty->clock[test]->tasty
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/tasty-0.10
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-llvm
-}
diff --git a/dev-haskell/clock/metadata.xml b/dev-haskell/clock/metadata.xml
deleted file mode 100644
index 9ebb335e7125..000000000000
--- a/dev-haskell/clock/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A package for convenient access to high-resolution
-		clock and timer functions of different operating
-		systems.
-		
-		It is planned to consist of two layers. The lower
-		layer will provide direct access to OS-specific
-		clock and timer functions like clock_gettime of
-		Posix or GetTickCount of Windows and its upper
-		layer shall then provide a common API for all
-		supported systems. Currently only the lower level
-		is being developed.
-		
-		
-		POSIX reference: IEEE Std 1003.1-2008
-		&lt;http://www.opengroup.org/onlinepubs/9699919799/&gt;,
-		&lt;http://www.opengroup.org/onlinepubs/9699919799/functions/clock_getres.html#&gt;
-		
-		WINDOWS reference: ...
-		
-		For more information, see:
-		&lt;http://corsis.sourceforge.net/index.php/Haskell/Clock&gt;
-	</longdescription>
-	<upstream>
-		<remote-id type="github">corsis/clock</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cmark-0.3.4 b/dev-haskell/cmark-0.3.4
new file mode 100644
index 000000000000..342cae7e49b0
--- /dev/null
+++ b/dev-haskell/cmark-0.3.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.14 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast, accurate CommonMark (Markdown) parser and renderer
+EAPI=5
+HOMEPAGE=https://github.com/jgm/commonmark-hs
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.4
+SRC_URI=mirror://hackage/packages/archive/cmark/0.3.4/cmark-0.3.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2cf37c665bee2183865efcefcab364e7
diff --git a/dev-haskell/cmark-0.4.0.1 b/dev-haskell/cmark-0.4.0.1
new file mode 100644
index 000000000000..f4edb2de59f9
--- /dev/null
+++ b/dev-haskell/cmark-0.4.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.14 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast, accurate CommonMark (Markdown) parser and renderer
+EAPI=5
+HOMEPAGE=https://github.com/jgm/commonmark-hs
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.0.1
+SRC_URI=mirror://hackage/packages/archive/cmark/0.4.0.1/cmark-0.4.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5854e1f7090e9b2afd4152082e4fdeb8
diff --git a/dev-haskell/cmark-0.5.5 b/dev-haskell/cmark-0.5.5
new file mode 100644
index 000000000000..f3d9221d7076
--- /dev/null
+++ b/dev-haskell/cmark-0.5.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.14 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast, accurate CommonMark (Markdown) parser and renderer
+EAPI=6
+HOMEPAGE=https://github.com/jgm/cmark-hs
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.5.5
+SRC_URI=mirror://hackage/packages/archive/cmark/0.5.5/cmark-0.5.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f436af86688c9dbfd1e23f4e329db8a6
diff --git a/dev-haskell/cmark-0.5.6 b/dev-haskell/cmark-0.5.6
new file mode 100644
index 000000000000..3de697fd69b7
--- /dev/null
+++ b/dev-haskell/cmark-0.5.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= system-cmark? ( app-text/cmark ) >=dev-haskell/cabal-1.14 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 ) system-cmark? ( virtual/pkgconfig ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast, accurate CommonMark (Markdown) parser and renderer
+EAPI=6
+HOMEPAGE=https://github.com/jgm/cmark-hs
+IUSE=+system-cmark doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= system-cmark? ( app-text/cmark )
+SLOT=0/0.5.6
+SRC_URI=mirror://hackage/packages/archive/cmark/0.5.6/cmark-0.5.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a3cc89525c2ead8987bc9123f377cebf
diff --git a/dev-haskell/cmark/Manifest b/dev-haskell/cmark/Manifest
deleted file mode 100644
index 0ad1645bf532..000000000000
--- a/dev-haskell/cmark/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST cmark-0.3.4.tar.gz 148195 BLAKE2B e4fc584ae8d29dc15e68307136d8686104a93f7a5cce41b2c746d3124da419095e0b977186a3c56f73c7bfefb4761933c58d04af89e1fa478277c2e20f691b15 SHA512 1491d671ad98af061beee31f22d4d7e73ce4090342f34713848d26fbabefb8367d8bd2686814659ef36e49b2298967ce06e41ac5d7cbd13dcce27e4fe5ce7895
-DIST cmark-0.4.0.1.tar.gz 175936 BLAKE2B 5a2acd868e4b8ca629fed8423e2faf6ba02e6f9ee2fc6799058a569cf907c741a7ffdaf790900cfa81f9086e7cb13520e423dc645e0669b54e1d66ed18aed443 SHA512 8dee17ab09d377de762579eb75c61fd1cd3e7c928d57f42b636d391b78b9e0b9ddf58e50f84a35a76eecce6763332f58cd1170df041b811f9b6f113daaa1c9be
-DIST cmark-0.5.5.tar.gz 169719 BLAKE2B 42886efdfb30c1efc983d6085ba3cafcab1353148ac96f2970c3d824ea29690ab86b923f61098446de97705e4d79504892decc3b34b259b8e7982cc149ce7102 SHA512 1c1929f78ce669c0eee20693eeec2a21bfdb49850d92db7a71a1e29164c09fc29bac000d921a5186c1662a6eaf168d7d1df0dc2d02f7d7ccb04763de23e6099f
-DIST cmark-0.5.6.tar.gz 170850 BLAKE2B 21ef603e6edd25545f0a51ff534aab8c7762ec1353c1b0349101217e42c09e3c0b33f99119831f09f9db20df9efb0e984420ef431c85a44c68f1580c02e009f3 SHA512 ba9ae5268c1d55123754e7b0c5f73c5134fa1d57a7a624e865c5c9690f073d9db9e6f1b7bc5fea86305d3a72a7af371a22f12fcce4ccbe9fd2942ba1d3677835
-EBUILD cmark-0.3.4.ebuild 704 BLAKE2B 829101cb6c07e5b71e4a4747d879ffc1450df7d5028f6893caeaef3e63b3c41a8f00e177f0a20f188a0154435a19fae08a72340d35099a97cbd526a1a9245489 SHA512 a3c509e24690d9b3287b127c060e9aa1022988b2fd269b0c90aaeadaac650004074346106e61094879674990a5d03f756b39ebfa2e2b902c198fe4a1605ed531
-EBUILD cmark-0.4.0.1.ebuild 702 BLAKE2B 08984e8403796f8306af83797003b940645ea5a58133864c0e0df63a0cd472538df5be58c94b36cc7ddd69d5fed4eb6e6f58d2e2ab7b18b5e913c67b964f34f4 SHA512 8569d50364e77d1fa0d8520f0b95508dd6377c450c0f29e271e9b3ae46cc97d44119a3697f6a4009a46d9fa06b9551c98ee0be7be21d9521eaedbb48c3b8f974
-EBUILD cmark-0.5.5.ebuild 800 BLAKE2B 93efc41c17b11891e05b47ad0cc9ce16ac065bfdadbbc505d69b06b38eeab34e3bd6bd60b0439cc21c57769fa4d0d8650a24dceca5257ff776ec5a51f6ba64ce SHA512 3ccb5e47bfde2e51725b2d3e32a2a3d063bab12d735cac9b63048dbcef8d1597c4c2447fc80a2aecb44ba36055b6d03ebe9ff75ab762bdbcb1632efd34e45a62
-EBUILD cmark-0.5.6.ebuild 913 BLAKE2B adeae97fe5bc3b2a0406db2092786494dc768dd2ff6a56e26ebf09ec8ccd0b93b4c3faeb83c9f504ed3ecd0ee3ccd514cfc898580c67edafc5f5574a28bbd542 SHA512 5c1c1da0a95bc1199ee703e50756baadb76f66930e3696bb3222a450965b2ab6770b9ee4259d85981e0b88bff833d0cd4ae938259b351f82cef4b317f84be4cf
-MISC metadata.xml 3529 BLAKE2B b8b6571f4e38d3cb44e700f899e834cf0a562dc695367b73b3bad6a57264fc7a6fd6eb76ea7e4a4c1e21d34e77d1a10475fa10d4c3dcc38010748212c526a0a1 SHA512 81816dbafd239df87356729fa48f70a7be0c4c2567340a0f06d1698e66d9161b4e0ca69bf881041d90b331aaed966f57c9b631a3b2151a441a40147ab163cc8e
diff --git a/dev-haskell/cmark/cmark-0.3.4.ebuild b/dev-haskell/cmark/cmark-0.3.4.ebuild
deleted file mode 100644
index f2e8dda78a9f..000000000000
--- a/dev-haskell/cmark/cmark-0.3.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast, accurate CommonMark (Markdown) parser and renderer"
-HOMEPAGE="https://github.com/jgm/commonmark-hs"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.14
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 )
-"
diff --git a/dev-haskell/cmark/cmark-0.4.0.1.ebuild b/dev-haskell/cmark/cmark-0.4.0.1.ebuild
deleted file mode 100644
index 724892a0dfca..000000000000
--- a/dev-haskell/cmark/cmark-0.4.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast, accurate CommonMark (Markdown) parser and renderer"
-HOMEPAGE="https://github.com/jgm/commonmark-hs"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.14
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 )
-"
diff --git a/dev-haskell/cmark/cmark-0.5.5.ebuild b/dev-haskell/cmark/cmark-0.5.5.ebuild
deleted file mode 100644
index ee5f940e742d..000000000000
--- a/dev-haskell/cmark/cmark-0.5.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -pkgconfig
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast, accurate CommonMark (Markdown) parser and renderer"
-HOMEPAGE="https://github.com/jgm/cmark-hs"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.14
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-pkgconfig
-}
diff --git a/dev-haskell/cmark/cmark-0.5.6.ebuild b/dev-haskell/cmark/cmark-0.5.6.ebuild
deleted file mode 100644
index a980c29c31d9..000000000000
--- a/dev-haskell/cmark/cmark-0.5.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-#hackport: flags: pkgconfig:system-cmark
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast, accurate CommonMark (Markdown) parser and renderer"
-HOMEPAGE="https://github.com/jgm/cmark-hs"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+system-cmark"
-
-RDEPEND=">=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	system-cmark? ( app-text/cmark )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.14
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 )
-	system-cmark? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag system-cmark pkgconfig)
-}
diff --git a/dev-haskell/cmark/metadata.xml b/dev-haskell/cmark/metadata.xml
deleted file mode 100644
index 2d92a8edfc92..000000000000
--- a/dev-haskell/cmark/metadata.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name='system-cmark'>use <pkg>app-text/cmark</pkg> instead of bundled copy</flag>
-	</use>
-	<longdescription>
-		This package provides Haskell bindings for
-		&lt;https://github.com/jgm/cmark libcmark&gt;, the reference
-		parser for &lt;http://commonmark.org CommonMark&gt;, a fully
-		specified variant of Markdown. It includes sources for
-		libcmark (0.19.0) and does not require prior installation of the
-		C library.
-		
-		cmark provides the following advantages over existing
-		Markdown libraries for Haskell:
-		
-		-   Speed: Conversion speed is on par with the
-		&lt;https://hackage.haskell.org/package/sundown sundown&gt;
-		library. We were unable to measure precisely
-		against
-		&lt;https://hackage.haskell.org/package/sundown sundown&gt;,
-		which raised a malloc error when compiled into our
-		benchmark suite. Relative to other implementations:
-		cmark was 82 times faster than
-		&lt;https://hackage.haskell.org/package/cheapskate cheapskate&gt;,
-		59 times faster than
-		&lt;https://hackage.haskell.org/package/markdown markdown&gt;,
-		105 times faster than
-		&lt;https://hackage.haskell.org/package/pandoc pandoc&gt;,
-		and 2.8 times faster than
-		&lt;https://hackage.haskell.org/package/discount discount&gt;.
-		
-		-   Memory footprint: Memory footprint is on par with
-		&lt;https://hackage.haskell.org/package/sundown sundown&gt;.
-		On one sample, the library uses a fourth the memory that
-		&lt;https://hackage.haskell.org/package/markdown markdown&gt;
-		uses, and less than a tenth the memory that
-		&lt;https://hackage.haskell.org/package/pandoc pandoc&gt;
-		uses.
-		
-		-   Robustness: cmark can handle whatever is thrown
-		at it, without the exponential blowups in parsing
-		time one can sometimes get with other libraries.
-		(The input @bench\/full-sample.md@, for example,
-		causes both
-		&lt;https://hackage.haskell.org/package/pandoc pandoc&gt;
-		and
-		&lt;https://hackage.haskell.org/package/markdown markdown&gt;
-		to grind to a halt.)
-		
-		-   Accuracy: cmark passes the CommonMark spec\'s
-		suite of over 500 conformance tests.
-		
-		-   Standardization: Since there is a spec and a
-		comprehensive suite of tests, we can have a high
-		degree of confidence that any two CommonMark
-		implementations will behave the same. Thus, for
-		example, one could use this library for server-side
-		rendering and
-		&lt;https://github.com/jgm/commonmark.js commonmark.js&gt;
-		for client-side previewing.
-		
-		-   Ease of installation: cmark is portable and has
-		minimal dependencies.
-		
-		cmark does not provide Haskell versions of the whole
-		&lt;https://github.com/jgm/cmark libcmark&gt; API, which is
-		built around mutable @cmark_node@ objects. Instead, it
-		provides functions for converting CommonMark to HTML
-		(and other formats), and a function for converting
-		CommonMark to a @Node@ tree that can be processed
-		further using Haskell.
-		
-		A note on security: This library does not attempt
-		to sanitize HTML output. We recommend using
-		&lt;https://hackage.haskell.org/package/xss-sanitize xss-sanitize&gt;
-		to filter the output.
-		
-		A note on stability: There is a good chance the API
-		will change significantly after this early release.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">jgm/commonmark-hs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cmdargs-0.10.13 b/dev-haskell/cmdargs-0.10.13
new file mode 100644
index 000000000000..5ce9493348a1
--- /dev/null
+++ b/dev-haskell/cmdargs-0.10.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Command line argument processing
+EAPI=5
+HOMEPAGE=http://community.haskell.org/~ndm/cmdargs/
+IUSE=+quotation testprog doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.10.13
+SRC_URI=mirror://hackage/packages/archive/cmdargs/0.10.13/cmdargs-0.10.13.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ead585eab9f61ca5ad4774c084fcad84
diff --git a/dev-haskell/cmdargs-0.10.14 b/dev-haskell/cmdargs-0.10.14
new file mode 100644
index 000000000000..858fbf02741a
--- /dev/null
+++ b/dev-haskell/cmdargs-0.10.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Command line argument processing
+EAPI=5
+HOMEPAGE=https://github.com/ndmitchell/cmdargs#readme
+IUSE=+quotation testprog doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.10.14
+SRC_URI=mirror://hackage/packages/archive/cmdargs/0.10.14/cmdargs-0.10.14.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6ddbf63de2c1600edb84b2f06903c7cc
diff --git a/dev-haskell/cmdargs-0.10.7 b/dev-haskell/cmdargs-0.10.7
new file mode 100644
index 000000000000..f789ad8294f4
--- /dev/null
+++ b/dev-haskell/cmdargs-0.10.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Command line argument processing
+EAPI=5
+HOMEPAGE=http://community.haskell.org/~ndm/cmdargs/
+IUSE=+quotation testprog doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.10.7
+SRC_URI=mirror://hackage/packages/archive/cmdargs/0.10.7/cmdargs-0.10.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cf19480f565a953009e38bcf960c0e60
diff --git a/dev-haskell/cmdargs/Manifest b/dev-haskell/cmdargs/Manifest
deleted file mode 100644
index 5651afe23097..000000000000
--- a/dev-haskell/cmdargs/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST cmdargs-0.10.13.tar.gz 64008 BLAKE2B 64108321d1acc028c8fe74deb8674005c25117599c8d960edc8d2717dd63ce0b71f73de26306e247cdcba2d83d03049e8e81cbe6e7c0597cd93dae8d03bf9997 SHA512 d4d0b93ca19b9ecdcea472b38b836c254a5e8a5ffe488c95d98f16395579483993fe0f7266d80771b85f1ed4683e34a6a3b493fe8e23595c1ba4db68a8daa0df
-DIST cmdargs-0.10.14.tar.gz 64056 BLAKE2B f31e52471a3f27e93fdcab68a8fb559e595f3799a8c166d882f343962af99dc453cb9d25923e0fc93c9433cd0f7974ddd72a6e3bb693401c8a9e34844d42573e SHA512 82a53fcecd42c9f1307e3e5bb1a8d490d53dda7243afe92fbda75d00dc6b638f6477591f4ebe98f1d576a623a8f5c111c8ff4d738466467f5579caa80ec6af15
-DIST cmdargs-0.10.7.tar.gz 61526 BLAKE2B ba9e6d639218576f0c576c93c4932fb9f7a5e15273df388798e582e6b3e3751e8e1d8e03c814114ff614f49fea5c9680a1b7b46ab9d8e1fcd934db8760ed6967 SHA512 b9091e4f708db1e7c8bac367c4faad5c311a3194aefbf2776316b4ecc559314f01ceb0102df007819996b00200c5300e5b56e1035d45561e924bbfc3b38b656a
-EBUILD cmdargs-0.10.13.ebuild 737 BLAKE2B 1ddde0976bd0df8f22fdcd1216863f5c533f06a35f3b5fa07bc1101ff54e7a35df4e98ed7036fb83941a8b6566b1432481ab86cf32521ac07b8516dc13b44e00 SHA512 1b48db6db915593457cd4efa103b57d90b568465b4ac157bc571bd2522a052d02cb02b5285dde25893b09b33e5b1c4bdd769b54039e6a9056c6337ac2f38a2c7
-EBUILD cmdargs-0.10.14.ebuild 739 BLAKE2B 09b1c59600ce4715723aafd052a16f8702e6742c4e343952b31f834306056ece2e1440afeb6fb2bfa036e5aaea242d359786be5b37306d13e7185901061c29e7 SHA512 3d98860a4a8a060d434d848cc8344b225ce55bcaed66a2d0b81e24da4b9c0d3b9d0cbefdcd4864bcc626c84417cf675794994d401861682c4d7f6d338d7d9c39
-EBUILD cmdargs-0.10.7.ebuild 740 BLAKE2B 3dc9c32b26dcb1aca1bb85c5532fa32361914a6b1fb5880a4a5e0b59fd7ed1cda42e079bfcc46e9fe240afafb8409e82c651a97c994e4c50965f6c914a928ae4 SHA512 e945c8fb20d1655a5f4c4251164399d7569bb646ac42826e44a4365b4fe1fb621480955a76382b709ebfa4d70752306bd78b90aa0398dae2989749d56f2f04c9
-MISC metadata.xml 1399 BLAKE2B 19e4eb5aa40c08e1cbcd82eda918e9790c065295de89a1039b1ea247922f82107b1df2a7a42d50cceba092972cf77af689c877418faec763c9443e1851aba6c5 SHA512 2c94fcc315c08a3c34dbf1cb4cb7131b76d612701abe89b7c18c7ea09bf1b29ea80fb6716551bd452594df6b8f62f6032b51467a121cd6184627e5622c26ae83
diff --git a/dev-haskell/cmdargs/cmdargs-0.10.13.ebuild b/dev-haskell/cmdargs/cmdargs-0.10.13.ebuild
deleted file mode 100644
index 30007953dfdb..000000000000
--- a/dev-haskell/cmdargs/cmdargs-0.10.13.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Command line argument processing"
-HOMEPAGE="http://community.haskell.org/~ndm/cmdargs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+quotation testprog"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag quotation quotation) \
-		$(cabal_flag testprog testprog)
-}
diff --git a/dev-haskell/cmdargs/cmdargs-0.10.14.ebuild b/dev-haskell/cmdargs/cmdargs-0.10.14.ebuild
deleted file mode 100644
index 0c6dc49ff9e0..000000000000
--- a/dev-haskell/cmdargs/cmdargs-0.10.14.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Command line argument processing"
-HOMEPAGE="https://github.com/ndmitchell/cmdargs#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+quotation testprog"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag quotation quotation) \
-		$(cabal_flag testprog testprog)
-}
diff --git a/dev-haskell/cmdargs/cmdargs-0.10.7.ebuild b/dev-haskell/cmdargs/cmdargs-0.10.7.ebuild
deleted file mode 100644
index 1054f2d431e5..000000000000
--- a/dev-haskell/cmdargs/cmdargs-0.10.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Command line argument processing"
-HOMEPAGE="http://community.haskell.org/~ndm/cmdargs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+quotation testprog"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag quotation quotation) \
-		$(cabal_flag testprog testprog)
-}
diff --git a/dev-haskell/cmdargs/metadata.xml b/dev-haskell/cmdargs/metadata.xml
deleted file mode 100644
index d07cc4fd7c80..000000000000
--- a/dev-haskell/cmdargs/metadata.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library provides an easy way to define command line parsers. Most users
-		will want to use the "System.Console.CmdArgs.Implicit" module, whose
-		documentation contains an example.
-		
-		* "System.Console.CmdArgs.Explicit" provides a way to write command line
-		parsers for both single mode programs (most programs) and multiple
-		mode programs (e.g. darcs or cabal). Parsers are defined by constructing
-		a data structure.
-		
-		* "System.Console.CmdArgs.Implicit" provides a way to concisely define
-		command line parsers, up to three times shorter than getopt. These parsers
-		are translated into the Explicit data type.
-		
-		* "System.Console.CmdArgs.GetOpt" provides a wrapper allowing compatiblity
-		with existing getopt parsers, mapping to the Explicit data type.
-		
-		For a general reference on what command line flags are commonly used,
-		see &lt;http://www.faqs.org/docs/artu/ch10s05.html&gt;.
-	</longdescription>
-	<use>
-		<flag name="testprog">Build the test program</flag>
-		<flag name="quotation">Build quote module</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ndmitchell/cmdargs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cmdlib-0.3.5-r1 b/dev-haskell/cmdlib-0.3.5-r1
new file mode 100644
index 000000000000..5529baf9045e
--- /dev/null
+++ b/dev-haskell/cmdlib-0.3.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-haskell/mtl-2:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[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 library for command line parsing & online help
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/cmdlib
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-2:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.3.5
+SRC_URI=mirror://hackage/packages/archive/cmdlib/0.3.5/cmdlib-0.3.5.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e7b3e3b5b9eec00e14fbfe19327f7630
diff --git a/dev-haskell/cmdlib-0.3.6 b/dev-haskell/cmdlib-0.3.6
new file mode 100644
index 000000000000..631e394282b1
--- /dev/null
+++ b/dev-haskell/cmdlib-0.3.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=a library for command line parsing & online help
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/cmdlib
+IUSE=doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.6
+SRC_URI=mirror://hackage/packages/archive/cmdlib/0.3.6/cmdlib-0.3.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b7a365ad23f6fc23f89482e3a2851850
diff --git a/dev-haskell/cmdlib/Manifest b/dev-haskell/cmdlib/Manifest
deleted file mode 100644
index d2286d7db21b..000000000000
--- a/dev-haskell/cmdlib/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX cmdlib-0.3.4-ghc-6.12.patch 641 BLAKE2B d7baed3baa617ed771b4494d6a7eb52b51fcf7c5b93581daa13d5c9c71c626193b8db9931d85158ebac2c4cdb9b6f59f0fb642b42755d687b23aa43c9fc7644e SHA512 ce3ded2a199342a7594c9e0708805757fd3275820d91c119088342d05323324edf1d517f20e83d66fa4706d9f4f3ac8bd837f2c108484e05629aba43e224af6c
-DIST cmdlib-0.3.5.tar.gz 22881 BLAKE2B 867e15e7b32a76f81b01c69ee60af74c8b5752d680693a154e1005167155b2ac501d4c0d1d476295d95c716dbe49f39d2d4f21c1d3f5a64e930adf6c31869289 SHA512 29ca53ddde33d3154b57d56d80eed1e511476ffeb4e4b3722c003770d85d2c4815dccde9d25bc2c86dacad66af6ce6b924c2e97106945a9d9c8ed33fc2424d67
-DIST cmdlib-0.3.6.tar.gz 22971 BLAKE2B 5feb462ee53cf3d5978fdf9b10cec0cabd3522e473e3c06d458a55de1bbc95ce687b4796b974ce9b26b0febd8ef4578093cb498c6bd40bd5dec82bbcfbc446fa SHA512 9d67e931c9caaaaf833215f2561d8ca6aeddd02c64b79343974d0a4d7f1dc618a7af4327ebf50d4071b871b1fd97edc3b5db5bbc8b3334352a20276733602024
-EBUILD cmdlib-0.3.5-r1.ebuild 873 BLAKE2B 48d4160eb4414a0a1e308cb4f367a5eb98daf80c82b1c0bd6723f69a52716220c7aea872c64900d5e8c5831c81d4d40c93134e6bce94cd63922780f18c5291ce SHA512 1f84b9c89f1042eff8e21e58a3e6e092f33eb85dab06c1763da5f62cbf325ca49f9ef6a6b14d9de2ca92bde8c19c72dc31ecb0b678458959dd590c537c35425c
-EBUILD cmdlib-0.3.6.ebuild 847 BLAKE2B 793c2643580db73ddb349180caa9e3f31f3636993b96e2c63262f8ce74d64a557ae1084c2d40a81f34f587569b401fc1d056537612de7b847035a14b700c770d SHA512 eea8a5124215e47abfb715b6b3870ca6aa5fbecd0360afa9a08bc6d2107376d85d444a1fe94804a992bf0c91d53070363e013dfefe403f24787b0307d15512f3
-MISC metadata.xml 1288 BLAKE2B 1b7bd06c3a112848cad704b7930d6830bf1c79de3d1dc497f534e76750fc67d5def5736f96b21f6a587c8e6155e3687738c85024b252a57bb1e6286b539b759d SHA512 7781bc2e5d27cd7ee98c7462301a28c532e6ad38c20f62bc38cc8cfde903f94c5b8f371727c9a01f1f1d183b9dfe1e17e16745bfca5bfc5087570224129cb0c1
diff --git a/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild b/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild
deleted file mode 100644
index 0a4bb34dd6f2..000000000000
--- a/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="a library for command line parsing & online help"
-HOMEPAGE="http://hackage.haskell.org/package/cmdlib"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2:=[profile?]
-		>=dev-haskell/transformers-0.2.2:=[profile?]
-		dev-haskell/split:=[profile?]
-		dev-haskell/syb:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-PATCHES=("${FILESDIR}/${PN}-0.3.4-ghc-6.12.patch")
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=mtl2 \
-		--flag=-test
-}
diff --git a/dev-haskell/cmdlib/cmdlib-0.3.6.ebuild b/dev-haskell/cmdlib/cmdlib-0.3.6.ebuild
deleted file mode 100644
index 179c2bceb912..000000000000
--- a/dev-haskell/cmdlib/cmdlib-0.3.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -test,+mtl2
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="a library for command line parsing & online help"
-HOMEPAGE="http://hackage.haskell.org/package/cmdlib"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2:=[profile?]
-	dev-haskell/split:=[profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=mtl2 \
-		--flag=-test
-}
diff --git a/dev-haskell/cmdlib/files/cmdlib-0.3.4-ghc-6.12.patch b/dev-haskell/cmdlib/files/cmdlib-0.3.4-ghc-6.12.patch
deleted file mode 100644
index 85a19d9aff02..000000000000
--- a/dev-haskell/cmdlib/files/cmdlib-0.3.4-ghc-6.12.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- cmdlib-0.3.4-orig/System/Console/CmdLib/Command.hs	2011-10-07 07:19:48.000000000 +1100
-+++ cmdlib-0.3.4/System/Console/CmdLib/Command.hs	2012-01-06 20:49:59.668959773 +1100
-@@ -225,6 +225,13 @@
- commandGroup :: (Commands a) => String -> a -> [CommandWrap]
- commandGroup s l = [CommandGroup s (toCommands l)]
- 
-+#if !MIN_VERSION_mtl(2,0,0)
-+instance Monad (Either e) where
-+        return = Right
-+        Left  l >>= _ = Left l
-+        Right r >>= k = k r    
-+#endif
-+
- -- TODO: disambiguation, hidden commands (aliases)
- findCommand :: String -> [CommandWrap] -> [CommandWrap]
- findCommand key list = case accum list of Left x -> [x]
diff --git a/dev-haskell/cmdlib/metadata.xml b/dev-haskell/cmdlib/metadata.xml
deleted file mode 100644
index c97e547df9f1..000000000000
--- a/dev-haskell/cmdlib/metadata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A commandline parsing library, based on getopt. Comes with a
-		powerful attribute system. Supports complex interfaces with many
-		options and commands, with option &amp; command grouping, with simple
-		and convenient API. Even though quite powerful, it strives to keep
-		simple things simple. The library uses "System.Console.GetOpt" as
-		its backend.
-		
-		In comparison to the other commandline handling libraries:
-		
-		Compared to cmdargs, cmdlib has a pure attribute system and is
-		based on GetOpt for help formatting &amp; argument parsing. Cmdlib may
-		also be more extendable due to typeclass design, and can use
-		user-supplied types for option arguments.
-		
-		Cmdargs &gt;= 0.4 can optionally use a pure attribute system,
-		although this is clearly an add-on and the API is a second-class
-		citizen in relation to the impure version.
-		
-		GetOpt and parseargs both require explicit flag representation, so
-		they live a level below cmdlib. GetOpt is in fact used as a
-		backend by cmdlib.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/code-page-0.1.1 b/dev-haskell/code-page-0.1.1
new file mode 100644
index 000000000000..81b08acc8eff
--- /dev/null
+++ b/dev-haskell/code-page-0.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Windows code page library for Haskell
+EAPI=6
+HOMEPAGE=https://github.com/RyanGlScott/code-page
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.1
+SRC_URI=mirror://hackage/packages/archive/code-page/0.1.1/code-page-0.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fbcf8dd5f87f84e07f17187a506e4346
diff --git a/dev-haskell/code-page/Manifest b/dev-haskell/code-page/Manifest
deleted file mode 100644
index 019c3664054b..000000000000
--- a/dev-haskell/code-page/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST code-page-0.1.1.tar.gz 4606 BLAKE2B c8529b737a29539a360a32a03d6a942077c9bbe7732e9eeb201ea65022ffa322f3cb3272a8356aba1a12e7b7a9809a93579a0479c10e899548dd425f5470c057 SHA512 867fb373680e638fcb32501a261b61e708008b9d449d5a28d11336b5961e4a0098c51e90069155ebee7a9229acac288df4598b0f6edd0b4c6b61cdd2711f5ba9
-EBUILD code-page-0.1.1.ebuild 559 BLAKE2B 82d6fb43ae4659c463afa055a9154679911b7db7424fc331b7f7ae093218efcb6292029fda3a55c987a388edcebf22fe91e6978335be394b1fef6b4cf041763d SHA512 9e2fb22ffa9b9b0907e34c2506a57eef63ccff46f1013449504df46c2a768e0a787d0a12cbb8e376adbad9b08cf60aa5568994849dc25fbdcbe17c27107d7f78
-MISC metadata.xml 746 BLAKE2B 4d5803af18ea6f3e41126603c0185048c59762afe39cd0879c5f810ada3500cc73297d37e45cc7ced1f3ad541fe1cf8ed80fc8f98f667ebccb2602b96376b258 SHA512 964781fdc03c324df2cf8a76fe3b7dd58fb1511d1d8281a57ca8eedb4ace74404d43b566a6b1f083b0a7b986e1181c81e83726a2c0c865f922a13cd0d8c8d0a3
diff --git a/dev-haskell/code-page/code-page-0.1.1.ebuild b/dev-haskell/code-page/code-page-0.1.1.ebuild
deleted file mode 100644
index 12231b90d8be..000000000000
--- a/dev-haskell/code-page/code-page-0.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Windows code page library for Haskell"
-HOMEPAGE="https://github.com/RyanGlScott/code-page"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/code-page/metadata.xml b/dev-haskell/code-page/metadata.xml
deleted file mode 100644
index f316630ab908..000000000000
--- a/dev-haskell/code-page/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library provides two modules:
-		
-		* "System.IO.CodePage": a cross-platform module that exports
-		functions which adjust code pages on Windows, and do nothing
-		on other operating systems.
-		
-		* "System.Win32.CodePage": On Windows, this exports functions
-		for getting, setting, and analyzing code pages. On other
-		operating systems, this module exports nothing.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">RyanGlScott/code-page</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/colour-2.3.3-r1 b/dev-haskell/colour-2.3.3-r1
new file mode 100644
index 000000000000..df9f14d38807
--- /dev/null
+++ b/dev-haskell/colour-2.3.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=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 model for human colour/color perception
+EAPI=5
+HOMEPAGE=http://www.haskell.org/haskellwiki/Colour
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/2.3.3
+SRC_URI=mirror://hackage/packages/archive/colour/2.3.3/colour-2.3.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e6174f5bbc639df1d931a3175ff39b5f
diff --git a/dev-haskell/colour/Manifest b/dev-haskell/colour/Manifest
deleted file mode 100644
index 4f6c1eecdc7d..000000000000
--- a/dev-haskell/colour/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST colour-2.3.3.tar.gz 20392 BLAKE2B c0ac11ac27c4ba0e4501f2177e35389bbf297e72678b07cbaa9bc43ee6d1b7f2583228e6de17f98320a266c29d9a9472567be310647a84704fa3dd961f1926f6 SHA512 3498215698c3c4010a2bcb6ef87ad263f5a5425167751730919363a0e6806a5c8c2ba82b403b7898addd74feaa756c9df339a37a2b2f2d727680c14ffc21ccf8
-EBUILD colour-2.3.3-r1.ebuild 1176 BLAKE2B e07b776905dc0d24b716b86c9a693626b9ca16afef0ed35a47cffd1b7994e98197b35e8c7a04ebbd10f7a2e52fb9c7b3b2fa8bbdf5b8ea319f9e996097c5efcd SHA512 c401a838fc1093e23437858bdaef4f69d6b0637fb9bf8a04ea612d2b0e91aa49747b74714c455f33dde31b11d9e86855c51d7fa075e47d72c3b3f04b373dfdd7
-MISC metadata.xml 494 BLAKE2B 3e64417d61195a8ffdaf511f43813fd558933fc983f637f0da4cc7c33843f5cb965451164ceb906e317b1dce823535f1c970e0c88b552e5d2d61fb88ac7d439d SHA512 32e07ce3aceeee92cd07819b05b61683492e0ab0805ca94391d898d589cfbe47aa468c84a7dc36f2410e6b24c7120dbd062cf5170e1eb55fe42e747175736caf
diff --git a/dev-haskell/colour/colour-2.3.3-r1.ebuild b/dev-haskell/colour/colour-2.3.3-r1.ebuild
deleted file mode 100644
index a6b0afa005c5..000000000000
--- a/dev-haskell/colour/colour-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A model for human colour/color perception"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Colour"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	if has_version "<dev-haskell/haddock-2.9.2"; then
-		# Workaround http://hackage.haskell.org/trac/hackage/ticket/626
-		# The haddock --hoogle option does not like unicode characters, which causes
-		# haddock 2.7.2 to fail like:
-		# haddock: internal Haddock or GHC error: dist/doc/html/enumerator/enumerator.txt: commitAndReleaseBuffer: invalid argument (Invalid or incomplete multibyte or wide character)
-		sed -e 's@&#176;@ degrees@g' \
-			-i "${S}/Data/Colour/CIE.hs" \
-			-i "${S}/Data/Colour/CIE/Chromaticity.hs"
-		sed -e 's@&#8220;@"@g' \
-			-e 's@&#8221;@"@g' \
-			-i "${S}/Data/Colour/RGB.hs"
-	fi
-}
diff --git a/dev-haskell/colour/metadata.xml b/dev-haskell/colour/metadata.xml
deleted file mode 100644
index 874a4514fe7d..000000000000
--- a/dev-haskell/colour/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides a data type for colours and transparency.
-		Colours can be blended and composed.
-		Various colour spaces are supported.
-		A module of colour names ("Data.Colour.Names") is provided.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/comonad-3.1 b/dev-haskell/comonad-3.1
new file mode 100644
index 000000000000..858f46360cef
--- /dev/null
+++ b/dev-haskell/comonad-3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/semigroups-0.8.3:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell 98 compatible comonads
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/comonad/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/semigroups-0.8.3:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/3.1
+SRC_URI=mirror://hackage/packages/archive/comonad/3.1/comonad-3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9a9a7be667b77ffcdbd697720519a813
diff --git a/dev-haskell/comonad-4.0 b/dev-haskell/comonad-4.0
new file mode 100644
index 000000000000..3ea120530e58
--- /dev/null
+++ b/dev-haskell/comonad-4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-1:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.10 test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Comonads
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/comonad/
+IUSE=+test-doctests doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-1:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/4.0
+SRC_URI=mirror://hackage/packages/archive/comonad/4.0/comonad-4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4ba0f9da0dd807bc5c486b2c88cc365d
diff --git a/dev-haskell/comonad-4.2.7.2 b/dev-haskell/comonad-4.2.7.2
new file mode 100644
index 000000000000..b5418f8489d2
--- /dev/null
+++ b/dev-haskell/comonad-4.2.7.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.4.1:= contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] ) >=dev-haskell/cabal-1.10 test? ( test-doctests? ( >=dev-haskell/doctest-0.9.10 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Comonads
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/comonad/
+IUSE=+containers +contravariant +distributive +test-doctests doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.4.1:= contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
+SLOT=0/4.2.7.2
+SRC_URI=mirror://hackage/packages/archive/comonad/4.2.7.2/comonad-4.2.7.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=48ae184a5ae9f2c28399d5529d4f64ac
diff --git a/dev-haskell/comonad-5 b/dev-haskell/comonad-5
new file mode 100644
index 000000000000..6c1758066c35
--- /dev/null
+++ b/dev-haskell/comonad-5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.4.1:= contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] ) >=dev-haskell/cabal-1.10 test? ( test-doctests? ( >=dev-haskell/doctest-0.9.10 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Comonads
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/comonad/
+IUSE=+containers +contravariant +distributive +test-doctests doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.4.1:= contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
+SLOT=0/5
+SRC_URI=mirror://hackage/packages/archive/comonad/5/comonad-5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=af330bc30f5db97730567bed79e405c8
diff --git a/dev-haskell/comonad-transformers-3.1 b/dev-haskell/comonad-transformers-3.1
new file mode 100644
index 000000000000..4e4258e69538
--- /dev/null
+++ b/dev-haskell/comonad-transformers-3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-3.0:=[profile?] >=dev-haskell/contravariant-0.2.0.1:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Comonad transformers
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/comonad-transformers/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/comonad-3.0:=[profile?] >=dev-haskell/contravariant-0.2.0.1:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/3.1
+SRC_URI=mirror://hackage/packages/archive/comonad-transformers/3.1/comonad-transformers-3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cac9fabd0fe5ef04bf3f291e96587ae8
diff --git a/dev-haskell/comonad-transformers-4.0 b/dev-haskell/comonad-transformers-4.0
new file mode 100644
index 000000000000..4fa093f7108d
--- /dev/null
+++ b/dev-haskell/comonad-transformers-4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-4:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3
+DESCRIPTION=This package has been merged into comonad 4.0
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/comonad-transformers/
+IUSE=profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/comonad-4:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/4.0
+SRC_URI=mirror://hackage/packages/archive/comonad-transformers/4.0/comonad-transformers-4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=80abdd0d5e7716ef744043b03d2fdea5
diff --git a/dev-haskell/comonad-transformers/Manifest b/dev-haskell/comonad-transformers/Manifest
deleted file mode 100644
index fd3d8dd67fe3..000000000000
--- a/dev-haskell/comonad-transformers/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST comonad-transformers-3.1.tar.gz 8552 BLAKE2B ca2949ec10e176d419cf9e7f970ac5268c55bbe48a962321e69ff7f85dd3c61fd1ea052eb9c703f2162dd2f9530962d431e210a15cf019c0afbe4b4dd52d75f4 SHA512 37afd48546a445f4baebbeb2da3530641f9768535438104ecbea1aa661f7312fed6a6a697ebea269141f8bf2d299c5aafd28f359b3720fc722196cbea1676404
-DIST comonad-transformers-4.0.tar.gz 2430 BLAKE2B 40de77da2839445abe984293d105fbadede706b32909119d941a49946f941d694a8f0278d1bd4d48560dee382bba75d820e1d49e249f445c5de2ed2285ebbc2b SHA512 5b35e80798691ba7defd030e03030491ffd6b4721b85f88f7596e75442b33c13eb6d2b8a91fdb47b76b05629a9008fde61ed0e1c87324f673a9de84510d2a668
-EBUILD comonad-transformers-3.1.ebuild 858 BLAKE2B 151a7b5b730c8894314dd38a0ae1087677ff04c25497330a5610c625090fca9886289421f49293fe36d02f3f29356b25c7bc10274292847758869f85a0b138e1 SHA512 b8ae34a8c1259e243f679b862731946e58f8b8f9c90b0137f22295b36e90d64cc90368b6508e160fcdf679a5ba6f1a0b92256f8abdd450fe32f43e6111631022
-EBUILD comonad-transformers-4.0.ebuild 582 BLAKE2B d90af5d737e9055a9d9b19a842fb1845aeeab4216c7c6087d39b1f964363ec857bdee6015c2b4efde65622b97db8644987313440cae131138c457e2a09501774 SHA512 b88129d3c10252b99d68ebd188f1a1406087d34dcba2f57da7862b2ad997454597718bd078c9f99a643a857de645d65c4de34539335d5e094b5ce1085c7b48fe
-MISC metadata.xml 403 BLAKE2B 4155d3084785a1046e0e5dfa5ad19b4337e0f80c05d780ea68fe37618c77d923e3f994929afb22432db2bf07a4328956b79079e32b77b5ff8771286f6ffa852a SHA512 cc36fddd504de218f1a16681a32d4d9819fac0d7fcd77c359f99e216ec6f7b0875b425bbf3bfa30ff53919f0a04ea9b77e894e0f18e4932d4cb90d63b62f4481
diff --git a/dev-haskell/comonad-transformers/comonad-transformers-3.1.ebuild b/dev-haskell/comonad-transformers/comonad-transformers-3.1.ebuild
deleted file mode 100644
index 4e2d9c10718d..000000000000
--- a/dev-haskell/comonad-transformers/comonad-transformers-3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Comonad transformers"
-HOMEPAGE="https://github.com/ekmett/comonad-transformers/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3.0:=[profile?]
-		>=dev-haskell/contravariant-0.2.0.1:=[profile?]
-		>=dev-haskell/distributive-0.2.2:=[profile?]
-		>=dev-haskell/semigroupoids-3.0:=[profile?]
-		>=dev-haskell/semigroups-0.8.3.1:=[profile?]
-		>=dev-haskell/transformers-0.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/comonad-transformers/comonad-transformers-4.0.ebuild b/dev-haskell/comonad-transformers/comonad-transformers-4.0.ebuild
deleted file mode 100644
index 43d9c21fbfe7..000000000000
--- a/dev-haskell/comonad-transformers/comonad-transformers-4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="This package has been merged into comonad 4.0"
-HOMEPAGE="https://github.com/ekmett/comonad-transformers/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/comonad-transformers/metadata.xml b/dev-haskell/comonad-transformers/metadata.xml
deleted file mode 100644
index 1d60aca837c3..000000000000
--- a/dev-haskell/comonad-transformers/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Comonad transformers
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/comonad-transformers</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/comonad/Manifest b/dev-haskell/comonad/Manifest
deleted file mode 100644
index 24109e5d8c12..000000000000
--- a/dev-haskell/comonad/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST comonad-3.1.tar.gz 7769 BLAKE2B c8ca82834b974209d895ec5e84ec45390325ba0e80c2c8a991236f6578d03b0535db18004f03da58b5b1157622ebf01d4097935107db836474b00fb20d3e24a8 SHA512 5e14dec1fc229ac5cc6a69a86277eb22e08fe4035159fc95273dd6addd5e0f8fc54526c98668b2d12242a043c7c67d7f83718c75a9d961e9e1496add8136bd2f
-DIST comonad-4.0.tar.gz 15014 BLAKE2B 37fed519018f1f5a3444faadab791a0c2f3dd3707626ffad94a3ce2a1b938fa51fa0f2d53078b498bf6aff458e5e9b336001c37c7f4ada18eb06fda053ab5e09 SHA512 2311c6db59dcd7a20190f925ded477412fa093d5cc43adaa1a7d2ca8174c919c73f7b78d53616da13dbe272817337826e168873acb37ff0df8e36655fbb2b47a
-DIST comonad-4.2.7.2.tar.gz 16430 BLAKE2B 0d71e5db8e2c3384e52b5254a2038ab3439dd3372e19192fd818724c51ee3173d459e6c1684f381a57a511c119f940a6abaed0760850d8b0b673d86c6278e703 SHA512 c4d31409f5b77c35628a86f25d3cae273079e1f0cfbd5880058ed29d63802e712a199ce900c38eb4aa2130e4e397c4852bb640f92d745cc3edee57ae515fcfe4
-DIST comonad-5.tar.gz 16383 BLAKE2B 110f27389b05817c795144d33282ba6a0b91346c3a52ad7b695027ae290f626caa97be4204eae6987d58381587e7ef91c9a97caedcf60b1adbea639f63db54fa SHA512 1acdee67bc2fd6061228541f417e02ffaa9ac412ac3a84b4b3f5b1e82a5626a63ad01f1a085262293682011b99ee8a3d70f34f75b6ce42bb24b91e167d5f816f
-EBUILD comonad-3.1.ebuild 800 BLAKE2B bc5512e84342c05827c8b30e0547aec5a5c44e6eb3c6e0057cba4394b15c87c1ac6e004d2e30432f2a8290337553a0a44fc6a9a4cc73e83b7518dd1b3730a601 SHA512 0d77d270a907e56a2156620846cbcc6b9a08beb8ad51c1ca44fde131b45dbc1d28b9b5b40478771de89dc4625ddeadd56b6a61986ea57331268f9158031656f6
-EBUILD comonad-4.0.ebuild 1176 BLAKE2B afdcb0973e5bbe7d7e1e699215a25728612b02e1a7ca155145a8f444137d1c00ae94cda10d4c5d3ba003952b3666c38b441f1f07f1cae646b9ff890574073d5f SHA512 0f2281c38eef34bfdf4a011859de5c7db0b6270c5d94f9a1f57ab06b395fdde0bd8ab7fa791d6126a52432f7466630423f3c77752f7720fd396335fd95246312
-EBUILD comonad-4.2.7.2.ebuild 1417 BLAKE2B 124d9c0513bbc532350bb5f756425e653254dbc1311f8a42a6c5f135fb2f9348d09b50de8e7e53996509aac9d5c5dc977f9d81f5a86bce950c311f66c60b3635 SHA512 dde2e4ec64b82dd0e29e60f46eda021df1ab18b74f457f3de109889ba57e66c72e36d195cf2aa943ecbbe3548449cb131b0c18418bf02dcfbf5b4287e6362b88
-EBUILD comonad-5.ebuild 1417 BLAKE2B d2db44e68ca15d97f1f64553f95bb7b8c27b72d91c6e1c964d7f6bc4e3560f8e27593266bccbacabd24a91ade39171ed25a00c35760ef9ce2a8b1036f7f30015 SHA512 7df39517e8e9eddf72b695315cd1dbdc4289b4850f073cb8bdd9c347fabed6476f4b55f8733df00d3400b9d444eead5643c6d3c00820268c6a9bf173100318a2
-MISC metadata.xml 1349 BLAKE2B e965c5d8d4657a8ac01dccc1569bce7cbe5349cb09e1f24d752861b2fa0413494ab80459a69e3282fb031b1feb0f8833bea1fded0ce5c4900d944f1601a37907 SHA512 e1a1bc3b06320550e0d437cf39b71b01a838fa1c3ae122d12b6639a2391474ae53c6313f4f1ea15a3e659feb23e5c43b9d3a3bf1f29810c1be612312eec5c264
diff --git a/dev-haskell/comonad/comonad-3.1.ebuild b/dev-haskell/comonad/comonad-3.1.ebuild
deleted file mode 100644
index fcfc3ca67744..000000000000
--- a/dev-haskell/comonad/comonad-3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 compatible comonads"
-HOMEPAGE="https://github.com/ekmett/comonad/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/semigroups-0.8.3:=[profile?]
-		<dev-haskell/semigroups-1:=[profile?]
-		>=dev-haskell/tagged-0.1:=[profile?]
-		<dev-haskell/tagged-1:=[profile?]
-		>=dev-haskell/transformers-0.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10
-		"
diff --git a/dev-haskell/comonad/comonad-4.0.ebuild b/dev-haskell/comonad/comonad-4.0.ebuild
deleted file mode 100644
index 02ae05bfe460..000000000000
--- a/dev-haskell/comonad/comonad-4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Comonads"
-HOMEPAGE="https://github.com/ekmett/comonad/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+test-doctests"
-
-RDEPEND=">=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-1:=[profile?]
-	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.1:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test-doctests test-doctests)
-}
diff --git a/dev-haskell/comonad/comonad-4.2.7.2.ebuild b/dev-haskell/comonad/comonad-4.2.7.2.ebuild
deleted file mode 100644
index e03715811925..000000000000
--- a/dev-haskell/comonad/comonad-4.2.7.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Comonads"
-HOMEPAGE="https://github.com/ekmett/comonad/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+containers +contravariant +distributive +test-doctests"
-
-RDEPEND=">=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.1:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] )
-	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.9.10 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag containers containers) \
-		$(cabal_flag contravariant contravariant) \
-		$(cabal_flag distributive distributive) \
-		$(cabal_flag test-doctests test-doctests)
-}
diff --git a/dev-haskell/comonad/comonad-5.ebuild b/dev-haskell/comonad/comonad-5.ebuild
deleted file mode 100644
index 085755dfdee6..000000000000
--- a/dev-haskell/comonad/comonad-5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Comonads"
-HOMEPAGE="https://github.com/ekmett/comonad/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+containers +contravariant +distributive +test-doctests"
-
-RDEPEND=">=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.1:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] )
-	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.9.10 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag containers containers) \
-		$(cabal_flag contravariant contravariant) \
-		$(cabal_flag distributive distributive) \
-		$(cabal_flag test-doctests test-doctests)
-}
diff --git a/dev-haskell/comonad/metadata.xml b/dev-haskell/comonad/metadata.xml
deleted file mode 100644
index e94f4818100b..000000000000
--- a/dev-haskell/comonad/metadata.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haskell 98 comonads
-	</longdescription>
-	<use>
-		<flag name="test-doctests">
-			Run the doctests test suite
-		</flag>
-		<flag name="containers">
-			You can disable the use of the `containers` package
-			using `-f-containers`. Disabing this is an unsupported configuration, but it
-			may be useful for accelerating builds in sandboxes for expert users.
-		</flag>
-		<flag name="contravariant">
-			You can disable the use of the `contravariant`
-			package using `-f-contravariant`. Disabling this is an unsupported
-			configuration, but it may be useful for accelerating builds in sandboxes for
-			expert users. If disabled we will not supply instances of `Contravariant`
-		</flag>
-		<flag name="distributive">
-			You can disable the use of the `distributive`
-			package using `-f-distributive`. Disabling this is an unsupported
-			configuration, but it may be useful for accelerating builds in sandboxes for
-			expert users. If disabled we will not supply instances of `Distributive`
-		</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ekmett/comonad</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/comonads-fd-3.0.3 b/dev-haskell/comonads-fd-3.0.3
new file mode 100644
index 000000000000..fb69a80e57b7
--- /dev/null
+++ b/dev-haskell/comonads-fd-3.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND==dev-haskell/comonad-3*:=[profile?] =dev-haskell/comonad-transformers-3*:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[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=Comonad transformers using functional dependencies
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/comonads-fd/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND==dev-haskell/comonad-3*:=[profile?] =dev-haskell/comonad-transformers-3*:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/3.0.3
+SRC_URI=mirror://hackage/packages/archive/comonads-fd/3.0.3/comonads-fd-3.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6de266b9388f56e6f12d5a686ea463e7
diff --git a/dev-haskell/comonads-fd-4.0 b/dev-haskell/comonads-fd-4.0
new file mode 100644
index 000000000000..b31246432646
--- /dev/null
+++ b/dev-haskell/comonads-fd-4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-4:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3
+DESCRIPTION=This package has been merged into comonad 4.0
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/comonads-fd/
+IUSE=profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/comonad-4:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/4.0
+SRC_URI=mirror://hackage/packages/archive/comonads-fd/4.0/comonads-fd-4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d99b65f1724f8e60290bab59453c33e5
diff --git a/dev-haskell/comonads-fd/Manifest b/dev-haskell/comonads-fd/Manifest
deleted file mode 100644
index fcdc9a6bc1f2..000000000000
--- a/dev-haskell/comonads-fd/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST comonads-fd-3.0.3.tar.gz 3572 BLAKE2B 348dadd24fa6653769ba635cfbcb97d53eb7b605fef09c95830c0a4d33f02b30c260ad7f3d924dd9fde6cb04c4930428a6ab0cb837cb1b33d4c8ab9b874a0c68 SHA512 222022cf5b619f11c54891d3c3e4b60907a165e8d69c67b372150d35e1b8770a7cef2f904d4c5a7baa32468c350155f93f58c7f1fbf01362027d1376bb575b05
-DIST comonads-fd-4.0.tar.gz 2605 BLAKE2B 3d498483964cf10f3622aaa4097adabf70c2ef1d82c28025697e775fb4b6d88b33332235772001f6180279876bfd4fa1b3720762c7297c3c9c9d00f031d2cf5c SHA512 290a137c7485c5cbebc7994737a0c2a70ffb2463188cd491bf86b4e02edb5cc3a8c4fd7b7cfcfc999c6dfbed6bb437a63f44959ec34e4addaffd0a81a20125a1
-EBUILD comonads-fd-3.0.3.ebuild 896 BLAKE2B 3a19ad1bfaa93750856974d829b588aa0419e7161703f23e4ce078b4eb89612ff1f73d9a214c98ee655183d7e6ea4177f04d7a364a693d97d638438a255ac187 SHA512 a23ae5cbb0ee1eaade80f90010928a96307991a78c5a4f17df91403f3af86eae802172452dc32e730adf493d4ee920d45702d7d9c7ea3c7363b782bfdd95d76b
-EBUILD comonads-fd-4.0.ebuild 573 BLAKE2B ffa0437447c60c0d9f59df1071106e356598ce10f81b59aba1e234de9852a45a31957d16b5e39bb7954bc95173a842b0bc1aeff7a7b9f25aa0982e4a5c33d65b SHA512 156db5ada98057d5b5050fe156cc39db0fea39e51d8d1422279f0614eeb678424a2bbb0c79b5068f63463e24ea2881905b985fcdc1fb843566a6677bd81333b9
-MISC metadata.xml 424 BLAKE2B a9beb4facce4d998573d188517b2b9ee981f3e5248b2b216cf57b8187fad39a200dfe89b279a5abd4f457a24641854596d4ab361e4b8aee1af6684e60b110067 SHA512 32c88e11934b03154e2806f99502df21f23837773a5cb4f866c739a2bb608f5ede5962b9671b9bb076338cf6e418ab50f8fee25a4bd88a390abbde4c770aedbd
diff --git a/dev-haskell/comonads-fd/comonads-fd-3.0.3.ebuild b/dev-haskell/comonads-fd/comonads-fd-3.0.3.ebuild
deleted file mode 100644
index c41b560b17f5..000000000000
--- a/dev-haskell/comonads-fd/comonads-fd-3.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Comonad transformers using functional dependencies"
-HOMEPAGE="https://github.com/ekmett/comonads-fd/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/comonad-3*:=[profile?]
-		=dev-haskell/comonad-transformers-3*:=[profile?]
-		>=dev-haskell/mtl-2.0:=[profile?]
-		<dev-haskell/mtl-2.2:=[profile?]
-		>=dev-haskell/semigroups-0.8.3.1:=[profile?]
-		<dev-haskell/semigroups-1:=[profile?]
-		>=dev-haskell/transformers-0.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/comonads-fd/comonads-fd-4.0.ebuild b/dev-haskell/comonads-fd/comonads-fd-4.0.ebuild
deleted file mode 100644
index ebfc1da3cf5e..000000000000
--- a/dev-haskell/comonads-fd/comonads-fd-4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="This package has been merged into comonad 4.0"
-HOMEPAGE="https://github.com/ekmett/comonads-fd/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/comonads-fd/metadata.xml b/dev-haskell/comonads-fd/metadata.xml
deleted file mode 100644
index af7f550860b9..000000000000
--- a/dev-haskell/comonads-fd/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Comonad transformers using functional dependencies
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/comonads-fd</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/concurrent-extra-0.7.0.10 b/dev-haskell/concurrent-extra-0.7.0.10
new file mode 100644
index 000000000000..d73f75e918c0
--- /dev/null
+++ b/dev-haskell/concurrent-extra-0.7.0.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/unbounded-delays-0.1:=[profile?] <dev-haskell/unbounded-delays-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/async-2.0 >=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.4 >=dev-haskell/random-1.0 <dev-haskell/random-1.2 >=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Extra concurrency primitives
+EAPI=5
+HOMEPAGE=https://github.com/basvandijk/concurrent-extra
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/unbounded-delays-0.1:=[profile?] <dev-haskell/unbounded-delays-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.0.10
+SRC_URI=mirror://hackage/packages/archive/concurrent-extra/0.7.0.10/concurrent-extra-0.7.0.10.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=82c4ebb1d85eeed11011b06d47dc140f
diff --git a/dev-haskell/concurrent-extra/Manifest b/dev-haskell/concurrent-extra/Manifest
deleted file mode 100644
index af7723f21527..000000000000
--- a/dev-haskell/concurrent-extra/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST concurrent-extra-0.7.0.10.tar.gz 16205 BLAKE2B 94fd5aca0a3365c482ae61985372458c269f5a6994b81574f8087c9a4b170a75aba67592671abe33e892af231752e7caf27aa66f9b93807bca1a14eb29de31a0 SHA512 2414fdb493834480f31e13b515233ea7739d46a170da12683b944de8372289cdafebfe8cf242c2edcceafc1fe3e659b0b20a0dcb4826d925cc50f6c1ebe73a58
-EBUILD concurrent-extra-0.7.0.10.ebuild 1118 BLAKE2B 3be33f1c476baa35fbc03995df1bac97d31ca4d952a1d938ad8691f0a37299632f2c8d323e73763d9bf9452b685618ff6ecab7b5cd035973b6186721a560dbae SHA512 6f82fbb650ba0baad04ce3f1068bc061938b952aa07067011f849436d291c93527bb001bb319dad58a2ad8e6095c742f315ca87e4797cf2c3bc018df1e270922
-MISC metadata.xml 1335 BLAKE2B 28eafe7f6d2efbb0a658951a8310d879cc509c917e0b24d90a42e0ea4ae2ee06d322032ccbeedea88eb2ce719ae7790101f5bb9204f37febb357c0cb0b2a77fe SHA512 0b50541d1736c51687e86edc63932699fb35a2c90ff896a71d5dd73e89c2b5889fc1f001859ba3c5e7eadfe2877091393ebb1419091adb39c31c506f1b40797e
diff --git a/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.10.ebuild b/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.10.ebuild
deleted file mode 100644
index b1a7f5e503b4..000000000000
--- a/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.10.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extra concurrency primitives"
-HOMEPAGE="https://github.com/basvandijk/concurrent-extra"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-haskell/unbounded-delays-0.1:=[profile?] <dev-haskell/unbounded-delays-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/async-2.0
-		>=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/random-1.0 <dev-haskell/random-1.2
-		>=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'async                >= 2.0     && < 2.1' 'async                >= 2.0'
-}
diff --git a/dev-haskell/concurrent-extra/metadata.xml b/dev-haskell/concurrent-extra/metadata.xml
deleted file mode 100644
index e1584be226f7..000000000000
--- a/dev-haskell/concurrent-extra/metadata.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The @concurrent-extra@ package offers among other things the
-		following selection of synchronisation primitives:
-		
-		* @Broadcast@: Wake multiple threads by broadcasting a value.
-		
-		* @Event@: Wake multiple threads by signalling an event.
-		
-		* @Lock@: Enforce exclusive access to a resource. Also known as a
-		binary semaphore or mutex. The package additionally provides an
-		alternative that works in the @STM@ monad.
-		
-		* @RLock@: A lock which can be acquired multiple times by the same
-		thread. Also known as a reentrant mutex.
-		
-		* @ReadWriteLock@: Multiple-reader, single-writer locks. Used to
-		protect shared resources which may be concurrently read, but only
-		sequentially written.
-		
-		* @ReadWriteVar@: Concurrent read, sequential write variables.
-		
-		Please consult the API documentation of the individual modules for
-		more detailed information.
-		
-		This package was inspired by the concurrency libraries of Java and
-		Python.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">basvandijk/concurrent-extra</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/concurrent-output-1.7.3 b/dev-haskell/concurrent-output-1.7.3
new file mode 100644
index 000000000000..f51cbc00c8a3
--- /dev/null
+++ b/dev-haskell/concurrent-output-1.7.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.6.0:=[profile?] <dev-haskell/ansi-terminal-0.7.0:=[profile?] >=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/exceptions-0.6.0:=[profile?] <dev-haskell/exceptions-0.9.0:=[profile?] >=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?] >=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-1.3.0:=[profile?] >=dev-haskell/transformers-0.3.0:=[profile?] <dev-haskell/transformers-0.5.0:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Ungarble output from several threads or commands
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/concurrent-output
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-haskell/ansi-terminal-0.6.0:=[profile?] <dev-haskell/ansi-terminal-0.7.0:=[profile?] >=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/exceptions-0.6.0:=[profile?] <dev-haskell/exceptions-0.9.0:=[profile?] >=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?] >=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-1.3.0:=[profile?] >=dev-haskell/transformers-0.3.0:=[profile?] <dev-haskell/transformers-0.5.0:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.7.3
+SRC_URI=mirror://hackage/packages/archive/concurrent-output/1.7.3/concurrent-output-1.7.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=158555ea0b561438e44a4125f8ee4f1b
diff --git a/dev-haskell/concurrent-output-1.7.6 b/dev-haskell/concurrent-output-1.7.6
new file mode 100644
index 000000000000..43a4ed217a84
--- /dev/null
+++ b/dev-haskell/concurrent-output-1.7.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.6.0:=[profile?] <dev-haskell/ansi-terminal-0.7.0:=[profile?] >=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/exceptions-0.6.0:=[profile?] <dev-haskell/exceptions-0.9.0:=[profile?] >=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?] >=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-1.3.0:=[profile?] >=dev-haskell/transformers-0.3.0:=[profile?] <dev-haskell/transformers-0.6.0:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Ungarble output from several threads or commands
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/concurrent-output
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-haskell/ansi-terminal-0.6.0:=[profile?] <dev-haskell/ansi-terminal-0.7.0:=[profile?] >=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/exceptions-0.6.0:=[profile?] <dev-haskell/exceptions-0.9.0:=[profile?] >=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?] >=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-1.3.0:=[profile?] >=dev-haskell/transformers-0.3.0:=[profile?] <dev-haskell/transformers-0.6.0:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.7.6
+SRC_URI=mirror://hackage/packages/archive/concurrent-output/1.7.6/concurrent-output-1.7.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=97d10727fee2a99965971f056281b34b
diff --git a/dev-haskell/concurrent-output-1.7.7 b/dev-haskell/concurrent-output-1.7.7
new file mode 100644
index 000000000000..bb4322a13350
--- /dev/null
+++ b/dev-haskell/concurrent-output-1.7.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.6.0:=[profile?] <dev-haskell/ansi-terminal-0.7.0:=[profile?] >=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/exceptions-0.6.0:=[profile?] <dev-haskell/exceptions-0.9.0:=[profile?] >=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?] >=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-1.3.0:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Ungarble output from several threads or commands
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/concurrent-output
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-haskell/ansi-terminal-0.6.0:=[profile?] <dev-haskell/ansi-terminal-0.7.0:=[profile?] >=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/exceptions-0.6.0:=[profile?] <dev-haskell/exceptions-0.9.0:=[profile?] >=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?] >=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-1.3.0:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.7.7
+SRC_URI=mirror://hackage/packages/archive/concurrent-output/1.7.7/concurrent-output-1.7.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7e534e807290ccf8ec2b4809d801882f
diff --git a/dev-haskell/concurrent-output-1.7.8 b/dev-haskell/concurrent-output-1.7.8
new file mode 100644
index 000000000000..ccc9d8b14448
--- /dev/null
+++ b/dev-haskell/concurrent-output-1.7.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.6.0:=[profile?] <dev-haskell/ansi-terminal-0.7.0:=[profile?] >=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/exceptions-0.6.0:=[profile?] <dev-haskell/exceptions-0.9.0:=[profile?] >=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?] >=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-1.3.0:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Ungarble output from several threads or commands
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/concurrent-output
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-haskell/ansi-terminal-0.6.0:=[profile?] <dev-haskell/ansi-terminal-0.7.0:=[profile?] >=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/exceptions-0.6.0:=[profile?] <dev-haskell/exceptions-0.9.0:=[profile?] >=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?] >=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-1.3.0:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.7.8
+SRC_URI=mirror://hackage/packages/archive/concurrent-output/1.7.8/concurrent-output-1.7.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e7698237d65f8b555cbb90b4e77d3f5e
diff --git a/dev-haskell/concurrent-output/Manifest b/dev-haskell/concurrent-output/Manifest
deleted file mode 100644
index 95b9048c6362..000000000000
--- a/dev-haskell/concurrent-output/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST concurrent-output-1.7.3.tar.gz 21005 BLAKE2B 2d34758f4a2c8e65e84e7fce911b59dd528be41f382f6b3a6801e01ba070e52838a7137c9538ed914df109ae0645dfe1ec91a4e65df83c5d98c390551d9a8bb1 SHA512 0c338d45167bac4d11f760994fa7c5b3d6b3525cc4fbb289e70247affcabec94b44cdc1991519e40ddb71975e5a995f10e116b289de194dd3a91467c6f4df950
-DIST concurrent-output-1.7.6.tar.gz 21143 BLAKE2B 33670c8060eafd6d67d8375515cf8ed6091d3b6205011db2dffe35f5abd33b36fc8aad50564dfdf111ff8f72996ec7bc8f889fa9a5e0ba49b49af492d4ebe780 SHA512 2a5b728ed5017273c89e3dff1b045905071b78eb7cc0dd2a6020170328a593bd7fea12651558598e55e807f197c7177dd6b086081df2a1895a2d172bf558864c
-DIST concurrent-output-1.7.7.tar.gz 21156 BLAKE2B 80c845dfa39bb475fbd6a12fa670d3317c0a333fe46009084333e1481d8c8cac7e2511515888a09f2c33331af7163623c1c9e94380530f01ac640df7cb111794 SHA512 65ddc7917b71e169aa05ad4a16c280e1bd3083c511198ff1a6cf5b6e9bdc0397f842ce7aa99671548c2f97eb6744b54ab097933a508303dfa371ac3cb5bad643
-DIST concurrent-output-1.7.8.tar.gz 21178 BLAKE2B 18b2f8d5a0de656c161487a50cc5c495b2343a7eed15b99ae6d79947717c2f2a00e8100b9384bb8922950c75affcadd5927c0783dede916ef295918cae5f6a69 SHA512 b5f64ff51302a46d1548469fa45b18e10276667bb33994023f6e5f75ed738d63ea666efd7a7e27dfdcde916985c3753141d374f85b43fae3c3cac960567ee01c
-EBUILD concurrent-output-1.7.3.ebuild 1154 BLAKE2B 2b7eb7dc1e7d5d41dcb2efe1161ab4392cb77ee1f1befd2c40a504e244a0e199520f163177a53ea2dab392c448e47f1fa69620e04f44897b5c5edfbd03bcf61c SHA512 8960e3e24af332bc5199eca12679ab62d173e2d8ea59dda23fe5a102ac3d007f04c4143ff4bea5bf6310b1fca675b74202afe0e4d8b7ef18516de2f92370ddbc
-EBUILD concurrent-output-1.7.6.ebuild 1152 BLAKE2B 44f867bb17e6dcb2108d5c96238fe12b329359be876958ccca38a926065ee8ee7c58bcc3f583a0bc52576392c894c813a2f09520b87eff991c2890a7254b2883 SHA512 474d9168977a43ef2db99b3c8af0233479e121a14ace3e202977a51dcf8bd2a2bde1fe11a2286f538c8cb118ba7b5327638bc48eed157cd23277078a2a0e4531
-EBUILD concurrent-output-1.7.7.ebuild 1062 BLAKE2B 37caa98a82a61ed91091eab440f3d92df2465fa1a207c3fc162db942c8366f555f86a1a7cc4367d1c4f963d35e84abfe9141011b9c3d8687ebc7b373fadc7540 SHA512 3d36622ee7a66453a575785302b009d144f782b80b798eac8d86837be1d11adfd750a016f636382ef472ad11d15f36166de400d848f1eaf7482be34f7a175e28
-EBUILD concurrent-output-1.7.8.ebuild 1064 BLAKE2B 6198f249feba2eba6ce95d036659aefbb4bd9e08716f053e9444e837e76b01df1b4a978866d55278212d7d333073b47cc4bc085b078260715bb04a0543c54cdf SHA512 2afcda4fc260c9815f3f67cb502b24c8dd13b765f51a590e64f14970a1e837aa89fa85091ddb7ac7951ba3d0ed25aaf78ad4d55d933a257c9a3d843ea064cc98
-MISC metadata.xml 828 BLAKE2B 9beba84837dcd8ba62bc153aa7d8053614ee9108eb9e42b59fa082238e1770a8f477209fad59a5eb4bb4f6560298124c49ca11fa6e13ad44c3661819d609620d SHA512 7b37a42f08da9e3d600a7666ad80b51f1c03bbf30fdf1d32dd75d1e49708ba2716a425b26966ccef5d3261484154ada57f2f97097855e7e29c2aa4da8a2282eb
diff --git a/dev-haskell/concurrent-output/concurrent-output-1.7.3.ebuild b/dev-haskell/concurrent-output/concurrent-output-1.7.3.ebuild
deleted file mode 100644
index 48a22386cb19..000000000000
--- a/dev-haskell/concurrent-output/concurrent-output-1.7.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Ungarble output from several threads or commands"
-HOMEPAGE="http://hackage.haskell.org/package/concurrent-output"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6.0:=[profile?] <dev-haskell/ansi-terminal-0.7.0:=[profile?]
-	>=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.2:=[profile?]
-	>=dev-haskell/exceptions-0.6.0:=[profile?] <dev-haskell/exceptions-0.9.0:=[profile?]
-	>=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?]
-	>=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-1.3.0:=[profile?]
-	>=dev-haskell/transformers-0.3.0:=[profile?] <dev-haskell/transformers-0.5.0:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/concurrent-output/concurrent-output-1.7.6.ebuild b/dev-haskell/concurrent-output/concurrent-output-1.7.6.ebuild
deleted file mode 100644
index b3e4837883b9..000000000000
--- a/dev-haskell/concurrent-output/concurrent-output-1.7.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Ungarble output from several threads or commands"
-HOMEPAGE="http://hackage.haskell.org/package/concurrent-output"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6.0:=[profile?] <dev-haskell/ansi-terminal-0.7.0:=[profile?]
-	>=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.2:=[profile?]
-	>=dev-haskell/exceptions-0.6.0:=[profile?] <dev-haskell/exceptions-0.9.0:=[profile?]
-	>=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?]
-	>=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-1.3.0:=[profile?]
-	>=dev-haskell/transformers-0.3.0:=[profile?] <dev-haskell/transformers-0.6.0:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/concurrent-output/concurrent-output-1.7.7.ebuild b/dev-haskell/concurrent-output/concurrent-output-1.7.7.ebuild
deleted file mode 100644
index 78ee42b2f434..000000000000
--- a/dev-haskell/concurrent-output/concurrent-output-1.7.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Ungarble output from several threads or commands"
-HOMEPAGE="http://hackage.haskell.org/package/concurrent-output"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6.0:=[profile?] <dev-haskell/ansi-terminal-0.7.0:=[profile?]
-	>=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.2:=[profile?]
-	>=dev-haskell/exceptions-0.6.0:=[profile?] <dev-haskell/exceptions-0.9.0:=[profile?]
-	>=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?]
-	>=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-1.3.0:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/concurrent-output/concurrent-output-1.7.8.ebuild b/dev-haskell/concurrent-output/concurrent-output-1.7.8.ebuild
deleted file mode 100644
index 5145a441d928..000000000000
--- a/dev-haskell/concurrent-output/concurrent-output-1.7.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Ungarble output from several threads or commands"
-HOMEPAGE="http://hackage.haskell.org/package/concurrent-output"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6.0:=[profile?] <dev-haskell/ansi-terminal-0.7.0:=[profile?]
-	>=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.2:=[profile?]
-	>=dev-haskell/exceptions-0.6.0:=[profile?] <dev-haskell/exceptions-0.9.0:=[profile?]
-	>=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?]
-	>=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-1.3.0:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/concurrent-output/metadata.xml b/dev-haskell/concurrent-output/metadata.xml
deleted file mode 100644
index 954b821ddf0b..000000000000
--- a/dev-haskell/concurrent-output/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Provides a simple interface for writing concurrent programs that
-		need to output a lot of status messages to the console, or display
-		multiple progress bars for different activities at the same time,
-		or concurrently run external commands that output to the console.
-		
-		Built on top of that is a way of defining multiple output regions,
-		which are automatically laid out on the screen and can be individually
-		updated. Can be used for progress displays etc.
-		
-		&lt;&lt;https://joeyh.name/code/concurrent-output/demo2.gif&gt;&gt;
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/conduit-1.0.15.1 b/dev-haskell/conduit-1.0.15.1
new file mode 100644
index 000000000000..6754ec92b705
--- /dev/null
+++ b/dev-haskell/conduit-1.0.15.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-0.4.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/text-stream-decode-0.1.0.4:=[profile?] <dev-haskell/text-stream-decode-0.2:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/void-0.5.5:=[profile?] >=dev-lang/ghc-7.0.1:= >=dev-haskell/cabal-1.10.0.0 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Streaming data processing library
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=nohandles doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-0.4.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/text-stream-decode-0.1.0.4:=[profile?] <dev-haskell/text-stream-decode-0.2:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/void-0.5.5:=[profile?] >=dev-lang/ghc-7.0.1:=
+SLOT=0/1.0.15.1
+SRC_URI=mirror://hackage/packages/archive/conduit/1.0.15.1/conduit-1.0.15.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=da49776aa7fb3e7dec436c32f89f8001
diff --git a/dev-haskell/conduit-1.1.6 b/dev-haskell/conduit-1.1.6
new file mode 100644
index 000000000000..16c7cf96e1f8
--- /dev/null
+++ b/dev-haskell/conduit-1.1.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/exceptions:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/void-0.5.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/exceptions-0.6 >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Streaming data processing library
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-haskell/exceptions:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/void-0.5.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.6
+SRC_URI=mirror://hackage/packages/archive/conduit/1.1.6/conduit-1.1.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d3a8d1c17de5806561d314c0ddf5d220
diff --git a/dev-haskell/conduit-1.2.12.1 b/dev-haskell/conduit-1.2.12.1
new file mode 100644
index 000000000000..0116a5179b1c
--- /dev/null
+++ b/dev-haskell/conduit-1.2.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] >=dev-haskell/void-0.5.5:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.3 >=dev-haskell/quickcheck-2.7 dev-haskell/safe >=dev-haskell/split-0.2.0.0 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Streaming data processing library
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] >=dev-haskell/void-0.5.5:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.2.12.1
+SRC_URI=mirror://hackage/packages/archive/conduit/1.2.12.1/conduit-1.2.12.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b6c5dd69701b7b5956d9d476bae6c755
diff --git a/dev-haskell/conduit-1.2.6.1 b/dev-haskell/conduit-1.2.6.1
new file mode 100644
index 000000000000..3a0b18369b41
--- /dev/null
+++ b/dev-haskell/conduit-1.2.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/void-0.5.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 >=dev-haskell/quickcheck-2.7 dev-haskell/safe ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Streaming data processing library
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/void-0.5.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.6.1
+SRC_URI=mirror://hackage/packages/archive/conduit/1.2.6.1/conduit-1.2.6.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0dd902f9e3e6f1382cf7a1fa2c02de0f
diff --git a/dev-haskell/conduit-1.2.6.6 b/dev-haskell/conduit-1.2.6.6
new file mode 100644
index 000000000000..30945ad6a034
--- /dev/null
+++ b/dev-haskell/conduit-1.2.6.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/void-0.5.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 >=dev-haskell/quickcheck-2.7 dev-haskell/safe ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Streaming data processing library
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/void-0.5.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.6.6
+SRC_URI=mirror://hackage/packages/archive/conduit/1.2.6.6/conduit-1.2.6.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9a2717bc512fcd54b55a37f3924b25fe
diff --git a/dev-haskell/conduit-1.2.8 b/dev-haskell/conduit-1.2.8
new file mode 100644
index 000000000000..133062a33a2e
--- /dev/null
+++ b/dev-haskell/conduit-1.2.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/void-0.5.5:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.3 >=dev-haskell/quickcheck-2.7 dev-haskell/safe ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Streaming data processing library
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/void-0.5.5:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.2.8
+SRC_URI=mirror://hackage/packages/archive/conduit/1.2.8/conduit-1.2.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dfd2fbc89c0925a85ba663efdaeb7710
diff --git a/dev-haskell/conduit-extra-1.1.13.1 b/dev-haskell/conduit-extra-1.1.13.1
new file mode 100644
index 000000000000..08d63a851c4a
--- /dev/null
+++ b/dev-haskell/conduit-extra-1.1.13.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?] dev-haskell/exceptions:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/primitive-0.5:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/streaming-commons-0.1.11:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/bytestring-builder >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Batteries included conduit: adapters for common libraries
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?] dev-haskell/exceptions:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/primitive-0.5:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/streaming-commons-0.1.11:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.13.1
+SRC_URI=mirror://hackage/packages/archive/conduit-extra/1.1.13.1/conduit-extra-1.1.13.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e293fe2b1d9c842ed240a4dbe79f76a3
diff --git a/dev-haskell/conduit-extra-1.1.15 b/dev-haskell/conduit-extra-1.1.15
new file mode 100644
index 000000000000..d2b9e907a121
--- /dev/null
+++ b/dev-haskell/conduit-extra-1.1.15
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?] dev-haskell/exceptions:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/primitive-0.5:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/streaming-commons-0.1.16:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/bytestring-builder >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Batteries included conduit: adapters for common libraries
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?] dev-haskell/exceptions:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/primitive-0.5:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/streaming-commons-0.1.16:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.1.15
+SRC_URI=mirror://hackage/packages/archive/conduit-extra/1.1.15/conduit-extra-1.1.15.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5396619cd068bc28cfa39c097125d6c5
diff --git a/dev-haskell/conduit-extra-1.1.9.1 b/dev-haskell/conduit-extra-1.1.9.1
new file mode 100644
index 000000000000..fc65f50e407a
--- /dev/null
+++ b/dev-haskell/conduit-extra-1.1.9.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/primitive-0.5:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/streaming-commons-0.1.11:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/async dev-haskell/bytestring-builder dev-haskell/exceptions >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Batteries included conduit: adapters for common libraries
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/primitive-0.5:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/streaming-commons-0.1.11:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.9.1
+SRC_URI=mirror://hackage/packages/archive/conduit-extra/1.1.9.1/conduit-extra-1.1.9.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d37fc78853958f7dfe68cb0effd0e8be
diff --git a/dev-haskell/conduit-extra-1.1.9.2 b/dev-haskell/conduit-extra-1.1.9.2
new file mode 100644
index 000000000000..38186fcb9b93
--- /dev/null
+++ b/dev-haskell/conduit-extra-1.1.9.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/primitive-0.5:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/streaming-commons-0.1.11:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/async dev-haskell/bytestring-builder dev-haskell/exceptions >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Batteries included conduit: adapters for common libraries
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/primitive-0.5:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/streaming-commons-0.1.11:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.9.2
+SRC_URI=mirror://hackage/packages/archive/conduit-extra/1.1.9.2/conduit-extra-1.1.9.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d872e3d672dbdbdb233171f48029dd08
diff --git a/dev-haskell/conduit-extra/Manifest b/dev-haskell/conduit-extra/Manifest
deleted file mode 100644
index 0378369636c0..000000000000
--- a/dev-haskell/conduit-extra/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST conduit-extra-1.1.13.1.tar.gz 33455 BLAKE2B 3a0dbdd2214f955f54daecf14a0d81bf47f5ee02c20fdd0d9eef3af833881d9fc26aebd97fc970098d5ffea3a709049b499e1925d4f51c11235fee2986fa361c SHA512 c7b7ccf4980a2420116b2e8ee084c76275cbd1a80812bdf006660aa4c48e9adace3b5530e9510c603711c8d2a7d1519ff501bb9cd08dbbb5bbd1b8d79bac8266
-DIST conduit-extra-1.1.15.tar.gz 34666 BLAKE2B ba81aa05990a2f67de1c8d8ff9311a012e0f300f97134e8d48ff64fb22e4d7c14644bb0897f3c7e43c73d7864c5209ac885b9b78ff5f5c0acd3e435f17683e31 SHA512 cdf47414e362950d6361a26cb584dbab9648572fa801e2444c5a76723f5f166c3c9d701282c8da06b2db462aa15e195feaed0bc154689bc93a237c1ec21f6cd5
-DIST conduit-extra-1.1.9.1.tar.gz 29571 BLAKE2B 1113b5bcd419a4f11f061dbbb6b21c985ccd647642a7ababb75bbab953fe1ec569eeabc57a79e310c77360f8eff4d29fce01a2480bfe53af62cdf43f2890bb50 SHA512 3e35c303fb9696f99af99db6ada5e59dcde09e0ce3d3559aed2b3354dab1a96d523b7976643239892316a709289e4943aea37152a2935c6c256b24e5b73dc716
-DIST conduit-extra-1.1.9.2.tar.gz 29576 BLAKE2B d16bde0c19cf14bd190875fd3a43fe18551f3f101e1f1c8546f88ec29c686dbfb0d6c81fdfa919f505555ff86a1fa0a1522ce40a73f6c402b81003054ae24799 SHA512 ddc8e99c3b939704421d464c928d8fc2a591cdb4e44942cebb670d5c3e9a4d96fa03c227a1acfd227560d45d3eead7ff6cadde54ec8e78324eb86a861fbb8576
-EBUILD conduit-extra-1.1.13.1.ebuild 1251 BLAKE2B fabf86711c7f432cd664b4d2671f4076a0785b4fe73a6aa73811f7da01197e58e2ded4ed16bf3f03a3a33e51dc081cfa4cd120c25894f0727bdfa50247dea767 SHA512 e977837a6fa637528be79eae0a336e9174b48988e87271023ca2fc641bd389c1a34e690ce6c31ca5b78bc2d3cf34f25142bd846ec2793c2163b2841df6cc437e
-EBUILD conduit-extra-1.1.15.ebuild 1218 BLAKE2B 78444fbf2d685008891bdbcffb586ef3ecda553a0f8d96e36207eb39292f8492db063ef037d0e4c0bbe0413b2a0b3f92c842ad7aec0b9062ba4b958e7b5174dd SHA512 7d2f3106745bc1974b6f1a7be9aaf78cbfec18c8ed0f7618ff166ca75681e4981160e421c85700f1baea2cd56690d95895be770000789675141e46eded5c5581
-EBUILD conduit-extra-1.1.9.1.ebuild 1202 BLAKE2B cee145b91c5c1d57c6832101b62dcf0fb7d1a08262185dcd59039652764bef9bc1afab10be6f0afe0602b3ebfcabb2eaa960c81f2c3f7005f754c5c05d3eb8c7 SHA512 6ac5fa7c30b2d675c3765d34bf21dee3326d1c34e615ae80c574657dd540663a7130730fd344fb06f2fcfbc3f337800e81102f3f975a266c335a4105dfc512d9
-EBUILD conduit-extra-1.1.9.2.ebuild 1204 BLAKE2B 08cc4b0773b586b35136692e5982a7045faccf5f17351f0e167b8c8af92f6d8121f9d71cc8418a6f218d129a24508491ee4034964808a273c730fbb88e81a4bf SHA512 32953be51f25c36bd21f503bd55bc01e45e8ce27303bb3dc51464a9cc7c0513e387a268fc39383dcfb05ae0b37721a7d7489886965eab1c5c9922eea0da84eec
-MISC metadata.xml 482 BLAKE2B 193f3bc4c7b8b6ba0b5b04e406ce7ae842a265b74c285b0d517e3f2e68fe3f4989f36304efb95a602235ee32ab4e92b19cd712183257cb014ccfb4e21e08b98f SHA512 63d2274b6081bb245d60f266b8f52d1fd29e1e509b1baa88968dd13165baeeb6022356101c73ef526ced87b2bd41343e9ac5647115c07c640aa112b8cb29831e
diff --git a/dev-haskell/conduit-extra/conduit-extra-1.1.13.1.ebuild b/dev-haskell/conduit-extra/conduit-extra-1.1.13.1.ebuild
deleted file mode 100644
index 4b1d1d377632..000000000000
--- a/dev-haskell/conduit-extra/conduit-extra-1.1.13.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Batteries included conduit: adapters for common libraries"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/primitive-0.5:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	dev-haskell/stm:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.11:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/bytestring-builder
-		>=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/conduit-extra/conduit-extra-1.1.15.ebuild b/dev-haskell/conduit-extra/conduit-extra-1.1.15.ebuild
deleted file mode 100644
index e47d4b2367ba..000000000000
--- a/dev-haskell/conduit-extra/conduit-extra-1.1.15.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Batteries included conduit: adapters for common libraries"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/primitive-0.5:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	dev-haskell/stm:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.16:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/bytestring-builder
-		>=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/conduit-extra/conduit-extra-1.1.9.1.ebuild b/dev-haskell/conduit-extra/conduit-extra-1.1.9.1.ebuild
deleted file mode 100644
index 137807ac7a0a..000000000000
--- a/dev-haskell/conduit-extra/conduit-extra-1.1.9.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Batteries included conduit: adapters for common libraries"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/primitive-0.5:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	dev-haskell/stm:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.11:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/async
-		dev-haskell/bytestring-builder
-		dev-haskell/exceptions
-		>=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/conduit-extra/conduit-extra-1.1.9.2.ebuild b/dev-haskell/conduit-extra/conduit-extra-1.1.9.2.ebuild
deleted file mode 100644
index d4019726bccb..000000000000
--- a/dev-haskell/conduit-extra/conduit-extra-1.1.9.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Batteries included conduit: adapters for common libraries"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/primitive-0.5:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	dev-haskell/stm:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.11:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/async
-		dev-haskell/bytestring-builder
-		dev-haskell/exceptions
-		>=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/conduit-extra/metadata.xml b/dev-haskell/conduit-extra/metadata.xml
deleted file mode 100644
index 838a86b72c70..000000000000
--- a/dev-haskell/conduit-extra/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package will soon contain much more functionality. This is a placeholder until the next release is ready.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/conduit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/conduit/Manifest b/dev-haskell/conduit/Manifest
deleted file mode 100644
index df9cdd79bcc2..000000000000
--- a/dev-haskell/conduit/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-DIST conduit-1.0.15.1.tar.gz 40651 BLAKE2B b7efc3779c0a8f28f66a7da20f7619e5bff1e24f516986728ea66ef857492f49a4cda74939490c110b6037a2b9a546fa989bc12c1cc35d529ab37c8d7aeb96b8 SHA512 ccd4b56a8bac306ecaeef3830abe4c7c5482082a5996e176dcef8b1145640f10f3c73e521a438f9080c54fa2c9afe2f460cb90a018e6fe547413a8281b9f7b1c
-DIST conduit-1.1.6.tar.gz 30968 BLAKE2B b6c7af88628eea61675d4432dbd7c76474a8fd689c65880da3c99533678fe3e16bcd1dae120214d18c7de1d954d08d1a347f79e1ff5810140e0c46062655655f SHA512 fb0ca3f9afd61cbd62b2d6bf73117d8521cdc838c1a71567c4c35aaf5ee60d4a9525a6eac1bc8fc4f7762387d67cd5ea999f30f231a8ca9d6622b63d75692ea9
-DIST conduit-1.2.12.1.tar.gz 50539 BLAKE2B e6128dfb3acccd688a046296e99f1cdce594f34c18f8315499756c543d10ce143fcda80083f52acc14d3a0ccbfe10ec231a6daf245b765cf309da347bdae5ebc SHA512 36d957600f5660258fd2357713474e961353f558cb969bc98fbaf6ea9115c0de0bf68218c9f6d7801bf217e9e62d376bf67cbd9f176ec7d3d72ef327784fd3e5
-DIST conduit-1.2.6.1.tar.gz 48531 BLAKE2B a6d5258923ad2777d315f58b552d5d66b0fbc230933eed8e9b7b19095dc57afd3fad96236339694b5bef208f2b6a8ca38721467321ecd300ec103f3131ff30f1 SHA512 fbeb437897a0ae00a5d3f5b12565c0a4f5e3807d8d9fcd6aaeeafa134ed5d0493a2a403dbe86112be9af49f8b7af90c504aafce0505f0a854a05a66a5175a6d2
-DIST conduit-1.2.6.6.tar.gz 48854 BLAKE2B f42a0a78808f29535d058d02a615af5161396096887aa21b87cd0277e8955cf01732e814ec71230f4d0c9dc11b20b93ceb86c081f7f03fbef2db42149951539c SHA512 6b722a70919bff0aa79b6e47c3220f89b019a7a584d31e921e4f7dada3e0b4dba753b65fe61f4da7e6562320dec7d76dc1f487d4e085299c485fdf2f7e0b7efd
-DIST conduit-1.2.8.tar.gz 49406 BLAKE2B ce99d20bc0001b7ebac30a37f7e75e6ec1796b534ed1d1b0595df7b734d8685e8e0d566915a21041e703d8867c35fde380958d3c195c796b0d6fdc02fe3a7712 SHA512 a181bc88291e761921a2be60e21efca47f7cd029fa4026d50131d49be0d91e75ea082e8c009aa621c44707eb61ea6b117af4f588b8e9251a381ba55f26124161
-EBUILD conduit-1.0.15.1.ebuild 1350 BLAKE2B 39de59cdc551d3eb83a2ffb25373a0be3ff8aa5f9bedd28e4f7b108bb38543916c34cc2d58d1102ed64db61feabdcc5ee49690ec9eac8c5a93f07967e4865035 SHA512 2453457fb62b24ccce380707a2ea6f38715ff8255bc7936c3987f53155cdb3fc56037fb739eabdda0f2219b5bd4f154ec026a326df887ea852f0ab1c8ceedecd
-EBUILD conduit-1.1.6.ebuild 1174 BLAKE2B f7ce57a1b3a7bf9ca880a3f705513b3e703b9f2207422875ece2805e6c2f57a279ce4fbaee708b730d116cb80bd8f00846ae509edab9d7fd2b8cd1b6d0a8a79b SHA512 7955576e0c130ae217185c96b2477dd4f5aadb164bae997e9b42b0edfbd5e0b50ebe59c3a0ab45cf9d6f1eb126a58a752a7df4437f76027650539fe26a2b0a3b
-EBUILD conduit-1.2.12.1.ebuild 1158 BLAKE2B ab153bf059e14108b137db38d9d16e91bccf9f2e83811f47b4e63cf83f4781e5d2d60754216e34a16b38df302c217beff84d69360ccb41398ff4781b9ee9fc41 SHA512 691e3898d02efc06e376ce45abcd6c6d78601b5a802a95a5f45f5647499b26ba4b9ab8c038b4d8e081f5073bbe4d9733823bc51c7e2a572ed66a8eec85abf9b0
-EBUILD conduit-1.2.6.1.ebuild 1086 BLAKE2B d34fd45a9de3715f4bf5fd02fd41b229233990471abbf9e245b1139855b3df58d5f3dad6d986c1f8323facf8b4af952964ca3803961b9546e3a9ae7dc8e5c251 SHA512 739460b701e083a19e9e602f9da5b9b0274b977c2409bb21ea0a00ac7445e4654c202ac98dbc89dbb9e93d83ab72bc5745da79755ee7e063518f38f9232ec27f
-EBUILD conduit-1.2.6.6.ebuild 1040 BLAKE2B 6b9937993a2ed809a982f2092fa0378df306156608961b120d8a9cae9e4d327bd48069144c9f7ea038a6577ea107d59e4105ca55f653a1e081e12216c43aa2df SHA512 576238d7bca888e8e41b3f16801bb2f456aa7362d385b9c970039fcaeb69e6a074e16999b0c1deb8d9d0e1f3a6b46c875e4e030aacd9348054cc646c36ff81de
-EBUILD conduit-1.2.8.ebuild 1038 BLAKE2B 0f7cf2e0b31982da36baf425edd3636d812685b2a942a261c11c873399321dbce2f7508a8f93fa9fb5fea44fe4acd997e5c02fa96c425455b641e805b64e42b8 SHA512 db95539741f66509490fbaeeb2ab97e530f66a4ff2a6164ba8b40b3d158eee37a11ecb85901f8c87513cc0ae98614f0b0557060e857024533bdf90d0b97ffdf7
-MISC metadata.xml 816 BLAKE2B 8131abf48d7a4d042920d57969535ee3e33459cd33790b4a52d55fc91c2f7391104a505d0a6dd67dba4251c3c093b17b78abe60ebe33b8031bb4c7b924848d5f SHA512 96bfab2b6d9b6738618b298668bdbffeb55ded7c2f98fe7eabfb8ceccea0c7b9d67ce194250576a24566e63cc9f17dbb67bb7d792b7bee0f18ef234f1857f44c
diff --git a/dev-haskell/conduit/conduit-1.0.15.1.ebuild b/dev-haskell/conduit/conduit-1.0.15.1.ebuild
deleted file mode 100644
index fae8b6c2a0ec..000000000000
--- a/dev-haskell/conduit/conduit-1.0.15.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Streaming data processing library"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="nohandles"
-
-RDEPEND=">=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	>=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-0.4.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/text-stream-decode-0.1.0.4:=[profile?] <dev-haskell/text-stream-decode-0.2:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/void-0.5.5:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag nohandles nohandles)
-}
diff --git a/dev-haskell/conduit/conduit-1.1.6.ebuild b/dev-haskell/conduit/conduit-1.1.6.ebuild
deleted file mode 100644
index 57201e5e5915..000000000000
--- a/dev-haskell/conduit/conduit-1.1.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Streaming data processing library"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/exceptions:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	>=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/void-0.5.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/exceptions-0.6
-		>=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/conduit/conduit-1.2.12.1.ebuild b/dev-haskell/conduit/conduit-1.2.12.1.ebuild
deleted file mode 100644
index e1a68a014cda..000000000000
--- a/dev-haskell/conduit/conduit-1.2.12.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Streaming data processing library"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?]
-	>=dev-haskell/void-0.5.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/quickcheck-2.7
-		dev-haskell/safe
-		>=dev-haskell/split-0.2.0.0 )
-"
diff --git a/dev-haskell/conduit/conduit-1.2.6.1.ebuild b/dev-haskell/conduit/conduit-1.2.6.1.ebuild
deleted file mode 100644
index f8eeeb0cce34..000000000000
--- a/dev-haskell/conduit/conduit-1.2.6.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Streaming data processing library"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/void-0.5.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/quickcheck-2.7
-		dev-haskell/safe )
-"
diff --git a/dev-haskell/conduit/conduit-1.2.6.6.ebuild b/dev-haskell/conduit/conduit-1.2.6.6.ebuild
deleted file mode 100644
index 2d85b3b1bfe3..000000000000
--- a/dev-haskell/conduit/conduit-1.2.6.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Streaming data processing library"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/void-0.5.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/quickcheck-2.7
-		dev-haskell/safe )
-"
diff --git a/dev-haskell/conduit/conduit-1.2.8.ebuild b/dev-haskell/conduit/conduit-1.2.8.ebuild
deleted file mode 100644
index ef1afa073da9..000000000000
--- a/dev-haskell/conduit/conduit-1.2.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Streaming data processing library"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/void-0.5.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/quickcheck-2.7
-		dev-haskell/safe )
-"
diff --git a/dev-haskell/conduit/metadata.xml b/dev-haskell/conduit/metadata.xml
deleted file mode 100644
index 3af8d9d07e99..000000000000
--- a/dev-haskell/conduit/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Conduits are an approach to the streaming data problem. It is meant as an alternative to enumerators\/iterators, hoping to address the same issues with different trade-offs based on real-world experience with enumerators. For more information, see &lt;http://www.yesodweb.com/blog/2011/12/conduits&gt;.
-	</longdescription>
-	<use>
-		<flag name="nohandles">experimental code to use raw system calls in place of handles. Not recommended for general use</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">snoyberg/conduit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/configfile-1.1.4 b/dev-haskell/configfile-1.1.4
new file mode 100644
index 000000000000..1c019e8a7132
--- /dev/null
+++ b/dev-haskell/configfile-1.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/missingh-1.0.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-7.4.1:= buildtests? ( dev-haskell/hunit:=[profile?] dev-haskell/testpack:=[profile?] ) >=dev-haskell/cabal-1.2.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Configuration file reading & writing
+EAPI=5
+HOMEPAGE=http://software.complete.org/configfile
+IUSE=buildtests doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/missingh-1.0.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-7.4.1:= buildtests? ( dev-haskell/hunit:=[profile?] dev-haskell/testpack:=[profile?] )
+SLOT=0/1.1.4
+SRC_URI=mirror://hackage/packages/archive/ConfigFile/1.1.4/ConfigFile-1.1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9724ffb1caf6c0f5a54beb326a7965d3
diff --git a/dev-haskell/configfile/Manifest b/dev-haskell/configfile/Manifest
deleted file mode 100644
index 3d64d4e9da64..000000000000
--- a/dev-haskell/configfile/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ConfigFile-1.1.4.tar.gz 28969 BLAKE2B 8cd70d207a26fabab3d7b124d17857ee8004a38388bba921fb658b9f09df4d082ea73149ee1d8fc7f5737f521f4f81727f60034b507265e7bd5ec89683d88965 SHA512 4455110c95172461b2d82ae88ba4f386d5e49ddd7f7def83714d2f6198090f0d121166eece3efa735341da9bbc0029e704be00d3e671d24ad27e838dfe913776
-EBUILD configfile-1.1.4.ebuild 911 BLAKE2B 585bbbccbb98d39bed5f2db7fc948ced517fb33d4624a95bb5dd6500e44b9cf80687eea15842eb18ae07dea749c5bf9b209e99ff09779a816a490ed898e9e8fd SHA512 63b587a5e1f4342d2068768fa02482dd0f0c52f76b5b9c97813696349b730c6d9ceb96a38c0f3dc8a18cf092f11cab95dc3d6778466119b660f48ac484e215fa
-MISC metadata.xml 963 BLAKE2B 9a0aa6609ab53aaac1f4cb37fb9c127f0491028c7966c6488897082152eb5933909ed5422f00a5e674e48668a8ee97b8ff1c09032cbc8a20dda9e49db0b03d94 SHA512 c1ddc5710ba6efb5705dc71c8c0306741f7df077bfb4e4fb9cc85771fba6630a2263e226597059c9135d7d2d97eef2d2ec4a89033879535b549bfd243a7f6ab7
diff --git a/dev-haskell/configfile/configfile-1.1.4.ebuild b/dev-haskell/configfile/configfile-1.1.4.ebuild
deleted file mode 100644
index f6bfd6f87d5a..000000000000
--- a/dev-haskell/configfile/configfile-1.1.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="ConfigFile"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Configuration file reading & writing"
-HOMEPAGE="http://software.complete.org/configfile"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="buildtests"
-
-RDEPEND=">=dev-haskell/missingh-1.0.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	buildtests? ( dev-haskell/hunit:=[profile?]
-			dev-haskell/testpack:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag buildtests buildtests)
-}
diff --git a/dev-haskell/configfile/metadata.xml b/dev-haskell/configfile/metadata.xml
deleted file mode 100644
index c430e789391c..000000000000
--- a/dev-haskell/configfile/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Parser and writer for handling sectioned config files in
-		Haskell.
-
-		The ConfigFile module works with configuration files in a standard
-		format that is easy for the user to edit, easy for the programmer
-		to work with, yet remains powerful and flexible.  It is inspired by,
-		and compatible with, Python's ConfigParser module.  It uses files
-		that resemble Windows .INI-style files, but with numerous
-		improvements.
-
-		ConfigFile provides simple calls to both read and write config files.
-		It's possible to make a config file parsable by this module,
-		the Unix shell, and make.
-	</longdescription>
-	<use>
-		<flag name="buildtests">Build the executable to run unit tests.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/configurator-0.3.0.0-r1 b/dev-haskell/configurator-0.3.0.0-r1
new file mode 100644
index 000000000000..d7baa91717a1
--- /dev/null
+++ b/dev-haskell/configurator-0.3.0.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10.0.2:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/text-0.11.1.0:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Configuration management
+EAPI=6
+HOMEPAGE=https://github.com/bos/configurator
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.10.0.2:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/text-0.11.1.0:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.0.0
+SRC_URI=mirror://hackage/packages/archive/configurator/0.3.0.0/configurator-0.3.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a0357104a28084a904a2ae17e0f569d9
diff --git a/dev-haskell/configurator/Manifest b/dev-haskell/configurator/Manifest
deleted file mode 100644
index db6e98acf380..000000000000
--- a/dev-haskell/configurator/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST configurator-0.3.0.0.tar.gz 15232 BLAKE2B 1d09d8054a6cc948e63ab2024db6866d6bafffcac2c56f8e6b0b13fa63177aea34495a49207235016a4911f5293babdd9ee90f73c1a08f350823d6b95d6b31a3 SHA512 0c4c95b3182874c87c4b6b8e74bf8e39ec7528b49f06e9a02baed5fa4aa90a22a9504f59e881c17616ef95a1aa5450b431df8cc9317ef837d8e821f330e303c9
-EBUILD configurator-0.3.0.0-r1.ebuild 941 BLAKE2B 9e5557f4d0e71d3391f76f27c172489dbed3497e95b192cf34e9703777166557f9c861e6672bc1823faef86b707869f4da43801476ee01b03b9e9520a91b8ff1 SHA512 edefcb5cad81fcb125f02d7597d241843e313adec541a1556538b4b853fc3b4fd8a08c52962ee17d0a177eaf56595c235da56d284abc19814b6e1aef4fdf1291
-MISC metadata.xml 1211 BLAKE2B 5538b16c2f108b42dc1e604ff015867fb9d0368093511ed54c8e8bb0c2758b59d19f555ba9711f787fdfe2797934eff03244d2a61a0d444de876bd9c51aa642f SHA512 3798db36c06ade14fe701fccd286af6cb3de0225ef712c2ce92b574be8c03fd7c7186121d55082ea5517ce1ecb338e32f404848ebf9904312393bc0939c5464d
diff --git a/dev-haskell/configurator/configurator-0.3.0.0-r1.ebuild b/dev-haskell/configurator/configurator-0.3.0.0-r1.ebuild
deleted file mode 100644
index 9fbe651380de..000000000000
--- a/dev-haskell/configurator/configurator-0.3.0.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.2.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Configuration management"
-HOMEPAGE="https://github.com/bos/configurator"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.0.2:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/text-0.11.1.0:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/configurator/metadata.xml b/dev-haskell/configurator/metadata.xml
deleted file mode 100644
index 2005cc7f0e0c..000000000000
--- a/dev-haskell/configurator/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A configuration management library for programs and daemons.
-		
-		Features include:
-		
-		* Automatic, dynamic reloading in response to modifications to
-		configuration files.
-		
-		* A simple, but flexible, configuration language, supporting several
-		of the most commonly needed types of data, along with
-		interpolation of strings from the configuration or the system
-		environment (e.g. @$(HOME)@).
-		
-		* Subscription-based notification of changes to configuration
-		properties.
-		
-		* An @import@ directive allows the configuration of a complex
-		application to be split across several smaller files, or common
-		configuration data to be shared across several applications.
-		
-		For details of the configuration file format, see
-		&lt;http://hackage.haskell.org/packages/archive/configurator/latest/doc/html/Data-Configurator.html&gt;.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bos/configurator</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/connection-0.2.4 b/dev-haskell/connection-0.2.4
new file mode 100644
index 000000000000..5a31d7b69a86
--- /dev/null
+++ b/dev-haskell/connection-0.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/byteable:=[profile?] dev-haskell/crypto-random:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/securemem:=[profile?] >=dev-haskell/socks-0.4:=[profile?] >=dev-haskell/tls-1.2:=[profile?] >=dev-haskell/x509-1.4:=[profile?] >=dev-haskell/x509-store-1.4:=[profile?] >=dev-haskell/x509-system-1.4:=[profile?] >=dev-haskell/x509-validation-1.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple and easy network connections API
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-connection
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/byteable:=[profile?] dev-haskell/crypto-random:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/securemem:=[profile?] >=dev-haskell/socks-0.4:=[profile?] >=dev-haskell/tls-1.2:=[profile?] >=dev-haskell/x509-1.4:=[profile?] >=dev-haskell/x509-store-1.4:=[profile?] >=dev-haskell/x509-system-1.4:=[profile?] >=dev-haskell/x509-validation-1.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.4
+SRC_URI=mirror://hackage/packages/archive/connection/0.2.4/connection-0.2.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bc5636885c5740e3423517160777ffd2
diff --git a/dev-haskell/connection-0.2.5 b/dev-haskell/connection-0.2.5
new file mode 100644
index 000000000000..d29e4d0154fb
--- /dev/null
+++ b/dev-haskell/connection-0.2.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/byteable:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/socks-0.4:=[profile?] >=dev-haskell/tls-1.3:=[profile?] >=dev-haskell/x509-1.5:=[profile?] >=dev-haskell/x509-store-1.5:=[profile?] >=dev-haskell/x509-system-1.5:=[profile?] >=dev-haskell/x509-validation-1.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple and easy network connections API
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-connection
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/byteable:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/socks-0.4:=[profile?] >=dev-haskell/tls-1.3:=[profile?] >=dev-haskell/x509-1.5:=[profile?] >=dev-haskell/x509-store-1.5:=[profile?] >=dev-haskell/x509-system-1.5:=[profile?] >=dev-haskell/x509-validation-1.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.5
+SRC_URI=mirror://hackage/packages/archive/connection/0.2.5/connection-0.2.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7bd8d38f97f570c8730c89011987acff
diff --git a/dev-haskell/connection/Manifest b/dev-haskell/connection/Manifest
deleted file mode 100644
index f5c2c7eeb2ae..000000000000
--- a/dev-haskell/connection/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST connection-0.2.4.tar.gz 11067 BLAKE2B a99a7430093f3bf279ffcc709dd3b52050e1534b50683289f68ae00a86cff9269ff5bafdfd1b2a46fd6b55b32f6b4ca2805083cedaf0e7d86c44943dab827deb SHA512 7a55f5bf8b35a8a03553051b38a01e3791e9c51db3222f5c91e77310cc9d61307e9d934d59e31f82be38804f1b9c60cd8856351b03e007e3b7a3c883abaabb48
-DIST connection-0.2.5.tar.gz 7576 BLAKE2B 312e65c9f25b97d7ba0325baae93ebbcd6b8a212d5fd3f48361982dcc3dccc3ccaeb273a8b74b95482bcdb68269b1f3177037ac4951871d25a97fbe501f2e94b SHA512 02f02bfe48aa2f667986433d11fc7723aed8e87deb38082a6eacf009901334db2acb95c254a2cebd0b6c035bcdb6536f51af6c5dfdcc1ee51a13c1b7383460c4
-EBUILD connection-0.2.4.ebuild 982 BLAKE2B 55543d6d98b4ac1875a0faac635dbc7e83a58c4eabaadf2644c883fe4c3db3e990d3566d40bebde5f1e599cb66c3ffee4f375a4dbe9de2aeb7ce94333c3556f7 SHA512 6d5696e08b4b5d6124992226fb2cce74e141e9e06f738a160367183554886bf83793b21a9409f409e71c5eaddfb24fa67afe50b8832a6b6c5ed9959a4ff527eb
-EBUILD connection-0.2.5.ebuild 910 BLAKE2B bd0982141c6cfbb66c76ab5107dd2ab24663fcf6e1d5da0ef95cbff3762fa0f5df93fd49561f2fcd5aeab94d57dc744f54337e5cb1b373c6b68318b559269bb9 SHA512 e13b0dc6e934785cdd5bcabfbad048a01494b5222d73ad196f7f08ef0ba270141ec8479e286411e7985740c35d2d4e03920a9585e6674e957d8048ced514ad71
-MISC metadata.xml 605 BLAKE2B 93b777894909dca02df5c082ae4eb35417336a8dd306ad8889662df406eda6b1972c6dc20cc6d170ad6f0fa6c3634415b3b0e0e4d4786cb6a958e6afa5727564 SHA512 a04bbc4f237d9c2bb70b18c4559ddb04e04a7f1056c38f5f1d34fcaea97999556f176ff5e7a0704f03b9a2e962334823b1571448a6586dd357ac8a296891db29
diff --git a/dev-haskell/connection/connection-0.2.4.ebuild b/dev-haskell/connection/connection-0.2.4.ebuild
deleted file mode 100644
index 653bb9d771dd..000000000000
--- a/dev-haskell/connection/connection-0.2.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple and easy network connections API"
-HOMEPAGE="https://github.com/vincenthz/hs-connection"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	dev-haskell/crypto-random:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	dev-haskell/securemem:=[profile?]
-	>=dev-haskell/socks-0.4:=[profile?]
-	>=dev-haskell/tls-1.2:=[profile?]
-	>=dev-haskell/x509-1.4:=[profile?]
-	>=dev-haskell/x509-store-1.4:=[profile?]
-	>=dev-haskell/x509-system-1.4:=[profile?]
-	>=dev-haskell/x509-validation-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/connection/connection-0.2.5.ebuild b/dev-haskell/connection/connection-0.2.5.ebuild
deleted file mode 100644
index 55df3cc7be2f..000000000000
--- a/dev-haskell/connection/connection-0.2.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple and easy network connections API"
-HOMEPAGE="https://github.com/vincenthz/hs-connection"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/socks-0.4:=[profile?]
-	>=dev-haskell/tls-1.3:=[profile?]
-	>=dev-haskell/x509-1.5:=[profile?]
-	>=dev-haskell/x509-store-1.5:=[profile?]
-	>=dev-haskell/x509-system-1.5:=[profile?]
-	>=dev-haskell/x509-validation-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/connection/metadata.xml b/dev-haskell/connection/metadata.xml
deleted file mode 100644
index e0146f287c42..000000000000
--- a/dev-haskell/connection/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Simple network library for all your connection need.
-		
-		Features: Really simple to use, SSL/TLS, SOCKS.
-		
-		This library provides a very simple api to create sockets
-		to a destination with the choice of SSL/TLS, and SOCKS.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-connection</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/constraints-0.4.1.3 b/dev-haskell/constraints-0.4.1.3
new file mode 100644
index 000000000000..cbbee64b47ef
--- /dev/null
+++ b/dev-haskell/constraints-0.4.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/newtype-0.2:=[profile?] <dev-haskell/newtype-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Constraint manipulation
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/constraints/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/newtype-0.2:=[profile?] <dev-haskell/newtype-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.1.3
+SRC_URI=mirror://hackage/packages/archive/constraints/0.4.1.3/constraints-0.4.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=39098f3a770356a545b0dc2f7e1d9ff0
diff --git a/dev-haskell/constraints-0.8 b/dev-haskell/constraints-0.8
new file mode 100644
index 000000000000..918e39a9506a
--- /dev/null
+++ b/dev-haskell/constraints-0.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/binary-0.7.3:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Constraint manipulation
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/constraints/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/binary-0.7.3:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.8
+SRC_URI=mirror://hackage/packages/archive/constraints/0.8/constraints-0.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bae26143b615e92a5e0aa0417d883ce8
diff --git a/dev-haskell/constraints/Manifest b/dev-haskell/constraints/Manifest
deleted file mode 100644
index f10452ee1f92..000000000000
--- a/dev-haskell/constraints/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX constraints-0.4.1.3-ghc-8.patch 569 BLAKE2B 778f426a7fe3db9e97615fb1cfefc387bb2b89f60fdf1f410da35427c3a528bd91420cd953f405f9d2ec370d20936d13b20a6927aed899f0d708866bf5c69b67 SHA512 72d9a60d78b679d5beabf4d299a1c8aa2c7c1c260fe7c9a4337b7c3f597f3a71450af2823a148c6cffcb17bc1a68d6a5789ab2626da775d0493e179cda2877c9
-DIST constraints-0.4.1.3.tar.gz 7311 BLAKE2B 27d2265324dfbb60da85cc7016c90e1b38ef5d906a0506b35b18e4b4b06050f9ae1f30e9e621466614a1d643949ccdf23cce183b44e52dc5fcfe3acc41226cac SHA512 0478c69be6a719b83d536aef7733d7383f5400a234829f49146597f89339d3aee46455f3f5001dfc213e07c116276699bf970a657051f3dddb8ab2d9f9593836
-DIST constraints-0.8.tar.gz 12348 BLAKE2B 63ddba733601898c8e8a7712c406e34417141f1da0adc7ab6ce4d271b2356eb1ad6e9ee5ab0b77c1c7efdaf6e0ba6c5e639c6c55032cd75cd6850719323a61a6 SHA512 8cd6f16e70657f95f6d9b0824f85e5991d7da85852a1664abf8b99f95ab85456ecda09f3e59577019284358c09b198d298d01ff152acb3086121521ee302e665
-EBUILD constraints-0.4.1.3.ebuild 666 BLAKE2B 57e9eb7ad0d6ae37e2fe574285dea756e1b0ba833d8813f0304c472e3ccae05603b41879fd14164d4c7245143cf2d92332cb38239f134660b6157abd7d07b8aa SHA512 3c6af99a2f41fdf747da3943a37e25b8accc75e239af52093baf7999edb22d59bae7f6702b37919c93dddb7a8be5bd6e370007f35109974e09f325d7afbb343c
-EBUILD constraints-0.8.ebuild 942 BLAKE2B ff46dc2dc537fdae7bf215f80cecb4b206019361e254fb8d9fcb18dd3ea8a68691deb529ae37a85ad1f4ed81daeb429e28fd6c15169497a506f0a81d080fe9b4 SHA512 99050ac7ea6cfe47a7fbe283b8da129162f9f7a1978c3cda4eb21ece6267c5b93b5e48395587126305e21ab0e4fc6f1055c0d9adc918b2d12f9dae030a020cf1
-MISC metadata.xml 397 BLAKE2B 1eee1841d0991b047d107068bc8a14fe69dc3e23bed9ef860729a3b9e0b07da6c4e73e4a770482fed90e907a08791657b7a4722fc940f021fb26b4b4b2808d34 SHA512 f641ba38e2f1e81b5b5552524b77d30607c80096088b48f02b06f68e313a76dcbaffd2972957ff83f14aa4221ac7008f538a962bc9e427832f97067a89fcba9f
diff --git a/dev-haskell/constraints/constraints-0.4.1.3.ebuild b/dev-haskell/constraints/constraints-0.4.1.3.ebuild
deleted file mode 100644
index 19bdfc6fab51..000000000000
--- a/dev-haskell/constraints/constraints-0.4.1.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Constraint manipulation"
-HOMEPAGE="https://github.com/ekmett/constraints/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/newtype-0.2:=[profile?] <dev-haskell/newtype-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-8.patch
-}
diff --git a/dev-haskell/constraints/constraints-0.8.ebuild b/dev-haskell/constraints/constraints-0.8.ebuild
deleted file mode 100644
index 4d9b084f91dd..000000000000
--- a/dev-haskell/constraints/constraints-0.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Constraint manipulation"
-HOMEPAGE="https://github.com/ekmett/constraints/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.7.3:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/constraints/files/constraints-0.4.1.3-ghc-8.patch b/dev-haskell/constraints/files/constraints-0.4.1.3-ghc-8.patch
deleted file mode 100644
index 1b2f8169c45d..000000000000
--- a/dev-haskell/constraints/files/constraints-0.4.1.3-ghc-8.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Data/Constraint.hs b/Data/Constraint.hs
-index 84d67c0..a104f51 100644
---- a/Data/Constraint.hs
-+++ b/Data/Constraint.hs
-@@ -79,3 +79,7 @@ import Data.Data
- #endif
-+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 707
-+import GHC.Exts (Constraint)
-+#else
- import GHC.Prim (Constraint)
-+#endif
- 
-@@ -375,3 +379,3 @@ instance Class () (b :=> a) where cls = Sub Dict
- instance Class b a => () :=> Class b a where ins = Sub Dict
--instance (b :=> a) => () :=> b :=> a where ins = Sub Dict
-+instance (b :=> a) => () :=> (b :=> a) where ins = Sub Dict
- 
diff --git a/dev-haskell/constraints/metadata.xml b/dev-haskell/constraints/metadata.xml
deleted file mode 100644
index 4b4bd0c95bf6..000000000000
--- a/dev-haskell/constraints/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Constraint manipulation
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/constraints</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/contravariant-0.4.4 b/dev-haskell/contravariant-0.4.4
new file mode 100644
index 000000000000..45250de294fe
--- /dev/null
+++ b/dev-haskell/contravariant-0.4.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[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=Contravariant functors
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/contravariant/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.4.4
+SRC_URI=mirror://hackage/packages/archive/contravariant/0.4.4/contravariant-0.4.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=77d83bfd02b02a90a7cae51b91ed203c
diff --git a/dev-haskell/contravariant-0.6 b/dev-haskell/contravariant-0.6
new file mode 100644
index 000000000000..fbff5a326c63
--- /dev/null
+++ b/dev-haskell/contravariant-0.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Contravariant functors
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/contravariant/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
+SLOT=0/0.6
+SRC_URI=mirror://hackage/packages/archive/contravariant/0.6/contravariant-0.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a246c4d8497646b5ad4cc1737d25e0c3
diff --git a/dev-haskell/contravariant-1.2.0.1 b/dev-haskell/contravariant-1.2.0.1
new file mode 100644
index 000000000000..0acdea000e8b
--- /dev/null
+++ b/dev-haskell/contravariant-1.2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:= tagged? ( >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Contravariant functors
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/contravariant/
+IUSE=+tagged doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:= tagged? ( >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] )
+SLOT=0/1.2.0.1
+SRC_URI=mirror://hackage/packages/archive/contravariant/1.2.0.1/contravariant-1.2.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7cc04a7b4041aac7901eeeca16812d63
diff --git a/dev-haskell/contravariant-1.3.3 b/dev-haskell/contravariant-1.3.3
new file mode 100644
index 000000000000..57d3c7e139e5
--- /dev/null
+++ b/dev-haskell/contravariant-1.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/void-0.7.1:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:= semigroups? ( >=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) statevar? ( >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Contravariant functors
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/contravariant/
+IUSE=+semigroups +statevar +tagged doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/void-0.7.1:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:= semigroups? ( >=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) statevar? ( >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] )
+SLOT=0/1.3.3
+SRC_URI=mirror://hackage/packages/archive/contravariant/1.3.3/contravariant-1.3.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ba41d318d6c96deac000bb52261fd40e
diff --git a/dev-haskell/contravariant-1.4 b/dev-haskell/contravariant-1.4
new file mode 100644
index 000000000000..070f3f3e74c2
--- /dev/null
+++ b/dev-haskell/contravariant-1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:= semigroups? ( >=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) statevar? ( >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Contravariant functors
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/contravariant/
+IUSE=safe +semigroups +statevar +tagged doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:= semigroups? ( >=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) statevar? ( >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] )
+SLOT=0/1.4
+SRC_URI=mirror://hackage/packages/archive/contravariant/1.4/contravariant-1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8ed9008ded6769e0f98c682c84ae58d5
diff --git a/dev-haskell/contravariant/Manifest b/dev-haskell/contravariant/Manifest
deleted file mode 100644
index 168564a1657d..000000000000
--- a/dev-haskell/contravariant/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST contravariant-0.4.4.tar.gz 4901 BLAKE2B 478e50e6f8b8a06a2d392da13a7edafd3eb602f0c0fd4a7489eef569b360c65af8a603b63acc66609d743b9cf8417edde2647d63efdf23125098bd4f54c5c28d SHA512 a54c37a371ce5347ae1df789e15a853e0da9e4e9a4006fe77f00f50cda5e92e72da7daf664be8a0a14422dbeb3e3849aae237b5dcd54904e4eee90086a81eaba
-DIST contravariant-0.6.tar.gz 5489 BLAKE2B edf506ef34205042a12c325f7d0982afaf7a8582cac685044fd873c45e6524a01ac77d0b1acc1b48eeedf7996c603d1b32c2ca0a588ea9c7787fa0d88eca2c0d SHA512 f10e93fc69ef26dfde15ae39fe3ff7e466c2b67161604f134b9bede7d18f5032efc3df57c4e78bae3a444bdd19cc4518a987d108fc6a318e934939e15176a7aa
-DIST contravariant-1.2.0.1.tar.gz 6640 BLAKE2B ab253ca2051b455650f8a177204c34f584bb2cb5aec0a4f7bf5f33496dd1a51abed08e7331eed2496a037f448ec85b96be66abc3d39e2c7e67098f7c9e53897f SHA512 c5c76c07931bea8381a412ec02e57f9c17d7e44f8eb5dd982a5083b9bbefd1364c9ed264105ef92615dc79b98fc700178f0dc2f03a3069ca542bdb62d7ca3f5a
-DIST contravariant-1.3.3.tar.gz 9923 BLAKE2B 489684ff698e788c2ce3f1b677a8f05970ff369317cb2ad8b0da0bd87d87cce3820d7bf6d91249b946ece5dfba9ac671540496bdccb1a4b9170a76cbcd2ce250 SHA512 38b9db8035a42c9d8bb1572f63b7fce0f94a93d78cde43f1ce9da5284323b51d71e5432d3aecd128946d7b918b264a1e103e04976ebc9feb01c782e1ea2c683f
-DIST contravariant-1.4.tar.gz 11652 BLAKE2B 7a5fb1d8793b13a2e51180ab92900d01f379f235f185ff591086c3329a2397ea7342100700a1dbea15b4775a5bc0b1ceda6cb491b195258b82e85c3098a7d82e SHA512 6d99a8ed4694ad8494e1a705e911f16ade01f31c92cc8fc21cf49f5b03beafd25597781abc304c4ee360a3ba9473470a4c96069604ab563fb8ae194e09cdf56a
-EBUILD contravariant-0.4.4.ebuild 801 BLAKE2B 0039ee4f73ad8129b706f66cd19c2906010f07db89fe163f2e74c34e2bfc9e63ba682de7560ece3995cf1a2f8fcddc7ef6cfb8e9aa63782b5eb126a8f108d00c SHA512 22a2648f7d75439c7df415194f37be88e06a88dc9a19c57f0c323fff954520c1196efd8332a18bb4f4f942801e850827e81843d8a55538dfc98565332bdf5edd
-EBUILD contravariant-0.6.ebuild 795 BLAKE2B 124bba54eeef6a2ee3c3b1a012b95d050cf3247dc913e2e0b3693412facec8d62030fdd060ed8835242c9bf711382dfb31e32a7d12c4b29b1a6f574c258a30f8 SHA512 b9772ac6b1c29bf9b06b5d4e53f963350b60f537ca6366bb79a411d64217b7cf3dd4bf5f0428563331ee41c041edcf362a827333b177a242c68ca0e86426de88
-EBUILD contravariant-1.2.0.1.ebuild 1044 BLAKE2B ff6c95a28917e1ab997d9d3ef223d0302b6f12371795736f1ac792891664231980524b03751d803262e960dc8f878cf9f4215d7c094bd6f4f1371d171a4e1abb SHA512 44d058b8d374e0f162b9e443a1e4822873db3160c42e0f294d217321037b8ed64e2c9c044e8fed1c19fc9dd1f16558f1439110929b7d94c1adfff76ce5879454
-EBUILD contravariant-1.3.3.ebuild 1250 BLAKE2B 6d207c9bbeb4dcd23e17df9dc125db6f689bfcb6b712eaefb5720d9fe4022fb671f543ba8bf92333dbdea44acbb6a18a22c86d96b791449789d5d78078ae36e1 SHA512 d03eaa69aa5cc347a52be4161e96defdeb344c8b81bed1849a69c175c772a5bfd18eaf56a4e3de09b2dc83d8463daad36fa1042ea11c191878efbe8114d19fe0
-EBUILD contravariant-1.4.ebuild 1281 BLAKE2B 81129471f77368d6c03d47e1b49c9728d3b1f4c8089600583f063c7f3ed0eebfe1ee59d6fbf656dea38e2c601f011c06d32531dc2a7834f68297baef07c794b9 SHA512 0260d32c282735d31ddc306a90d41465f02cc513cba22f8040a97cac6fc86de6be032a4910cc82242433adaff14fc38c359796d16733bd132e2c179e3215a831
-MISC metadata.xml 1296 BLAKE2B 3fe68b72d499093177159f33ccb32c4de3c51f7c7e353b873ec608651bf5909f41d82c76636f9627b6bd3cafc18dd29a43a4f4e8a26b086b5a7588863542e9fc SHA512 69074a4b878538c5b87a1f667b59a69ecf98e8f8b84d4c937c44eb3ea0c69aeaf3bb384d35d1707fd354e20a941654e18957da6978e88868830dda88106feaad
diff --git a/dev-haskell/contravariant/contravariant-0.4.4.ebuild b/dev-haskell/contravariant/contravariant-0.4.4.ebuild
deleted file mode 100644
index 59161627babe..000000000000
--- a/dev-haskell/contravariant/contravariant-0.4.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Contravariant functors"
-HOMEPAGE="https://github.com/ekmett/contravariant/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/tagged-0.4.4:=[profile?]
-		<dev-haskell/tagged-1:=[profile?]
-		>=dev-haskell/transformers-0.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-haskell/transformers-compat-0.1:=[profile?]
-		<dev-haskell/transformers-compat-1:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/contravariant/contravariant-0.6.ebuild b/dev-haskell/contravariant/contravariant-0.6.ebuild
deleted file mode 100644
index 6dd3eb742946..000000000000
--- a/dev-haskell/contravariant/contravariant-0.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Contravariant functors"
-HOMEPAGE="https://github.com/ekmett/contravariant/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/contravariant/contravariant-1.2.0.1.ebuild b/dev-haskell/contravariant/contravariant-1.2.0.1.ebuild
deleted file mode 100644
index 79fc7cc121eb..000000000000
--- a/dev-haskell/contravariant/contravariant-1.2.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Contravariant functors"
-HOMEPAGE="https://github.com/ekmett/contravariant/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+tagged"
-
-RDEPEND=">=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	tagged? ( >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag tagged tagged)
-}
diff --git a/dev-haskell/contravariant/contravariant-1.3.3.ebuild b/dev-haskell/contravariant/contravariant-1.3.3.ebuild
deleted file mode 100644
index cb869a5ba5d9..000000000000
--- a/dev-haskell/contravariant/contravariant-1.3.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Contravariant functors"
-HOMEPAGE="https://github.com/ekmett/contravariant/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+semigroups +statevar +tagged"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/void-0.7.1:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	semigroups? ( >=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] )
-	statevar? ( >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?] )
-	tagged? ( >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag semigroups semigroups) \
-		$(cabal_flag statevar statevar) \
-		$(cabal_flag tagged tagged)
-}
diff --git a/dev-haskell/contravariant/contravariant-1.4.ebuild b/dev-haskell/contravariant/contravariant-1.4.ebuild
deleted file mode 100644
index b47ecac6de1b..000000000000
--- a/dev-haskell/contravariant/contravariant-1.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Contravariant functors"
-HOMEPAGE="https://github.com/ekmett/contravariant/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="safe +semigroups +statevar +tagged"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	semigroups? ( >=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] )
-	statevar? ( >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?] )
-	tagged? ( >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag safe safe) \
-		$(cabal_flag semigroups semigroups) \
-		$(cabal_flag statevar statevar) \
-		$(cabal_flag tagged tagged)
-}
diff --git a/dev-haskell/contravariant/metadata.xml b/dev-haskell/contravariant/metadata.xml
deleted file mode 100644
index 7707171c83b0..000000000000
--- a/dev-haskell/contravariant/metadata.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haskell 98 contravariant functors
-	</longdescription>
-	<use>
-		<flag name="safe">
-			Get Safe guarantees rather than merely
-			Trustworthy, but with worse constant factors.
-		</flag>
-		<flag name="semigroups">
-			You can disable the use of the `semigroups`
-			package using `-f-semigroups`. Disabling this is an unsupported
-			configuration, but it may be useful for accelerating builds in
-			sandboxes for expert users.
-		</flag>
-		<flag name="statevar">
-			You can disable the use of the `StateVar`
-			package using `-f-StateVar`. Disabling this is an unsupported
-			configuration, but it may be useful for accelerating builds in
-			sandboxes for expert users.
-		</flag>
-		<flag name="tagged">
-			You can disable the use of the `tagged` package
-			on older versons of GHC using `-f-tagged`. Disabling this is an
-			unsupported configuration, but it may be useful for accelerating
-			builds in sandboxes for expert users.
-		</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ekmett/contravariant</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/control-monad-loop-0.1 b/dev-haskell/control-monad-loop-0.1
new file mode 100644
index 000000000000..61328d6996fd
--- /dev/null
+++ b/dev-haskell/control-monad-loop-0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple monad transformer for imperative-style loops
+EAPI=5
+HOMEPAGE=https://github.com/joeyadams/haskell-control-monad-loop
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.1
+SRC_URI=mirror://hackage/packages/archive/control-monad-loop/0.1/control-monad-loop-0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0d2cff8a2e6bfbbd452a4158643abfd1
diff --git a/dev-haskell/control-monad-loop/Manifest b/dev-haskell/control-monad-loop/Manifest
deleted file mode 100644
index b20e82f034e0..000000000000
--- a/dev-haskell/control-monad-loop/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST control-monad-loop-0.1.tar.gz 5081 BLAKE2B 8e9b755a7b37d90f8422794cc590cfc826665aac267bf28565d475adffd167ef29c806b644c87e9834eefa6d24ff7e554aa727a2a4069120d52a80112d57f8ec SHA512 a3eb80b06762ecf442b23fd39a35393a5754a7d71f4ba21e8a3a2457d8ee34a9b5d4b6c8f20d5c5fa19a42beb863bc2a7602bffd06db6ddc99f9b94ae2ec74dd
-EBUILD control-monad-loop-0.1.ebuild 656 BLAKE2B 5f48f01079760ca97403e98c992ef2ba4a843384f4e5a26fef1eb32f9389ea27cfa609efbd727f2e0317e71aed55cb3be051111ec735b1bafcb06c7e8001e7d1 SHA512 65ea32bfca8c9709b0c436f5a47c3c6236b6ff7672439046c68a7d75dffcba84cacf7f869a9a2399cc1d1891166ab20d8e0a255b8192fe8b41879d192cbfc40d
-MISC metadata.xml 477 BLAKE2B 6896f6c0f343e42023ff6407af65206c0ac67f9fd43bb9aca941d4c28dc73c0cf851fb7372a41be42d1b713bf76be5b6278dc86f87ef3880d6b6edcffb6bdd59 SHA512 488e332a15ad9874eefca93ae7daac470506786c51f82ef73abdd5535d92ec7040aaae9ea62050cca5ee8cb23e2d237293ecf3b0829ba7764f3b6a17c239b680
diff --git a/dev-haskell/control-monad-loop/control-monad-loop-0.1.ebuild b/dev-haskell/control-monad-loop/control-monad-loop-0.1.ebuild
deleted file mode 100644
index 69e60968160e..000000000000
--- a/dev-haskell/control-monad-loop/control-monad-loop-0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple monad transformer for imperative-style loops"
-HOMEPAGE="https://github.com/joeyadams/haskell-control-monad-loop"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/transformers:=[profile?]
-		dev-haskell/transformers-base:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/control-monad-loop/metadata.xml b/dev-haskell/control-monad-loop/metadata.xml
deleted file mode 100644
index ad72d40303ea..000000000000
--- a/dev-haskell/control-monad-loop/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A library of looping constructs with @continue@ and @exit@ control flow
-		statements.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">joeyadams/haskell-control-monad-loop</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/convertible-1.0.11.1 b/dev-haskell/convertible-1.0.11.1
new file mode 100644
index 000000000000..7125a7570a66
--- /dev/null
+++ b/dev-haskell/convertible-1.0.11.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl[profile?] >=dev-haskell/text-0.7[profile?] >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.2 test? ( dev-haskell/hunit dev-haskell/quickcheck:2 dev-haskell/testpack ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Typeclasses and instances for converting between types
+EAPI=4
+HOMEPAGE=http://hackage.haskell.org/cgi-bin/hackage-scripts/package/convertible
+IUSE=test doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl[profile?] >=dev-haskell/text-0.7[profile?] >=dev-lang/ghc-6.8.2
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/convertible/1.0.11.1/convertible-1.0.11.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a9dfa3a70b04b65eeb45386ec77b9b3e
diff --git a/dev-haskell/convertible-1.1.1.0 b/dev-haskell/convertible-1.1.1.0
new file mode 100644
index 000000000000..45207b5431f3
--- /dev/null
+++ b/dev-haskell/convertible-1.1.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/text-0.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Typeclasses and instances for converting between types
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/convertible
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/text-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.1.1.0
+SRC_URI=mirror://hackage/packages/archive/convertible/1.1.1.0/convertible-1.1.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=01fdedc0a7bef2f34f08537c2cba3e73
diff --git a/dev-haskell/convertible/Manifest b/dev-haskell/convertible/Manifest
deleted file mode 100644
index 467287e4ad5e..000000000000
--- a/dev-haskell/convertible/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST convertible-1.0.11.1.tar.gz 14478 BLAKE2B 43b5bb35572870af30f7163834d5fba5680202f55995723b3540aa3b3b7b91d74f0762c982eca81dc4424b8db3a8d9ef053c6a3c5bd25b2e6b60287cb7b2fc59 SHA512 50082727409c450657bef534af94e8a58e8a3f97fa59d8f24f34d5b72e8335a41c3678036eafd8831f4748c6f1158cef96950d24c53e8402a4b9a7778640a9b1
-DIST convertible-1.1.1.0.tar.gz 14354 BLAKE2B 8d60f3ed29732dddf68d9b0221aae12300533c79d2d2763fe09af143296bfda93bc1781b7d21034b4747b5bc18894db033ce16a7c4a3967f8c7c4f4429cb1f52 SHA512 cd36107b686c56a5d374efbb9be4fa8a0ec3504f0cd807870d34f279707b36721ce5639e22939d11d1795354e453fabe4f1b6130b06ec20ad597287f62959dba
-EBUILD convertible-1.0.11.1.ebuild 1127 BLAKE2B 061d0a418c165592480cfc0fabdaaca9060f356e221c67af1b56a1df22a646c47ef91e30b07f9993d9a24a7eeb51663ecf58f7089b915df98fdd3c81781c737d SHA512 1004ec9c652b8fa91c05b21a09cd3e458ffa0dea7f69faf53882502bbd7d92ced0aba02cabf4033bfdc7065dbc9296917bf5930c1a8cd14a46a415ab4826b802
-EBUILD convertible-1.1.1.0.ebuild 819 BLAKE2B d56855ac6d6ca73d93a70074178cad93230b6ddefa22742771952b9b6b331623212e7e5b0e140abfffc0b95386da2ed66ca6d22c74f2d705a29011852a7fa3d7 SHA512 f8e92a8c682144fb8670ef721161a5928c5d8c29dc8e54dfacc382557dc0ed3c1c12f37b8acce2260819bf2c877b2b2e4854b00f44aa35e519b6398c3d2120f6
-MISC metadata.xml 633 BLAKE2B bcb4b69551be8d969d69408fd592561d9dccfdf3ab70d9aaf1ab1633c82971385dc4f7f04cf7e2f011a2de1697b7ee3e09e333f4b925328904c80c473b5632e4 SHA512 257966cf9d8c81c8d4961c285c2b739a5998731714e8e9b585797015ec076d08eaf4e40aa2ea8fea34c23e6c173d72224857a0c569af8e5536d3b2401cff2db3
diff --git a/dev-haskell/convertible/convertible-1.0.11.1.ebuild b/dev-haskell/convertible/convertible-1.0.11.1.ebuild
deleted file mode 100644
index e5adf73bde49..000000000000
--- a/dev-haskell/convertible/convertible-1.0.11.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.17.9999
-
-EAPI=4
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Typeclasses and instances for converting between types"
-HOMEPAGE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/convertible"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-haskell/mtl[profile?]
-		>=dev-haskell/text-0.7[profile?]
-		>=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2
-		test? ( dev-haskell/hunit
-			dev-haskell/quickcheck:2
-			dev-haskell/testpack
-		)
-	"
-
-src_configure() {
-	cabal_src_configure $(cabal_flag test buildtests)
-}
-
-src_test() {
-	# default tests
-	haskell-cabal_src_test || die "cabal test failed"
-
-	# built custom tests
-	"${S}/dist/build/runtests/runtests" || die "unit tests failed"
-}
-
-src_install() {
-	cabal_src_install
-
-	# if tests were enabled, make sure the unit test driver is deleted
-	rm -f "${ED}/usr/bin/runtests"
-}
diff --git a/dev-haskell/convertible/convertible-1.1.1.0.ebuild b/dev-haskell/convertible/convertible-1.1.1.0.ebuild
deleted file mode 100644
index c525e53d3b08..000000000000
--- a/dev-haskell/convertible/convertible-1.1.1.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -buildtests
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Typeclasses and instances for converting between types"
-HOMEPAGE="http://hackage.haskell.org/package/convertible"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-buildtests
-}
diff --git a/dev-haskell/convertible/metadata.xml b/dev-haskell/convertible/metadata.xml
deleted file mode 100644
index 3c57bb78ce53..000000000000
--- a/dev-haskell/convertible/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Convertible provides a typeclass with a single function
-		that is designed to help convert between different types: numeric
-		values, dates and times, and the like. The conversions perform bounds
-		checking and return a pure 'Either' value. This means that you need
-		not remember which specific function performs the conversion you
-		desire.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/cookie-0.4.2 b/dev-haskell/cookie-0.4.2
new file mode 100644
index 000000000000..bc1d54007ef7
--- /dev/null
+++ b/dev-haskell/cookie-0.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2.1:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/old-locale-1:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HTTP cookie parsing and rendering
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/cookie
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-builder-0.2.1:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/old-locale-1:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.2
+SRC_URI=mirror://hackage/packages/archive/cookie/0.4.2/cookie-0.4.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3aee71d3f0b257aaf1dea36f29ce44a8
diff --git a/dev-haskell/cookie-0.4.2.1 b/dev-haskell/cookie-0.4.2.1
new file mode 100644
index 000000000000..aa8a61c105ec
--- /dev/null
+++ b/dev-haskell/cookie-0.4.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2.1:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/old-locale-1:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HTTP cookie parsing and rendering
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/cookie
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/blaze-builder-0.2.1:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/old-locale-1:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.2.1
+SRC_URI=mirror://hackage/packages/archive/cookie/0.4.2.1/cookie-0.4.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=23963bd01b55bfd734aa07a7798ebb36
diff --git a/dev-haskell/cookie/Manifest b/dev-haskell/cookie/Manifest
deleted file mode 100644
index ae3db7347179..000000000000
--- a/dev-haskell/cookie/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST cookie-0.4.2.1.tar.gz 5774 BLAKE2B a3c7b156f27fdeec2d19a73c61c0a0c502160446bf4be9959e8d461bfb1a9bc46dfd1c81cb9ca831c1f6bb25b089cc13bfc0fe6934fd9e6a1945790c15bbd92f SHA512 32d712b121e2cf9a9bf913d546769fa8fd8dbd6c77b7bd15fb334b8fda22e498e793ceaef6dc142f2f69813f91d555261cd624d5af6b90f5cd8072967a2eddc2
-DIST cookie-0.4.2.tar.gz 5849 BLAKE2B db5ddb7f57af343c84fda3efca955235db3e379ffdc2d52df73211a2b506f7559e5fe3402ddbb875fc68e0993afcf14b87ca9e9b9ac51e46318ead6f567ea6c1 SHA512 fb220c6d58ca36385d5f21025f821d634944ba05e4b60b962b9b10f50db22f34425fa663590c8d95d80cf3598456982ac0da55e63a487847967498b7d85667c1
-EBUILD cookie-0.4.2.1.ebuild 846 BLAKE2B 302619f4989b43e1abddc4234e425651d3d33308c5b47d1545325cae99b30f274c2c3e1bb2198115d63072ccfd5db21f9f4b7e740ee5a75d65f829e05cfa31e5 SHA512 f9d42bf07f93a1156f7227b4f86e4531f537ac93810e55e2ce572144b81d5dc6af42b62e573764422bcd5c2cf1554a2b9467e269043436bda48abb4ca009248b
-EBUILD cookie-0.4.2.ebuild 846 BLAKE2B cc3b49be92177571cfb30e500d9ebf6cbe58db2360623365eaa8a6755b521a26ba001205bae96877a0283ba07794ae1512f777b0d2e28aba5062a15a85c195bd SHA512 4287dc615e83afb874c6df830b428dc14f6634c88b6858992aca69fc047f9b2d40187dc82bd7928e0e077888fc2e3358211a384ad1fea00c59edb26d1e042e82
-MISC metadata.xml 404 BLAKE2B 486feca0dd4def1819e86debbe66867edcb76240a7402687fcaa55d68f37fb30d23b954fc48f9b6c780d2f1603fbc57aadb113812ab2fb356b6c0bdaef06b277 SHA512 ea8b9fd38fd063c656e385e73db44db2e8b7e00f073ac9e692ff9fd5d0a8dd1eb1e1ed77f64f502d14cec43f00d1114758b51f3c551a9708a89624217099db09
diff --git a/dev-haskell/cookie/cookie-0.4.2.1.ebuild b/dev-haskell/cookie/cookie-0.4.2.1.ebuild
deleted file mode 100644
index fb41b00202fe..000000000000
--- a/dev-haskell/cookie/cookie-0.4.2.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP cookie parsing and rendering"
-HOMEPAGE="https://github.com/snoyberg/cookie"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/cookie/cookie-0.4.2.ebuild b/dev-haskell/cookie/cookie-0.4.2.ebuild
deleted file mode 100644
index c1e9dd7a5291..000000000000
--- a/dev-haskell/cookie/cookie-0.4.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP cookie parsing and rendering"
-HOMEPAGE="https://github.com/snoyberg/cookie"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/cookie/metadata.xml b/dev-haskell/cookie/metadata.xml
deleted file mode 100644
index 4dd0bf8f601d..000000000000
--- a/dev-haskell/cookie/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		HTTP cookie parsing and rendering
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/cookie</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cpphs-1.15 b/dev-haskell/cpphs-1.15
new file mode 100644
index 000000000000..b8cc9667bbcf
--- /dev/null
+++ b/dev-haskell/cpphs-1.15
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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 liberalised re-implementation of cpp, the C pre-processor
+EAPI=5
+HOMEPAGE=http://haskell.org/cpphs/
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/1.15
+SRC_URI=mirror://hackage/packages/archive/cpphs/1.15/cpphs-1.15.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=99bd51e2f7eee76294eab3424074312f
diff --git a/dev-haskell/cpphs-1.16 b/dev-haskell/cpphs-1.16
new file mode 100644
index 000000000000..441d668eabe6
--- /dev/null
+++ b/dev-haskell/cpphs-1.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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 liberalised re-implementation of cpp, the C pre-processor
+EAPI=5
+HOMEPAGE=http://haskell.org/cpphs/
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/1.16
+SRC_URI=mirror://hackage/packages/archive/cpphs/1.16/cpphs-1.16.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3547475f16e2ba8341842b24f3a8068a
diff --git a/dev-haskell/cpphs-1.17.1 b/dev-haskell/cpphs-1.17.1
new file mode 100644
index 000000000000..c4287ce579b9
--- /dev/null
+++ b/dev-haskell/cpphs-1.17.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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 liberalised re-implementation of cpp, the C pre-processor
+EAPI=5
+HOMEPAGE=http://haskell.org/cpphs/
+IUSE=doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/1.17.1
+SRC_URI=mirror://hackage/packages/archive/cpphs/1.17.1/cpphs-1.17.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c53250ec619a6c6ac80abf334fcdf66c
diff --git a/dev-haskell/cpphs-1.18.8 b/dev-haskell/cpphs-1.18.8
new file mode 100644
index 000000000000..57301ee4838d
--- /dev/null
+++ b/dev-haskell/cpphs-1.18.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/polyparse-1.9:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A liberalised re-implementation of cpp, the C pre-processor
+EAPI=5
+HOMEPAGE=http://projects.haskell.org/cpphs/
+IUSE=doc hscolour profile
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/polyparse-1.9:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.18.8
+SRC_URI=mirror://hackage/packages/archive/cpphs/1.18.8/cpphs-1.18.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=04f302a051480b66dfc34f38bb588b6e
diff --git a/dev-haskell/cpphs-1.19.3 b/dev-haskell/cpphs-1.19.3
new file mode 100644
index 000000000000..b4aa4e359a9b
--- /dev/null
+++ b/dev-haskell/cpphs-1.19.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/polyparse-1.9:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A liberalised re-implementation of cpp, the C pre-processor
+EAPI=5
+HOMEPAGE=http://projects.haskell.org/cpphs/
+IUSE=doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/polyparse-1.9:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.19.3
+SRC_URI=mirror://hackage/packages/archive/cpphs/1.19.3/cpphs-1.19.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=70438658481c2d4e2e3747683dc68e2e
diff --git a/dev-haskell/cpphs-1.20.2 b/dev-haskell/cpphs-1.20.2
new file mode 100644
index 000000000000..35e6b3d2ea13
--- /dev/null
+++ b/dev-haskell/cpphs-1.20.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/polyparse-1.9:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A liberalised re-implementation of cpp, the C pre-processor
+EAPI=6
+HOMEPAGE=http://projects.haskell.org/cpphs/
+IUSE=doc hscolour profile
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/polyparse-1.9:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.20.2
+SRC_URI=mirror://hackage/packages/archive/cpphs/1.20.2/cpphs-1.20.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cd889c9d9f40d89a414e96dcf1bb58c9
diff --git a/dev-haskell/cpphs/Manifest b/dev-haskell/cpphs/Manifest
deleted file mode 100644
index 7de7652a0549..000000000000
--- a/dev-haskell/cpphs/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-DIST cpphs-1.15.tar.gz 71444 BLAKE2B 77af7bfc036b5410cf3c977ba3b980d792ee9061deb3d4c73a61c54a442562af38ac7e0175d3dfe02d99d5bc51e1b93de9a2e4076e101fc071e53c3824fa07ff SHA512 5845a52924c60d81910c12b09c141d31e4f9ec01c6af8e1f92007d80fd83344334b7f4afc27d6f46a0dcfa2fe51f048afdc05e93f7f5d7feed80f95bb63932ac
-DIST cpphs-1.16.tar.gz 71105 BLAKE2B 8b1a1db2a4b69f4278d7ce2d1f50631c7af6076e9ba87f11194061faee4e4088606d3015becc676e481edc4654cf9364e560d9b5fc6108070717b89fee0dba74 SHA512 f643bde885b4f30873a8c19d23d8910ffea5a0c98ad08c3940a6e66c26a30612d881d61491133b3799773147684ff8ee3ee06a5d004e36aa644a06ff805e370a
-DIST cpphs-1.17.1.tar.gz 72200 BLAKE2B 4c88456ae4b35954e3615437e8959e9a4ce1c6b437845fc20792258124c85a9fc568ec413ed57f91767c318c2514a79409c3101030c93ca30a8daabd1b743a4b SHA512 1db359ba98ed9d6f75c2c35e7bb3f554329b76d7708e9ddf71892b2505d18c7334b30ad3734941d72a832bb7f661f9d346297e8f56980c01564a4f6a4a9cc5dd
-DIST cpphs-1.18.8.tar.gz 43861 BLAKE2B c9c2b994d22eb69ecc650bb2e4516f1e57615cfa270141e5899c62eb2ff7d0fd99f2061ad4be05c123e19d5227ec93416681fb82e495e6515afb2a4524effd8f SHA512 ed6041e6e5c358656685d5a62f5e2cf78a8d714feb6844cfcbd6c852543e02410f78e3ed60f23ef52aaccd999a83b27d3d83950724c07c1441e0648ae31a622a
-DIST cpphs-1.19.3.tar.gz 44306 BLAKE2B 01533340416dc2a36e8fcbf3831d1291478676966c059edce7d92100cc6e10c95c5c3803da88b71e06c15a5197cb550ef532b3bd7dce4ab7a3c7120c72fb53b4 SHA512 30e647b55a7cd86a21ba2346adc2f932c2557e52e59437f523e3300b285c0de51fca43aa29ce9306bc5e3919ed02a51e72056531c33dc52efc1a320ea84746b7
-DIST cpphs-1.20.2.tar.gz 44732 BLAKE2B 948603fdfd80937ea7ea032c15a2f0bc0a2d1b553215b0fa72eb84d71917a29abd3251f667b2dcbe4395c554f35bea13488ba99dc3263fe2d6459727c0efaa20 SHA512 0315684ff884f805d281ab2538558d59614e68de47db2e2b02cea05f0b913a20259cff6e2823b88910a3eb1993b25a26e5cc8d3b902b602d14f35bb54c49f5b6
-EBUILD cpphs-1.15.ebuild 590 BLAKE2B 79bb2b88200f4a93a094a5ad15f21a3fea176c6bea35e381674636005db1fff336deea06609b0a70401409debe3328edcd91359648ece66aaf824a80541b50b0 SHA512 85640fdff9b5525e1e2417b8550583c6a05f4cab351432ee520f6b2e465db29fbe92098358126d2cb28930c52f9f7195cdf9ab03ddf0c2dcbbc62f011cd61a2f
-EBUILD cpphs-1.16.ebuild 590 BLAKE2B a6f80a554819e1a4907031cd56b69cf3f2e26430f48eb62efb452509f784eb7b405320f5528454c9e4c759593b5b58c67a5536cba3650e273001b665036f254c SHA512 83870bd28b4269bde0318cccfe7abc0676d014bed83bb4a16c9cce332589f7041d948c332f51e775014f292be70eb9d0520284784c364e26e5fd80f5e034b6c7
-EBUILD cpphs-1.17.1.ebuild 595 BLAKE2B 5300154bb73e8ea629dc0a648e2ea85c6e26112469c5bbc9e731a016aaf094e1503d0fba13b42db12169d2783347511c495c0fa9d3bd8724e447068ec1fddfa5 SHA512 20e21b2862e04467eff9d222e834c96fa6aea95553949d7401529720b8438cf782e91704ea084f980dad5483b9b59841e9d94c7cf3a9f5dfdab71b33c03c6a50
-EBUILD cpphs-1.18.8.ebuild 642 BLAKE2B d41e4d1dd3ec030a873d56b3ec5ed07813817f070111461b70916de8a4bdf772aad4a69b6dec2e1424773fcaad6180065007be19d3d818aa1b845fdc4b353a0c SHA512 bd7fb00780ae0b99d976f488319eea6e67acecd0884d1ca6afb2b9071d83dac95ef67ccfe444bf717f25773c634ba8e94b9ff533ed62ceee581d61e802ac4e04
-EBUILD cpphs-1.19.3.ebuild 906 BLAKE2B 2550656561116e945c3e1d446de7200412864c2fc7269d03757a6a20cc4132833b9be3114c12de04757b27952fe994b0515346867f070e56550f58bfdc3c1b82 SHA512 652d4ecbd2f22aab32aea7f1770040cf4c339dd768ebcdc6dda1c5f281ba00919bcbdafaac3eccda9830eef75f1bd2873ea93702ccbbce3744dd588c24020388
-EBUILD cpphs-1.20.2.ebuild 715 BLAKE2B 4f24be70198a8ec6b2f124bd9a086893c1120573645945e0a58a162557275e461266a9e0df3763c46bd53d057298f2d17d2aaac382dd38ee4292fdfbe69cbaec SHA512 363f66e65b3a18c055faa726e3ee00b465d11b9d20a1eb27aab81695a0e4753f17a66f5d6ec6d7c335a398f8711023d79d604fd75531ee4da021e6930832df93
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/cpphs/cpphs-1.15.ebuild b/dev-haskell/cpphs/cpphs-1.15.ebuild
deleted file mode 100644
index d8893e46ff5f..000000000000
--- a/dev-haskell/cpphs/cpphs-1.15.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A liberalised re-implementation of cpp, the C pre-processor"
-HOMEPAGE="http://haskell.org/cpphs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/cpphs/cpphs-1.16.ebuild b/dev-haskell/cpphs/cpphs-1.16.ebuild
deleted file mode 100644
index 6cc2ddaf2660..000000000000
--- a/dev-haskell/cpphs/cpphs-1.16.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A liberalised re-implementation of cpp, the C pre-processor"
-HOMEPAGE="http://haskell.org/cpphs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/cpphs/cpphs-1.17.1.ebuild b/dev-haskell/cpphs/cpphs-1.17.1.ebuild
deleted file mode 100644
index 0792faab3476..000000000000
--- a/dev-haskell/cpphs/cpphs-1.17.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A liberalised re-implementation of cpp, the C pre-processor"
-HOMEPAGE="http://haskell.org/cpphs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/cpphs/cpphs-1.18.8.ebuild b/dev-haskell/cpphs/cpphs-1.18.8.ebuild
deleted file mode 100644
index 19eecc250076..000000000000
--- a/dev-haskell/cpphs/cpphs-1.18.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A liberalised re-implementation of cpp, the C pre-processor"
-HOMEPAGE="http://projects.haskell.org/cpphs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/polyparse-1.9:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/cpphs/cpphs-1.19.3.ebuild b/dev-haskell/cpphs/cpphs-1.19.3.ebuild
deleted file mode 100644
index 976adca5b8ae..000000000000
--- a/dev-haskell/cpphs/cpphs-1.19.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A liberalised re-implementation of cpp, the C pre-processor"
-HOMEPAGE="http://projects.haskell.org/cpphs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="dev-haskell/old-locale:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/polyparse-1.9:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	# https://ghc.haskell.org/trac/ghc/ticket/10667
-	[[ $(ghc-version) == 7.10.1.20150630 ]] && replace-hcflags -g ''
-	[[ $(ghc-version) == 7.10.2 ]] && replace-hcflags -g ''
-}
diff --git a/dev-haskell/cpphs/cpphs-1.20.2.ebuild b/dev-haskell/cpphs/cpphs-1.20.2.ebuild
deleted file mode 100644
index 45814b970290..000000000000
--- a/dev-haskell/cpphs/cpphs-1.20.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A liberalised re-implementation of cpp, the C pre-processor"
-HOMEPAGE="http://projects.haskell.org/cpphs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/old-locale:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/polyparse-1.9:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/cpphs/metadata.xml b/dev-haskell/cpphs/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/cpphs/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/cprng-aes-0.5.2 b/dev-haskell/cprng-aes-0.5.2
new file mode 100644
index 000000000000..4c0f7a2f8f6c
--- /dev/null
+++ b/dev-haskell/cprng-aes-0.5.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/cipher-aes-0.2:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?] >=dev-haskell/crypto-random-0.0.7:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Crypto Pseudo Random Number Generator using AES in counter mode
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-cprng-aes
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/cipher-aes-0.2:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?] >=dev-haskell/crypto-random-0.0.7:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.5.2
+SRC_URI=mirror://hackage/packages/archive/cprng-aes/0.5.2/cprng-aes-0.5.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=246c4018de7cff1541a480dfab3ca021
diff --git a/dev-haskell/cprng-aes-0.6.1 b/dev-haskell/cprng-aes-0.6.1
new file mode 100644
index 000000000000..11fdd620aacd
--- /dev/null
+++ b/dev-haskell/cprng-aes-0.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/cipher-aes-0.2.9:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?] >=dev-haskell/crypto-random-0.0.7:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Crypto Pseudo Random Number Generator using AES in counter mode
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-cprng-aes
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/cipher-aes-0.2.9:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?] >=dev-haskell/crypto-random-0.0.7:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.6.1
+SRC_URI=mirror://hackage/packages/archive/cprng-aes/0.6.1/cprng-aes-0.6.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c442aa23f6f563ecb0b76acd5ea1fc26
diff --git a/dev-haskell/cprng-aes/Manifest b/dev-haskell/cprng-aes/Manifest
deleted file mode 100644
index 475bb4c11b32..000000000000
--- a/dev-haskell/cprng-aes/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST cprng-aes-0.5.2.tar.gz 4903 BLAKE2B 963963df710e929872874cc5c85a19361629f0e3c22867ce93d9e057b193380ae9aa529d2fea36c94087386a001cee0f1d5d29aad0254a2d652a7de982db0193 SHA512 bcc658c5ecac7b856ae128938c467cc4762089128a49716d8b16de1649a15206a12d6b624e82ec1564fca46df9b03ee4d277a2c641af787a1f758a11262bbcca
-DIST cprng-aes-0.6.1.tar.gz 4396 BLAKE2B 813773cb6185974e6c3250ce744abbe4ea5dbfa4725320736563fdea6446f246b704e2825e2f8612d35dddb01424cea93ad24a05764713d09d25cfe5afcaeaa7 SHA512 839a3a449edf996b0061a989058ed59625d8a849e852217c047b9d9b59b58504c0efaca699f75beea3ebcad8284f55c1f53b523dbebb10f56e705506bfccb5f5
-EBUILD cprng-aes-0.5.2.ebuild 813 BLAKE2B 21e0ee0793c8a4999e5d071d1a913905868748a86aef7d8538ced19aaefa479fb1a3fa838d29c2be97cd14c4b4d43c85f1e259908fc47ae930fcbf94fc183153 SHA512 793db48f91939d1101dc5fefd7c3891358b7ae5aa50a0e36db2eca42ac0d13a4767bb1571d6bf7092997a5655c3d2938ae1f03dfc32ec89b218d2841fae712b0
-EBUILD cprng-aes-0.6.1.ebuild 784 BLAKE2B e64694f7188cf142c0e12b875910834341429f254964ee1ac74c3eb71836e73eb787de47a0debd7d72b33cfcab25be8e171fb6d12e2059f1af546046c031d202 SHA512 5f3c4ca17d41d9b4255490febb285e957883fcd0ce62cfe2de9856f6cf248a47b25093cb901b13a83ae21ef74ffd7ae010be1303cd71e24df9ef3f05ea42dbe6
-MISC metadata.xml 1186 BLAKE2B c757cbbda20b5af9af4347e0a462794803ae126274665b7078904dde092392ac1a1e1a00092139e4cc4a745efdfcb08c87469fe2b497e2e886aade12686d867a SHA512 e757226e7a8887b9540382fa998e22f9818c2f39f1d01e36772fae79821da9883ecc8d7914484b6110006ea2f0b3ee97b6e59d528b211b153c983ccd4094a4b7
diff --git a/dev-haskell/cprng-aes/cprng-aes-0.5.2.ebuild b/dev-haskell/cprng-aes/cprng-aes-0.5.2.ebuild
deleted file mode 100644
index 7905bc609564..000000000000
--- a/dev-haskell/cprng-aes/cprng-aes-0.5.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Crypto Pseudo Random Number Generator using AES in counter mode"
-HOMEPAGE="https://github.com/vincenthz/hs-cprng-aes"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-haskell/cipher-aes-0.2:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?]
-	>=dev-haskell/crypto-random-0.0.7:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild b/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild
deleted file mode 100644
index 4fe72e8134fd..000000000000
--- a/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Crypto Pseudo Random Number Generator using AES in counter mode"
-HOMEPAGE="https://github.com/vincenthz/hs-cprng-aes"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-haskell/cipher-aes-0.2.9:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?]
-	>=dev-haskell/crypto-random-0.0.7:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/cprng-aes/metadata.xml b/dev-haskell/cprng-aes/metadata.xml
deleted file mode 100644
index 9a0185abd6dc..000000000000
--- a/dev-haskell/cprng-aes/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Simple crypto pseudo-random-number-generator with really good randomness property.
-		
-		Using ent, a randomness property maker on one 1Mb sample:
-		Entropy = 7.999837 bits per byte.
-		Optimum compression would reduce the size of this 1048576 byte file by 0 percent.
-		Chi square distribution for 1048576 samples is 237.02
-		Arithmetic mean value of data bytes is 127.3422 (127.5 = random)
-		Monte Carlo value for Pi is 3.143589568 (error 0.06 percent)
-		
-		Compared to urandom with the same sampling:
-		Entropy = 7.999831 bits per byte.
-		Optimum compression would reduce the size of this 1048576 byte file by 0 percent.
-		Chi square distribution for 1048576 samples is 246.63
-		Arithmetic mean value of data bytes is 127.6347 (127.5 = random).
-		Monte Carlo value for Pi is 3.132465868 (error 0.29 percent).
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-cprng-aes</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cpu-0.1.2 b/dev-haskell/cpu-0.1.2
new file mode 100644
index 000000000000..eaa2ddc8ad72
--- /dev/null
+++ b/dev-haskell/cpu-0.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Cpu information and properties helpers
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-cpu
+IUSE=executable doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.1.2
+SRC_URI=mirror://hackage/packages/archive/cpu/0.1.2/cpu-0.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3b5b9b4c3e9efa10949fb8ae6049def6
diff --git a/dev-haskell/cpu/Manifest b/dev-haskell/cpu/Manifest
deleted file mode 100644
index 72770f0c3aa5..000000000000
--- a/dev-haskell/cpu/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cpu-0.1.2.tar.gz 4317 BLAKE2B 17d34e81432a2487e74ff0297b8126c815d0034809290d28557bcbb5180b161fc474703de29f4bbd1fcf18887a291bbd2608f362752028f910a9c61d51847517 SHA512 2dab5b956619cad1a6a99f16a6156d5f2539ef4882204e3cb1ec3e86bc00cd4d948e3a5eba4948fd0cc37dd98a27eeebc77957f87af6e51f86a65a84db1d25d3
-EBUILD cpu-0.1.2.ebuild 650 BLAKE2B 7b5c7722c2db565af401cec6a0a65815c16b290d921fc3416e597bde755361fdef5396df87eed57a0b0e8712cb54783ab913f6c097a8ad7b712bb70060d140c9 SHA512 0814f811f8b35aa01427f1de2be3b434b77531f34ea34d8f1262472386b59576e810978c036e64a8087e68130910d886d6e63dab647e47bf9969978d2ea64d73
-MISC metadata.xml 539 BLAKE2B c0caba5ac36639130cb46c870bf8432d4197b6002474aea9126fde612d914639814f4b745a3d9272c8440db88fd983bcc26cc8bf8dae2d897efd790e8e56aaf5 SHA512 e1484d14f8c8e582a758f9ca8902dc1f9716b6fc37787b869c53f795050b894d4722fd4a87e8ad0d3100326334930fc04afd35d114ed033909eadcee1e10d7fa
diff --git a/dev-haskell/cpu/cpu-0.1.2.ebuild b/dev-haskell/cpu/cpu-0.1.2.ebuild
deleted file mode 100644
index 63f0d4ef86ae..000000000000
--- a/dev-haskell/cpu/cpu-0.1.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Cpu information and properties helpers"
-HOMEPAGE="https://github.com/vincenthz/hs-cpu"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable"
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable)
-}
diff --git a/dev-haskell/cpu/metadata.xml b/dev-haskell/cpu/metadata.xml
deleted file mode 100644
index aa5b10119e39..000000000000
--- a/dev-haskell/cpu/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="executable">build 'cpuid' tool</flag>
-	</use>
-	<longdescription>
-		Lowlevel cpu routines to get basic properties of the cpu platform, like endianness and architecture.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-cpu</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/criterion-0.8.1.0 b/dev-haskell/criterion-0.8.1.0
new file mode 100644
index 000000000000..b862fd464b41
--- /dev/null
+++ b/dev-haskell/criterion-0.8.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.3.2.12:=[profile?] >=dev-haskell/binary-0.6.3.0:=[profile?] >=dev-haskell/glob-0.7.2:=[profile?] >=dev-haskell/hastache-0.6.0:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/mwc-random-0.8.0.3:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] >=dev-haskell/statistics-0.11:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Robust, reliable performance measurement and analysis
+EAPI=5
+HOMEPAGE=https://github.com/bos/criterion
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.3.2.12:=[profile?] >=dev-haskell/binary-0.6.3.0:=[profile?] >=dev-haskell/glob-0.7.2:=[profile?] >=dev-haskell/hastache-0.6.0:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/mwc-random-0.8.0.3:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] >=dev-haskell/statistics-0.11:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.8.1.0
+SRC_URI=mirror://hackage/packages/archive/criterion/0.8.1.0/criterion-0.8.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ac1c10da31316a8ebc306c832a0aafba
diff --git a/dev-haskell/criterion-1.0.2.0 b/dev-haskell/criterion-1.0.2.0
new file mode 100644
index 000000000000..1f837a16c585
--- /dev/null
+++ b/dev-haskell/criterion-1.0.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.8:=[profile?] dev-haskell/ansi-wl-pprint:=[profile?] >=dev-haskell/binary-0.5.1.0:=[profile?] >=dev-haskell/cassava-0.3.0.0:=[profile?] dev-haskell/either:=[profile?] >=dev-haskell/glob-0.7.2:=[profile?] >=dev-haskell/hastache-0.6.0:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/mwc-random-0.8.0.3:=[profile?] >=dev-haskell/optparse-applicative-0.11:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] >=dev-haskell/statistics-0.13.2.1:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.4 dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Robust, reliable performance measurement and analysis
+EAPI=5
+HOMEPAGE=http://www.serpentine.com/criterion
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.8:=[profile?] dev-haskell/ansi-wl-pprint:=[profile?] >=dev-haskell/binary-0.5.1.0:=[profile?] >=dev-haskell/cassava-0.3.0.0:=[profile?] dev-haskell/either:=[profile?] >=dev-haskell/glob-0.7.2:=[profile?] >=dev-haskell/hastache-0.6.0:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/mwc-random-0.8.0.3:=[profile?] >=dev-haskell/optparse-applicative-0.11:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] >=dev-haskell/statistics-0.13.2.1:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.2.0
+SRC_URI=mirror://hackage/packages/archive/criterion/1.0.2.0/criterion-1.0.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9bd7f7c74f895f3b9e80a7128e5a30ee
diff --git a/dev-haskell/criterion-1.1.0.0 b/dev-haskell/criterion-1.1.0.0
new file mode 100644
index 000000000000..2db7710d9865
--- /dev/null
+++ b/dev-haskell/criterion-1.1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?] >=dev-haskell/binary-0.5.1.0:=[profile?] >=dev-haskell/cassava-0.3.0.0:=[profile?] >=dev-haskell/glob-0.7.2:=[profile?] >=dev-haskell/hastache-0.6.0:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/mwc-random-0.8.0.3:=[profile?] >=dev-haskell/optparse-applicative-0.11:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] >=dev-haskell/statistics-0.13.2.1:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.4 dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Robust, reliable performance measurement and analysis
+EAPI=5
+HOMEPAGE=http://www.serpentine.com/criterion
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?] >=dev-haskell/binary-0.5.1.0:=[profile?] >=dev-haskell/cassava-0.3.0.0:=[profile?] >=dev-haskell/glob-0.7.2:=[profile?] >=dev-haskell/hastache-0.6.0:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/mwc-random-0.8.0.3:=[profile?] >=dev-haskell/optparse-applicative-0.11:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] >=dev-haskell/statistics-0.13.2.1:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.0.0
+SRC_URI=mirror://hackage/packages/archive/criterion/1.1.0.0/criterion-1.1.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d7f0bcd72c899783159c93a71ca310df
diff --git a/dev-haskell/criterion-1.1.1.0 b/dev-haskell/criterion-1.1.1.0
new file mode 100644
index 000000000000..baad5bc934db
--- /dev/null
+++ b/dev-haskell/criterion-1.1.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?] >=dev-haskell/binary-0.5.1.0:=[profile?] >=dev-haskell/cassava-0.3.0.0:=[profile?] >=dev-haskell/glob-0.7.2:=[profile?] >=dev-haskell/hastache-0.6.0:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/mwc-random-0.8.0.3:=[profile?] >=dev-haskell/optparse-applicative-0.11:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] >=dev-haskell/statistics-0.13.2.1:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.4 dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Robust, reliable performance measurement and analysis
+EAPI=5
+HOMEPAGE=http://www.serpentine.com/criterion
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?] >=dev-haskell/binary-0.5.1.0:=[profile?] >=dev-haskell/cassava-0.3.0.0:=[profile?] >=dev-haskell/glob-0.7.2:=[profile?] >=dev-haskell/hastache-0.6.0:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/mwc-random-0.8.0.3:=[profile?] >=dev-haskell/optparse-applicative-0.11:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] >=dev-haskell/statistics-0.13.2.1:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.1.0
+SRC_URI=mirror://hackage/packages/archive/criterion/1.1.1.0/criterion-1.1.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=38d37e5b9691391d74201d2087edff5b
diff --git a/dev-haskell/criterion-1.1.4.0 b/dev-haskell/criterion-1.1.4.0
new file mode 100644
index 000000000000..4e6a228b1267
--- /dev/null
+++ b/dev-haskell/criterion-1.1.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?] >=dev-haskell/cassava-0.3.0.0:=[profile?] dev-haskell/code-page:=[profile?] >=dev-haskell/glob-0.7.2:=[profile?] >=dev-haskell/hastache-0.6.0:=[profile?] dev-haskell/js-flot:=[profile?] dev-haskell/js-jquery:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/mwc-random-0.8.0.3:=[profile?] >=dev-haskell/optparse-applicative-0.13:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] >=dev-haskell/statistics-0.13.2.1:=[profile?] <dev-haskell/statistics-0.14:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2.4 dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Robust, reliable performance measurement and analysis
+EAPI=6
+HOMEPAGE=http://www.serpentine.com/criterion
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?] >=dev-haskell/cassava-0.3.0.0:=[profile?] dev-haskell/code-page:=[profile?] >=dev-haskell/glob-0.7.2:=[profile?] >=dev-haskell/hastache-0.6.0:=[profile?] dev-haskell/js-flot:=[profile?] dev-haskell/js-jquery:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/mwc-random-0.8.0.3:=[profile?] >=dev-haskell/optparse-applicative-0.13:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] >=dev-haskell/statistics-0.13.2.1:=[profile?] <dev-haskell/statistics-0.14:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.1.4.0
+SRC_URI=mirror://hackage/packages/archive/criterion/1.1.4.0/criterion-1.1.4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=459799edc547b0660abc4c13a68eb663
diff --git a/dev-haskell/criterion/Manifest b/dev-haskell/criterion/Manifest
deleted file mode 100644
index 81a391ad5faf..000000000000
--- a/dev-haskell/criterion/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST criterion-0.8.1.0.tar.gz 155095 BLAKE2B a5bd4a6c0cb7b3866199ae2f7fdb9d7e3e501af628c71873f23504ae5b4d9cb39f7e14c5b45c6310ea1c2dd2751aba44db9e5b26509a55d8d3fb350c170775fb SHA512 96dd101dfcbb4cfea446235137d163e9bb806b8dbc6ca7cdb19f380dc8c6ad0169f22b08acb638c0e731be659b1f761cc4f3d33154c5cda3f44bf6f854b1b485
-DIST criterion-1.0.2.0.tar.gz 1003368 BLAKE2B 7281cc53a3e9ef0d91bc8730bf6d43b864fb164a5b2e556c9809414a89db880d15eb20c759a9925228b5fdd0df368025a4287efd094b4a500b86e42e9ee5f602 SHA512 35063822e12bca0b8ad41d2e6fd2c6ddfd58432467d9fee7ca537e03fb0100dcf6c11565abd21c11c0736bc0e2c9977f248a559eec7c8b049c27ff54ea58f01a
-DIST criterion-1.1.0.0.tar.gz 1004534 BLAKE2B ad6697171457e20b6ce52cfeb36d472977adf7cb931a2bb192e66557265a31658a0b90dda59a0fbf264f8d2d0581b14b963797140166aabdbf32f443abd4a537 SHA512 959635b49fbe9aeaffb8eb072e9998934732028311031debf5dc3bcbe7ea89ea3a330fe6656272888896ee9ee5e324d1ea72b25fbc0b5c466eb060d654ca61b6
-DIST criterion-1.1.1.0.tar.gz 866254 BLAKE2B e750fdc50c7b6629761bbdf3642ccd64ebc08c2bff5798225a53fab26a72c441be7481d9372cedc6cfa39fae2a2ce8da4855a806318b9a1b52bb5926762b4210 SHA512 964b81cc160c7c402ece1de57fddbd8ae454934fe4d3ca30da9f0d8f036019a14e462a0b4a63a4c38992e295002e3fb2dd082960c4934a19b36463157ef3594a
-DIST criterion-1.1.4.0.tar.gz 119945 BLAKE2B 0064eb86a9d6b9298cb17cc7a4e45374e0e8ef2a7b4c2f5dbadc38ca7a75da940152479bd64ff15768f76db6c02c20833dd9fd5faac33196208e6f352b2a7485 SHA512 b503bd50cfeccfe6222ac1af91ad6d10b600cc9609a107d3b46c9e470ec39f2ce24d6debc730045b178b2c599575710c29940dc5c595ffb28e9243e02f624f0c
-EBUILD criterion-0.8.1.0.ebuild 1045 BLAKE2B ec75ec8f28dad7523f22ad7462910fa39236e99b778a0777762b0b162d3811a2e856fae8868ba25e6b3b36406b62652f19920285ddb6350b1fe83addb4971623 SHA512 f510b6ee2fc92b44480420d0922eb4fb3965e34fd6f4d98bcedb70bcc4df1837c9d5571addbc815cff5caf5672a59286c2ded48723d8ac71f369f33c4d11296c
-EBUILD criterion-1.0.2.0.ebuild 1409 BLAKE2B 242d102dce51f67bdc84c862c0b1aeb8b4a8c191769a4f3ba2f05f1704f2496f3dd64aca31c00d90d8436423cf63c2e089741bc2d33e0b0f409b9aafa99077c9 SHA512 319016a1ebc6bfa3efb2e8c0c3546a500d59f965fbfeb1e86fea438d3340585240ec72eb61b31d53c0b4b1a9f52ab00d7af86ceacb9125b3a21903e9e1704a81
-EBUILD criterion-1.1.0.0.ebuild 1438 BLAKE2B 0783b0c0f90227c958da52aff5fbb1dd3c48935780dd661d55031199ab76bbfd311e4bd8d83568f21ca624c42de5539053aec95797412471961a5c23937e60b5 SHA512 c2a7f24e2c0d874feb4d9233752c47a81c0349d9caf122036d5135f854df7a94837d8566a9f4b5a3a914b1f6d41c187577a94bd794f3efc8828cf203ad7d046c
-EBUILD criterion-1.1.1.0.ebuild 1438 BLAKE2B 92ac43443b8582aa481de31498e87b2acb554a657d0543e340432266e3aa5823e62c870039823d7991af5c76777b51a1805343577916bdda4faa0700bb4ce40e SHA512 86a43ea2bfd402de6340858d3b370aaf6afe7978ef5c4c539a9365a4cf67b7377282cfec06cd0ce8b02d4be7244b1e40f80c5204ab7fced3735b73e2ad31efcb
-EBUILD criterion-1.1.4.0.ebuild 1554 BLAKE2B c03f0e65eba0b1f4bf21d08f31e1354021258a908b3fcdd7ef4e9efbaa3224a194c940ac37c43419f50fdae1f63322226762532789e833d25321cf0f9f403d4a SHA512 e940ae88edc9f6f419063d73005c04a323e2a5fc2daede53932ff715f8ae83e1b65db4d5d0d3ae14b55a3cd591e436dd32892587fedc9752e274dbd4e42656ed
-MISC metadata.xml 755 BLAKE2B fc08f1348bf25a9baf4c39e499f54c977af78a505e735b2e092e64b902558d80c71d57d9b91404577ecf45fef428c92652d02ed786dafcddae805e9ee9707c36 SHA512 5e4f4147f5fb4f4101646d869d6d76557cf313cb37b0079e64cfa00530578689c8f5c90cea95f9f55cb216fed10ca498663e0e60a81fe5b1a19ed812ec673e49
diff --git a/dev-haskell/criterion/criterion-0.8.1.0.ebuild b/dev-haskell/criterion/criterion-0.8.1.0.ebuild
deleted file mode 100644
index 46f90471c2b8..000000000000
--- a/dev-haskell/criterion/criterion-0.8.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Robust, reliable performance measurement and analysis"
-HOMEPAGE="https://github.com/bos/criterion"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.3.2.12:=[profile?]
-	>=dev-haskell/binary-0.6.3.0:=[profile?]
-	>=dev-haskell/glob-0.7.2:=[profile?]
-	>=dev-haskell/hastache-0.6.0:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	>=dev-haskell/mwc-random-0.8.0.3:=[profile?]
-	>=dev-haskell/parsec-3.1.0:=[profile?]
-	>=dev-haskell/statistics-0.11:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/vector-0.7.1:=[profile?]
-	>=dev-haskell/vector-algorithms-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/criterion/criterion-1.0.2.0.ebuild b/dev-haskell/criterion/criterion-1.0.2.0.ebuild
deleted file mode 100644
index b080fc751f88..000000000000
--- a/dev-haskell/criterion/criterion-1.0.2.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Robust, reliable performance measurement and analysis"
-HOMEPAGE="http://www.serpentine.com/criterion"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
-	dev-haskell/ansi-wl-pprint:=[profile?]
-	>=dev-haskell/binary-0.5.1.0:=[profile?]
-	>=dev-haskell/cassava-0.3.0.0:=[profile?]
-	dev-haskell/either:=[profile?]
-	>=dev-haskell/glob-0.7.2:=[profile?]
-	>=dev-haskell/hastache-0.6.0:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	>=dev-haskell/mwc-random-0.8.0.3:=[profile?]
-	>=dev-haskell/optparse-applicative-0.11:=[profile?]
-	>=dev-haskell/parsec-3.1.0:=[profile?]
-	>=dev-haskell/statistics-0.13.2.1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/vector-0.7.1:=[profile?]
-	>=dev-haskell/vector-algorithms-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/test-framework-0.4
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2 )
-"
diff --git a/dev-haskell/criterion/criterion-1.1.0.0.ebuild b/dev-haskell/criterion/criterion-1.1.0.0.ebuild
deleted file mode 100644
index 19817c905704..000000000000
--- a/dev-haskell/criterion/criterion-1.1.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Robust, reliable performance measurement and analysis"
-HOMEPAGE="http://www.serpentine.com/criterion"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
-	>=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?]
-	>=dev-haskell/binary-0.5.1.0:=[profile?]
-	>=dev-haskell/cassava-0.3.0.0:=[profile?]
-	>=dev-haskell/glob-0.7.2:=[profile?]
-	>=dev-haskell/hastache-0.6.0:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	>=dev-haskell/mwc-random-0.8.0.3:=[profile?]
-	>=dev-haskell/optparse-applicative-0.11:=[profile?]
-	>=dev-haskell/parsec-3.1.0:=[profile?]
-	>=dev-haskell/statistics-0.13.2.1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?]
-	>=dev-haskell/vector-0.7.1:=[profile?]
-	>=dev-haskell/vector-algorithms-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/test-framework-0.4
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2 )
-"
diff --git a/dev-haskell/criterion/criterion-1.1.1.0.ebuild b/dev-haskell/criterion/criterion-1.1.1.0.ebuild
deleted file mode 100644
index a297c7902491..000000000000
--- a/dev-haskell/criterion/criterion-1.1.1.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Robust, reliable performance measurement and analysis"
-HOMEPAGE="http://www.serpentine.com/criterion"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
-	>=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?]
-	>=dev-haskell/binary-0.5.1.0:=[profile?]
-	>=dev-haskell/cassava-0.3.0.0:=[profile?]
-	>=dev-haskell/glob-0.7.2:=[profile?]
-	>=dev-haskell/hastache-0.6.0:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	>=dev-haskell/mwc-random-0.8.0.3:=[profile?]
-	>=dev-haskell/optparse-applicative-0.11:=[profile?]
-	>=dev-haskell/parsec-3.1.0:=[profile?]
-	>=dev-haskell/statistics-0.13.2.1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?]
-	>=dev-haskell/vector-0.7.1:=[profile?]
-	>=dev-haskell/vector-algorithms-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/test-framework-0.4
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2 )
-"
diff --git a/dev-haskell/criterion/criterion-1.1.4.0.ebuild b/dev-haskell/criterion/criterion-1.1.4.0.ebuild
deleted file mode 100644
index fbd90465be55..000000000000
--- a/dev-haskell/criterion/criterion-1.1.4.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -fast
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Robust, reliable performance measurement and analysis"
-HOMEPAGE="http://www.serpentine.com/criterion"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
-	>=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?]
-	>=dev-haskell/cassava-0.3.0.0:=[profile?]
-	dev-haskell/code-page:=[profile?]
-	>=dev-haskell/glob-0.7.2:=[profile?]
-	>=dev-haskell/hastache-0.6.0:=[profile?]
-	dev-haskell/js-flot:=[profile?]
-	dev-haskell/js-jquery:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	>=dev-haskell/mwc-random-0.8.0.3:=[profile?]
-	>=dev-haskell/optparse-applicative-0.13:=[profile?]
-	>=dev-haskell/parsec-3.1.0:=[profile?]
-	>=dev-haskell/statistics-0.13.2.1:=[profile?] <dev-haskell/statistics-0.14:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?]
-	>=dev-haskell/vector-0.7.1:=[profile?]
-	>=dev-haskell/vector-algorithms-0.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.4
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-fast
-}
diff --git a/dev-haskell/criterion/metadata.xml b/dev-haskell/criterion/metadata.xml
deleted file mode 100644
index 46e84190a145..000000000000
--- a/dev-haskell/criterion/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library provides a powerful but simple way to measure the
-		performance of Haskell code.  It provides both a framework for
-		executing and analysing benchmarks and a set of driver functions
-		that makes it easy to build and run benchmarks, and to analyse their
-		results.
-		
-		The fastest way to get started is to read the documentation and
-		examples in the Criterion.Main module.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bos/criterion</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/crypto-4.2.5.1-r1 b/dev-haskell/crypto-4.2.5.1-r1
new file mode 100644
index 000000000000..af34f5bf3ec5
--- /dev/null
+++ b/dev-haskell/crypto-4.2.5.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.4.0.1:2=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Collects together existing Haskell cryptographic functions into a package
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/Crypto
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD GPL-2
+RDEPEND=dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.4.0.1:2=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/4.2.5.1
+SRC_URI=mirror://hackage/packages/archive/Crypto/4.2.5.1/Crypto-4.2.5.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0da7147c4fa8760b5f3fdcebec1c4294
diff --git a/dev-haskell/crypto-api-0.12.2.2 b/dev-haskell/crypto-api-0.12.2.2
new file mode 100644
index 000000000000..a27e9b0084ea
--- /dev/null
+++ b/dev-haskell/crypto-api-0.12.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cereal-0.2:=[profile?] dev-haskell/entropy:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] dev-haskell/transformers:=[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 generic interface for cryptographic operations
+EAPI=5
+HOMEPAGE=https://github.com/TomMD/crypto-api
+IUSE=all_cpolys doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cereal-0.2:=[profile?] dev-haskell/entropy:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.12.2.2
+SRC_URI=mirror://hackage/packages/archive/crypto-api/0.12.2.2/crypto-api-0.12.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ff13d44a77b77455d17afc1baae2fe76
diff --git a/dev-haskell/crypto-api-0.13.2 b/dev-haskell/crypto-api-0.13.2
new file mode 100644
index 000000000000..c7ab1eec8663
--- /dev/null
+++ b/dev-haskell/crypto-api-0.13.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cereal-0.2:=[profile?] dev-haskell/entropy:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A generic interface for cryptographic operations
+EAPI=5
+HOMEPAGE=https://github.com/TomMD/crypto-api
+IUSE=all_cpolys doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cereal-0.2:=[profile?] dev-haskell/entropy:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.13.2
+SRC_URI=mirror://hackage/packages/archive/crypto-api/0.13.2/crypto-api-0.13.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d6568f209fb4a9b890a6ed722ffb0128
diff --git a/dev-haskell/crypto-api-tests-0.3-r1 b/dev-haskell/crypto-api-tests-0.3-r1
new file mode 100644
index 000000000000..17055cc5a313
--- /dev/null
+++ b/dev-haskell/crypto-api-tests-0.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/cereal:=[profile?] >=dev-haskell/crypto-api-0.13:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] >=dev-haskell/test-framework-0.4:=[profile?] >=dev-haskell/test-framework-hunit-0.2:=[profile?] >=dev-haskell/test-framework-quickcheck2-0.3:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A test framework and KATs for cryptographic operations
+EAPI=5
+HOMEPAGE=http://trac.haskell.org/crypto-api/wiki
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/cereal:=[profile?] >=dev-haskell/crypto-api-0.13:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] >=dev-haskell/test-framework-0.4:=[profile?] >=dev-haskell/test-framework-hunit-0.2:=[profile?] >=dev-haskell/test-framework-quickcheck2-0.3:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/0.3
+SRC_URI=mirror://hackage/packages/archive/crypto-api-tests/0.3/crypto-api-tests-0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=87cc122368e46723d15d59443d86e675
diff --git a/dev-haskell/crypto-api-tests/Manifest b/dev-haskell/crypto-api-tests/Manifest
deleted file mode 100644
index 9fe7296f21a0..000000000000
--- a/dev-haskell/crypto-api-tests/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST crypto-api-tests-0.3.tar.gz 3635597 BLAKE2B 0b13730ef105217068e8ffbe237dbe727e3ae09aefa4d0c021877010371024c5796e6959ad788edc5c213faf55e69cd5eea9d55023f48cb96f263ceeeb6e4500 SHA512 4d9dfd52dc67279a712bd444972faa6650d987c8f65fb41178e5c6523a7260c0e2df8f44bc511ffa217b6d71c5ec41ab11a0466a326c9133f7e20c01c37404d5
-EBUILD crypto-api-tests-0.3-r1.ebuild 875 BLAKE2B 03c46ae4369493862546c1406554ea149b37182c97d7a380305d7b37f1a350b519297c9993506afe5de0fdb30ddc5c525cba22702ba513e3b8f4b57919d5908c SHA512 b272849067b652fa6fb58d72952eca7bc67db18e476c1ad7eacacf67981d39417a0e0ed3488b3d8765b8db28bba6f4fc036c3d4afa358f630b5f50ffe3cb4a69
-MISC metadata.xml 555 BLAKE2B f8ed536bbfe36a3fab22f312b39f7f2d9f94814608ab87f85ff00a72930aab5f2cec806844d1c637b9acd97149e657529f2b2ad42f5456446abaff940cf032d6 SHA512 fe598ebf4ea5b051949d2ef8b0d64170438d753928544b1c4dad41ad5e8eb317cf76d2e8f62c4fc21a1dec05f23de5da2affaeb60e37c6e34b182f2ebf25a997
diff --git a/dev-haskell/crypto-api-tests/crypto-api-tests-0.3-r1.ebuild b/dev-haskell/crypto-api-tests/crypto-api-tests-0.3-r1.ebuild
deleted file mode 100644
index 161db3551488..000000000000
--- a/dev-haskell/crypto-api-tests/crypto-api-tests-0.3-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A test framework and KATs for cryptographic operations"
-HOMEPAGE="http://trac.haskell.org/crypto-api/wiki"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/cereal:=[profile?]
-	>=dev-haskell/crypto-api-0.13:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	>=dev-haskell/quickcheck-2.4:2=[profile?]
-	>=dev-haskell/test-framework-0.4:=[profile?]
-	>=dev-haskell/test-framework-hunit-0.2:=[profile?]
-	>=dev-haskell/test-framework-quickcheck2-0.3:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/crypto-api-tests/metadata.xml b/dev-haskell/crypto-api-tests/metadata.xml
deleted file mode 100644
index d327429f980e..000000000000
--- a/dev-haskell/crypto-api-tests/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A test framework for hash and cipher operations using
-		the crypto-api interface.  Known answer tests (KATs)
-		for common cryptographic algorithms are included.
-		Patches welcome (both adding KATs for more algorithms
-		or property tests for classes of algorithms).
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/crypto-api/Manifest b/dev-haskell/crypto-api/Manifest
deleted file mode 100644
index dd911c04afa3..000000000000
--- a/dev-haskell/crypto-api/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST crypto-api-0.12.2.2.tar.gz 45271 BLAKE2B e5290eabe5ee7c70c3fc7e957853477a343716192cbbc39a30cc8b7515e12f3fcfa904cc01ef4262663ead64dd5c2fe34097576cd2e9aa89fac2f888651464e6 SHA512 340aefd9f8b24d99866fce26bd3eaba8484be6e15648a2ff1a0a051f8974514a50f809f8d2539c7fe747dbe1b6946a1ecfa8a2966548391e71b498d19e79cc86
-DIST crypto-api-0.13.2.tar.gz 47877 BLAKE2B e9a10cdc7ab66ce4155856feb4ce4df93e7f49785fb9571f326377f9b5faf5a939aa625d9ad75bf31835b2a764bacb2a2a762b4d25c20faaaeedcfb205d20cb8 SHA512 2803862a714c3f448aa63469171fc68835ea9648a94d69ec76a32d20c1ed480aa3ecacedc3bf1e674797430c5d2966ceea4a83e38e827a68d2fab78fb4c8567c
-EBUILD crypto-api-0.12.2.2.ebuild 806 BLAKE2B a01a6f1492964d40c37b2b9147a41fcf87cdf401029d633ec2ead78b0509b62a30309d340988ca22abaeee21a5880e17f0f0fd6d798c56c9918354d8956a8f75 SHA512 a3b361c62abcf49874d9e8309bf5cef1ac87afa835a36d0e7d889581cda0aa47e665699e1ecbe2e7a295448713a83a30acf5b3cf9ace70bcb22dcce160ea6779
-EBUILD crypto-api-0.13.2.ebuild 813 BLAKE2B 9024329fd5eef2705bf10def6ed96b72046ec1d57ecb5a8f522f8fd46530459f2f837148841d1e1215dec23b4792154a5ae83880c540055423f67b7c987e9c86 SHA512 ad984ce7bbde4d7fb4842db1ef15284c94080edcf5e05d17afe2a5b9f77077294c7910b05ae475abbd8ecea260ddd2dbc642ee163cfcf0171286de7d76a84e98
-MISC metadata.xml 935 BLAKE2B 720707a1375a75abd923fad0446e9b1c72b4655dd816eff0b380b2bcf0b770cb2dd43c053a28f22b2fef715b015f12fc7b9ed0219d9d4bd413a86d9477b0a00b SHA512 6851ee1e8aa4bb9bb1fb396c75ddfd09cae5116ee03b05ed5ceb23ad30ae2ae10c457753de3050f4c157a4d4b6d1e95ef1dd5338b20458a80476b2790568d001
diff --git a/dev-haskell/crypto-api/crypto-api-0.12.2.2.ebuild b/dev-haskell/crypto-api/crypto-api-0.12.2.2.ebuild
deleted file mode 100644
index bb6cd4b5bc36..000000000000
--- a/dev-haskell/crypto-api/crypto-api-0.12.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A generic interface for cryptographic operations"
-HOMEPAGE="https://github.com/TomMD/crypto-api"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="all_cpolys"
-
-RDEPEND=">=dev-haskell/cereal-0.2:=[profile?]
-		dev-haskell/entropy:=[profile?]
-		>=dev-haskell/tagged-0.1:=[profile?]
-		dev-haskell/transformers:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag all_cpolys all_cpolys)
-}
diff --git a/dev-haskell/crypto-api/crypto-api-0.13.2.ebuild b/dev-haskell/crypto-api/crypto-api-0.13.2.ebuild
deleted file mode 100644
index a38648c23edb..000000000000
--- a/dev-haskell/crypto-api/crypto-api-0.13.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A generic interface for cryptographic operations"
-HOMEPAGE="https://github.com/TomMD/crypto-api"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 x86"
-IUSE="all_cpolys"
-
-RDEPEND=">=dev-haskell/cereal-0.2:=[profile?]
-	dev-haskell/entropy:=[profile?]
-	>=dev-haskell/tagged-0.1:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag all_cpolys all_cpolys)
-}
diff --git a/dev-haskell/crypto-api/metadata.xml b/dev-haskell/crypto-api/metadata.xml
deleted file mode 100644
index 92b13075a714..000000000000
--- a/dev-haskell/crypto-api/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A generic interface for cryptographic operations (hashes, ciphers, randomness).
-		Maintainers of hash and cipher implementations are
-		encouraged to add instances for the classes defined
-		in Crypto.Classes.  Crypto users are similarly
-		encouraged to use the interfaces defined in the Classes
-		module.
-		Any concepts or functions of general use to more than
-		one cryptographic algorithm (ex: padding) is within
-		scope of this package.
-	</longdescription>
-	<use>
-		<flag name="all_cpolys">Build all the CMAC polynomes up to 10000 bits instead of just the usual ones</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">TomMD/crypto-api</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/crypto-cipher-tests-0.0.11-r1 b/dev-haskell/crypto-cipher-tests-0.0.11-r1
new file mode 100644
index 000000000000..29d75ae7c87b
--- /dev/null
+++ b/dev-haskell/crypto-cipher-tests-0.0.11-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.8:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/quickcheck-2:2=[profile?] >=dev-haskell/securemem-0.1.1:=[profile?] <dev-haskell/securemem-0.2:=[profile?] dev-haskell/test-framework:=[profile?] dev-haskell/test-framework-hunit:=[profile?] dev-haskell/test-framework-quickcheck2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generic cryptography cipher tests
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-crypto-cipher
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.8:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/quickcheck-2:2=[profile?] >=dev-haskell/securemem-0.1.1:=[profile?] <dev-haskell/securemem-0.2:=[profile?] dev-haskell/test-framework:=[profile?] dev-haskell/test-framework-hunit:=[profile?] dev-haskell/test-framework-quickcheck2:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.0.11
+SRC_URI=mirror://hackage/packages/archive/crypto-cipher-tests/0.0.11/crypto-cipher-tests-0.0.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=018bb4e840c2017bab96eeb51d7a2b43
diff --git a/dev-haskell/crypto-cipher-tests/Manifest b/dev-haskell/crypto-cipher-tests/Manifest
deleted file mode 100644
index 863a36665cfa..000000000000
--- a/dev-haskell/crypto-cipher-tests/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST crypto-cipher-tests-0.0.11.tar.gz 6183 BLAKE2B 6899bfff8cc9654656becb1ec21a7c3792a9b50141858ccc5678050daaec1f195ea5b9826cbb85e127f0e0c3236bb9dad94280a2c49732966453b1c0832b2d33 SHA512 cc8361517e6c2afed1585e7648ed1143e8b4224918fbd8191a970d0afe2a162b759e8e6aee49308a93bdfe0d4d15e2bfb587d4e9f6891766f8e834822553b853
-EBUILD crypto-cipher-tests-0.0.11-r1.ebuild 1063 BLAKE2B a05b4c8f5b0dc275cce01729566d967b96455ba59fbce7cb1e4fbc5b571fcadefa7a8ca75aabf24fcd4216d272b8aa49cd2c94de1ae580c83a08ed01c79bebf0 SHA512 f71360e3e3aa0aab8f8a8264b8a59a4822b02509c48b88e6b06815900ceb8f82b7855fc6aeb525ee16a8ccd6c82ef53a175671fdcfa8f2e63d5bbf0f7c45775c
-MISC metadata.xml 415 BLAKE2B 69515ea2df91bc6e3a8f7159542e450e01f68c3929fc418315716a865027cc82b4d40cc5870ff5f4a79457dff0f48f3b305c8ed9ac726cb3dc2e300391e110ce SHA512 877b9688e611d63e5c9c3bcd07fc8ea13d8327d01ecd63feba9be14d066c1234879210754cea8a2d4c935a8a54a49751c759112cd2a5a48fa07a7db9eebcb334
diff --git a/dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild b/dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild
deleted file mode 100644
index eb4193d11bf5..000000000000
--- a/dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Generic cryptography cipher tests"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-cipher"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?]
-	>=dev-haskell/crypto-cipher-types-0.0.8:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/quickcheck-2:2=[profile?]
-	>=dev-haskell/securemem-0.1.1:=[profile?] <dev-haskell/securemem-0.2:=[profile?]
-	dev-haskell/test-framework:=[profile?]
-	dev-haskell/test-framework-hunit:=[profile?]
-	dev-haskell/test-framework-quickcheck2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/crypto-cipher-tests/metadata.xml b/dev-haskell/crypto-cipher-tests/metadata.xml
deleted file mode 100644
index 8c2fb2ea1e16..000000000000
--- a/dev-haskell/crypto-cipher-tests/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Generic cryptography cipher tests
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-cipher</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/crypto-cipher-types-0.0.9 b/dev-haskell/crypto-cipher-types-0.0.9
new file mode 100644
index 000000000000..45e082328583
--- /dev/null
+++ b/dev-haskell/crypto-cipher-types-0.0.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/securemem-0.1.1:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generic cryptography cipher types
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-crypto-cipher
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/securemem-0.1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.0.9
+SRC_URI=mirror://hackage/packages/archive/crypto-cipher-types/0.0.9/crypto-cipher-types-0.0.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d3f77c440f6a0f9983341f52e8c89e85
diff --git a/dev-haskell/crypto-cipher-types/Manifest b/dev-haskell/crypto-cipher-types/Manifest
deleted file mode 100644
index faf55f5039c0..000000000000
--- a/dev-haskell/crypto-cipher-types/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST crypto-cipher-types-0.0.9.tar.gz 8073 BLAKE2B 80f5349e31f04b591509382b6c475f0f65095b50646dd5cd785c037eb9be8193a011f060beeee42a37586ccaf69122804124fbb77ef46f894ed985d573481c93 SHA512 9b369dfbe1baa918f8b72dca0a6637634582629ccd46226a3a89813f42cca1e11ee738e1053503a6bc2863c04dd885083e6a09a5bda5a52dbf381e9f133e24cc
-EBUILD crypto-cipher-types-0.0.9.ebuild 634 BLAKE2B eabfec9d45e94a5f52c4cbc6490201e47ba52413b7fc5a2586fa91bb4f8a3e6cccc7082d4bb5f480a17755909fbcb82e05d6b2341039add13790afb9c54ddd69 SHA512 680216e2ea72d0e6d1278229fdc189f6cb4dd161efb33f2b39469f4fba56f10f69b6870f3c4f7fe9b3656ddd93ca7292dc74a7118e50ff2bb489d8ff82641fb3
-MISC metadata.xml 415 BLAKE2B b7f6c0fc480486d33f3e0501aa86f511ef2511d7641db068c36816dea5ba52f4f1a25fc86bcba1b017911b34b6db31db9cc6645c7f06cba43cf4ac8a72d1be7d SHA512 c6fc6cdaa419087b9829d59c6f002a0a7b5d1456d37df083c8fcc70e903f76d66cf84fe223ff392b130aa1e178b9685287a36e707ba91aa2840b280d64d31805
diff --git a/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild b/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild
deleted file mode 100644
index ca5d393abfb3..000000000000
--- a/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generic cryptography cipher types"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-cipher"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?]
-	>=dev-haskell/securemem-0.1.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/crypto-cipher-types/metadata.xml b/dev-haskell/crypto-cipher-types/metadata.xml
deleted file mode 100644
index 28daedbd609f..000000000000
--- a/dev-haskell/crypto-cipher-types/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Generic cryptography cipher types
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-cipher</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/crypto-conduit-0.5.5-r1 b/dev-haskell/crypto-conduit-0.5.5-r1
new file mode 100644
index 000000000000..9b66aebb2a8a
--- /dev/null
+++ b/dev-haskell/crypto-conduit-0.5.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/crypto-api-0.9:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= conduit11? ( >=dev-haskell/conduit-extra-1.1:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/crypto-api-0.13 >=dev-haskell/cryptocipher-0.4 >=dev-haskell/cryptohash-cryptoapi-0.1 >=dev-haskell/hspec-1.3 >=dev-haskell/skein-0.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Conduit interface for cryptographic operations (from crypto-api)
+EAPI=5
+HOMEPAGE=https://github.com/prowdsponsor/crypto-conduit
+IUSE=+conduit11 doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/crypto-api-0.9:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= conduit11? ( >=dev-haskell/conduit-extra-1.1:=[profile?] )
+SLOT=0/0.5.5
+SRC_URI=mirror://hackage/packages/archive/crypto-conduit/0.5.5/crypto-conduit-0.5.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2e87c73f0f8428386a26d55bd6aebb8c
diff --git a/dev-haskell/crypto-conduit-0.5.5-r2 b/dev-haskell/crypto-conduit-0.5.5-r2
new file mode 100644
index 000000000000..66b57680a3b3
--- /dev/null
+++ b/dev-haskell/crypto-conduit-0.5.5-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/crypto-api-0.9:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= conduit11? ( >=dev-haskell/conduit-extra-1.1:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/crypto-api-0.13 >=dev-haskell/cryptocipher-0.4 >=dev-haskell/cryptohash-cryptoapi-0.1 >=dev-haskell/hspec-1.3 >=dev-haskell/skein-0.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Conduit interface for cryptographic operations (from crypto-api)
+EAPI=5
+HOMEPAGE=https://github.com/prowdsponsor/crypto-conduit
+IUSE=+conduit11 doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/crypto-api-0.9:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= conduit11? ( >=dev-haskell/conduit-extra-1.1:=[profile?] )
+SLOT=0/0.5.5
+SRC_URI=mirror://hackage/packages/archive/crypto-conduit/0.5.5/crypto-conduit-0.5.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8977e4d4ae7fa8a9d92766ba4fd64c52
diff --git a/dev-haskell/crypto-conduit/Manifest b/dev-haskell/crypto-conduit/Manifest
deleted file mode 100644
index 227a059b36b5..000000000000
--- a/dev-haskell/crypto-conduit/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST crypto-conduit-0.5.5.tar.gz 6883 BLAKE2B e0bc6eae04d0da1d0b04135a4d2321a2fc07189010dddfe8d03b161b62d97c631eda0f7f6318b7827a4b6f7fd23d491a13718bddde33d51d8c87baf8f971ba78 SHA512 4fb9df7a5434af1c3bf48e5649b4dc56ee07d03f4f00647adfc61eaf1a0c54326f7374e27717b92106f34435c5ba38eeb7b23082e9095dfbaf131598a8791887
-EBUILD crypto-conduit-0.5.5-r1.ebuild 1387 BLAKE2B c2f321fa9b57ee89223252aba98b63029bde338bdd596b71ac72da67c6ca5bb13dc79c56ea42fde083e67ab584b2570e6563238fb68ed4f5ac922a3bb618b708 SHA512 c078a81c1ac2a2cdf7d7b4665c6e325e64ae4043acbe2be911e2cda295a07b85f25210a1f49b907d36bf33823e3729739ea4a1869b396a1abcf8b3f1b8e51767
-EBUILD crypto-conduit-0.5.5-r2.ebuild 1402 BLAKE2B efcb0836927e77477d2b500ece8c72e659bb80302bc2256fe61d7e0cfbf78f54065eb6fe00dd7bb8585571a60d1acd3e79e8795f2a85d272eb4da0211d1c11f5 SHA512 c54080bafe70b1ed8fef25f7216c806ca238025ac6317cd06cd0911ca29fa740419cb752c8d5aa113f8da2b84e77d5e3ccd90dd0359525c54db9e76b19699ae5
-MISC metadata.xml 616 BLAKE2B cd8021118e67046739cccb77f9779a7231164fcff802bf9d3c9bcb015e1ec4e5055f3c638070fb89c1917a12950312fe511e78a5b3bd35379aebcc558e7b6edf SHA512 5828e9f0d73f84b32017d54be2e231fbfb0b99f4c3e36e1ab91cf1179acdb647273270c15bb00df2009f44f0e3ad6ff62b48601ed4b7133cff40a0ae20181e9d
diff --git a/dev-haskell/crypto-conduit/crypto-conduit-0.5.5-r1.ebuild b/dev-haskell/crypto-conduit/crypto-conduit-0.5.5-r1.ebuild
deleted file mode 100644
index 667fd9ab41c9..000000000000
--- a/dev-haskell/crypto-conduit/crypto-conduit-0.5.5-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -old-crypto-api
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conduit interface for cryptographic operations (from crypto-api)"
-HOMEPAGE="https://github.com/prowdsponsor/crypto-conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+conduit11"
-
-RDEPEND=">=dev-haskell/cereal-0.3:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/crypto-api-0.9:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	conduit11? ( >=dev-haskell/conduit-extra-1.1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/crypto-api-0.13
-		>=dev-haskell/cryptocipher-0.4
-		>=dev-haskell/cryptohash-cryptoapi-0.1
-		>=dev-haskell/hspec-1.3
-		>=dev-haskell/skein-0.1 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'cereal       >= 0.3 && < 0.5' 'cereal       >= 0.3'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag conduit11 conduit11) \
-		--flag=-old-crypto-api
-}
diff --git a/dev-haskell/crypto-conduit/crypto-conduit-0.5.5-r2.ebuild b/dev-haskell/crypto-conduit/crypto-conduit-0.5.5-r2.ebuild
deleted file mode 100644
index b9f5c4c66071..000000000000
--- a/dev-haskell/crypto-conduit/crypto-conduit-0.5.5-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -old-crypto-api
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conduit interface for cryptographic operations (from crypto-api)"
-HOMEPAGE="https://github.com/prowdsponsor/crypto-conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+conduit11"
-
-RDEPEND=">=dev-haskell/cereal-0.3:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/crypto-api-0.9:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	conduit11? ( >=dev-haskell/conduit-extra-1.1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/crypto-api-0.13
-		>=dev-haskell/cryptocipher-0.4
-		>=dev-haskell/cryptohash-cryptoapi-0.1
-		>=dev-haskell/hspec-1.3
-		>=dev-haskell/skein-0.1 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'cereal       >= 0.3 && < 0.5' 'cereal       >= 0.3' \
-		'transformers >= 0.2 && < 0.5' 'transformers >= 0.2'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag conduit11 conduit11) \
-		--flag=-old-crypto-api
-}
diff --git a/dev-haskell/crypto-conduit/metadata.xml b/dev-haskell/crypto-conduit/metadata.xml
deleted file mode 100644
index 0b8019ffa1d2..000000000000
--- a/dev-haskell/crypto-conduit/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package contains everything that you need to use a
-		cryptographic package that supports the @crypto-api@ package
-		using conduits from the @conduit@ package.
-	</longdescription>
-	<use>
-		<flag name="conduit11">Use conduit &gt;= 1.1.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">prowdsponsor/crypto-conduit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/crypto-numbers-0.2.3 b/dev-haskell/crypto-numbers-0.2.3
new file mode 100644
index 000000000000..657720ae1958
--- /dev/null
+++ b/dev-haskell/crypto-numbers-0.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/byteable dev-haskell/hunit >=dev-haskell/quickcheck-2 >=dev-haskell/test-framework-0.3.3 dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Cryptographic numbers: functions and algorithms
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-crypto-numbers
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.2.3
+SRC_URI=mirror://hackage/packages/archive/crypto-numbers/0.2.3/crypto-numbers-0.2.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=edd1735aaae4c19a73bc16e445d3b86d
diff --git a/dev-haskell/crypto-numbers-0.2.7 b/dev-haskell/crypto-numbers-0.2.7
new file mode 100644
index 000000000000..0e2b97ee26c3
--- /dev/null
+++ b/dev-haskell/crypto-numbers-0.2.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/byteable dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Cryptographic numbers: functions and algorithms
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-crypto-numbers
+IUSE=+gmp doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.7
+SRC_URI=mirror://hackage/packages/archive/crypto-numbers/0.2.7/crypto-numbers-0.2.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e56735a7e3e9220490714eada3f4b517
diff --git a/dev-haskell/crypto-numbers/Manifest b/dev-haskell/crypto-numbers/Manifest
deleted file mode 100644
index 089df3169c05..000000000000
--- a/dev-haskell/crypto-numbers/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST crypto-numbers-0.2.3.tar.gz 15714 BLAKE2B d8b27bbbcc64a8c7cf3e64d2ee1f04c76bae264815f7a9c0a1ab098f915f448708496b9a0dc2cce655cba5e55ccbcbea65e2b3070bb773fc7190841a2b33261d SHA512 5ab8fdbcfb89f448148886fa7b31994452278da7d2ff8891702dddc861b6e3bdad432756fd639ba85534e1b6846b86a666f388bbae43d11a60a35d151cf1fa7e
-DIST crypto-numbers-0.2.7.tar.gz 16064 BLAKE2B 52e7373d56f87d46f585e36019e2fc1ba3f1710ec2530a14069a839b348859e1f9ba784ea91c7241d767d488a15433f0381e5249775f9501197ecbcd051f8aeb SHA512 4fac18f6d76d5cc9ae82d177a45c155847264494dd112db80a76c955faee4917b4b3c563bb76eb3a08923bb020138307a7115d78fe0caa20fd3fb2b12d679947
-EBUILD crypto-numbers-0.2.3.ebuild 897 BLAKE2B 5bc4ca1f7b291784709fded239dc17a1f16d7280d29845da578acaac475832f9a8e7b4ac34070f94912043ffaf972055411ab2a264ae5c815b8a71b4ae6d67ed SHA512 6a0dffddf9e33255de1d3813f47e2a62848b3a11ede25f4ade5322625a57423acd6968f847e683ac52f9abfe3b59542f063d37f0f07e746b44f97b384b8b351d
-EBUILD crypto-numbers-0.2.7.ebuild 925 BLAKE2B 713069cf332fa67d1ec83f4e8a3a66593811921572b171b45e2152ba855fedaa8f2b193d6d128b7529523f12a6941ec9ec93b293b0f47ae7a98fa53093ad00b2 SHA512 7149f9f5e9ecafb4dd40ff80253203198248c3a53e97167f84446a3de5a1b50c9c8d794697e6ef02a1d7d18814c3d8c4257d65e411d3f85c0e24adf397d1e2cd
-MISC metadata.xml 430 BLAKE2B 8bd1e8546f55bc2ae56c43355f82998eaa21a9172b6a88446e98535cc6aa1c9d5e41cb67a9c30dd0e717b5b1510299aeddd512c1cebe849b8d579c0212f6f170 SHA512 372fbfb142be1fe359a484dd01f8d303c05dfda0a154a426dec0041e4e4ec4a22ab7f46655d775149907711a9d83aa23b1837872923bf737c6541ee00397f45a
diff --git a/dev-haskell/crypto-numbers/crypto-numbers-0.2.3.ebuild b/dev-haskell/crypto-numbers/crypto-numbers-0.2.3.ebuild
deleted file mode 100644
index a83d2ede051c..000000000000
--- a/dev-haskell/crypto-numbers/crypto-numbers-0.2.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cryptographic numbers: functions and algorithms"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-numbers"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/byteable
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2
-		>=dev-haskell/test-framework-0.3.3
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
diff --git a/dev-haskell/crypto-numbers/crypto-numbers-0.2.7.ebuild b/dev-haskell/crypto-numbers/crypto-numbers-0.2.7.ebuild
deleted file mode 100644
index 642b6823fa3e..000000000000
--- a/dev-haskell/crypto-numbers/crypto-numbers-0.2.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: integer-gmp:gmp
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cryptographic numbers: functions and algorithms"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-numbers"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+gmp"
-
-RDEPEND=">=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/byteable
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag gmp integer-gmp)
-}
diff --git a/dev-haskell/crypto-numbers/metadata.xml b/dev-haskell/crypto-numbers/metadata.xml
deleted file mode 100644
index 72aff463b419..000000000000
--- a/dev-haskell/crypto-numbers/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Cryptographic numbers: functions and algorithms
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-numbers</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/crypto-pubkey-0.2.8 b/dev-haskell/crypto-pubkey-0.2.8
new file mode 100644
index 000000000000..4cbe62022425
--- /dev/null
+++ b/dev-haskell/crypto-pubkey-0.2.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-numbers-0.2.2:=[profile?] >=dev-haskell/crypto-pubkey-types-0.4.1:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?] >=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] >=dev-haskell/cryptohash-0.9.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( 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=Public Key cryptography
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-crypto-pubkey
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-numbers-0.2.2:=[profile?] >=dev-haskell/crypto-pubkey-types-0.4.1:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?] >=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] >=dev-haskell/cryptohash-0.9.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.2.8
+SRC_URI=mirror://hackage/packages/archive/crypto-pubkey/0.2.8/crypto-pubkey-0.2.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d643f4ed5ddb05a867f7a4c159a827a1
diff --git a/dev-haskell/crypto-pubkey-types-0.4.3 b/dev-haskell/crypto-pubkey-types-0.4.3
new file mode 100644
index 000000000000..5b0774b57e44
--- /dev/null
+++ b/dev-haskell/crypto-pubkey-types-0.4.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/asn1-encoding:=[profile?] >=dev-haskell/asn1-types-0.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generic cryptography Public keys algorithm types
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-crypto-pubkey-types
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/asn1-encoding:=[profile?] >=dev-haskell/asn1-types-0.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.3
+SRC_URI=mirror://hackage/packages/archive/crypto-pubkey-types/0.4.3/crypto-pubkey-types-0.4.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8040573d3cb037fd943620b09a0debdf
diff --git a/dev-haskell/crypto-pubkey-types/Manifest b/dev-haskell/crypto-pubkey-types/Manifest
deleted file mode 100644
index 21fe6412bc57..000000000000
--- a/dev-haskell/crypto-pubkey-types/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST crypto-pubkey-types-0.4.3.tar.gz 11234 BLAKE2B 8b2b0fc64c6b4355264826d01de7457fddf82003748a29d636d52368874dbbd53f303e3bbad5316e9c5ac9fec3cb9021f60e0b749bc2147c15a6ffc9afc11ff8 SHA512 08e6b74ded0decaaf87b4b9ec15af2e8bbeb7095701b5e2062b570af1ecb3d25eb706d6bd91795acfaaf7d09d0e9040359736a0a06a1bc593ef0d8aaf3e374d6
-EBUILD crypto-pubkey-types-0.4.3.ebuild 690 BLAKE2B 5937d997e648d29d80292641f81411157769b1d5ff955e911249ae5b289dbade1ebc764aa69e56b6cd1d04a78077c078e34ee4b527d80b907ac9c6852ada5e93 SHA512 1a5b5d9a78fdd07dfd8ce3f0ab6e9c6a5f0f708099a1e31b0affc80d9f1f5c074787fee26e66e4ad28fb54ca79855a6e39fa0bd711359ecf0289c48bc8bb1584
-MISC metadata.xml 436 BLAKE2B 1ee088ff27f4fb84dffb49ebd7a0b60bd08c2a50452e45f0fb7629d2d00266729d6eea0c6762b7000bed3e6c97d75a387a4d3de04ade9a95a91dbf4f21ae2d0b SHA512 c21d088027a4cf82b9cd8b63430f9f20eaa0cff1ddb677f7da1d16aa8762bae2c36db3ebd6c68f682966db70d841961a381457926a3f37ade28aa8410307ebba
diff --git a/dev-haskell/crypto-pubkey-types/crypto-pubkey-types-0.4.3.ebuild b/dev-haskell/crypto-pubkey-types/crypto-pubkey-types-0.4.3.ebuild
deleted file mode 100644
index 2c78fe939801..000000000000
--- a/dev-haskell/crypto-pubkey-types/crypto-pubkey-types-0.4.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generic cryptography Public keys algorithm types"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-pubkey-types"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/asn1-encoding:=[profile?]
-	>=dev-haskell/asn1-types-0.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/crypto-pubkey-types/metadata.xml b/dev-haskell/crypto-pubkey-types/metadata.xml
deleted file mode 100644
index ee02a3ff8488..000000000000
--- a/dev-haskell/crypto-pubkey-types/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Generic cryptography public keys algorithm types
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-pubkey-types</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/crypto-pubkey/Manifest b/dev-haskell/crypto-pubkey/Manifest
deleted file mode 100644
index fee75b796e93..000000000000
--- a/dev-haskell/crypto-pubkey/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST crypto-pubkey-0.2.8.tar.gz 46405 BLAKE2B ee04b805204899ec6fdc1cfcda7a1ac83010805396308f9be7b2e885d52245f7ac77ad9caa7028afc2a3deaa594126a36ab4b93631227cf274e40dacb252b56a SHA512 9e7d54421fdb3c53964688831a2ca5f5379e141e7924af76916d868300833c0dbde22392e1452f80aaf2ec7a9a52de6b429a6f8f78b8fbef6c32f2f31202ed06
-EBUILD crypto-pubkey-0.2.8.ebuild 1006 BLAKE2B 56dcb5875ca09502e71f1978a1d381826e90aad57244b87e3df35c2e9f0317c7c31773afe4b98e267acd747461b5672562f696ffe0a476601b45d32e29868764 SHA512 4bf10b073f27535e8256143cc322e4ea2c1e905b8d4676d815ab227d048d4a7bc7a83eb4eba41b981b89a3142b546359d1438c2843c937d5a70fc38efcc89078
-MISC metadata.xml 550 BLAKE2B e4921e40eb276a11ba0ee29e7cfe8acb8d03ba4cae9f86ad4d13b4281971a0284a0cb1be9d88db5342fd48533cefbc10b88bb689bbd336d8176919b7e1cb8fad SHA512 6bc022c97cb51ca0de160f9152ca0a3eabc143ab3c35cc4de6a06f76ad559a87ab931db7dab4358ab05f750528f1e393ed0ec9b490ed7c1f06821bd1c443e195
diff --git a/dev-haskell/crypto-pubkey/crypto-pubkey-0.2.8.ebuild b/dev-haskell/crypto-pubkey/crypto-pubkey-0.2.8.ebuild
deleted file mode 100644
index a15a2eb4bf51..000000000000
--- a/dev-haskell/crypto-pubkey/crypto-pubkey-0.2.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Public Key cryptography"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-pubkey"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RESTRICT=test # missing files
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-haskell/crypto-numbers-0.2.2:=[profile?]
-	>=dev-haskell/crypto-pubkey-types-0.4.1:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?]
-	>=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?]
-	>=dev-haskell/cryptohash-0.9.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-kat
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/crypto-pubkey/metadata.xml b/dev-haskell/crypto-pubkey/metadata.xml
deleted file mode 100644
index 07093d50668a..000000000000
--- a/dev-haskell/crypto-pubkey/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Public Key cryptography
-		
-		Supports RSA PKCS15, RSA OAEP, RSA PSS, DSA, ElGamal signature.
-		
-		Also have primitive support for Diffie Hellman, and ElGamal encryption
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-pubkey</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/crypto-random-0.0.7 b/dev-haskell/crypto-random-0.0.7
new file mode 100644
index 000000000000..e3941d2d20e3
--- /dev/null
+++ b/dev-haskell/crypto-random-0.0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/securemem:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple cryptographic random related types
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-crypto-random
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/securemem:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.0.7
+SRC_URI=mirror://hackage/packages/archive/crypto-random/0.0.7/crypto-random-0.0.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f0629041a0b6d9626841a0c662ab1077
diff --git a/dev-haskell/crypto-random-0.0.9 b/dev-haskell/crypto-random-0.0.9
new file mode 100644
index 000000000000..7e6a0111f531
--- /dev/null
+++ b/dev-haskell/crypto-random-0.0.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/securemem:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple cryptographic random related types
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-crypto-random
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/securemem:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.0.9
+SRC_URI=mirror://hackage/packages/archive/crypto-random/0.0.9/crypto-random-0.0.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3aaf4666bc5695e42567bb0ecaf690d5
diff --git a/dev-haskell/crypto-random-api-0.2.0 b/dev-haskell/crypto-random-api-0.2.0
new file mode 100644
index 000000000000..3d11084f2cd1
--- /dev/null
+++ b/dev-haskell/crypto-random-api-0.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/entropy:=[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=Simple random generators API for cryptography related code
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-crypto-random-api
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/entropy:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.2.0
+SRC_URI=mirror://hackage/packages/archive/crypto-random-api/0.2.0/crypto-random-api-0.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cdfabfe51a9b18ccb0069656c0b044c7
diff --git a/dev-haskell/crypto-random-api/Manifest b/dev-haskell/crypto-random-api/Manifest
deleted file mode 100644
index 3578b5fa44a8..000000000000
--- a/dev-haskell/crypto-random-api/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST crypto-random-api-0.2.0.tar.gz 3397 BLAKE2B b0a895186bf6c4f9487777eb7a86404d5972fa5af6002f2692a234ff608fe6c4f28f2d6cd69f2fe4c60953f2fdf67aad5293ffc7396b729e478bb59fa060c416 SHA512 8f7df05e54e053456e3ebe9394b19beb2a37dfed30cfb5fb673f591415dc6fabe105af51e838fbe73ef078906d94562080ca465b0c6b4e1537bd4a6e066244f7
-EBUILD crypto-random-api-0.2.0.ebuild 613 BLAKE2B c4d101f997e3c6a827aaa3da072c0bb4f5d71cecf0c0a726b5df92e69616b41b8c50919aa2e9a239e62704e10ac4ab1f86be15cc07ad5bfdae7ba9995773ef64 SHA512 11ce52894da027cea5edf8113ba166fc14108cd629b43146aabf5700b59367968754d3645bf2515eadbb7a1008644e761c4f763be1f6c43236905c8056f4de1d
-MISC metadata.xml 444 BLAKE2B 0c69bca996e3e34a0e1c366baeb5736f9198d2a5a3cfdd165184f32ea4c64a1a70550ac4715300c8bce85fa28d115982f0bd738307e857518aca8f2abadffded SHA512 6d0c299740c05ed2abf8b0f5879f037f516ba7e1940e4e43edd7fa39e786be57313d6aab20ee3ad25afb64c0552484b00a2589b603276d9162b11dc27df993e1
diff --git a/dev-haskell/crypto-random-api/crypto-random-api-0.2.0.ebuild b/dev-haskell/crypto-random-api/crypto-random-api-0.2.0.ebuild
deleted file mode 100644
index cdef3a8e524b..000000000000
--- a/dev-haskell/crypto-random-api/crypto-random-api-0.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple random generators API for cryptography related code"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-random-api"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/entropy:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/crypto-random-api/metadata.xml b/dev-haskell/crypto-random-api/metadata.xml
deleted file mode 100644
index a2c58a20bef1..000000000000
--- a/dev-haskell/crypto-random-api/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Simple random generators API for cryptography related code
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-random-api</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/crypto-random/Manifest b/dev-haskell/crypto-random/Manifest
deleted file mode 100644
index 48f213d4fa53..000000000000
--- a/dev-haskell/crypto-random/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST crypto-random-0.0.7.tar.gz 8999 BLAKE2B 121268501910f7d507c2d1c92d8807a9d17e1dd65e9af2d2a760a5f763d686c1b085c47dcf4f584e533fac83fe023ce02bbee5c55c5e8714d9f35e6a5f195563 SHA512 7e96f602c2cd194601f7feeb4589ab4606542c81bc27b566edb90030c010da3998b235cd2b229ca781ea147defe4677077897343b4ef561e0858ad71a4a7a409
-DIST crypto-random-0.0.9.tar.gz 9256 BLAKE2B f9433a75c7285e92feda4f5d3db165c0f530d59ab95f733755c138bfaa162b0948b84ca912dbf26fc80b06d5cee7670361defa308d1ea5926a0e1cd385d39976 SHA512 07e298e2e3846b48330af92a46ab8550982ad74f6154c59a531762d9282f6712c1e867a48ed6cf4d967f463f52c1af4287a74552aeff0635480ea21cd54a7a24
-EBUILD crypto-random-0.0.7.ebuild 628 BLAKE2B 679aeb6dfbecc834cfe4416aba529d1a9d4dba18053aec6f3b48a0bbf6299e9eb4f39f85d052e9f9333ee76f9ad8c9c71ee5eb64173a6d6e7dfac35c1015aa21 SHA512 0a5ff6f822011a8ba1ba05290ee7edfa556e2c923cad2dc3e01476f6062a43db9cf5a2427f2a787e09742499277658e6a3f32a6e9e05c14fabad3a5b1894cd0b
-EBUILD crypto-random-0.0.9.ebuild 623 BLAKE2B 205f79fd1e5350d3d80e73b271383cefc63062021977d67ffb4594a0449af7ae35fbac50defefdd72e8ea0cb254f3ad7cb2b7a21b91915d6f367bc5d449939ed SHA512 57d390e038218bb39397a4eeb8c728577684fdd00726ebc74d24c80da37117a01fc205623122c437e90a50ec5885d156e47db042fc2bcf4f36967c188298f78f
-MISC metadata.xml 423 BLAKE2B 0d9bc2ab2304cb3e0aac533d285d8d9fd4841625db3a6dedc88f14722e0fadc158b3bf745bb21b04644f8b126ad69bd1a45af30e98aade3bee237f43ce3985ea SHA512 693c88b1416825ce53c3aa70ae35162821d17de563635655f0bee2b3080553635735123a21a0eb0c1fb703189209fc744efa08ec1db0b53ab364501c07ffc743
diff --git a/dev-haskell/crypto-random/crypto-random-0.0.7.ebuild b/dev-haskell/crypto-random/crypto-random-0.0.7.ebuild
deleted file mode 100644
index 0a6f5543d494..000000000000
--- a/dev-haskell/crypto-random/crypto-random-0.0.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple cryptographic random related types"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-random"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/securemem:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild b/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild
deleted file mode 100644
index 434edab5c437..000000000000
--- a/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple cryptographic random related types"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-random"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/securemem:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/crypto-random/metadata.xml b/dev-haskell/crypto-random/metadata.xml
deleted file mode 100644
index 5b827aacddd8..000000000000
--- a/dev-haskell/crypto-random/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Simple cryptographic random related types
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-random</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/crypto/Manifest b/dev-haskell/crypto/Manifest
deleted file mode 100644
index ef310bbfe35e..000000000000
--- a/dev-haskell/crypto/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Crypto-4.2.5.1.tar.gz 56474 BLAKE2B a5e86c4e161b1e89c37b3feff1fc3a30911cf6401a7bb6c3cb1d605fb2ebb5bb145ff2a398fa6fab59e194e1b5f235eb8212f3ac70b21c32202173d0d15dff65 SHA512 3b965f6a06784d3e8996aaae2622fa5b8e4a645a324618ff497f565230a8db525a0a5305d5cc5166283b2a24242df4554b29eb015326d416dc705f252ef456ac
-EBUILD crypto-4.2.5.1-r1.ebuild 1103 BLAKE2B 40f0b7887854dede05701e384f35309e276e83b37926f4c845022158f0278d956fd6484badb44d184f6385255feadcf75805e6eefdfea8ba5b9804d86a59974d SHA512 4ebb1adc121fd5ecdb173800f6ca9d1d7e35763319183b0193f470a06ea10448674c576b252e2128039439865026695e556e0c5c947b543d885e7ac8bf9d6063
-MISC metadata.xml 547 BLAKE2B 9c2abb3770b4858b3bc4a3ea0239bc0b48c5d9b6fd132d0db28488a48fe554f26e0e8c65aeb71a7ba042a271350a1eea882f3cf636a3eb2825d9017f510f8785 SHA512 cfee502ca5b3d23d9223a97a0e1b928955be0f9fc8552e988aeb5e25f515ab2dc6a7578b2aa5f930400c7807835c29ba7e9103165a2a0a330d4f5b88c2f907e9
diff --git a/dev-haskell/crypto/crypto-4.2.5.1-r1.ebuild b/dev-haskell/crypto/crypto-4.2.5.1-r1.ebuild
deleted file mode 100644
index 196367b36910..000000000000
--- a/dev-haskell/crypto/crypto-4.2.5.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Crypto"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Collects together existing Haskell cryptographic functions into a package"
-HOMEPAGE="http://hackage.haskell.org/package/Crypto"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-		>=dev-haskell/quickcheck-2.4.0.1:2=[profile?]
-		dev-haskell/random:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-S="${WORKDIR}/${MY_P}"
-
-src_test() {
-	TESTS="SymmetricTest SHA1Test RSATest QuickTest HMACTest WordListTest"
-
-	for t in $TESTS; do
-		einfo "Running test $t..."
-		# the quickcheck tests doesn't fail when the test fails...
-		"${S}/dist/build/$t/$t" || die "Test $t failed"
-	done
-}
-
-src_install() {
-	cabal_src_install
-
-	rm -rf "${D}/usr/bin" 2>/dev/null
-}
diff --git a/dev-haskell/crypto/metadata.xml b/dev-haskell/crypto/metadata.xml
deleted file mode 100644
index 2dbebd8cd714..000000000000
--- a/dev-haskell/crypto/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		DES, Blowfish, AES, TEA, SHA1, MD5, RSA, BubbleBabble,
-		Hexdump, Support for Word128, Word192 and Word256 and Beyond, PKCS5
-		Padding, Various Encryption Modes e.g. Cipher Block Chaining all in one package,
-		with HUnit and QuickCheck tests, and examples.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/cryptocipher-0.5.2 b/dev-haskell/cryptocipher-0.5.2
new file mode 100644
index 000000000000..2ffe02e26cdc
--- /dev/null
+++ b/dev-haskell/cryptocipher-0.5.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/cereal:=[profile?] dev-haskell/cipher-aes:=[profile?] dev-haskell/cipher-rc4:=[profile?] =dev-haskell/cpu-0.1*:=[profile?] >=dev-haskell/crypto-api-0.5:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/cryptohash dev-haskell/entropy >=dev-haskell/quickcheck-2 >=dev-haskell/test-framework-0.3.3 >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Symmetrical block and stream ciphers
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-crypto-cipher
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/cereal:=[profile?] dev-haskell/cipher-aes:=[profile?] dev-haskell/cipher-rc4:=[profile?] =dev-haskell/cpu-0.1*:=[profile?] >=dev-haskell/crypto-api-0.5:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.5.2
+SRC_URI=mirror://hackage/packages/archive/cryptocipher/0.5.2/cryptocipher-0.5.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=619ba074a1ad70ed03bcc77247e1acc7
diff --git a/dev-haskell/cryptocipher-0.6.2 b/dev-haskell/cryptocipher-0.6.2
new file mode 100644
index 000000000000..c182a53eccdf
--- /dev/null
+++ b/dev-haskell/cryptocipher-0.6.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cipher-aes-0.2.3:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?] >=dev-haskell/cipher-blowfish-0.0:=[profile?] <dev-haskell/cipher-blowfish-0.1:=[profile?] >=dev-haskell/cipher-camellia-0.0:=[profile?] <dev-haskell/cipher-camellia-0.1:=[profile?] >=dev-haskell/cipher-des-0.0:=[profile?] <dev-haskell/cipher-des-0.1:=[profile?] >=dev-haskell/cipher-rc4-0.1.3:=[profile?] <dev-haskell/cipher-rc4-0.2:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.8:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Symmetrical block and stream ciphers
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-crypto-cipher
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cipher-aes-0.2.3:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?] >=dev-haskell/cipher-blowfish-0.0:=[profile?] <dev-haskell/cipher-blowfish-0.1:=[profile?] >=dev-haskell/cipher-camellia-0.0:=[profile?] <dev-haskell/cipher-camellia-0.1:=[profile?] >=dev-haskell/cipher-des-0.0:=[profile?] <dev-haskell/cipher-des-0.1:=[profile?] >=dev-haskell/cipher-rc4-0.1.3:=[profile?] <dev-haskell/cipher-rc4-0.2:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.8:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.6.2
+SRC_URI=mirror://hackage/packages/archive/cryptocipher/0.6.2/cryptocipher-0.6.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9137f8dde654425b4142ea2152b27179
diff --git a/dev-haskell/cryptocipher/Manifest b/dev-haskell/cryptocipher/Manifest
deleted file mode 100644
index 679ea109c8b9..000000000000
--- a/dev-haskell/cryptocipher/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST cryptocipher-0.5.2.tar.gz 22384 BLAKE2B 7133784c97498bbd0c5b39c9bea0e76534c7b3bec26683227277e9ef8474b5cc2cc6e67de46c609b5545a074bae8a3a8401de826b4bb45a30d48df29bf1da4b3 SHA512 f9e76805b27b7002f5393893d9cac30998c82f3d5759be48a25907c95ab0d8250c2e54dea252c1881bca5117fb2fe3fcc59b304265b6db286e1f1a2d733a631d
-DIST cryptocipher-0.6.2.tar.gz 2027 BLAKE2B 617f3c184baa3acb6a248b60dc928fc4696d4818b31a55fe111838154a1f1a6e3fd42c96cb4d8ecceb21ae0145550fe2b097635524207b5d9e63f41e29047d67 SHA512 d63984d26e355ff613a4176c11634f1012f8b9ec43180ffed236f37aa7a1b1dafee1871799eec53774544518c886c27ae19bb0b058288da6bd8f2b45eaa5e5ab
-EBUILD cryptocipher-0.5.2.ebuild 1010 BLAKE2B 6138a4b82f106b9e8a9225da5ab015c7aa7bf41bb8c77dd37b583187f2cb7b2b0bf513c2f7fb69dc967d46cf69b25c83c384aa0be95e6e8b29227af1b54139bb SHA512 424b0e9c4f8487b6e78fd2fba6b15ea1dd119cd0bb64e3d650beb794e23fe3a43c355768d5cb2ece272bb7666e90ce9a1cd63cfa6ac1c3ac8a88baca6f6be498
-EBUILD cryptocipher-0.6.2.ebuild 1090 BLAKE2B d7a9ed16a4c1888f388795e9cd487f3849913eb7e569d09bd7768b49a6e21bad80c4a33e0d5673f5d5145744a9e98255cfa054c2f5e83d88664a172cc5ccdaf8 SHA512 64ada82a43fb68c81c1bb91d74cefa6c326b068ca75c21cf13177337ec9bc6ab19df30d0a9f97826acc97490802e4e64bc89a92cafcd08c6a100527c97cbaf27
-MISC metadata.xml 426 BLAKE2B fb3e13fbea249cd665f5845d33da7c8c25c58d910ba5b585884ad1e64c2e224a5c400bad2ab06af8bd8ac28f57844eef5e69fe0eaffeb1333255d739da2cff5b SHA512 6bec3dd0fb96088e872fa1532d15d910b690c2ea17a9ba4e73047f70c72f1d0c106a8ad78b93c5f298aa7522a62ca6103837160c67d10899b9dee9c0cfc0af1f
diff --git a/dev-haskell/cryptocipher/cryptocipher-0.5.2.ebuild b/dev-haskell/cryptocipher/cryptocipher-0.5.2.ebuild
deleted file mode 100644
index 8e4112ded18c..000000000000
--- a/dev-haskell/cryptocipher/cryptocipher-0.5.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Symmetrical block and stream ciphers"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-cipher"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/cereal:=[profile?]
-		dev-haskell/cipher-aes:=[profile?]
-		dev-haskell/cipher-rc4:=[profile?]
-		=dev-haskell/cpu-0.1*:=[profile?]
-		>=dev-haskell/crypto-api-0.5:=[profile?]
-		dev-haskell/primitive:=[profile?]
-		>=dev-haskell/vector-0.7:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/cryptohash
-			dev-haskell/entropy
-			>=dev-haskell/quickcheck-2
-			>=dev-haskell/test-framework-0.3.3
-			>=dev-haskell/test-framework-quickcheck2-0.2.9
-		)"
diff --git a/dev-haskell/cryptocipher/cryptocipher-0.6.2.ebuild b/dev-haskell/cryptocipher/cryptocipher-0.6.2.ebuild
deleted file mode 100644
index 661de1637479..000000000000
--- a/dev-haskell/cryptocipher/cryptocipher-0.6.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Symmetrical block and stream ciphers"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-cipher"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cipher-aes-0.2.3:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?]
-	>=dev-haskell/cipher-blowfish-0.0:=[profile?] <dev-haskell/cipher-blowfish-0.1:=[profile?]
-	>=dev-haskell/cipher-camellia-0.0:=[profile?] <dev-haskell/cipher-camellia-0.1:=[profile?]
-	>=dev-haskell/cipher-des-0.0:=[profile?] <dev-haskell/cipher-des-0.1:=[profile?]
-	>=dev-haskell/cipher-rc4-0.1.3:=[profile?] <dev-haskell/cipher-rc4-0.2:=[profile?]
-	>=dev-haskell/crypto-cipher-types-0.0.8:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/cryptocipher/metadata.xml b/dev-haskell/cryptocipher/metadata.xml
deleted file mode 100644
index 927dcf71828b..000000000000
--- a/dev-haskell/cryptocipher/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Symmetrical Block, Stream and PubKey Ciphers
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-cipher</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cryptohash-0.10.0 b/dev-haskell/cryptohash-0.10.0
new file mode 100644
index 000000000000..7877ecea4f0e
--- /dev/null
+++ b/dev-haskell/cryptohash-0.10.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/byteable:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2 >=dev-haskell/test-framework-0.3.3 dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=collection of crypto hashes, fast, pure and practical
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-cryptohash
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/byteable:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.10.0
+SRC_URI=mirror://hackage/packages/archive/cryptohash/0.10.0/cryptohash-0.10.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5aea100d4b67605bb0fc7296cb6c7067
diff --git a/dev-haskell/cryptohash-0.11.1 b/dev-haskell/cryptohash-0.11.1
new file mode 100644
index 000000000000..276eb2658dc9
--- /dev/null
+++ b/dev-haskell/cryptohash-0.11.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/byteable:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2 >=dev-haskell/test-framework-0.3.3 dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=collection of crypto hashes, fast, pure and practical
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-cryptohash
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/byteable:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.11.1
+SRC_URI=mirror://hackage/packages/archive/cryptohash/0.11.1/cryptohash-0.11.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3c8698f7a7a1baeeae33255b354412c9
diff --git a/dev-haskell/cryptohash-0.11.6 b/dev-haskell/cryptohash-0.11.6
new file mode 100644
index 000000000000..ded0bed6d326
--- /dev/null
+++ b/dev-haskell/cryptohash-0.11.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/byteable:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2 dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=collection of crypto hashes, fast, pure and practical
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-cryptohash
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/byteable:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.11.6
+SRC_URI=mirror://hackage/packages/archive/cryptohash/0.11.6/cryptohash-0.11.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=43a65900cfa2736282d6284374e32ed5
diff --git a/dev-haskell/cryptohash-0.11.9 b/dev-haskell/cryptohash-0.11.9
new file mode 100644
index 000000000000..3e58c04f75d6
--- /dev/null
+++ b/dev-haskell/cryptohash-0.11.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/cryptonite-0.13:=[profile?] dev-haskell/memory:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2 dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=collection of crypto hashes, fast, pure and practical
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-cryptohash
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/cryptonite-0.13:=[profile?] dev-haskell/memory:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.11.9
+SRC_URI=mirror://hackage/packages/archive/cryptohash/0.11.9/cryptohash-0.11.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f68de14aad84f2671e91928a983e5851
diff --git a/dev-haskell/cryptohash-0.9.1 b/dev-haskell/cryptohash-0.9.1
new file mode 100644
index 000000000000..1bbc30071455
--- /dev/null
+++ b/dev-haskell/cryptohash-0.9.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/byteable:=[profile?] >=dev-lang/ghc-6.10.4:= cryptoapi? ( >=dev-haskell/cereal-0.2:=[profile?] >=dev-haskell/crypto-api-0.5:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2 >=dev-haskell/test-framework-0.3.3 dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=collection of crypto hashes, fast, pure and practical
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-cryptohash
+IUSE=+cryptoapi doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/byteable:=[profile?] >=dev-lang/ghc-6.10.4:= cryptoapi? ( >=dev-haskell/cereal-0.2:=[profile?] >=dev-haskell/crypto-api-0.5:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] )
+SLOT=0/0.9.1
+SRC_URI=mirror://hackage/packages/archive/cryptohash/0.9.1/cryptohash-0.9.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ff080dc6390a9920b8a938fc629b5349
diff --git a/dev-haskell/cryptohash-conduit-0.1.1 b/dev-haskell/cryptohash-conduit-0.1.1
new file mode 100644
index 000000000000..bef1eddb0421
--- /dev/null
+++ b/dev-haskell/cryptohash-conduit-0.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptohash:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=cryptohash conduit
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-cryptohash-conduit
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptohash:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.1.1
+SRC_URI=mirror://hackage/packages/archive/cryptohash-conduit/0.1.1/cryptohash-conduit-0.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c7004eef9d76d1c810c986fc6ea6a688
diff --git a/dev-haskell/cryptohash-conduit/Manifest b/dev-haskell/cryptohash-conduit/Manifest
deleted file mode 100644
index 754a6f037ed5..000000000000
--- a/dev-haskell/cryptohash-conduit/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cryptohash-conduit-0.1.1.tar.gz 2318 BLAKE2B 3bc4d926d020b899c34169211b4b74394260e222e098d5afbc886898a45205b13cb89661699ae169f20a8ac092439463e74b5dffeb65131b891126ece5e80c6e SHA512 6382a05b35bae34b53fd1ad6d897c25ca149ed852360c8f775587efcd3c29e45ff854f96ddbc9b446e04a4dd5698b1f5e2af754345f7d5af8f587b73b57fdec0
-EBUILD cryptohash-conduit-0.1.1.ebuild 722 BLAKE2B 555832da9f2083ca4a230da152fda1230e27f75f7648886a39c126e69a20690906bda31c83dc37eb5467c7a611e49406e5ff77df7d107743b2b279d0067b526a SHA512 962026a0f8a8ec0206b98c62e8903b489eb761d45727afc4f3d33becf967139d39aa09ff9c5bc04305a2ff0b7c37d83de8a3bc4e4ac24af3e0418e20493e936b
-MISC metadata.xml 468 BLAKE2B 8032283c0f6fe821212914f4da082d8b9fab6511c99e4087fd77ea30cbf8c75b5704373976e50a8ac6f8df126ae323044c0aef915f11a68a9ba07715a5b879e9 SHA512 3ae24a3559e8e7acabb915fcbebf65fa22a9620aa2bb3b1c22e3ca428585dd973c01ac750616f230ac3547af8b968e756eef1b3a75785cc86d4a6e19361e9c43
diff --git a/dev-haskell/cryptohash-conduit/cryptohash-conduit-0.1.1.ebuild b/dev-haskell/cryptohash-conduit/cryptohash-conduit-0.1.1.ebuild
deleted file mode 100644
index 88a2a8260dca..000000000000
--- a/dev-haskell/cryptohash-conduit/cryptohash-conduit-0.1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="cryptohash conduit"
-HOMEPAGE="https://github.com/vincenthz/hs-cryptohash-conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/conduit:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/cryptohash:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/cryptohash-conduit/metadata.xml b/dev-haskell/cryptohash-conduit/metadata.xml
deleted file mode 100644
index 877d639f87fb..000000000000
--- a/dev-haskell/cryptohash-conduit/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Support all the @cryptohash@ package using conduits from
-		the @conduit@ package.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-cryptohash-conduit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cryptohash-cryptoapi-0.1.3 b/dev-haskell/cryptohash-cryptoapi-0.1.3
new file mode 100644
index 000000000000..a67b1707d561
--- /dev/null
+++ b/dev-haskell/cryptohash-cryptoapi-0.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cereal-0.2:=[profile?] >=dev-haskell/crypto-api-0.11:=[profile?] >=dev-haskell/cryptohash-0.8.0:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Crypto-api interfaces for cryptohash
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-cryptohash-cryptoapi
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cereal-0.2:=[profile?] >=dev-haskell/crypto-api-0.11:=[profile?] >=dev-haskell/cryptohash-0.8.0:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.3
+SRC_URI=mirror://hackage/packages/archive/cryptohash-cryptoapi/0.1.3/cryptohash-cryptoapi-0.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=27c97bd4f57cae5efffe10bb1ba09bf1
diff --git a/dev-haskell/cryptohash-cryptoapi-0.1.4 b/dev-haskell/cryptohash-cryptoapi-0.1.4
new file mode 100644
index 000000000000..8c4d19a81bd3
--- /dev/null
+++ b/dev-haskell/cryptohash-cryptoapi-0.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cereal-0.2:=[profile?] >=dev-haskell/crypto-api-0.11:=[profile?] >=dev-haskell/cryptonite-0.13:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Crypto-api interfaces for cryptohash
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-cryptohash-cryptoapi
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cereal-0.2:=[profile?] >=dev-haskell/crypto-api-0.11:=[profile?] >=dev-haskell/cryptonite-0.13:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.4
+SRC_URI=mirror://hackage/packages/archive/cryptohash-cryptoapi/0.1.4/cryptohash-cryptoapi-0.1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6ba2021d986d154303f9f4fec969527c
diff --git a/dev-haskell/cryptohash-cryptoapi/Manifest b/dev-haskell/cryptohash-cryptoapi/Manifest
deleted file mode 100644
index 62064e6de6c3..000000000000
--- a/dev-haskell/cryptohash-cryptoapi/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST cryptohash-cryptoapi-0.1.3.tar.gz 2922 BLAKE2B bce61995eafdcf5c839cd3f035245cccaf59a676f515836a0afe2862fcc946f1cd143bcb67fd1ceb660d8bcbdecb2791a8190a226dc4c3e9bfc90b936becba6b SHA512 c33af37d4d1d8f3b13ad1ed93db4ec138ea3bef315006ee8117ccacb5c36e2afeb92ae903d46de537f0fbea2a262c5c487eb32d3e1d7099de27b53cc4f17889a
-DIST cryptohash-cryptoapi-0.1.4.tar.gz 3094 BLAKE2B afd5169c172965eadacf9113a03a58cfff9350b63c339170788585437777deb41998322ea3d33f5d9c2c77b4f927e4457bfcaf8f4f92c6f77e85bffc51c02a47 SHA512 f5add1c8922e682d5d08073d0a3d03c6d5545f38edd90821bad7a92f354203ca380ca7e302b4b259bb9e2ce6ae09b1a2428e981e2d745a4a1b1a5cff696621e2
-EBUILD cryptohash-cryptoapi-0.1.3.ebuild 721 BLAKE2B a8cdaac95dd62a2d05cbbfe8c6cd0c7d296a2e8c62d2e92a2a2ef3bd0c83bc747e9983f81779723939baa910289a4be77ff307367dee8f45b2e4f483b295dea2 SHA512 6288cdfc8e87811172ae6d75e4cf82755435b4aee1ff61a1a7f3f214dc1308a80239ed684b314447d8dcdccdedee54ba4078215870b8186a92802321b87ba0ef
-EBUILD cryptohash-cryptoapi-0.1.4.ebuild 754 BLAKE2B cb7574c40fd409f5012d5a6ff350a32712d6cdac66a65470d88b30fcd5af75065fea690b33c2bfd46c27e54b66e111b34739725adb6463e327fba075b07ddc6a SHA512 7953f10ed49c24b5a58e1fd81f5583c81bcf45e398406ade9c208b18c2c4368c614cbbea73cd1ee30f8bbf8297f61f333c6f2ccb6b6b0b10cf1d5999ff0e49a0
-MISC metadata.xml 425 BLAKE2B b7ceac3e2d825beb20a99913efd0924ea410a8db94c5e7f2c8ff90ece0e235cb5a313ef1956b5d0bdc47682f2b09aaf52e7fd365684c8724c8579cef7609fbef SHA512 d02785027a398cb3bff35fadb16316fd642912445872d7d06abfad9cda24da496ddd63bb59054fc21d701b281dd33b1dce961e293041a3435e6bd900191b366a
diff --git a/dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.3.ebuild b/dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.3.ebuild
deleted file mode 100644
index cfb9bf0ecac6..000000000000
--- a/dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Crypto-api interfaces for cryptohash"
-HOMEPAGE="https://github.com/vincenthz/hs-cryptohash-cryptoapi"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cereal-0.2:=[profile?]
-	>=dev-haskell/crypto-api-0.11:=[profile?]
-	>=dev-haskell/cryptohash-0.8.0:=[profile?]
-	>=dev-haskell/tagged-0.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.4.ebuild b/dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.4.ebuild
deleted file mode 100644
index 27bc99ad3a7a..000000000000
--- a/dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Crypto-api interfaces for cryptohash"
-HOMEPAGE="https://github.com/vincenthz/hs-cryptohash-cryptoapi"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cereal-0.2:=[profile?]
-	>=dev-haskell/crypto-api-0.11:=[profile?]
-	>=dev-haskell/cryptonite-0.13:=[profile?]
-	dev-haskell/memory:=[profile?]
-	>=dev-haskell/tagged-0.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/cryptohash-cryptoapi/metadata.xml b/dev-haskell/cryptohash-cryptoapi/metadata.xml
deleted file mode 100644
index 3c253aeae484..000000000000
--- a/dev-haskell/cryptohash-cryptoapi/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Crypto-api interfaces for cryptohash
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-cryptohash-cryptoapi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cryptohash-sha256-0.11.100.1 b/dev-haskell/cryptohash-sha256-0.11.100.1
new file mode 100644
index 000000000000..f42b42de7918
--- /dev/null
+++ b/dev-haskell/cryptohash-sha256-0.11.100.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/base16-bytestring-0.1.1 <dev-haskell/base16-bytestring-0.2 >=dev-haskell/sha-1.6.4 <dev-haskell/sha-1.7 >=dev-haskell/tasty-0.11 <dev-haskell/tasty-0.12 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast, pure and practical SHA-256 implementation
+EAPI=6
+HOMEPAGE=https://github.com/hvr/cryptohash-sha256
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.11.100.1
+SRC_URI=mirror://hackage/packages/archive/cryptohash-sha256/0.11.100.1/cryptohash-sha256-0.11.100.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=554efb60419bd57a7e06c1a5e5f29715
diff --git a/dev-haskell/cryptohash-sha256/Manifest b/dev-haskell/cryptohash-sha256/Manifest
deleted file mode 100644
index e35a030f4cf1..000000000000
--- a/dev-haskell/cryptohash-sha256/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cryptohash-sha256-0.11.100.1.tar.gz 10885 BLAKE2B 09f33b351b72bb9b8892409b5b140bd446f98cb7fdc349f483a3b719753c0a0ca08c0557ccff2bc4bfedb4336b3c5d046d15548cc8e3a404d69efcf2a5c744c2 SHA512 df6a8c7a4796f3b94faf0c1073b552eccf7dfbe6ab1489fef391e6342f34b3cb29991d1313aa5da11a90cb37bcd43c23eea12073ad4c7190926005de952c39e2
-EBUILD cryptohash-sha256-0.11.100.1.ebuild 882 BLAKE2B b5ef661cbf1c993d33eab61ba6f72c36d3f821cfc75ea217c746eb364d5ff981317a33b96d7c622af55bb009988193206a8341c20053b387469953125ae974f2 SHA512 67f8bbee528779f375f3f1f8a3689634f8e51953395c0be19f4ade5a284c9fef87eabf7ec18ba28fac2c38cd90e5ce29169102c13479e07e14d628582ba34c57
-MISC metadata.xml 1142 BLAKE2B 0cad5264e9d4ede629d9ca0ead9b4f523b1fc78f845db2c3ef27198e089499ea09a272e4070ca0212cbcdc983dbcdecff11e13e9e445a46fe5b0d0371e4ffca6 SHA512 992cbdbfeabf1b1b5d70b451ec96adbf782fd2ba4f49dd1acd796d19fabb0d54bc5dcbcf968b0c9d99335f972abe0d0aa4b6f042a3152ca1705396cb5fb4c76a
diff --git a/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.100.1.ebuild b/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.100.1.ebuild
deleted file mode 100644
index 7389ba6c9f44..000000000000
--- a/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.100.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast, pure and practical SHA-256 implementation"
-HOMEPAGE="https://github.com/hvr/cryptohash-sha256"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/base16-bytestring-0.1.1 <dev-haskell/base16-bytestring-0.2
-		>=dev-haskell/sha-1.6.4 <dev-haskell/sha-1.7
-		>=dev-haskell/tasty-0.11 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 )
-"
diff --git a/dev-haskell/cryptohash-sha256/metadata.xml b/dev-haskell/cryptohash-sha256/metadata.xml
deleted file mode 100644
index 095ef6762db6..000000000000
--- a/dev-haskell/cryptohash-sha256/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A practical incremental and one-pass, pure API to the
-		&lt;https://en.wikipedia.org/wiki/SHA-2 SHA-256 hash algorithm&gt;
-		with performance close to the fastest implementations available in other languages.
-		
-		The implementation is made in C with a haskell FFI wrapper that hides the C implementation.
-		
-		NOTE: This package has been forked off @cryptohash-0.11.7@ because the @cryptohash@ has been
-		deprecated and so this package continues to satisfy the need for a lightweight package
-		providing the SHA256 hash algorithm without any dependencies on packages other than
-		@base@ and @bytestring@.
-		
-		Consequently, this package can be used as a drop-in replacement for @cryptohash@'s
-		"Crypto.Hash.SHA256" module, though with a clearly smaller footprint.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">hvr/cryptohash-sha256</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cryptohash/Manifest b/dev-haskell/cryptohash/Manifest
deleted file mode 100644
index 129a2aca8e5f..000000000000
--- a/dev-haskell/cryptohash/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST cryptohash-0.10.0.tar.gz 63901 BLAKE2B 525338416b5ec73a7c8c261d9de4d5016e585fa32997ab75470dae43681ede364c1285a27a1bd1ac2883014d3e0cd73832c8bb7404ad8349933073b3879c3e78 SHA512 14a58c7d35feea846fc14821e532bd26046844a5d34274a46fcfd9cbc5100d414f980c95b64ef7ed5431993fb558962d6f7e262adc7297a54987dfa32cc4da2a
-DIST cryptohash-0.11.1.tar.gz 64985 BLAKE2B 2d67794751198575e6301f7f3f4c60416f89a9492aad1871e234a9a93ebf30ca79cbf84c3f1c5cdd2a56ae44575a84e927095fd9fa163eac39dae5b7438d5e19 SHA512 eb2da3e2c8a523354b81200b7ab3f36d29690d5f3311008ac24a5abaefe288551b67d7637b662f5a2b2b46bc5ef548ff6eae4f59ed9f1231ab9d8b0e6d039551
-DIST cryptohash-0.11.6.tar.gz 65798 BLAKE2B b7868955a8d5f2469dfff3d784c5c80cecfd498bad1c36feb12c53c6644a9bc0415c45bcb7641d515dd80c25d0052440e30f641b8ca2ca26d6a9dc0df96a9a56 SHA512 a6d3bd33104eb3b71d836323b330636cdce84165daa7e3b908296980468828c624a96db58cf9f953581986e090e53b78b10e15e361d354a00c9e9b49843a6956
-DIST cryptohash-0.11.9.tar.gz 25762 BLAKE2B a97de6b08f58ead9d51ae2042a52237d3cbea4eeb5d0138f4a90b1d65d545990297fd55ebb53d8458582790289b5a00eb3a82d1d08288e8ab100afa910a488e9 SHA512 d0eb07f59ae893df1a92a4dc45a98142e507ba3da25057ae4acf781b1b6200a2fb68dd2a19f1ba5f9395217bc81e7be1311a479dc3dcb4ec5338518a2f5239af
-DIST cryptohash-0.9.1.tar.gz 64991 BLAKE2B 86c26a40d1c5b77da226bc3a58a8bc19dd1c6214d40aeb802cfb87dfe6f1a398917c8f9a71b124a843bc7ae299b8392b1a121cf51b0522fd8afeb64caeeb0adf SHA512 773a16c1e16f8d2b48f4c107d22f14d439a15ffe9e92e43886538ee15e9349fdf53d1e15d20f888eaeac4fcaa07eb907b92de6f436b6655925a617f5139ac298
-EBUILD cryptohash-0.10.0.ebuild 790 BLAKE2B 0c3bdde156b686caba60848c7a41b1230c1174ce22c8952cd6661f438612d653e5d7ec5d34cefd1814abc468476bc21be17dd5cc51a1a73b2a04067164ec547c SHA512 3642e0d0f79dbd537a8f3c470004cfcc715ea2f6d9026ac53715b60856205f55b3df620ba509552a0d3e177b111074fada0d3c313dc8968a0fa0e5581434f686
-EBUILD cryptohash-0.11.1.ebuild 790 BLAKE2B caecb36013b2960f2c9716031de832fcb53229c12046f0ad012944bafbae860ce2f81557a428635324765d14d9a4870b44c86ed57e5e235afd33857fd1802b89 SHA512 7a580a0a6444871c008c245b7d1ff6f5974e4c1ca993038242faa89a54c1dcf2b7f82c5e8c6b38dd3a1b3c8f0ef74ae6f00a71d1af6e6044e520f9dce8bccae8
-EBUILD cryptohash-0.11.6.ebuild 747 BLAKE2B 0730baf3ada81cd40cf52282461a67167abd6203ae2affee7fdf90d284ca2cac39f30e48b8e36291663e58b773895884e8cd35b1387cf22e61568ab93f34f69d SHA512 1c056141514db8e2269db2350a59a8496014025229ae9f8bd64423fe7c83cc3b2dcbbf147d7342559b248359b3da206d09f6717e05f87d99b4210f79988b2b72
-EBUILD cryptohash-0.11.9.ebuild 822 BLAKE2B ab904d0e70d1836d13cbe66d74f8004d556bc2a9fc56be3b314bf7a175887fccc760f9c80b19a93781dec99488279a1a92b11fbde7f2a0b6bf52577f9d246d8a SHA512 5d56d22e49f7b0630babc04dc9f087dcf226e894756e2e01a8a3c5d53bf96ad4a03c3bb970f912f40579feed6a33049e65b30a614a019edd5b3bb52fce6f1b79
-EBUILD cryptohash-0.9.1.ebuild 1037 BLAKE2B 571bf2be365ff8405d9cf20dce256630b226434e73ae138d83ff6a2eb7833b14231d97b0d2569803e308c04f0fc74f445337c4fe82cc24f26ef850e3252112ad SHA512 d0bd2fe152a2d468df6bfff9db5dd603a4f79a8f94b6d998c22d3539e9a2ca40092d9e087363372abc86622594126c36936d7aec090fb0fecc905d98798b4e3f
-MISC metadata.xml 724 BLAKE2B 145f7888fa1e53a8f5ba21a14d1e132b9a7853f9eff8b65e8049b8c0b23199ffdfd8049094f42acb751da804a38e03871897794e76d2ff35dbc74598f99d7d25 SHA512 d6e1c6786e24d3bcdb829064b898002f5d2a5d874fac1c842c01957cad6dc0a32fc0e224abb0f38ddd229227af12bb9fca51480ca84114a5908915d9d89a5a4a
diff --git a/dev-haskell/cryptohash/cryptohash-0.10.0.ebuild b/dev-haskell/cryptohash/cryptohash-0.10.0.ebuild
deleted file mode 100644
index 8f4e4624f11f..000000000000
--- a/dev-haskell/cryptohash/cryptohash-0.10.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="collection of crypto hashes, fast, pure and practical"
-HOMEPAGE="https://github.com/vincenthz/hs-cryptohash"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2
-		>=dev-haskell/test-framework-0.3.3
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
diff --git a/dev-haskell/cryptohash/cryptohash-0.11.1.ebuild b/dev-haskell/cryptohash/cryptohash-0.11.1.ebuild
deleted file mode 100644
index 732a9f1a556f..000000000000
--- a/dev-haskell/cryptohash/cryptohash-0.11.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="collection of crypto hashes, fast, pure and practical"
-HOMEPAGE="https://github.com/vincenthz/hs-cryptohash"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2
-		>=dev-haskell/test-framework-0.3.3
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
diff --git a/dev-haskell/cryptohash/cryptohash-0.11.6.ebuild b/dev-haskell/cryptohash/cryptohash-0.11.6.ebuild
deleted file mode 100644
index 6308b2195056..000000000000
--- a/dev-haskell/cryptohash/cryptohash-0.11.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="collection of crypto hashes, fast, pure and practical"
-HOMEPAGE="https://github.com/vincenthz/hs-cryptohash"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/cryptohash/cryptohash-0.11.9.ebuild b/dev-haskell/cryptohash/cryptohash-0.11.9.ebuild
deleted file mode 100644
index eced9c7e4297..000000000000
--- a/dev-haskell/cryptohash/cryptohash-0.11.9.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="collection of crypto hashes, fast, pure and practical"
-HOMEPAGE="https://github.com/vincenthz/hs-cryptohash"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-haskell/cryptonite-0.13:=[profile?]
-	dev-haskell/memory:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/cryptohash/cryptohash-0.9.1.ebuild b/dev-haskell/cryptohash/cryptohash-0.9.1.ebuild
deleted file mode 100644
index 0348fd24dd91..000000000000
--- a/dev-haskell/cryptohash/cryptohash-0.9.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="collection of crypto hashes, fast, pure and practical"
-HOMEPAGE="https://github.com/vincenthz/hs-cryptohash"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cryptoapi"
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		cryptoapi? ( >=dev-haskell/cereal-0.2:=[profile?]
-			>=dev-haskell/crypto-api-0.5:=[profile?]
-			>=dev-haskell/tagged-0.1:=[profile?]
-		)"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/hunit
-			>=dev-haskell/quickcheck-2
-			>=dev-haskell/test-framework-0.3.3
-			dev-haskell/test-framework-hunit
-			>=dev-haskell/test-framework-quickcheck2-0.2.9
-		)"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag cryptoapi cryptoapi)
-}
diff --git a/dev-haskell/cryptohash/metadata.xml b/dev-haskell/cryptohash/metadata.xml
deleted file mode 100644
index 30d94fedcc23..000000000000
--- a/dev-haskell/cryptohash/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A collection of crypto hashes, with a practical incremental and one-pass, pure APIs,
-		with performance close to the fastest implementations available in others languages.
-		
-		The implementations are made in C with a haskell FFI wrapper that hide the C implementation.
-	</longdescription>
-	<use>
-		<flag name="cryptoapi">Defines crypto-api instances</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-cryptohash</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cryptonite-0.21 b/dev-haskell/cryptonite-0.21
new file mode 100644
index 000000000000..f33fe9d78fed
--- /dev/null
+++ b/dev-haskell/cryptonite-0.21
@@ -0,0 +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
+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
+KEYWORDS=amd64 x86
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d5d1a32dda94c001adb0e31bf4e18a05
diff --git a/dev-haskell/cryptonite-0.7 b/dev-haskell/cryptonite-0.7
new file mode 100644
index 000000000000..9d5079850dee
--- /dev/null
+++ b/dev-haskell/cryptonite-0.7
@@ -0,0 +1,14 @@
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=74ff2a2843e0e231dfdec6d4f897216c
diff --git a/dev-haskell/cryptonite-0.8 b/dev-haskell/cryptonite-0.8
new file mode 100644
index 000000000000..9fb2fd5dfcd4
--- /dev/null
+++ b/dev-haskell/cryptonite-0.8
@@ -0,0 +1,14 @@
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4bd23267cc0affb1dc3e3b6842bb799e
diff --git a/dev-haskell/cryptonite/Manifest b/dev-haskell/cryptonite/Manifest
deleted file mode 100644
index f61af31673b8..000000000000
--- a/dev-haskell/cryptonite/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST cryptonite-0.21.tar.gz 615850 BLAKE2B df5f0273fa40b5401e4bb5df7c4cd5839ab87fdff3d2cef6be80c977433a1adbcdbf1c9d42f79987e4a7a590f8179fd998f93017af396116e10554108566b028 SHA512 7f04ad5f7411bf90f343c13b71438fdd0e1e40cc5c9a5f1553c1f396a278f81cbe3a548ee8bc03b3b63bc66485ce36dc9a93c3dc3e5884f601bbae49efa98cc3
-DIST cryptonite-0.7.tar.gz 324734 BLAKE2B b0eabfa2575ed4680de541b5acafa1cc7d95ed5e7faca3ea53dddfdeea98a69ca76d7ea65e6117a8f6faf3c43a0b8f3a39c200e975279a78366140d80d663aff SHA512 077b181b1563087c6c04816a36bfd2efd7a732f72b02e5277f3d987093954ca8e420814b547c7c985418e74e8c838a3c8381b4821f3ed6fa8412b63078fade0e
-DIST cryptonite-0.8.tar.gz 325531 BLAKE2B b62d1330de4305e2a7c48063f1745d8f47ef176d356c07b2d533dbdfe02d4d76bd5699f8dda0f258108b2c16b2cf4bbe8228f4565620125839101e721310a05a SHA512 c393e7a93f8d4368ae9ee3130eb44cbc0a4937fdbe27bb918a8900716d9946bae39897717b1c2b3c2531ce69562df3d3260177fa76a6f90ee53ace206fe382a3
-EBUILD cryptonite-0.21.ebuild 1285 BLAKE2B 2722a82dafce4913a9d2d79d23e870a0bb52f4fee220412b65a97dbb0ad5e23c53f756715a7d0e45f75890c78776b7b3e5fb03869d989ea4fe691287a33c2aeb SHA512 baccf65be74a4062d24b662275770536966198c6ff700bc582a717b83c54680e43bd8ccd7a7fad235091b33365c52d877445934bffd5c5d79e988246c6d45cb8
-EBUILD cryptonite-0.7.ebuild 1109 BLAKE2B 0248cc967d6ffad48a7941933b80f5bf246413ca75ffa74b088d06074a2b4b53cc9663c2cd0d808346caa6a79da9d8ed8595ca789d97f4022d77167b01baecef SHA512 68b9c87848b3c64ca0834d9ad4b1f67e668029f16a0ac41f6b7d9cbb3a44ecfa44ed98d0cdd6fab86a17bc32d4b2f4be410cf4936991433b72867d04c402289a
-EBUILD cryptonite-0.8.ebuild 1114 BLAKE2B 05cad9a54436b5c59c465365c2100e7b4c8c191a8e9e578d1ff3dd8c3f9fbbc1f64712c2b4089107b87a74184d7415a7213d92ea56c775241d8695c0622af0c4 SHA512 f470ba4e7ad2ef069da36b531f70d323fa661c8d48e9f93e2d62710db67ac9dc586918e5f0f29a5ec3e8f78d19f0aca03d9cdd2ed4b382abf8ecd8f60f13a126
-MISC metadata.xml 1742 BLAKE2B 69dc6545e0d61413e5d719fb39384815586d24a4359becfc388d3e4654b5998c59dcabfa3617846047ad467ba385b575f45e5089e8b98039778b42d20242e15d SHA512 f1dcfbb9a816fc6c7a418fb38b98f3de6fc240b694e44a3d1a5a44f06e79d1940be46ac2712e32e1fc3af29942f8a100c0a4795d7e803d28c2e76c103b179d13
diff --git a/dev-haskell/cryptonite/cryptonite-0.21.ebuild b/dev-haskell/cryptonite/cryptonite-0.21.ebuild
deleted file mode 100644
index a4d474225be7..000000000000
--- a/dev-haskell/cryptonite/cryptonite-0.21.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -check_alignment,-old_toolchain_inliner
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cryptography Primitives sink"
-HOMEPAGE="https://github.com/haskell-crypto/cryptonite"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+integer-gmp +support_aesni support_blake2_sse +support_deepseq support_pclmuldq +support_rdrand"
-
-RDEPEND=">=dev-haskell/memory-0.8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/byteable
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-kat
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-check_alignment \
-		$(cabal_flag integer-gmp integer-gmp) \
-		--flag=-old_toolchain_inliner \
-		$(cabal_flag support_aesni support_aesni) \
-		$(cabal_flag support_blake2_sse support_blake2_sse) \
-		$(cabal_flag support_deepseq support_deepseq) \
-		$(cabal_flag support_pclmuldq support_pclmuldq) \
-		$(cabal_flag support_rdrand support_rdrand)
-}
diff --git a/dev-haskell/cryptonite/cryptonite-0.7.ebuild b/dev-haskell/cryptonite/cryptonite-0.7.ebuild
deleted file mode 100644
index bf70362d04a2..000000000000
--- a/dev-haskell/cryptonite/cryptonite-0.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cryptography Primitives sink"
-HOMEPAGE="https://github.com/vincenthz/cryptonite"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+integer-gmp +support_aesni +support_deepseq support_pclmuldq +support_rdrand"
-
-RESTRICT=test # slow
-
-RDEPEND=">=dev-haskell/memory-0.8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/byteable
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-kat
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag integer-gmp integer-gmp) \
-		$(cabal_flag support_aesni support_aesni) \
-		$(cabal_flag support_deepseq support_deepseq) \
-		$(cabal_flag support_pclmuldq support_pclmuldq) \
-		$(cabal_flag support_rdrand support_rdrand)
-}
diff --git a/dev-haskell/cryptonite/cryptonite-0.8.ebuild b/dev-haskell/cryptonite/cryptonite-0.8.ebuild
deleted file mode 100644
index 08d4a6767c3b..000000000000
--- a/dev-haskell/cryptonite/cryptonite-0.8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cryptography Primitives sink"
-HOMEPAGE="https://github.com/haskell-crypto/cryptonite"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+integer-gmp +support_aesni +support_deepseq support_pclmuldq +support_rdrand"
-
-RESTRICT=test # slow
-
-RDEPEND=">=dev-haskell/memory-0.8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/byteable
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-kat
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag integer-gmp integer-gmp) \
-		$(cabal_flag support_aesni support_aesni) \
-		$(cabal_flag support_deepseq support_deepseq) \
-		$(cabal_flag support_pclmuldq support_pclmuldq) \
-		$(cabal_flag support_rdrand support_rdrand)
-}
diff --git a/dev-haskell/cryptonite/metadata.xml b/dev-haskell/cryptonite/metadata.xml
deleted file mode 100644
index 2558232f1f8f..000000000000
--- a/dev-haskell/cryptonite/metadata.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A repository of cryptographic primitives.
-		
-		* Symmetric ciphers: AES, DES, 3DES, Blowfish, Camellia, RC4, Salsa, ChaCha.
-		
-		* Hash: SHA1, SHA2, SHA3, MD2, MD4, MD5, Kekkak, Skein, Ripemd, Tiger, Whirlpool
-		
-		* MAC: HMAC, Poly1305
-		
-		* Assymmetric crypto: DSA, RSA, DH, ECDH, ECDSA, ECC, Curve25519, Ed25519
-		
-		* Key Derivation Function: PBKDF2, Scrypt
-		
-		* Cryptographic Random generation: System Entropy, Deterministic Random Generator
-		
-		* Data related: Anti-Forensic Information Splitter (AFIS)
-		
-		If anything cryptographic related is missing from here, submit
-		a pull request to have it added. This package strive to be a
-		cryptographic kitchen sink that provides cryptography for everyone.
-		
-		Evaluate the security related to your requirements before using.
-	</longdescription>
-	<use>
-		<flag name="support_aesni">allow compilation with AESNI on system and architecture that supports it</flag>
-		<flag name="support_rdrand">allow compilation with AESNI on system and architecture that supports it</flag>
-		<flag name="support_pclmuldq">Allow compilation with pclmuldq on architecture that supports it</flag>
-		<flag name="integer-gmp">Whether or not to use GMP for some functions</flag>
-		<flag name="support_deepseq">add deepseq instances for cryptographic types</flag>
-		<flag name="support_blake2_sse">Use SSE optimized version of BLAKE2</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">haskell-crypto/cryptonite</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/css-text-0.1.2.1 b/dev-haskell/css-text-0.1.2.1
new file mode 100644
index 000000000000..78f1a3a94506
--- /dev/null
+++ b/dev-haskell/css-text-0.1.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10.2.0:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=CSS parser and renderer
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.10.2.0:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.1.2.1
+SRC_URI=mirror://hackage/packages/archive/css-text/0.1.2.1/css-text-0.1.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e89c43ab5fb523c9971bd0c034619b82
diff --git a/dev-haskell/css-text/Manifest b/dev-haskell/css-text/Manifest
deleted file mode 100644
index 7cb8ffede5b2..000000000000
--- a/dev-haskell/css-text/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST css-text-0.1.2.1.tar.gz 3947 BLAKE2B 815ff937c708e211c53524fcb89777da56591f4f0f5050d812b43ad292c1bf5653b3383af0cf7478a428236d7f92f3668de57ff8fa3e1f0ebb041db7a961c3c6 SHA512 837b5e45ea87e4656a1a33b9a1ab098c03fa90a150ca6626dd4eaa75b4d35332703d2de6182d61dc1a144402366c6e74c3a85b60ff864aa080f8c8ef7b670bbc
-EBUILD css-text-0.1.2.1.ebuild 674 BLAKE2B 05ce6abf199bfcafa9d78db186704aa4590cc3d19c2cee05b09ee3c1155a465d1f974b5b3c295ba5f1fc6d28ae8d466114c071befab5f760a992212e7ecca62b SHA512 8a67e471e98c463d1a3551107bdd022bd9d3d9674145cf044c257248f66c4029383c12267f1df271ff10f74d0e5b1d7504b535dfc0001a5eeb0c53a7731a26dc
-MISC metadata.xml 315 BLAKE2B 603436f2ee77dd27b2bcfb67544e148679626e7fef272371720302c2af79126aa2a50adff83ba3aa6397196df401d4434665d636fded9e7f1b939f50cbc53d97 SHA512 0b3bdec757e4d97dbaf34a73267d47fb1a1c758c2a2da9084e3be508c98f94258a57cc48500bab0fd3487435840e5d57d9990ac7b37ba86930dfb5d16c21d911
diff --git a/dev-haskell/css-text/css-text-0.1.2.1.ebuild b/dev-haskell/css-text/css-text-0.1.2.1.ebuild
deleted file mode 100644
index 1607b70ed31f..000000000000
--- a/dev-haskell/css-text/css-text-0.1.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="CSS parser and renderer"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.2.0:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/css-text/metadata.xml b/dev-haskell/css-text/metadata.xml
deleted file mode 100644
index 70f8bc93197d..000000000000
--- a/dev-haskell/css-text/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		CSS parser and renderer.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/curl-1.3.8 b/dev-haskell/curl-1.3.8
new file mode 100644
index 000000000000..e928a303fba6
--- /dev/null
+++ b/dev-haskell/curl-1.3.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= net-misc/curl >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell binding to libcurl
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/curl
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:= net-misc/curl
+SLOT=0/1.3.8
+SRC_URI=mirror://hackage/packages/archive/curl/1.3.8/curl-1.3.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6e46b10c6ee76d81cef3f74a1e1fdc95
diff --git a/dev-haskell/curl/Manifest b/dev-haskell/curl/Manifest
deleted file mode 100644
index 614a9bcc43c3..000000000000
--- a/dev-haskell/curl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST curl-1.3.8.tar.gz 47704 BLAKE2B da95451318561b9d8ab478479f8f6c147c36f86c4a89b112eb597202e2ff6305597ab200ba1e89b953dbde77cd043a3299614d5c19b83242059bd6e89906eddb SHA512 00012fc9b0a80b0d306f688bfb9cfbde8aa72045e6a139c0d8a0cdd7832b5e86ab06c6ea95803665f4bb8ec4e9af3dbc6e405f100985c2cfbaead8527ba7a382
-EBUILD curl-1.3.8.ebuild 549 BLAKE2B 02185eae03b3719dc305c2e88d43b5570c79451a621657a18a6a2b4f45bb022fd496fdbfd1e807f71e01bf13c6f0bb94bcce209d0a31f2f0eef3dd66adae81db SHA512 adbb6879dc94909b719c55700c8a45388cf17256d25d3d34347ee6db2037cc78933406120ffefbba1aa17c73a2ce82af4391c584d3ee7fc3592910f6c2c5a016
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/curl/curl-1.3.8.ebuild b/dev-haskell/curl/curl-1.3.8.ebuild
deleted file mode 100644
index a77ded7cc0a9..000000000000
--- a/dev-haskell/curl/curl-1.3.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell binding to libcurl"
-HOMEPAGE="http://hackage.haskell.org/package/curl"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-		net-misc/curl"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/curl/metadata.xml b/dev-haskell/curl/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/curl/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/data-accessor-0.2.2.7 b/dev-haskell/data-accessor-0.2.2.7
new file mode 100644
index 000000000000..9eff41f18340
--- /dev/null
+++ b/dev-haskell/data-accessor-0.2.2.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Utilities for accessing and manipulating fields of records
+EAPI=5
+HOMEPAGE=http://www.haskell.org/haskellwiki/Record_access
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.2.7
+SRC_URI=mirror://hackage/packages/archive/data-accessor/0.2.2.7/data-accessor-0.2.2.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=28e167c927d0705ecda78dc539a1014b
diff --git a/dev-haskell/data-accessor/Manifest b/dev-haskell/data-accessor/Manifest
deleted file mode 100644
index 8af07e108a96..000000000000
--- a/dev-haskell/data-accessor/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST data-accessor-0.2.2.7.tar.gz 9670 BLAKE2B ac672adce3fe9dcf4bd01b47a05c089fef14e485835271627b9dc3f4a85aa39b98e2cc36213988516d2eb45bd9acb03e9ba2f822d215bfc322a35e7a9a0cf73b SHA512 42f78d5be738e83e2bc64a2f38bc70748ecb741433916c4e527355f5e808a844e43b14607cfff149a5951f557c73a947469c878340738244e3778f475ccd021d
-EBUILD data-accessor-0.2.2.7.ebuild 664 BLAKE2B cf379029ceebdf445c92a97ea97ff8aa501dd7a190ba237b7468d014ba607e1c92fb200b07ecaa4ea60675cc3091decbae61aea733122b9b7066d3ae6b2324ea SHA512 938a72120625172d0e72e5e96ef16b239c25d3c49671efff544e7c7cfc242a63dba50f870c6ee530b01a01a9e1c54838539ea5124ba21d074e9d52c6da580b55
-MISC metadata.xml 2766 BLAKE2B 479dee85b4b018bdfc63524d77c5655bef1135dea72120d1dea1a0798d544af47996b7317a44624abf311f1156837f5fb8bd2ec2d198438b6ee59ad190e979ee SHA512 3431d5aac5f153e477c641a57f39dd2e1a2ebe690db42f9e41737991cb0098c16d2ce09943d3eb09451574cc7865f9ac769f1a8e08c808ad918a9de329d31636
diff --git a/dev-haskell/data-accessor/data-accessor-0.2.2.7.ebuild b/dev-haskell/data-accessor/data-accessor-0.2.2.7.ebuild
deleted file mode 100644
index 6d552dd120b6..000000000000
--- a/dev-haskell/data-accessor/data-accessor-0.2.2.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities for accessing and manipulating fields of records"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Record_access"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/data-accessor/metadata.xml b/dev-haskell/data-accessor/metadata.xml
deleted file mode 100644
index 1962ea1d1e20..000000000000
--- a/dev-haskell/data-accessor/metadata.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		In Haskell 98 the name of a record field
-		is automatically also the name of a function which gets the value
-		of the according field.
-		E.g. if we have
-		
-		data Pair a b = Pair
-		first :: a, second :: b
-		
-		then
-		
-		&gt; first  :: Pair a b -&gt; a
-		&gt; second :: Pair a b -&gt; b
-		
-		However for setting or modifying a field value
-		we need to use some syntactic sugar, which is often clumsy.
-		
-		modifyFirst :: (a -&gt; a) -&gt; (Pair a b -&gt; Pair a b)
-		modifyFirst f r\@(Pair
-		first=a
-		) = r
-		first = f a
-		
-		With this package you can define record field accessors
-		which allow setting, getting and modifying values easily.
-		The package clearly demonstrates the power of the functional approach:
-		You can combine accessors of a record and sub-records,
-		to make the access look like the fields of the sub-record belong to the main record.
-		
-		Example:
-		
-		&gt; *Data.Accessor.Example&gt; (first^:second^=10) (('b',7),"hallo")
-		&gt; (('b',10),"hallo")
-		
-		You can easily manipulate record fields in a 'Control.Monad.State.State' monad,
-		you can easily code 'Show' instances that use the Accessor syntax
-		and you can parse binary streams into records.
-		See @Data.Accessor.Example@ for demonstration of all features.
-		
-		It would be great if in revised Haskell versions the names of record fields
-		are automatically 'Data.Accessor.Accessor's
-		rather than plain @get@ functions.
-		For now, the package @data-accessor-template@ provides Template Haskell functions
-		for automated generation of 'Data.Acesssor.Accessor's.
-		See also the other @data-accessor@ packages
-		that provide an Accessor interface to other data types.
-		The package @enumset@ provides accessors to bit-packed records.
-		
-		For similar packages see @lenses@ and @fclabel@.
-		A related concept are editors
-		&lt;http://conal.net/blog/posts/semantic-editor-combinators/&gt;.
-		Editors only consist of a modify method
-		(and @modify@ applied to a 'const' function is a @set@ function).
-		This way, they can modify all function values of a function at once,
-		whereas an accessor can only change a single function value,
-		say, it can change @f 0 = 1@ to @f 0 = 2@.
-		This way, editors can even change the type of a record or a function.
-		An Arrow instance can be defined for editors,
-		but for accessors only a Category instance is possible ('(.)' method).
-		The reason is the @arr@ method of the @Arrow@ class,
-		that conflicts with the two-way nature (set and get) of accessors.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/data-binary-ieee754-0.4.4 b/dev-haskell/data-binary-ieee754-0.4.4
new file mode 100644
index 000000000000..fa783645ccde
--- /dev/null
+++ b/dev-haskell/data-binary-ieee754-0.4.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/binary-0.4:=[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=Parser/Serialiser for IEEE-754 floating-point values
+EAPI=5
+HOMEPAGE=https://john-millikin.com/software/data-binary-ieee754/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/binary-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.4.4
+SRC_URI=mirror://hackage/packages/archive/data-binary-ieee754/0.4.4/data-binary-ieee754-0.4.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=31e4ecf81744e3f4aaf148ed64235984
diff --git a/dev-haskell/data-binary-ieee754/Manifest b/dev-haskell/data-binary-ieee754/Manifest
deleted file mode 100644
index 5b3fc70604aa..000000000000
--- a/dev-haskell/data-binary-ieee754/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST data-binary-ieee754-0.4.4.tar.gz 4117 BLAKE2B 012ccb5cb3bd94b15a8326011563b1a2e3c28699d3819675822cd27372e6b81d527ad84fc20a054a2a4e8d14ba821bdce25393ab12042eedc64cb88064076d0c SHA512 af280e164b4b4a21d5d3cd489d8b2ff43e86fbf1d3896aabe9a8e3558b15549f4efc4497d99d6877b7d9547bf26a4a8ed422cbe00abbea73b2e936b30a71009f
-EBUILD data-binary-ieee754-0.4.4.ebuild 618 BLAKE2B c23b3c6e8d42c70205f2f9b351f0d54c4f23e0100b61e230bcc7995d15e709a1eb0e26ccfd327b5e01035c560750cba1c238e5f4213cd43d21a72c8c0eea0679 SHA512 e6d542aea61fcfb0809763c7c08dc00e00307b1f3721f692997056280ca5a21d7d9ec7cbc325a5af6dc123799b21926a35feb689242d42a54ee285ccd29ff3ca
-MISC metadata.xml 343 BLAKE2B 4ffebf94664112aec4c1994bd1f5fd9f065aa80919c48a190bce0cf37804776f3d7c1ea7b615d709c8cb6e4379a9655289a5243d7cc237dad155814e11edf07d SHA512 37105f787958249af027f86b53b19317d15932723fe21d97e3f51d05cd02f3f55348daaa79c9ca90e36fb45a8369b893abe3acdec9c6936d290094ffc6160cff
diff --git a/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.4.ebuild b/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.4.ebuild
deleted file mode 100644
index 998053c854ab..000000000000
--- a/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parser/Serialiser for IEEE-754 floating-point values"
-HOMEPAGE="https://john-millikin.com/software/data-binary-ieee754/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/data-binary-ieee754/metadata.xml b/dev-haskell/data-binary-ieee754/metadata.xml
deleted file mode 100644
index b171e0d3dfa4..000000000000
--- a/dev-haskell/data-binary-ieee754/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Convert Float and Decimal values to/from raw octets.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/data-default-0.5.3 b/dev-haskell/data-default-0.5.3
new file mode 100644
index 000000000000..00f61313ef26
--- /dev/null
+++ b/dev-haskell/data-default-0.5.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/data-default-instances-base:=[profile?] dev-haskell/data-default-instances-containers:=[profile?] dev-haskell/data-default-instances-dlist:=[profile?] dev-haskell/data-default-instances-old-locale:=[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 class for types with a default value
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/data-default
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/data-default-instances-base:=[profile?] dev-haskell/data-default-instances-containers:=[profile?] dev-haskell/data-default-instances-dlist:=[profile?] dev-haskell/data-default-instances-old-locale:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.5.3
+SRC_URI=mirror://hackage/packages/archive/data-default/0.5.3/data-default-0.5.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=71059c113352c3bf2d17c3df03f0273d
diff --git a/dev-haskell/data-default-class-0.0.1 b/dev-haskell/data-default-class-0.0.1
new file mode 100644
index 000000000000..294c2ad31ccf
--- /dev/null
+++ b/dev-haskell/data-default-class-0.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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 class for types with a default value
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/data-default-class
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.0.1
+SRC_URI=mirror://hackage/packages/archive/data-default-class/0.0.1/data-default-class-0.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f28ad3a0fc5c236bce1f0dbb4169f7db
diff --git a/dev-haskell/data-default-class/Manifest b/dev-haskell/data-default-class/Manifest
deleted file mode 100644
index eb93a9cf4e04..000000000000
--- a/dev-haskell/data-default-class/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST data-default-class-0.0.1.tar.gz 1461 BLAKE2B 59bdb47ee92796b1ec6b46eccd93da9928b7208ed47cb4f1f97dbc8374f4bdd89a30c28ac23bde0d084d2eecfe6c58301a64b73223a7667c722b3dad8da0ea98 SHA512 f9960deb48938bf0364273762662e56ad0dba3d5db005bf0a00b8eff11cfa2e94c5b5c1d2b2af2622a680dad4495cb31445a17074cfe752cbcf3de7b91e0e313
-EBUILD data-default-class-0.0.1.ebuild 610 BLAKE2B 409dd90a0bc180bbe0bf9f71fb5f46e48a3b4c776f872eeec076c049f110d0dc66234fbfeecfc3b58c6bc31f79c8c7f8170233eea09f597ba915d9f0bfd8a446 SHA512 424975c69a7e460fb2692b0efa2fd875e7cf2cef474603abcdbb3e1330ed84fd2563e62bf102af907b71f963cc2f5bb05d3ac2ad81dcb3dcbad09404cedbf386
-MISC metadata.xml 329 BLAKE2B 43b0027f4eac9c823695630e0f414b99bd0460e9958141ee7f3aa4c6615a57722b3958dd9fb96288a3c88c8da98f150bd2ac5e0d2c5f567e24d6b82358835af2 SHA512 c0cf6ea5636d8e9b5c038d4ed8eb81ed2698a56e30050d3aa28b55a65dcce1aa8258bc4f4d6456ba546627be96a7f3588cdc02978774eeef8ecf49ca0ebf6d9e
diff --git a/dev-haskell/data-default-class/data-default-class-0.0.1.ebuild b/dev-haskell/data-default-class/data-default-class-0.0.1.ebuild
deleted file mode 100644
index 260d52038ae2..000000000000
--- a/dev-haskell/data-default-class/data-default-class-0.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A class for types with a default value"
-HOMEPAGE="http://hackage.haskell.org/package/data-default-class"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/data-default-class/metadata.xml b/dev-haskell/data-default-class/metadata.xml
deleted file mode 100644
index ec0be8b04080..000000000000
--- a/dev-haskell/data-default-class/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A class for types with a default value
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/data-default-instances-base-0.0.1 b/dev-haskell/data-default-instances-base-0.0.1
new file mode 100644
index 000000000000..8f33c4fba2eb
--- /dev/null
+++ b/dev-haskell/data-default-instances-base-0.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/data-default-class:=[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=Default instances for types in base
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/data-default-instances-base
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=dev-haskell/data-default-class:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.0.1
+SRC_URI=mirror://hackage/packages/archive/data-default-instances-base/0.0.1/data-default-instances-base-0.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=efa075a23dc49fc09f0e93f4fa36bad4
diff --git a/dev-haskell/data-default-instances-base/Manifest b/dev-haskell/data-default-instances-base/Manifest
deleted file mode 100644
index d93d0bcd3e83..000000000000
--- a/dev-haskell/data-default-instances-base/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST data-default-instances-base-0.0.1.tar.gz 1930 BLAKE2B 61faf28f84aeb2fccf07845072a7480ec14f30744fa310bec74cc1e26d2fba1c55872380c417b8b7697656e81bb0b90ee9b6da60af8395b19dfc13eb45520ee5 SHA512 e5598ef3d940b9512b0e18bcc526d41ca08df3d8b0a640717914ff7c510de68b6a8aa1299d0681062f510b31be3f62f6f318dc305e2797879739e19a8c871728
-EBUILD data-default-instances-base-0.0.1.ebuild 661 BLAKE2B 043641811cb285b6e654dd43cff10e257c52bea1a7e452771c84ee87b21335d22c9753007d5aafdb7d589e1d5d56bcf33e6cfe733f40383b70d312cf69dfb029 SHA512 29997d329df0209df79d0187314b8a62e8a7bf53f9b570b7745cda04a112fe09f691d5f6e9ce646e940d307f34def46781fa5a673a999e8f2af2c45d22905eb3
-MISC metadata.xml 326 BLAKE2B a53bded82cab952d7f6dcf8d5c714023a308a6bffb03c15942e7a4ff7ddc3432fb5cbe465b15b33d7b70a1c5a79e25f61a3cdc79511f5178f4140db5844a1dc2 SHA512 79bb1f0f9f4ea2cce2c3c806eae5eb3b0035d7d649c550528f8aac9bfb824ef8f017e9c56f59b884558dbdc1bdd350990adbb4bdf99eef3107d1e8ac08d5de8b
diff --git a/dev-haskell/data-default-instances-base/data-default-instances-base-0.0.1.ebuild b/dev-haskell/data-default-instances-base/data-default-instances-base-0.0.1.ebuild
deleted file mode 100644
index d689a0f04387..000000000000
--- a/dev-haskell/data-default-instances-base/data-default-instances-base-0.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Default instances for types in base"
-HOMEPAGE="http://hackage.haskell.org/package/data-default-instances-base"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="dev-haskell/data-default-class:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/data-default-instances-base/metadata.xml b/dev-haskell/data-default-instances-base/metadata.xml
deleted file mode 100644
index 4e780c1aed96..000000000000
--- a/dev-haskell/data-default-instances-base/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Default instances for types in base
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/data-default-instances-containers-0.0.1 b/dev-haskell/data-default-instances-containers-0.0.1
new file mode 100644
index 000000000000..23736fba91c7
--- /dev/null
+++ b/dev-haskell/data-default-instances-containers-0.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/data-default-class:=[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=Default instances for types in containers
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/data-default-instances-containers
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=dev-haskell/data-default-class:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.0.1
+SRC_URI=mirror://hackage/packages/archive/data-default-instances-containers/0.0.1/data-default-instances-containers-0.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e53f0284669cd77361ee20ee0956dad4
diff --git a/dev-haskell/data-default-instances-containers/Manifest b/dev-haskell/data-default-instances-containers/Manifest
deleted file mode 100644
index fe809bccc68e..000000000000
--- a/dev-haskell/data-default-instances-containers/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST data-default-instances-containers-0.0.1.tar.gz 1659 BLAKE2B f422dc8c9d6d51a63019cc2c0edfe8216602fcecf97894cddd226ec3544fd5e469471a21cdafce39dfea835a475a332e80451c8c33549377fe2e73260f512e87 SHA512 a12352eb0484ad772b16674b2ef8145b3733473f716c182841d6378d8a2d3b196e8fc966afd7c335e81e924ea83088a9c67c4aaddb14a87a7a816cbe27236bfd
-EBUILD data-default-instances-containers-0.0.1.ebuild 673 BLAKE2B 1dd1653376c5755569c6ddd946e0de151851b3faeef62f3b6813cb9622019d383330bbcd9cd790b05a60f662331d5059343a302f27e8629c14ddd05bb5544b08 SHA512 04844c9bf051dc52fc695934183037e922bf8731c7932026504b944813bc2aaba7d8ec9072fd459e876bd2ef948984d3e4e7dfe64b1dca5a4d832a2eead797c0
-MISC metadata.xml 332 BLAKE2B bd79b21691b4d598c6aa13875ec1c576137717041c338cb89f3bdb03f7ff47d829f9af64074d76ac5f7f4cef4d0640584ae980b7c92828f182fc4c04c6642ab7 SHA512 6d021277805747d022061342125665f5a50ca7af50a3f50e55af901e6fd00cfeb15d634d15dbb8d9ab3eacdfe5f094b00eacddce66762c555e924f704c3ebb70
diff --git a/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild b/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild
deleted file mode 100644
index d67215d3d75f..000000000000
--- a/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Default instances for types in containers"
-HOMEPAGE="http://hackage.haskell.org/package/data-default-instances-containers"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="dev-haskell/data-default-class:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/data-default-instances-containers/metadata.xml b/dev-haskell/data-default-instances-containers/metadata.xml
deleted file mode 100644
index b54530493eef..000000000000
--- a/dev-haskell/data-default-instances-containers/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Default instances for types in containers
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/data-default-instances-dlist-0.0.1 b/dev-haskell/data-default-instances-dlist-0.0.1
new file mode 100644
index 000000000000..6b52a902d2be
--- /dev/null
+++ b/dev-haskell/data-default-instances-dlist-0.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/dlist:=[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=Default instances for types in dlist
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/data-default-instances-dlist
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/dlist:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.0.1
+SRC_URI=mirror://hackage/packages/archive/data-default-instances-dlist/0.0.1/data-default-instances-dlist-0.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=599b73eaf2d2309dc724204edb1d52a4
diff --git a/dev-haskell/data-default-instances-dlist/Manifest b/dev-haskell/data-default-instances-dlist/Manifest
deleted file mode 100644
index 3350397b1574..000000000000
--- a/dev-haskell/data-default-instances-dlist/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST data-default-instances-dlist-0.0.1.tar.gz 1503 BLAKE2B 672c6ad40c6174fe86176bb3af7fcf469fba942c3af32307babc2f2bdf477f5d3ff4b7361ffad01b1e475075434fdd6c9c4497f7ca6a036d5f5295bc61c03c0d SHA512 b3794c296d5f1ca54badaab4c267b302967ce73ac649d8df031daafa17f66537bf670ee42fda1b75b92998eb4b8862c1e0a9bdd3716c31dfd0937c3c76b6f03d
-EBUILD data-default-instances-dlist-0.0.1.ebuild 695 BLAKE2B 5af5e1d4aaa4c85b4e330586a5024006d8463ea4987202eb87d04c3e10c68d958b3d426e8e8f7a278d6c9ec6e7bc8dbd3eb8fb31e6ea22a1f573b9c3746c4249 SHA512 2632285c4465a6144e1128c57c67af8a4d12d80e3b3979871e96c981f68d79d452a75f1b794e0e714c9b5fc31a1eaeee85d3c33e2acc8f46b6846c7d8475fbeb
-MISC metadata.xml 327 BLAKE2B 86241d63af88e11ae3112525aa57d96f1a47ba2904ca98691be64f0ad281a617dfaf4ec8e32c1c64b4b3c208b50c37e034d7a2af7b8318a6889139f9b70b9b2b SHA512 be671f60db5a7cdf21c9b8927d3c7be47813e4dfb2b8c6b9e98420afd03bbfa2843d45c234e7537fd2dcd05b30b9b94ff475c2c55cc791004db1f2679b2b91c2
diff --git a/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild b/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild
deleted file mode 100644
index c5a80a303900..000000000000
--- a/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Default instances for types in dlist"
-HOMEPAGE="http://hackage.haskell.org/package/data-default-instances-dlist"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="dev-haskell/data-default-class:=[profile?]
-		dev-haskell/dlist:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/data-default-instances-dlist/metadata.xml b/dev-haskell/data-default-instances-dlist/metadata.xml
deleted file mode 100644
index 54d1a9cbcd47..000000000000
--- a/dev-haskell/data-default-instances-dlist/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Default instances for types in dlist
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/data-default-instances-old-locale-0.0.1 b/dev-haskell/data-default-instances-old-locale-0.0.1
new file mode 100644
index 000000000000..22865a9cca99
--- /dev/null
+++ b/dev-haskell/data-default-instances-old-locale-0.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Default instances for types in old-locale
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/data-default-instances-old-locale
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.0.1
+SRC_URI=mirror://hackage/packages/archive/data-default-instances-old-locale/0.0.1/data-default-instances-old-locale-0.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d8ca1adeba8bf0c7f8bc4f1aeb7f18c8
diff --git a/dev-haskell/data-default-instances-old-locale/Manifest b/dev-haskell/data-default-instances-old-locale/Manifest
deleted file mode 100644
index 74b50557740f..000000000000
--- a/dev-haskell/data-default-instances-old-locale/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST data-default-instances-old-locale-0.0.1.tar.gz 1519 BLAKE2B 4c2e28955f260bc4b2107449b1827216d2400f8bbf441e11a749f380300706007c363ede8ecd3dd84d31af7c9724e409129508f34195151a193e025b91b0a9d7 SHA512 bbaf4626c922820dca8cc230585fef80b6f6bd6278d335cc7abd4e5b7a857f0626ca9937ea95066e7655387dfcc684e6fbb0f6f5bc6905e539fbd1176ddd99ec
-EBUILD data-default-instances-old-locale-0.0.1.ebuild 708 BLAKE2B 0eaf30e028d079e17ea9c3607fceb117ca64a7f970fdcddb64f3379de7204f11767f652c2938394316976abd140ae15019e86a7ff044ba142afd19114fb23760 SHA512 f895f75483c3336693db2d929bc2c5fcf881c77f7330442da972fa8e05f5ff29d42f17b1401c853e7938518ce097aaf37112ec9c197341bb1a1612d4ae2c3d96
-MISC metadata.xml 332 BLAKE2B fe6f770f3d6d6378dd9894ada63b641ee21c7f3520c5cce5c88202b5cfbdfca431c6982dd4ada01145584799143257ef6e0e1b106e4070e6004256e02bada8f0 SHA512 faeab58e198765b73484d61c625ca018aa28e4e5470392ffe0eca935b54cf633d84c9eb8553b904c8bfd2a54af7190517628dce3642e638c4b5a9c8d63646a72
diff --git a/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild b/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild
deleted file mode 100644
index ba7924414446..000000000000
--- a/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Default instances for types in old-locale"
-HOMEPAGE="http://hackage.haskell.org/package/data-default-instances-old-locale"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="dev-haskell/data-default-class:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/data-default-instances-old-locale/metadata.xml b/dev-haskell/data-default-instances-old-locale/metadata.xml
deleted file mode 100644
index 50cce3688992..000000000000
--- a/dev-haskell/data-default-instances-old-locale/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Default instances for types in old-locale
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/data-default/Manifest b/dev-haskell/data-default/Manifest
deleted file mode 100644
index a92163053bfd..000000000000
--- a/dev-haskell/data-default/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST data-default-0.5.3.tar.gz 1623 BLAKE2B 365de6448edfdaec1b852e89eb31faa323f0ab5f6fc101247f0a16d76680f98fea751c524fa3fe5b697c927eac3cf4c778a37eb5ff0fbcf0daf8bb3ab27f4220 SHA512 57cb632ccc6c9b0973594c7c5944574f4e7e78f980194d4205bb14a6e5aa1bd3e92723f3b80cfeac301ae663b2a22925503a03ecb5311ebc08077fe06022817e
-EBUILD data-default-0.5.3.ebuild 878 BLAKE2B 48c3047e58333e86ce8ad0df30f93642e457940508136d48db49c28e649f552cec243d0c92487c2305552c4507c27ba192fa6281f2b0c3eadde1b35b68a85cf2 SHA512 6ac5443cf036ebaddfd08ddd243cfda3fa99d27116a0fcf64c4b428404427d4799b830f4b40581c9734cff81ac3c0abf6c474328baec688467acb5bffa975200
-MISC metadata.xml 329 BLAKE2B 43b0027f4eac9c823695630e0f414b99bd0460e9958141ee7f3aa4c6615a57722b3958dd9fb96288a3c88c8da98f150bd2ac5e0d2c5f567e24d6b82358835af2 SHA512 c0cf6ea5636d8e9b5c038d4ed8eb81ed2698a56e30050d3aa28b55a65dcce1aa8258bc4f4d6456ba546627be96a7f3588cdc02978774eeef8ecf49ca0ebf6d9e
diff --git a/dev-haskell/data-default/data-default-0.5.3.ebuild b/dev-haskell/data-default/data-default-0.5.3.ebuild
deleted file mode 100644
index 8484499dca77..000000000000
--- a/dev-haskell/data-default/data-default-0.5.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A class for types with a default value"
-HOMEPAGE="http://hackage.haskell.org/package/data-default"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="dev-haskell/data-default-class:=[profile?]
-		dev-haskell/data-default-instances-base:=[profile?]
-		dev-haskell/data-default-instances-containers:=[profile?]
-		dev-haskell/data-default-instances-dlist:=[profile?]
-		dev-haskell/data-default-instances-old-locale:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/data-default/metadata.xml b/dev-haskell/data-default/metadata.xml
deleted file mode 100644
index ec0be8b04080..000000000000
--- a/dev-haskell/data-default/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A class for types with a default value
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/data-endian-0.0.1 b/dev-haskell/data-endian-0.0.1
new file mode 100644
index 000000000000..049bbe1214af
--- /dev/null
+++ b/dev-haskell/data-endian-0.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Endian-sensitive data
+EAPI=5
+HOMEPAGE=https://github.com/mvv/data-endian
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.0.1
+SRC_URI=mirror://hackage/packages/archive/data-endian/0.0.1/data-endian-0.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cfd9428bb59441dbe4e416bf5efa57c3
diff --git a/dev-haskell/data-endian-0.1 b/dev-haskell/data-endian-0.1
new file mode 100644
index 000000000000..952ece4af4ff
--- /dev/null
+++ b/dev-haskell/data-endian-0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Endian-sensitive data
+EAPI=5
+HOMEPAGE=https://github.com/mvv/data-endian
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1
+SRC_URI=mirror://hackage/packages/archive/data-endian/0.1/data-endian-0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=64e029bdd8dce55f9cf6ca26128bda6b
diff --git a/dev-haskell/data-endian-0.1.1 b/dev-haskell/data-endian-0.1.1
new file mode 100644
index 000000000000..58bf06978e24
--- /dev/null
+++ b/dev-haskell/data-endian-0.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Endian-sensitive data
+EAPI=6
+HOMEPAGE=https://github.com/mvv/data-endian
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.1
+SRC_URI=mirror://hackage/packages/archive/data-endian/0.1.1/data-endian-0.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=baa959fb88166ec93515bb9122e707a3
diff --git a/dev-haskell/data-endian/Manifest b/dev-haskell/data-endian/Manifest
deleted file mode 100644
index db11e48ae129..000000000000
--- a/dev-haskell/data-endian/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST data-endian-0.0.1.tar.gz 2454 BLAKE2B ca75c2c9546a48030a8a7236490a4e4a404d1fb8faa69d0460b36420d56b35e78ed00d8fff7fb6839594012260ac878767527ebb581256693a41e7c3e5cd2cb5 SHA512 1f6d096c574fe9d09104c884a67a44cdde2e436fa27e9614d077122ef6f5e8f28eaa81f48dbf09f7dcdf95065c9971d1342c31b887280a51334c38a29031bbf0
-DIST data-endian-0.1.1.tar.gz 2788 BLAKE2B 6f2bcf0f1074a07953027f7d29b99db995f0cbce0cee59aa81556fee0b69419ddf5727f6c27c4548c7c6f3b62a7e3b85c23983505c77c539cbcce395492a63ea SHA512 a8e94f996a0b1c929cd01b8f38c52149cf3bac0f50449d327ba66ac4a378ba5c3826860abe4d1592aa83ed9ca81dba6083c63a66e6ee0655c27521cb87977a90
-DIST data-endian-0.1.tar.gz 2733 BLAKE2B f24ccd728da923a435720d6b295af7e00661132f2b0574329b875e29bdbdb37198865d7f5905bcdd3fad646f9b7ea569f2442e5e630259d6fe3ae5ee25e5626e SHA512 ded4df9eed2ccee18d537b223f0039afc7fbe10329b525d9793a639c3f4a01f0e5e8f5ddd1c2e7c5477a63067bd3135417a1bd935076b104dc2aead5390d82cf
-EBUILD data-endian-0.0.1.ebuild 529 BLAKE2B 19accb0552d738e52025af34d107f866e7366716820e46d12aa433b95d1749c53e8868a7fd3d228860581a31645a37a216238206b3902085c8a7790b0a7841f7 SHA512 37ab87945c16826d6281b282c43c905cd296a6bc14f0ed0f4110d95287944cd515bf76f0a3018d7749c09c761c36d783b6233b53869d9a11d244cfc29831ddbb
-EBUILD data-endian-0.1.1.ebuild 527 BLAKE2B 51c2b9469d7d23bf8685d5b4ae81168fe7c799a0f0610bb3de8ce2177043da45df5d4d55d968adb5389f81eb79a94251109c6f315ae4580d2fc07ed1336dd7ca SHA512 fbc993f5235dd4caf8620c741f93ea3f6dc37663581f7fe397b5998cf0dec3231c2144c0580956c6243ee2bd55a5e516b3fb4f62e3426b85404a37af758d5a7d
-EBUILD data-endian-0.1.ebuild 529 BLAKE2B b614a136d81abfc0c109cc3b313c09cd2357b7dc5eacf23b42a79a71553bd470b54103d8dacea35486cd243a26590f10439ee327afcfc2379e0bbae87be6377a SHA512 af0fd345c370723b43228d9d55b0dd28eb9b71ee02b86ce9a680f32c8f2d7cbcd311928d6c2efc057e81d7bea1f350af15c3c2bbe296e067b35dc9f70c2e9f83
-MISC metadata.xml 438 BLAKE2B 85c24931b9d9ceb5d66dca3d826084aa55869cc5a1c9079603decbbc080eb595719b71d4642278df28e4cdad03b983b341ae06b9dbb6abe9e4aae72369304ef4 SHA512 ba8fee02f97cfe6b3cb16e1ec90e2fab81977e2a6ed5b1703f6d26239d15086beef6f1d76b2dc3c26a46bc9ec6fd4425e840d8ed2e5922a116ab5252db014405
diff --git a/dev-haskell/data-endian/data-endian-0.0.1.ebuild b/dev-haskell/data-endian/data-endian-0.0.1.ebuild
deleted file mode 100644
index a1c28b31dab8..000000000000
--- a/dev-haskell/data-endian/data-endian-0.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Endian-sensitive data"
-HOMEPAGE="https://github.com/mvv/data-endian"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6.0"
diff --git a/dev-haskell/data-endian/data-endian-0.1.1.ebuild b/dev-haskell/data-endian/data-endian-0.1.1.ebuild
deleted file mode 100644
index c3126ff255ac..000000000000
--- a/dev-haskell/data-endian/data-endian-0.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Endian-sensitive data"
-HOMEPAGE="https://github.com/mvv/data-endian"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0
-"
diff --git a/dev-haskell/data-endian/data-endian-0.1.ebuild b/dev-haskell/data-endian/data-endian-0.1.ebuild
deleted file mode 100644
index 7420abdce386..000000000000
--- a/dev-haskell/data-endian/data-endian-0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Endian-sensitive data"
-HOMEPAGE="https://github.com/mvv/data-endian"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0
-"
diff --git a/dev-haskell/data-endian/metadata.xml b/dev-haskell/data-endian/metadata.xml
deleted file mode 100644
index 920ff23d60c3..000000000000
--- a/dev-haskell/data-endian/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides helpers for converting endian-sensitive data.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">mvv/data-endian</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/data-hash-0.2.0.1 b/dev-haskell/data-hash-0.2.0.1
new file mode 100644
index 000000000000..74f38796c279
--- /dev/null
+++ b/dev-haskell/data-hash-0.2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Combinators for building fast hashing functions
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/data-hash
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.0.1
+SRC_URI=mirror://hackage/packages/archive/data-hash/0.2.0.1/data-hash-0.2.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d9707872d8c71642df19dbb810b8d312
diff --git a/dev-haskell/data-hash/Manifest b/dev-haskell/data-hash/Manifest
deleted file mode 100644
index c729c423e3ac..000000000000
--- a/dev-haskell/data-hash/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST data-hash-0.2.0.1.tar.gz 8504 BLAKE2B e48e6be1e7074c415df85e1ff65311ad5cbd6e73b74bcea095e3d407f035b18c73370ea264cc4f617150f2c0aeb4a82619ac18e169ea2d4909f14570852b5bbb SHA512 daea098b9c808396606d90ae70e5156c492463db929b563a6195ee648ad72fc2949ab231ad67758fe0c68991826ea2292109a5d1f46d0cfc27c16e2e2b0666fa
-EBUILD data-hash-0.2.0.1.ebuild 678 BLAKE2B 090880e5ee5595e0d73109343791044f2d272eb1992b399144fb28d0a4400a07558b484399e2489fccd583aa6cc32dbe8e27589f7fae663d56c5c2301596dc21 SHA512 f3d76ecffeb147d3e7a277048490aa404c20cdd7998356b610d6f1776c7c66b2b0553603dab81af50db3ced0fd5a2f9d761f2839fe99bd7df5baecab1237e902
-MISC metadata.xml 399 BLAKE2B c9b872af09e7f0088341f6d309994a3706561a60358a4b524d9165bde7e6c6706605bac81a76d87bb0515fb65b71850ebff4060df6b69402ccc6ef3b3495efe0 SHA512 60a9f6b6891e077d6199265c53c19f604b9189e0142058cc756266d272b024a99c973f1b90c8c2c31a8d146e19faf9988c1c9c4b0dccd9389616d4971571859a
diff --git a/dev-haskell/data-hash/data-hash-0.2.0.1.ebuild b/dev-haskell/data-hash/data-hash-0.2.0.1.ebuild
deleted file mode 100644
index 99632ba1ed61..000000000000
--- a/dev-haskell/data-hash/data-hash-0.2.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Combinators for building fast hashing functions"
-HOMEPAGE="http://hackage.haskell.org/package/data-hash"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/data-hash/metadata.xml b/dev-haskell/data-hash/metadata.xml
deleted file mode 100644
index 386d47c94f2f..000000000000
--- a/dev-haskell/data-hash/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Combinators for building fast hashing functions. Includes
-		hashing functions for all basic Haskell98 types.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/data-ordlist-0.4.7.0 b/dev-haskell/data-ordlist-0.4.7.0
new file mode 100644
index 000000000000..431adaa6ad71
--- /dev/null
+++ b/dev-haskell/data-ordlist-0.4.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Set and bag operations on ordered lists
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/data-ordlist
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.7.0
+SRC_URI=mirror://hackage/packages/archive/data-ordlist/0.4.7.0/data-ordlist-0.4.7.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6f00537bebc4a5f52fa37b74b7d15400
diff --git a/dev-haskell/data-ordlist/Manifest b/dev-haskell/data-ordlist/Manifest
deleted file mode 100644
index 90d2ba7e5d1e..000000000000
--- a/dev-haskell/data-ordlist/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST data-ordlist-0.4.7.0.tar.gz 8906 BLAKE2B 7bea3092bad04fb9defc7331e32dd997613dd4d43c5df82360c61831bec936eb03b178130f528eda59f2c5142ca579a76369afcab62638d4b037fe65a0fdde24 SHA512 a34ed99ea8eb34b29727a210f7a56c80b18a881e2da90fff0ae056b7c56b1f37212413a1daebc0b0118c193eb579d3d43bd426b25944da9044e8152eed80fa8b
-EBUILD data-ordlist-0.4.7.0.ebuild 556 BLAKE2B 5f8009c4815bc95ca264e09ed24f327492c9c7625f4773e5f460665351d24702b8e3d0391e7805ad757b071fc7e2d67aeb1badcefe703d445284c92eaed46026 SHA512 ad80aca11c55d3153a30adb64de00b0dcce44505731542cda94272971c5a3731111ab3222b72b0311ebc26ab4fc3369863f0d07f8df72fe3893dc8114903783d
-MISC metadata.xml 357 BLAKE2B f746bb517e5c1237dad57bc299421899b8ddd82f6d7b104d0481cf37b1f2f8dfc305b0cdf2b76a3a89c3eb8044063e15654bee1f3687e892b149e93394ca048d SHA512 a4cc167182a956937c9acae5bc06af9aeb10ad92c4760c01cc3c831779660a46381d1482808ad5df150fce2ccd421d9a0d9b4cefbb66dcb2e79505aa727fb148
diff --git a/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild b/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild
deleted file mode 100644
index c98454a032d3..000000000000
--- a/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Set and bag operations on ordered lists"
-HOMEPAGE="http://hackage.haskell.org/package/data-ordlist"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/data-ordlist/metadata.xml b/dev-haskell/data-ordlist/metadata.xml
deleted file mode 100644
index 3b461e48b9fe..000000000000
--- a/dev-haskell/data-ordlist/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This module provides set and multiset operations on ordered lists.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/dataenc-0.14.0.5 b/dev-haskell/dataenc-0.14.0.5
new file mode 100644
index 000000000000..70da2f39fb79
--- /dev/null
+++ b/dev-haskell/dataenc-0.14.0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=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=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 ~amd64-linux ~x86-fbsd ~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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8089195c34f412127a3b7a46d241ac94
diff --git a/dev-haskell/dataenc-0.14.0.7 b/dev-haskell/dataenc-0.14.0.7
new file mode 100644
index 000000000000..3a323dc20949
--- /dev/null
+++ b/dev-haskell/dataenc-0.14.0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 test? ( dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.5:2=[profile?] dev-haskell/test-framework:=[profile?] dev-haskell/test-framework-hunit:=[profile?] dev-haskell/test-framework-quickcheck2:=[profile?] dev-haskell/test-framework-th:=[profile?] ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bbabaf96d6382ee26b0d837d4c830db6
diff --git a/dev-haskell/dataenc/Manifest b/dev-haskell/dataenc/Manifest
deleted file mode 100644
index 733e9e0ba9f7..000000000000
--- a/dev-haskell/dataenc/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST dataenc-0.14.0.5.tar.gz 12902 BLAKE2B bdff7050d04565877d9940967dad288e72060bbd8a7ed4cf28effa97a4683e61fef88b9036e15f234f3bfded0dfbcab60c87446f6b1479fa50a4549c80f4bd74 SHA512 b73e5060a3b9c00fbcdadb6dd8ca890c4a6f8ef862822e7d71bde1c0a99de1199cfa384cd8c219f41218f8eef4e9017ecc2c1c186516d7a809aadb599530bf88
-DIST dataenc-0.14.0.7.tar.gz 12813 BLAKE2B 3f213d73121c7973c706ad0d81d2e0153d7ac9cb242aa8d5b3bcd093dd8611d9476263a4893c43ce95aa642893d8b1b2ac2baf26d0f33c0fa3d64d7d0bb0722d SHA512 82f34ad51b64b66726e45c0c2ef52c9c2be201f42c5718763158a13eb2e8f82cb0298c1580dd52788e8d7b3f1eb0e7ade4e6e69f7ba4b2f8804eb2178e719e20
-EBUILD dataenc-0.14.0.5.ebuild 825 BLAKE2B 9cc5942bf5dc46485dddfcef726e9d4dbed27c77ccfd30200d6662e0c31f997ff4b69e8b18fbcd7eb003432469b7d29e1f03600384f178b983e300e5e5afe499 SHA512 6b8a56c5d0c00bb36da85bd34493cbcfa868cf7b59d123d88c72d78f510ecb5040e6d293ca3bcadc4039cb3e5c18c481140676a5b8e730422dd1baaec9cb1282
-EBUILD dataenc-0.14.0.7.ebuild 1158 BLAKE2B 06148dee7d40ac025fd190bf13307f83c7564ebda602b298b936515b9c3f38e3ef5e1dce7641938629ea4eca0cdbddd32f037c8116d480910bd418a2b2728420 SHA512 f51075609f588e56e9f9807ce28fc3a3a7ac6a614abe1bfdbd8dc32f89e776b0574254128d7fdc07d041e52a6ad1346e058489cdda1800a5bbe531c4ee29b208
-MISC metadata.xml 481 BLAKE2B 3692a18b12132405687d94af86493582c1a0080c549b0c29c8849861b42e42cf807ac37021cbbc59992d7065b469b6a88e6be916d61f11430d1f1a7523d7b3c1 SHA512 195d8c9c9c9080cf2f11c4535237ca3334d055018471dc9974a54c13e95362d79dde8fb556720e781a56ecfa2e5772a48ef45a7d0d270a29958777312768dbaa
diff --git a/dev-haskell/dataenc/dataenc-0.14.0.5.ebuild b/dev-haskell/dataenc/dataenc-0.14.0.5.ebuild
deleted file mode 100644
index 1086d71e0214..000000000000
--- a/dev-haskell/dataenc/dataenc-0.14.0.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Data encoding library"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Library/Data_encoding"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	cabal_chdeps \
-		'array >= 0.1.0 && < 0.5' 'array >= 0.1.0 && < 0.6' \
-		'base >= 3.0.0 && < 4.7' 'base >= 3.0.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-tests
-}
diff --git a/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild b/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
deleted file mode 100644
index 6a61df78e57d..000000000000
--- a/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Data encoding library"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Library/Data_encoding"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-	test? ( dev-haskell/hunit:=[profile?]
-			>=dev-haskell/quickcheck-2.5:2=[profile?]
-			dev-haskell/test-framework:=[profile?]
-			dev-haskell/test-framework-hunit:=[profile?]
-			dev-haskell/test-framework-quickcheck2:=[profile?]
-			dev-haskell/test-framework-th:=[profile?] )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >= 3.0.0 && < 4.8' 'base >= 3.0.0' \
-		'QuickCheck ==2.5.*' 'QuickCheck >=2.5' \
-		'executable tests' 'executable dataenc-tests'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test tests)
-}
diff --git a/dev-haskell/dataenc/metadata.xml b/dev-haskell/dataenc/metadata.xml
deleted file mode 100644
index c20526f18ddb..000000000000
--- a/dev-haskell/dataenc/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Data encoding library currently providing Base16, Base32,
-		Base32Hex, Base64, Base64Url, Base85, Python string escaping,
-		Quoted-Printable, URL encoding, uuencode, xxencode, and yEncoding.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/date-cache-0.3.0-r1 b/dev-haskell/date-cache-0.3.0-r1
new file mode 100644
index 000000000000..110af02f09e7
--- /dev/null
+++ b/dev-haskell/date-cache-0.3.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Date cacher
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/date-cache
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.3.0
+SRC_URI=mirror://hackage/packages/archive/date-cache/0.3.0/date-cache-0.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e1d7fd388a6c317c068980e82d3dfd8a
diff --git a/dev-haskell/date-cache/Manifest b/dev-haskell/date-cache/Manifest
deleted file mode 100644
index ce48a873af00..000000000000
--- a/dev-haskell/date-cache/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST date-cache-0.3.0.tar.gz 2126 BLAKE2B 51f0686bee8a72a0286c7ab03cc39346e4f4998ab0069a69586ae183fa8e9d9f4a707a5932bd3895d5fb7b895f206a643f097882a40a8127eb2a38bb49bbbefc SHA512 12e048dbd163929acf1b2e51eb81f83382dfbaee00f506a89c5477c0acccbcc29ec24c6d5d85340ea540430c2c1c4c62ad00d1f36196ae8a6fd3f9ae826f39be
-EBUILD date-cache-0.3.0-r1.ebuild 528 BLAKE2B af0472efe672490b178412b9b3e4e91c4a9d10aec4692464e80eb1bbbfea8e6c4893a3d29e163474fd5c319f0cff8cc81a352437ea53fee7d45cee7513710661 SHA512 24695a43d2b9975a828b281859ee0308d53fa70d78aac657fe5f26988557d014c4943ebebd5e5c75d2daca3209db019c84abc899c93d536da4efd0469be4fddb
-MISC metadata.xml 374 BLAKE2B 2c5a422824ee60533755e9114b9d9faaa3bc334b2baaeadd1e44067ad23dc47ad6c3f924c12e64900fa0eaa55807d6c0210c9fd688da8e7d9ae25113cb942ab2 SHA512 444eb792100265f2740a37b37b08c5efe57c2f6d2f0828f989323aa0f448fa0dd9df882377dd90475fde1254316dcc50d726c8bd9bac55cc28e5a08ba08cc87b
diff --git a/dev-haskell/date-cache/date-cache-0.3.0-r1.ebuild b/dev-haskell/date-cache/date-cache-0.3.0-r1.ebuild
deleted file mode 100644
index e2ba8610e86d..000000000000
--- a/dev-haskell/date-cache/date-cache-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Date cacher"
-HOMEPAGE="http://hackage.haskell.org/package/date-cache"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/date-cache/metadata.xml b/dev-haskell/date-cache/metadata.xml
deleted file mode 100644
index 2fcf6e4da1d0..000000000000
--- a/dev-haskell/date-cache/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Formatting time is slow. This package provides
-		mechanisms to cache formatted date
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/dav-0.4.1 b/dev-haskell/dav-0.4.1
new file mode 100644
index 000000000000..5d53023a489e
--- /dev/null
+++ b/dev-haskell/dav-0.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/http-conduit-1.9.0:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lens-3.0:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/optparse-applicative:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] <=dev-haskell/xml-conduit-1.2:=[profile?] >=dev-haskell/xml-hamlet-0.4:=[profile?] <=dev-haskell/xml-hamlet-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=RFC 4918 WebDAV support
+EAPI=5
+HOMEPAGE=http://floss.scru.org/hDAV
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/http-conduit-1.9.0:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lens-3.0:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/optparse-applicative:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] <=dev-haskell/xml-conduit-1.2:=[profile?] >=dev-haskell/xml-hamlet-0.4:=[profile?] <=dev-haskell/xml-hamlet-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.1
+SRC_URI=mirror://hackage/packages/archive/DAV/0.4.1/DAV-0.4.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=80ecd99496a137f8ad5c236675d52cb1
diff --git a/dev-haskell/dav-0.5.1 b/dev-haskell/dav-0.5.1
new file mode 100644
index 000000000000..bc02580346e5
--- /dev/null
+++ b/dev-haskell/dav-0.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/http-client-0.2:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lens-3.0:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/optparse-applicative:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] <=dev-haskell/xml-conduit-1.2:=[profile?] >=dev-haskell/xml-hamlet-0.4:=[profile?] <=dev-haskell/xml-hamlet-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=RFC 4918 WebDAV support
+EAPI=5
+HOMEPAGE=http://floss.scru.org/hDAV
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/http-client-0.2:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lens-3.0:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/optparse-applicative:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] <=dev-haskell/xml-conduit-1.2:=[profile?] >=dev-haskell/xml-hamlet-0.4:=[profile?] <=dev-haskell/xml-hamlet-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.5.1
+SRC_URI=mirror://hackage/packages/archive/DAV/0.5.1/DAV-0.5.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cedc7781607b33db4d4ed9ddf1ff82cd
diff --git a/dev-haskell/dav-0.6.2 b/dev-haskell/dav-0.6.2
new file mode 100644
index 000000000000..08a6e13d1582
--- /dev/null
+++ b/dev-haskell/dav-0.6.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/either-4.1:=[profile?] dev-haskell/errors:=[profile?] >=dev-haskell/http-client-0.2:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lens-3.0:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3.2:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/optparse-applicative-0.5.0:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] <dev-haskell/xml-conduit-1.3:=[profile?] >=dev-haskell/xml-hamlet-0.4:=[profile?] <=dev-haskell/xml-hamlet-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=RFC 4918 WebDAV support
+EAPI=5
+HOMEPAGE=http://floss.scru.org/hDAV
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/either-4.1:=[profile?] dev-haskell/errors:=[profile?] >=dev-haskell/http-client-0.2:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lens-3.0:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3.2:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/optparse-applicative-0.5.0:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] <dev-haskell/xml-conduit-1.3:=[profile?] >=dev-haskell/xml-hamlet-0.4:=[profile?] <=dev-haskell/xml-hamlet-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.6.2
+SRC_URI=mirror://hackage/packages/archive/DAV/0.6.2/DAV-0.6.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ae5cce4abf0588005f144d6f5cecebcf
diff --git a/dev-haskell/dav-1.0.7 b/dev-haskell/dav-1.0.7
new file mode 100644
index 000000000000..c4f1d62c2640
--- /dev/null
+++ b/dev-haskell/dav-1.0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/case-insensitive-0.4:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/either-4.3:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/http-client-0.2:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lens-3.0:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/optparse-applicative-0.10.0:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] dev-haskell/transformers-base:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-hamlet-0.4:=[profile?] <dev-haskell/xml-hamlet-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=RFC 4918 WebDAV support
+EAPI=5
+HOMEPAGE=http://floss.scru.org/hDAV
+IUSE=+network-uri doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-haskell/case-insensitive-0.4:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/either-4.3:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/http-client-0.2:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lens-3.0:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/optparse-applicative-0.10.0:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] dev-haskell/transformers-base:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-hamlet-0.4:=[profile?] <dev-haskell/xml-hamlet-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/1.0.7
+SRC_URI=mirror://hackage/packages/archive/DAV/1.0.7/DAV-1.0.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8dcbf54de51f6fb9829b31df5132eb7a
diff --git a/dev-haskell/dav-1.3.1 b/dev-haskell/dav-1.3.1
new file mode 100644
index 000000000000..5974ba24d6d7
--- /dev/null
+++ b/dev-haskell/dav-1.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/case-insensitive-0.4:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/exceptions-0.7:=[profile?] dev-haskell/haskeline:=[profile?] >=dev-haskell/http-client-0.4:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lens-3.0:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] >=dev-haskell/optparse-applicative-0.10.0:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-hamlet-0.4:=[profile?] <dev-haskell/xml-hamlet-0.5:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=RFC 4918 WebDAV support
+EAPI=6
+HOMEPAGE=http://floss.scru.org/hDAV
+IUSE=+network-uri doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-haskell/case-insensitive-0.4:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/exceptions-0.7:=[profile?] dev-haskell/haskeline:=[profile?] >=dev-haskell/http-client-0.4:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lens-3.0:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] >=dev-haskell/optparse-applicative-0.10.0:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-hamlet-0.4:=[profile?] <dev-haskell/xml-hamlet-0.5:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/1.3.1
+SRC_URI=mirror://hackage/packages/archive/DAV/1.3.1/DAV-1.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=761c34f3110965cd3599301a253026c1
diff --git a/dev-haskell/dav/Manifest b/dev-haskell/dav/Manifest
deleted file mode 100644
index f0716733de51..000000000000
--- a/dev-haskell/dav/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST DAV-0.4.1.tar.gz 18631 BLAKE2B 503b2746100668e9fa230029b34c8659bdaf504a3b966a6abaddc909ace2686d876c53808d038aeff4061d128643bc10e782b6295f9e0c5a52c90146784b1980 SHA512 280aef7ab401df1a8b724a6ba610257085fa1829b38860dfc676c4764a95ea3a9e53d6c18007a66bad0caff931891138c9512361d2d21107582a44e534cc98ff
-DIST DAV-0.5.1.tar.gz 18657 BLAKE2B 0638bd6f1b860163f0261035d638f78af557d9998917fdea152e8d38c0e9e6c45f8031154081d9ab4ff70cd6dfab313153b3c1c8a8fb2481b3ad73517fb4176b SHA512 b72d757c2dc94d328b144fd3b9d2601d3adf3795bff6b49b436684306abc0f147aaedf1e782303bfdfe1803d6821cf19215caa5faaf5184822f6887a008f91ff
-DIST DAV-0.6.2.tar.gz 19039 BLAKE2B d00443cdf7e4305ea0b424f292e44b2cbefe5b388b70ede36a29fc28d97bad9ac25df2995772d2190357e6ff6c4bb1c07391f14be1c91db5e8db93b96a09a747 SHA512 2342bd0d1bca3e0fcbe459ad1dda74265e728d2524781989165895ae49b610c5ce96576968555b5d9d049157553684539fc4cbfcf4527dd231bef13855d47ad3
-DIST DAV-1.0.7.tar.gz 19768 BLAKE2B 923f1c20db5325527798bfc6c0b02f02aa051e3e7969e90c43bdf6bbc804918e88c0c5784295060afccf29d095e67a73d76a8a3cd3c610af5172caec7c81ca52 SHA512 3f4cdd5c708793a3c9542cb89845cc8de6a456ba55bc564bf7227ca2c3243807e3e85d6995581ad7662c994d65a0a9cde6f3c0d0a7fbe8ac7c8a07e338b039a8
-DIST DAV-1.3.1.tar.gz 20003 BLAKE2B ae4227b845761092a7435dc2c5a82640c3abf547587bc3b0a0ed3af2a2dd3b96498f45ab299abf7e85711b55ef233efc3be0e4e311f9204aa2196048281eb953 SHA512 d9f502e52c6d6de774b6b25426f1231c02e1a522ea2b991266ddb56778fd34c3a2dcafc81fdf55332895df4b9ca717e3df30cdf39b707589224b646f1895a621
-EBUILD dav-0.4.1.ebuild 1195 BLAKE2B c8826de47c996f40718d012eaf8997b9589c07eca60a31117375157f2161c1992f8c01c78876b68bf4ab51dda42d2d8c602e74a83341ce068df5916628184f73 SHA512 8f9364929f3025cb52fd7fed1038e6ad192b41b6babb7967fda344fa8d668eb85927c4af4a8a1216467d6148130f9c4172f4bd20a0cf89c0af057430cc9a2f0d
-EBUILD dav-0.5.1.ebuild 1224 BLAKE2B ab036235c815beaf74c4b1261c4e438109b4145f39c3f26a1172047ce6893543dfc5c890b87ac76a89d73a5d1d4f93065be0109aa51f1acebc250d0a8f901d6f SHA512 e9ad3f63d29f7cc569ba5f340b639af32dfa56108e5c8974ac7880f52b20e56503d7797999e329eba26305a487375265c158d5914567465f896d465ec66b5170
-EBUILD dav-0.6.2.ebuild 1348 BLAKE2B 6d4fc543e9272fbd598681c863c640510752078397a4e59e7345515770496caede2009409a66a91f269c9fc25beb136803edb379a3156b4f1c8399fb6f844d1b SHA512 323852a379670d7806cea8853d27ae25f492aa199979f4e076bb6238f2d8c195100e44454ddb48e63254e8ba5155eb812d757d4f917399e920d9b716a0f4f641
-EBUILD dav-1.0.7.ebuild 1558 BLAKE2B 6138fa402b1d9031f7258e93a030ce477b893797c53d0807773bbf415d36ddd00a3e80f8ec4534190428119a5b2738d45cc33a9381420a56bbbf433a7c929268 SHA512 b4b6950dd9b40d8c7b3b2b3d61d5ccebf680468c437ec34d9e6796dac4197b14ba5e69cd5304f87524e6ba4245c8444de9345f69220dee4c7678412fcfb982e0
-EBUILD dav-1.3.1.ebuild 1626 BLAKE2B 6a996a2bddfd3b643c18fdf0b4b7694516598f18e46296979b271142d8d734d2d46c296139b8f7c547abbf95458ada94397711dc1ea13c4b712e312eeeac35bc SHA512 f4b4ca49f1d5edff46f0ec4768e28e3276caa5c9cf65e74b5f6a61b6032e09f89dd0d39ff34326de9309d74f741ba3346cd3927d4e5eb84ba088683d01934a17
-MISC metadata.xml 650 BLAKE2B c387958eada84c6abeb2c338a51d77a6070c9abfe4a30a9b32e0385b0cdbe2019505f8762390ec0d39961ded95f859f8238c7e04d61d4b85c61551fd0d4b948d SHA512 0d4eb14205b9b25fd1821ad4c43f905b5cad5ff376491fe0e9b1e6758dbbb5930cead0552dd9ba0af0a9d35a9d60c015874427e9ee51665913831d217bbfe957
diff --git a/dev-haskell/dav/dav-0.4.1.ebuild b/dev-haskell/dav/dav-0.4.1.ebuild
deleted file mode 100644
index 459d2d0fbde6..000000000000
--- a/dev-haskell/dav/dav-0.4.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="DAV"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="RFC 4918 WebDAV support"
-HOMEPAGE="http://floss.scru.org/hDAV"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
-		>=dev-haskell/http-conduit-1.9.0:=[profile?]
-		>=dev-haskell/http-types-0.7:=[profile?]
-		>=dev-haskell/lens-3.0:=[profile?]
-		>=dev-haskell/lifted-base-0.1:=[profile?]
-		>=dev-haskell/mtl-2.1:=[profile?]
-		>=dev-haskell/network-2.3:=[profile?]
-		dev-haskell/optparse-applicative:=[profile?]
-		>=dev-haskell/resourcet-0.3:=[profile?]
-		>=dev-haskell/transformers-0.3:=[profile?]
-		>=dev-haskell/xml-conduit-1.0:=[profile?]
-		<=dev-haskell/xml-conduit-1.2:=[profile?]
-		>=dev-haskell/xml-hamlet-0.4:=[profile?]
-		<=dev-haskell/xml-hamlet-0.5:=[profile?]
-		>=dev-lang/ghc-7.4.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/dav/dav-0.5.1.ebuild b/dev-haskell/dav/dav-0.5.1.ebuild
deleted file mode 100644
index b3e43963adcd..000000000000
--- a/dev-haskell/dav/dav-0.5.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="DAV"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="RFC 4918 WebDAV support"
-HOMEPAGE="http://floss.scru.org/hDAV"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
-	>=dev-haskell/http-client-0.2:=[profile?]
-	>=dev-haskell/http-client-tls-0.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lens-3.0:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	dev-haskell/optparse-applicative:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?] <=dev-haskell/xml-conduit-1.2:=[profile?]
-	>=dev-haskell/xml-hamlet-0.4:=[profile?] <=dev-haskell/xml-hamlet-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/dav/dav-0.6.2.ebuild b/dev-haskell/dav/dav-0.6.2.ebuild
deleted file mode 100644
index 7ae4792adfd8..000000000000
--- a/dev-haskell/dav/dav-0.6.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="DAV"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="RFC 4918 WebDAV support"
-HOMEPAGE="http://floss.scru.org/hDAV"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
-	>=dev-haskell/either-4.1:=[profile?]
-	dev-haskell/errors:=[profile?]
-	>=dev-haskell/http-client-0.2:=[profile?]
-	>=dev-haskell/http-client-tls-0.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lens-3.0:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/monad-control-0.3.2:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/optparse-applicative-0.5.0:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?] <dev-haskell/xml-conduit-1.3:=[profile?]
-	>=dev-haskell/xml-hamlet-0.4:=[profile?] <=dev-haskell/xml-hamlet-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/dav/dav-1.0.7.ebuild b/dev-haskell/dav/dav-1.0.7.ebuild
deleted file mode 100644
index 527fe2a3823d..000000000000
--- a/dev-haskell/dav/dav-1.0.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="DAV"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="RFC 4918 WebDAV support"
-HOMEPAGE="http://floss.scru.org/hDAV"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/either-4.3:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	>=dev-haskell/http-client-0.2:=[profile?]
-	>=dev-haskell/http-client-tls-0.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lens-3.0:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?]
-	>=dev-haskell/optparse-applicative-0.10.0:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-haskell/xml-hamlet-0.4:=[profile?] <dev-haskell/xml-hamlet-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/dav/dav-1.3.1.ebuild b/dev-haskell/dav/dav-1.3.1.ebuild
deleted file mode 100644
index 4d5cb55c6fda..000000000000
--- a/dev-haskell/dav/dav-1.3.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -mtl-compat
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="DAV"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="RFC 4918 WebDAV support"
-HOMEPAGE="http://floss.scru.org/hDAV"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/exceptions-0.7:=[profile?]
-	dev-haskell/haskeline:=[profile?]
-	>=dev-haskell/http-client-0.4:=[profile?]
-	>=dev-haskell/http-client-tls-0.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lens-3.0:=[profile?]
-	>=dev-haskell/mtl-2.2.1:=[profile?]
-	>=dev-haskell/optparse-applicative-0.10.0:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-haskell/xml-hamlet-0.4:=[profile?] <dev-haskell/xml-hamlet-0.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-mtl-compat \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/dav/metadata.xml b/dev-haskell/dav/metadata.xml
deleted file mode 100644
index 8dcb4ff8ac22..000000000000
--- a/dev-haskell/dav/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This is a library for the Web Distributed Authoring and Versioning
-		(WebDAV) extensions to HTTP.  At present it supports a very small
-		subset of client functionality.
-		
-		In addition, there is an executable, hdav, which can be used for
-		command-line operation.
-	</longdescription>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/dbus-0.10.10 b/dev-haskell/dbus-0.10.10
new file mode 100644
index 000000000000..16fb46c0f6f0
--- /dev/null
+++ b/dev-haskell/dbus-0.10.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cereal-0.3.4:=[profile?] <dev-haskell/cereal-0.5:=[profile?] >=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?] >=dev-haskell/network-2.2.3:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-2.0:=[profile?] >=dev-haskell/text-0.11.1.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5 >=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3 >=dev-haskell/quickcheck-2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A client library for the D-Bus IPC system
+EAPI=5
+HOMEPAGE=https://john-millikin.com/software/haskell-dbus/
+IUSE=doc hscolour profile test
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=GPL-3
+RDEPEND=>=dev-haskell/cereal-0.3.4:=[profile?] <dev-haskell/cereal-0.5:=[profile?] >=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?] >=dev-haskell/network-2.2.3:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-2.0:=[profile?] >=dev-haskell/text-0.11.1.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.10.10
+SRC_URI=mirror://hackage/packages/archive/dbus/0.10.10/dbus-0.10.10.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c18449360a325e9e12430d6c2465393f
diff --git a/dev-haskell/dbus-0.10.11-r1 b/dev-haskell/dbus-0.10.11-r1
new file mode 100644
index 000000000000..dd367878b342
--- /dev/null
+++ b/dev-haskell/dbus-0.10.11-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/cereal-0.3.4:=[profile?] >=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?] >=dev-haskell/network-2.2.3:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-2.0:=[profile?] >=dev-haskell/text-0.11.1.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5 >=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3 >=dev-haskell/quickcheck-2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A client library for the D-Bus IPC system
+EAPI=5
+HOMEPAGE=https://john-millikin.com/software/haskell-dbus/
+IUSE=doc hscolour profile test
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-haskell/cereal-0.3.4:=[profile?] >=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?] >=dev-haskell/network-2.2.3:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-2.0:=[profile?] >=dev-haskell/text-0.11.1.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.10.11
+SRC_URI=mirror://hackage/packages/archive/dbus/0.10.11/dbus-0.10.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ce347a61307f03b88f8a5dde8eedff03
diff --git a/dev-haskell/dbus-0.10.12 b/dev-haskell/dbus-0.10.12
new file mode 100644
index 000000000000..f765c5663338
--- /dev/null
+++ b/dev-haskell/dbus-0.10.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/cereal-0.3.4:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?] >=dev-haskell/network-2.2.3:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-2.0:=[profile?] >=dev-haskell/text-0.11.1.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5 >=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3 >=dev-haskell/quickcheck-2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A client library for the D-Bus IPC system
+EAPI=5
+HOMEPAGE=https://john-millikin.com/software/haskell-dbus/
+IUSE=doc hscolour profile test
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-haskell/cereal-0.3.4:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?] >=dev-haskell/network-2.2.3:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-2.0:=[profile?] >=dev-haskell/text-0.11.1.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.10.12
+SRC_URI=mirror://hackage/packages/archive/dbus/0.10.12/dbus-0.10.12.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2f5360314fdf795d1b5b1b76c5a7e701
diff --git a/dev-haskell/dbus-0.10.13 b/dev-haskell/dbus-0.10.13
new file mode 100644
index 000000000000..aefbb303d465
--- /dev/null
+++ b/dev-haskell/dbus-0.10.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/cereal:=[profile?] dev-haskell/libxml-sax:=[profile?] dev-haskell/network:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/random:=[profile?] dev-haskell/text:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/xml-types:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/chell dev-haskell/chell-quickcheck dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A client library for the D-Bus IPC system
+EAPI=6
+HOMEPAGE=https://github.com/rblaze/haskell-dbus#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-3
+RDEPEND=dev-haskell/cereal:=[profile?] dev-haskell/libxml-sax:=[profile?] dev-haskell/network:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/random:=[profile?] dev-haskell/text:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/xml-types:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0/0.10.13
+SRC_URI=mirror://hackage/packages/archive/dbus/0.10.13/dbus-0.10.13.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cc166b18d573fe32b89fea94da632465
diff --git a/dev-haskell/dbus-core-0.9.3-r3 b/dev-haskell/dbus-core-0.9.3-r3
new file mode 100644
index 000000000000..d906e3ee8f5f
--- /dev/null
+++ b/dev-haskell/dbus-core-0.9.3-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/binary-0.4:=[profile?] >=dev-haskell/data-binary-ieee754-0.3:=[profile?] <dev-haskell/data-binary-ieee754-0.5:=[profile?] =dev-haskell/libxml-sax-0.7*:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-0.11.1.5:=[profile?] >=dev-haskell/vector-0.7:=[profile?] =dev-haskell/xml-types-0.3*:=[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=Low-level D-Bus protocol implementation
+EAPI=5
+HOMEPAGE=https://john-millikin.com/software/dbus-core/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-haskell/binary-0.4:=[profile?] >=dev-haskell/data-binary-ieee754-0.3:=[profile?] <dev-haskell/data-binary-ieee754-0.5:=[profile?] =dev-haskell/libxml-sax-0.7*:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-0.11.1.5:=[profile?] >=dev-haskell/vector-0.7:=[profile?] =dev-haskell/xml-types-0.3*:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.9.3
+SRC_URI=mirror://hackage/packages/archive/dbus-core/0.9.3/dbus-core-0.9.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f7cca0d4eec13e4bf195e27a15b09b5a
diff --git a/dev-haskell/dbus-core/Manifest b/dev-haskell/dbus-core/Manifest
deleted file mode 100644
index 6ce1c5b14fa9..000000000000
--- a/dev-haskell/dbus-core/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX dbus-core-0.9.3-ghc-7.10.patch 2960 BLAKE2B cbf0294948a042fd3135558755ed0dd61aede38cbb0777b62c8b6ca27fe68bf20622914264d0f50acc20a9e99f25e8461b474e0fc9d89c9eddc87320e5b55087 SHA512 f64631810064c8598264835f58a8bc952160e24a14977bd440cb34895dc4a3a28dfa1122e045f5c16a1ecb3245207b1a5b2349f51f65facfd4eee08b0e203a6a
-DIST dbus-core-0.9.3.tar.gz 216896 BLAKE2B affa443c08cfcc978aeb57a9b73be9afd4f0650e1fa363821688ad7c42439e6446f687f666acef793b95ba65b134bfd7c35968337dbd4c3878c8a8be9b8abe01 SHA512 4eee88958a49a0e0280744b490b9bc71e27f7f7fb32cc8ce34487439a124ba5fe72cb6b006781a03a41e87bdaeb2975fd19374fc19f699f7ad011a9b821ed32d
-EBUILD dbus-core-0.9.3-r3.ebuild 2093 BLAKE2B 5e7d7c82fcea451cb68fb43d9fc0e1f297856955bb16154fc7fd8f1975371606a22ead343a74e0ca48d5b3d8d14542ab5e2a282707a2254d1ddd53138413793e SHA512 e4d7eea9210617f6c7d3ad2f81e603fc16d7c9a8f6488f648fcecbac889554bb5476aa72aab3500d1f70d34b91067591a4248ce11dd13f4f59b15bb34e543755
-MISC metadata.xml 330 BLAKE2B a8f740494ea67b7eb5feacfd853aec03ecddd42c3d59cdaac045a82100b15d4663ec64a9fa1aa509dea37f63e825b14436dd931cfe47c45107bff4718ae62c61 SHA512 55edf794d4db633aeffb156a8f35bf05967fefc4d1e3c342f8a360b4f5c3260a150488af3fdf8410204cb7ae9c8d0cf5a98374638d8c85737e5eb4e24119e063
diff --git a/dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild b/dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild
deleted file mode 100644
index 5bda653667e7..000000000000
--- a/dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level D-Bus protocol implementation"
-HOMEPAGE="https://john-millikin.com/software/dbus-core/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4:=[profile?]
-		>=dev-haskell/data-binary-ieee754-0.3:=[profile?] <dev-haskell/data-binary-ieee754-0.5:=[profile?]
-		=dev-haskell/libxml-sax-0.7*:=[profile?]
-		>=dev-haskell/network-2.2:=[profile?]
-		>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-		>=dev-haskell/text-0.11.1.5:=[profile?]
-		>=dev-haskell/vector-0.7:=[profile?]
-		=dev-haskell/xml-types-0.3*:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-
-	if has_version "<dev-haskell/haddock-2.9.2"; then
-		# Workaround http://hackage.haskell.org/trac/hackage/ticket/626
-		# The haddock --hoogle option does not like unicode characters, which causes
-		# haddock 2.7.2 to fail like:
-		# haddock: internal Haddock or GHC error: dist/doc/html/enumerator/enumerator.txt: commitAndReleaseBuffer: invalid argument (Invalid or incomplete multibyte or wide character)
-		sed -e 's@&#8208;@-@g' \
-			-e "s@&#8217;@'@g" \
-			-i "${S}/hs/DBus/Connection.hs" \
-			-i "${S}/hs/DBus/Client/Internal.hs" \
-			-i "${S}/hs/DBus/Client/Simple.hs" \
-			-i "${S}/hs/DBus/Message/Internal.hs" \
-			-i "${S}/hs/DBus/Types/Internal.hs" \
-			-i "${S}/hs/DBus/Wire/Internal.hs"
-	fi
-	cabal_chdeps \
-		'binary >= 0.4 && < 0.6' 'binary >= 0.4' \
-		'bytestring >= 0.9 && < 0.10' 'bytestring >= 0.9' \
-		'containers >= 0.1 && < 0.5' 'containers >= 0.1' \
-		'network >= 2.2 && < 2.4' 'network >= 2.2' \
-		'text >= 0.11.1.5 && < 0.12' 'text >= 0.11.1.5' \
-		'unix >= 2.2 && < 2.6' 'unix >= 2.2' \
-		'vector >= 0.7 && < 0.10' 'vector >= 0.7'
-}
diff --git a/dev-haskell/dbus-core/files/dbus-core-0.9.3-ghc-7.10.patch b/dev-haskell/dbus-core/files/dbus-core-0.9.3-ghc-7.10.patch
deleted file mode 100644
index 402df007e7df..000000000000
--- a/dev-haskell/dbus-core/files/dbus-core-0.9.3-ghc-7.10.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff --git a/hs/DBus/Connection/Authentication.hs b/hs/DBus/Connection/Authentication.hs
-index b909a38..c33d311 100644
---- a/hs/DBus/Connection/Authentication.hs
-+++ b/hs/DBus/Connection/Authentication.hs
-@@ -25,3 +25,4 @@ module DBus.Connection.Authentication
- import           Prelude hiding (getLine, head)
--import           Control.Monad (liftM)
-+import           Control.Applicative
-+import           Control.Monad
- import qualified Data.ByteString
-@@ -58,2 +59,9 @@ data Auth a = Auth
- 
-+instance Functor Auth where
-+    fmap  = liftM
-+
-+instance Applicative Auth where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad Auth where
-diff --git a/hs/DBus/Introspection.hs b/hs/DBus/Introspection.hs
-index 96ff4a3..da82812 100644
---- a/hs/DBus/Introspection.hs
-+++ b/hs/DBus/Introspection.hs
-@@ -29,3 +29,4 @@ module DBus.Introspection
- 	) where
--import           Control.Monad ((>=>))
-+import           Control.Applicative
-+import           Control.Monad
- import           Control.Monad.ST (runST)
-@@ -176,2 +177,9 @@ newtype XmlWriter a = XmlWriter { runXmlWriter :: Maybe (a, Text) }
- 
-+instance Functor XmlWriter where
-+    fmap  = liftM
-+
-+instance Applicative XmlWriter where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad XmlWriter where
-diff --git a/hs/DBus/Types/Internal.hs b/hs/DBus/Types/Internal.hs
-index 7f5d9c5..7c73afe 100644
---- a/hs/DBus/Types/Internal.hs
-+++ b/hs/DBus/Types/Internal.hs
-@@ -5,2 +5,3 @@
- {-# LANGUAGE IncoherentInstances #-}
-+{-# LANGUAGE FlexibleContexts #-}
- 
-diff --git a/hs/DBus/Util/MonadError.hs b/hs/DBus/Util/MonadError.hs
-index 33b51ed..ef01df2 100644
---- a/hs/DBus/Util/MonadError.hs
-+++ b/hs/DBus/Util/MonadError.hs
-@@ -23,2 +23,6 @@ module DBus.Util.MonadError
- 	) where
-+
-+import Control.Applicative
-+import Control.Monad
-+
- newtype ErrorM e a = ErrorM { runErrorM :: Either e a }
-@@ -30,2 +34,6 @@ instance Functor (ErrorM e) where
- 
-+instance Applicative (ErrorM e) where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad (ErrorM e) where
-@@ -41,2 +49,9 @@ newtype ErrorT e m a = ErrorT { runErrorT :: m (Either e a) }
- 
-+instance Monad m => Functor (ErrorT e m) where
-+    fmap  = liftM
-+
-+instance Monad m => Applicative (ErrorT e m) where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad m => Monad (ErrorT e m) where
-diff --git a/hs/DBus/Wire/Internal.hs b/hs/DBus/Wire/Internal.hs
-index b386eec..512ff1a 100644
---- a/hs/DBus/Wire/Internal.hs
-+++ b/hs/DBus/Wire/Internal.hs
-@@ -19,3 +19,4 @@
- module DBus.Wire.Internal where
--import Control.Monad (liftM, when, unless)
-+import Control.Applicative
-+import Control.Monad hiding (void)
- 
-@@ -96,2 +97,9 @@ newtype Wire s a = Wire
- 
-+instance Functor (Wire s) where
-+    fmap  = liftM
-+
-+instance Applicative (Wire s) where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad (Wire s) where
diff --git a/dev-haskell/dbus-core/metadata.xml b/dev-haskell/dbus-core/metadata.xml
deleted file mode 100644
index 54fe8f8c3fff..000000000000
--- a/dev-haskell/dbus-core/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Low-level D-Bus protocol implementation
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/dbus/Manifest b/dev-haskell/dbus/Manifest
deleted file mode 100644
index c23aeef2c5e0..000000000000
--- a/dev-haskell/dbus/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX dbus-0.10.11-cereal-0.5.patch 4545 BLAKE2B e6c657d037b0e3d296e5199351179968a536dc493e904b7805384530880fbb423648216d76400ce39045835e8809b7da1506213f07a684c647799400c90908fd SHA512 40b8996d4e5b8f77beeca0947f1f46a969a54fb34a875f7b04766767a1188f83f1f2e1aecc0f82be56146c496ccf2cf2c4d85d6fd48d22581a3a128768eb52ba
-AUX dbus-0.10.12-QC-2.8.2.patch 466 BLAKE2B 21e5312a3f931aecdd7a5d906e8cb528919dcdfe9161a9c072b38d2555cfb8d989ea1eb48e5e7d24fbdc4f76d54608ca79df670375d7324e4173f4fd71b35523 SHA512 d1c4da222986b1570a4e9777d39f83d282471039abae1a65ec158b781bcd56fbc02ce1ed2592fa9541814b2943c22697a475c66b526eeda7d95fc67950544d5d
-DIST dbus-0.10.10.tar.gz 73707 BLAKE2B 90903a39d6962fcd3864988215fc74a3f85571509f021a3507f392dd14f2b358d75558dc25269a49426bfcef18eccc53e76c468559b3329367db7ab5904e9879 SHA512 c2faa76c32abb19ab903c015f6fc133beb605bbb4459d018fa544ffe4e04110cc63fc45815d862e8311f5b99de9c180c8eeb8e135fd6c7eb388ff579529a8ead
-DIST dbus-0.10.11.tar.gz 74853 BLAKE2B e72838c14906106b2114d9be9d8580295617c33fd322a3139c8c8245849dd77837cc26587c0289982de32442265b477754196f1b600f630d2f05f1c5312941f1 SHA512 290c1e9b142b920d56c59f3b250da88e114d850c8d846c37b400b21e92fae2d58983b4821497b61d0ff96f54179aedb70a5eb3ca40e1fbb6bbe59dee2f9256ff
-DIST dbus-0.10.12.tar.gz 74960 BLAKE2B b0bf015a761e3bcff8b5b40165f475c0ce00320f95a3f21cad65fed2db6955d982c2c4dbee2e9697f9a67f44b680f12e00c892a1dfa5fd45f745167d39307e66 SHA512 e725adc1b9dbbef4e2f47fd96ae60894f6553a15d5524071f7d6a48ab60cd6c25cda9be3cf84c5f4090f9769810abab7939a7333dcf77f31d1a71690bb6852d9
-DIST dbus-0.10.13.tar.gz 75603 BLAKE2B b1acb541505f0f9afe63fd8d9441114fcee3574e109686b16cd5c506aa940674352d32c14e155d2a2ddbc4bab3485ed70f747f59240b572559d6e649aff3a8da SHA512 e3cbb4153cd9df9308d89662b83659e13f07881f4d652c6f02dc6b6768ac1009552a7cfa9c610ededc9b630d26290eec153a9b08b7a3d70b44a6946af3d030ec
-EBUILD dbus-0.10.10.ebuild 1346 BLAKE2B 923a9bf402bbe72e03d2430f5f197382817966a3bb5d59976f50082c75cb872ba3680103a51aaa6000055141a349ab197b34f4d064455a4fe4ed98c8a60a3064 SHA512 8ff25ca95ab099a4c6c1a814c6486c7f721483002b43e80319ab2385e92b0766eb9e88468769671dc1b43ea8ad4412c71034748a818709f0924437bc14300e67
-EBUILD dbus-0.10.11-r1.ebuild 1444 BLAKE2B aecd5b50cf7e9dc7079dc00397f762d5f4d5f598dcdd40b3e4069f6a6ecf5a7530770969a6d44d398c27807abb8a78ef6122a4629497b89c64eefa747bd152fb SHA512 271975c1830e055831b335cfce2a7b1dce5b04816de14fb7e7c74557abed7a4ddfc4c6d8db954a97a5887c280f60d567a30321523b2902b008e05e138b82feb6
-EBUILD dbus-0.10.12.ebuild 1419 BLAKE2B 3db74a7e1b9513622e4c02aad966a60f6a2c0808d3c013e5f0c3a78ae0e0f73d5281c77bd4eae1f23e88131a30e829fa67239ac5b297d6c02b65a5b2fd0b1b14 SHA512 ce25f343860b26a00f5e6ce9b7de6264681036dbe9081245fb571767c3dd375b0ee8cffef29246e4b3084fa3cc46a0d7de0f5e135d934c68d368441759628d6c
-EBUILD dbus-0.10.13.ebuild 1005 BLAKE2B 4ef253fa791572d7cb423f9f9d9fec9082a8903b57c7ddf06516bc09538d94f4663fbbe2c5fe6e70f8ba7e7e3f5803e38463def6cc0c2509f4d41e63ede19b7d SHA512 773085e8b23cb2a25b54aedc35e7192481b6c5d5ed1c4a067dec8e439ebde152c6a328a3199e9b9449f84829d07998783fef17404176d75c96e184f1b4ea7717
-MISC metadata.xml 2059 BLAKE2B 6b4337ace7dfef9da556e9effadbf17714b10926a5f8ac738fa31685fe615b9dddbbf1a4e65550477bd75dd44d46081479faeb67d270218d53bd421cc878e94e SHA512 5fe5ada12b86da78282ff30e5bf0c8218ec81a451988695907c82759aba1dc022539d1d852d078023b37263c1f21a58831edc69a02730caca79487a897065a3b
diff --git a/dev-haskell/dbus/dbus-0.10.10.ebuild b/dev-haskell/dbus/dbus-0.10.10.ebuild
deleted file mode 100644
index 7ceb8c0cb097..000000000000
--- a/dev-haskell/dbus/dbus-0.10.10.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A client library for the D-Bus IPC system"
-HOMEPAGE="https://john-millikin.com/software/haskell-dbus/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cereal-0.3.4:=[profile?] <dev-haskell/cereal-0.5:=[profile?]
-	>=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?]
-	>=dev-haskell/network-2.2.3:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-2.0:=[profile?]
-	>=dev-haskell/text-0.11.1.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3
-		>=dev-haskell/quickcheck-2.4 )
-"
diff --git a/dev-haskell/dbus/dbus-0.10.11-r1.ebuild b/dev-haskell/dbus/dbus-0.10.11-r1.ebuild
deleted file mode 100644
index bd88e89c19b7..000000000000
--- a/dev-haskell/dbus/dbus-0.10.11-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A client library for the D-Bus IPC system"
-HOMEPAGE="https://john-millikin.com/software/haskell-dbus/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cereal-0.3.4:=[profile?]
-	>=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?]
-	>=dev-haskell/network-2.2.3:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-2.0:=[profile?]
-	>=dev-haskell/text-0.11.1.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3
-		>=dev-haskell/quickcheck-2.4 )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cereal-0.5.patch
-
-	cabal_chdeps \
-		'cereal >= 0.3.4 && < 0.5' 'cereal >= 0.3.4'
-}
diff --git a/dev-haskell/dbus/dbus-0.10.12.ebuild b/dev-haskell/dbus/dbus-0.10.12.ebuild
deleted file mode 100644
index 0aba52d5a793..000000000000
--- a/dev-haskell/dbus/dbus-0.10.12.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A client library for the D-Bus IPC system"
-HOMEPAGE="https://john-millikin.com/software/haskell-dbus/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cereal-0.3.4:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
-	>=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?]
-	>=dev-haskell/network-2.2.3:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-2.0:=[profile?]
-	>=dev-haskell/text-0.11.1.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3
-		>=dev-haskell/quickcheck-2.4 )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-QC-2.8.2.patch
-}
diff --git a/dev-haskell/dbus/dbus-0.10.13.ebuild b/dev-haskell/dbus/dbus-0.10.13.ebuild
deleted file mode 100644
index c03d412ebff0..000000000000
--- a/dev-haskell/dbus/dbus-0.10.13.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A client library for the D-Bus IPC system"
-HOMEPAGE="https://github.com/rblaze/haskell-dbus#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RESTRICT=test # don't allow access to running dbus
-
-RDEPEND="dev-haskell/cereal:=[profile?]
-	dev-haskell/libxml-sax:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/xml-types:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/chell
-		dev-haskell/chell-quickcheck
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/dbus/files/dbus-0.10.11-cereal-0.5.patch b/dev-haskell/dbus/files/dbus-0.10.11-cereal-0.5.patch
deleted file mode 100644
index 5c2c4c57cbb0..000000000000
--- a/dev-haskell/dbus/files/dbus-0.10.11-cereal-0.5.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff --git a/lib/DBus/Transport.hs b/lib/DBus/Transport.hs
-index 8c50ab9..9517212 100644
---- a/lib/DBus/Transport.hs
-+++ b/lib/DBus/Transport.hs
-@@ -42,3 +42,5 @@ import qualified Data.ByteString
- import           Data.ByteString (ByteString)
-+import qualified Data.ByteString.Lazy as BL
- import qualified Data.Map as Map
-+import qualified Data.Monoid as M
- import           Data.Typeable (Typeable)
-@@ -49,3 +51,3 @@ import qualified System.Info
- 
--import qualified Data.Serialize.Builder as Builder
-+import qualified Data.ByteString.Builder as Builder
- 
-@@ -151,3 +153,3 @@ instance Transport SocketTransport where
- recvLoop :: Socket -> Int -> IO ByteString
--recvLoop s = loop Builder.empty where
-+recvLoop s = loop M.mempty where
- 	chunkSize = 4096
-@@ -156,3 +158,3 @@ recvLoop s = loop Builder.empty where
- 			chunk <- recv s chunkSize
--			let builder = Builder.append acc (Builder.fromByteString chunk)
-+			let builder = M.mappend acc (Builder.byteString chunk)
- 			loop builder (n - Data.ByteString.length chunk)
-@@ -163,8 +165,8 @@ recvLoop s = loop Builder.empty where
- 				-- Return what we've got so far.
--				0 -> return (Builder.toByteString acc)
-+				0 -> return (BL.toStrict $ Builder.toLazyByteString acc)
- 				
- 				len -> do
--					let builder = Builder.append acc (Builder.fromByteString chunk)
-+					let builder = M.mappend acc (Builder.byteString chunk)
- 					if len == n
--						then return (Builder.toByteString builder)
-+						then return (BL.toStrict $ Builder.toLazyByteString builder)
- 						else loop builder (n - Data.ByteString.length chunk)
-diff --git a/lib/DBus/Wire.hs b/lib/DBus/Wire.hs
-index 43ae315..09bf8bd 100644
---- a/lib/DBus/Wire.hs
-+++ b/lib/DBus/Wire.hs
-@@ -34,2 +34,3 @@ import qualified Data.ByteString.Char8
- import           Data.Int (Int16, Int32, Int64)
-+import qualified Data.ByteString.Lazy as BL
- import qualified Data.Map
-@@ -37,2 +38,3 @@ import           Data.Map (Map)
- import           Data.Maybe (fromJust, listToMaybe, fromMaybe)
-+import qualified Data.Monoid as M
- import           Data.Text (Text)
-@@ -45,3 +47,3 @@ import           System.Posix.Types (Fd(..))
- 
--import qualified Data.Serialize.Builder as Builder
-+import qualified Data.ByteString.Builder as Builder
- import qualified Data.Serialize.Get as Get
-@@ -180,3 +182,3 @@ appendB :: Word64 -> Builder.Builder -> Marshal ()
- appendB size bytes = Wire (\_ (MarshalState builder count) -> let
--	builder' = Builder.append builder bytes
-+	builder' = M.mappend builder bytes
- 	count' = count + size
-@@ -187,3 +189,3 @@ appendS bytes = appendB
- 	(fromIntegral (Data.ByteString.length bytes))
--	(Builder.fromByteString bytes)
-+	(Builder.byteString bytes)
- 
-@@ -275,3 +277,3 @@ unmarshalGet count be le = do
- marshalWord8 :: Word8 -> Marshal ()
--marshalWord8 x = appendB 1 (Builder.singleton x)
-+marshalWord8 x = appendB 1 (Builder.word8 x)
- 
-@@ -282,4 +284,4 @@ marshalWord16 :: Word16 -> Marshal ()
- marshalWord16 = marshalBuilder 2
--	Builder.putWord16be
--	Builder.putWord16le
-+	Builder.word16BE
-+	Builder.word16LE
- 
-@@ -287,4 +289,4 @@ marshalWord32 :: Word32 -> Marshal ()
- marshalWord32 = marshalBuilder 4
--	Builder.putWord32be
--	Builder.putWord32le
-+	Builder.word32BE
-+	Builder.word32LE
- 
-@@ -292,4 +294,4 @@ marshalWord64 :: Word64 -> Marshal ()
- marshalWord64 = marshalBuilder 8
--	Builder.putWord64be
--	Builder.putWord64le
-+	Builder.word64BE
-+	Builder.word64LE
- 
-@@ -441,6 +443,6 @@ getArrayBytes itemType vs = do
- 	
--	putState (MarshalState Builder.empty afterPadding)
-+	putState (MarshalState M.mempty afterPadding)
- 	(MarshalState itemBuilder _) <- Data.Vector.mapM_ marshal vs >> getState
- 	
--	let itemBytes = Builder.toByteString itemBuilder
-+	let itemBytes = BL.toStrict $ Builder.toLazyByteString itemBuilder
- 	    paddingSize = fromIntegral (afterPadding - afterLength)
-@@ -568,3 +570,3 @@ marshalMessage e serial msg = runMarshal where
- 		marshal (toValue (encodeEndianness e))
--		let bodyBytes = Builder.toByteString bodyBytesB
-+		let bodyBytes = BL.toStrict $ Builder.toLazyByteString bodyBytesB
- 		marshalHeader msg serial sig (fromIntegral (Data.ByteString.length bodyBytes))
-@@ -573,6 +575,6 @@ marshalMessage e serial msg = runMarshal where
- 		checkMaximumSize
--	emptyState = MarshalState Builder.empty 0
-+	emptyState = MarshalState M.mempty 0
- 	runMarshal = case unWire marshaler e emptyState of
- 		WireRL err -> Left (MarshalError err)
--		WireRR _ (MarshalState builder _) -> Right (Builder.toByteString builder)
-+		WireRR _ (MarshalState builder _) -> Right (BL.toStrict $ Builder.toLazyByteString builder)
- 
diff --git a/dev-haskell/dbus/files/dbus-0.10.12-QC-2.8.2.patch b/dev-haskell/dbus/files/dbus-0.10.12-QC-2.8.2.patch
deleted file mode 100644
index 5fbfa1f61981..000000000000
--- a/dev-haskell/dbus/files/dbus-0.10.12-QC-2.8.2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/tests/DBusTests/Util.hs b/tests/DBusTests/Util.hs
-index cc83cef..972afb1 100644
---- a/tests/DBusTests/Util.hs
-+++ b/tests/DBusTests/Util.hs
-@@ -1,2 +1,2 @@
--{-# LANGUAGE TemplateHaskell #-}
-+{-# LANGUAGE TemplateHaskell, CPP #-}
- 
-@@ -194,4 +194,6 @@ countFileDescriptors = liftIO io where
- 
-+#if ! MIN_VERSION_QuickCheck(2,8,2)
- instance (Arbitrary a, Ord a) => Arbitrary (Data.Set.Set a) where
- 	arbitrary = fmap Data.Set.fromList arbitrary
-+#endif
- 
diff --git a/dev-haskell/dbus/metadata.xml b/dev-haskell/dbus/metadata.xml
deleted file mode 100644
index ffab7be7b225..000000000000
--- a/dev-haskell/dbus/metadata.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-	</maintainer>
-	<longdescription>
-		D-Bus is a simple, message-based protocol for inter-process
-		communication, which allows applications to interact with other parts of
-		the machine and the user's session using remote procedure calls.
-		
-		D-Bus is a essential part of the modern Linux desktop, where it replaces
-		earlier protocols such as CORBA and DCOP.
-		
-		This library is an implementation of the D-Bus protocol in Haskell. It
-		can be used to add D-Bus support to Haskell applications, without the
-		awkward interfaces common to foreign bindings.
-		
-		Example: connect to the session bus, and get a list of active names.
-		
-		@
-		&amp;#x7b;-\# LANGUAGE OverloadedStrings \#-&amp;#x7d;
-		
-		import Data.List (sort)
-		import DBus
-		import DBus.Client
-		
-		main = do
-		&amp;#x20;   client &lt;- connectSession
-		&amp;#x20;   //
-		&amp;#x20;   \-- Request a list of connected clients from the bus
-		&amp;#x20;   reply &lt;- call_ client (methodCall \"\/org\/freedesktop\/DBus\" \"org.freedesktop.DBus\" \"ListNames\")
-		&amp;#x20;       &amp;#x7b; methodCallDestination = Just \"org.freedesktop.DBus\"
-		&amp;#x20;       &amp;#x7d;
-		&amp;#x20;   //
-		&amp;#x20;   \-- org.freedesktop.DBus.ListNames() returns a single value, which is
-		&amp;#x20;   \-- a list of names (here represented as [String])
-		&amp;#x20;   let Just names = fromVariant (methodReturnBody reply !! 0)
-		&amp;#x20;   //
-		&amp;#x20;   \-- Print each name on a line, sorted so reserved names are below
-		&amp;#x20;   \-- temporary names.
-		&amp;#x20;   mapM_ putStrLn (sort names)
-		@
-		
-		&gt;$ ghc --make list-names.hs
-		&gt;$ ./list-names
-		&gt;:1.0
-		&gt;:1.1
-		&gt;:1.10
-		&gt;:1.106
-		&gt;:1.109
-		&gt;:1.110
-		&gt;ca.desrt.dconf
-		&gt;org.freedesktop.DBus
-		&gt;org.freedesktop.Notifications
-		&gt;org.freedesktop.secrets
-		&gt;org.gnome.ScreenSaver
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/deepseq-generics-0.1.1.2 b/dev-haskell/deepseq-generics-0.1.1.2
new file mode 100644
index 000000000000..d701f67af50f
--- /dev/null
+++ b/dev-haskell/deepseq-generics-0.1.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=GHC.Generics-based Control.DeepSeq.rnf implementation
+EAPI=5
+HOMEPAGE=https://github.com/hvr/deepseq-generics
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.1.2
+SRC_URI=mirror://hackage/packages/archive/deepseq-generics/0.1.1.2/deepseq-generics-0.1.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=57a33f76ce98b483b7679b28228c136e
diff --git a/dev-haskell/deepseq-generics-0.2.0.0 b/dev-haskell/deepseq-generics-0.2.0.0
new file mode 100644
index 000000000000..b654625b1d3a
--- /dev/null
+++ b/dev-haskell/deepseq-generics-0.2.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=GHC.Generics-based Control.DeepSeq.rnf implementation
+EAPI=5
+HOMEPAGE=https://github.com/hvr/deepseq-generics
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.0.0
+SRC_URI=mirror://hackage/packages/archive/deepseq-generics/0.2.0.0/deepseq-generics-0.2.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6f7005dd92e4b8131f35d45f4d3632b8
diff --git a/dev-haskell/deepseq-generics/Manifest b/dev-haskell/deepseq-generics/Manifest
deleted file mode 100644
index 5fe23cec192d..000000000000
--- a/dev-haskell/deepseq-generics/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST deepseq-generics-0.1.1.2.tar.gz 5304 BLAKE2B 6a22f0eeb2f1d9d85de2ae83f7a98d54e6e5e647164d0b5729345250dbcdbae0327a475e775ef6caab139987e6d0c172a235245407c00fe51293999b6a22882a SHA512 79937e658395f10210c6cce96dabb22418fc01eafa50743394403e6a34b8f70a3eba79782fb193089fd7569686066891aa3edd4e5c14df896e8da2dc1e186077
-DIST deepseq-generics-0.2.0.0.tar.gz 5192 BLAKE2B c1711c69267a92749803f71cdb0738bf465d63a1cd91c0f26afefa52a7806711c7de75b52a1fa0421ec84a8f9165743fb7f2c5371dc3e4bd5e340ae0bfc4f532 SHA512 403d5fd9d8bee827ec2434841d06e78520f6ff5709e4b8e1223d926e819cb99727162d7004f98bff795beaff1dc7d42d07534300c11d453ac559a743a4d70e7e
-EBUILD deepseq-generics-0.1.1.2.ebuild 758 BLAKE2B b5479c70bb9382168dc46831a6d3388dcc7d3690270edede92a1475a4aeb4f35b85cfe17abe029cbb43ef5f325b5a244dc6d617767081b3f8e2b8eafb827de1e SHA512 6cd8a14927767127fd8833cf4ab64b777c12bb2deb231167863d9bcf5690f40a39f2e431644378374b73dbffdfe25aa843ed613ed1807d7ea9689c3e5bbaa7fd
-EBUILD deepseq-generics-0.2.0.0.ebuild 667 BLAKE2B 973a31adbed744376c5c9c0b9d12b4289db86c1e941e360b02dd20a1850d563359f8c8d1e9d5d2a943a1588d55a841e66e7c541fa07b0f4295b8a8ee4a43853a SHA512 bbcd142f69eb54d65616188df2349769f6c5aa9495fdf8597f28257990bdff7a9d3a6244cd1e95625c70b925346a5219604e8dc9ddd7d3e262842537604b9839
-MISC metadata.xml 1048 BLAKE2B 61c8054912a88415a551128386deea3bce7214a30ba5e14b9a52ccd8501f3f687694e3f8b5a8da97ac995d191cc7dc7b780dd2fc8d311fb3d8fec71c1998761f SHA512 8db9471a28c7cafce4965230ddd9054182a6384f49870b3d9c137ffe9cce53c2a56f3e41f473c72568e08e7a01ce93eb72ebc89c1a608362e9c9205c4a9d8b9e
diff --git a/dev-haskell/deepseq-generics/deepseq-generics-0.1.1.2.ebuild b/dev-haskell/deepseq-generics/deepseq-generics-0.1.1.2.ebuild
deleted file mode 100644
index 07eb0962b1c5..000000000000
--- a/dev-haskell/deepseq-generics/deepseq-generics-0.1.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="GHC.Generics-based Control.DeepSeq.rnf implementation"
-HOMEPAGE="https://github.com/hvr/deepseq-generics"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'ghc-prim >= 0.2 && < 0.4' 'ghc-prim >= 0.2 && < 0.5'
-}
diff --git a/dev-haskell/deepseq-generics/deepseq-generics-0.2.0.0.ebuild b/dev-haskell/deepseq-generics/deepseq-generics-0.2.0.0.ebuild
deleted file mode 100644
index 1ac8075ed1b3..000000000000
--- a/dev-haskell/deepseq-generics/deepseq-generics-0.2.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="GHC.Generics-based Control.DeepSeq.rnf implementation"
-HOMEPAGE="https://github.com/hvr/deepseq-generics"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
diff --git a/dev-haskell/deepseq-generics/metadata.xml b/dev-haskell/deepseq-generics/metadata.xml
deleted file mode 100644
index de3594300240..000000000000
--- a/dev-haskell/deepseq-generics/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides a "GHC.Generics"-based
-		'Control.DeepSeq.Generics.genericRnf' function which can be used
-		for providing a 'rnf' implementation. See the documentation for
-		the 'genericRnf' function in the "Control.DeepSeq.Generics" module
-		to get started.
-		
-		The original idea was pioneered in the @generic-deepseq@ package
-		(see &lt;http://www.haskell.org/pipermail/haskell-cafe/2012-February/099551.html&gt;
-		for more information).
-		
-		This package differs from the @generic-deepseq@ package by working
-		in combination with the existing @deepseq@ package as opposed to defining a
-		conflicting drop-in replacement for @deepseq@'s @Control.Deepseq@ module.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">hvr/deepseq-generics</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/derive-2.5.26 b/dev-haskell/derive-2.5.26
new file mode 100644
index 000000000000..68935e8859f3
--- /dev/null
+++ b/dev-haskell/derive-2.5.26
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/haskell-src-exts-1.17:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/uniplate-1.5:=[profile?] <dev-haskell/uniplate-1.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A program and library to derive instances for data types
+EAPI=6
+HOMEPAGE=https://github.com/ndmitchell/derive#readme
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/haskell-src-exts-1.17:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/uniplate-1.5:=[profile?] <dev-haskell/uniplate-1.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.5.26
+SRC_URI=mirror://hackage/packages/archive/derive/2.5.26/derive-2.5.26.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=222469e1af3d16c34d6a01fae60370e6
diff --git a/dev-haskell/derive/Manifest b/dev-haskell/derive/Manifest
deleted file mode 100644
index d719afc532bb..000000000000
--- a/dev-haskell/derive/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST derive-2.5.26.tar.gz 58346 BLAKE2B abf62a7a948cc06f9f19b314f6ff670a6721c5bc1ebaf0d2dcfd068cbe23932b7cf3548e1e2fc574d7fd4ff6afecab380c16cc091aa95d8cef143ceb4af71b41 SHA512 06297c8d5ebe48dabe3a392a60c1fdec8f81c9a443952c361dfe39d7cf61171162c0e766d26f0f79253ed6540fac756a928543374e0741a334af4ff536e6a6c6
-EBUILD derive-2.5.26.ebuild 820 BLAKE2B 8aa60378c5a083e2c80b1767af447920fd4a6a5d4778c34b3753bc8150f5c58ef777395232ddd087c1c66b3ab063ecbc2d5b66dec63eb5318cad7ef7818037a3 SHA512 a5c704330308b64f37f808b6dc664a055f2adac2901119eb46a1e5bb1916c469c23f5affd2c7f41dc1cfdb7ec746caf3089d64185ab85ba02ae28e27136e3f63
-MISC metadata.xml 663 BLAKE2B 55557b90f9421ebad24656449251e7b7b26afc4612110a309a247e5bf3c5af2cf517a5bbf7993baffee073d481846b4977a04eeb66d023a05d182b9828a4538f SHA512 7186a00841f01ded97b6f0e48d720dd3a478912295306631e4bb9a08c59ff0f1ff548b0149a9f9c61a1ee8131edb0636285f7b39cfc556ef0953e5b07b735ac3
diff --git a/dev-haskell/derive/derive-2.5.26.ebuild b/dev-haskell/derive/derive-2.5.26.ebuild
deleted file mode 100644
index d123ab2c6595..000000000000
--- a/dev-haskell/derive/derive-2.5.26.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A program and library to derive instances for data types"
-HOMEPAGE="https://github.com/ndmitchell/derive#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/haskell-src-exts-1.17:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/uniplate-1.5:=[profile?] <dev-haskell/uniplate-1.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/derive/metadata.xml b/dev-haskell/derive/metadata.xml
deleted file mode 100644
index 4b41d4a95355..000000000000
--- a/dev-haskell/derive/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Data.Derive is a library and a tool for deriving instances for Haskell programs.
-		It is designed to work with custom derivations, SYB and Template Haskell mechanisms.
-		The tool requires GHC, but the generated code is portable to all compilers.
-		We see this tool as a competitor to DrIFT.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ndmitchell/derive</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/deriving-compat-0.3.5 b/dev-haskell/deriving-compat-0.3.5
new file mode 100644
index 000000000000..fa6948f31d43
--- /dev/null
+++ b/dev-haskell/deriving-compat-0.3.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-compat-0.5:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/base-compat-0.8.1 <dev-haskell/base-compat-1 >=dev-haskell/base-orphans-0.5 <dev-haskell/base-orphans-1 >=dev-haskell/hspec-1.8 >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 >=dev-haskell/tagged-0.7 <dev-haskell/tagged-1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Backports of GHC deriving extensions
+EAPI=6
+HOMEPAGE=https://github.com/haskell-compat/deriving-compat
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-compat-0.5:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.3.5
+SRC_URI=mirror://hackage/packages/archive/deriving-compat/0.3.5/deriving-compat-0.3.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fa09c8286655e335c7abc650c0645f01
diff --git a/dev-haskell/deriving-compat/Manifest b/dev-haskell/deriving-compat/Manifest
deleted file mode 100644
index 7ac38d5be51d..000000000000
--- a/dev-haskell/deriving-compat/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST deriving-compat-0.3.5.tar.gz 60418 BLAKE2B c3b56d5bbb0054b5bcfea50c38a742df35030d723e4051f5f441b0e341bfaa88aab7691a0cc77ba8b2df623e7e7c0e2b272ca63a11e27827d9b8e67e68cc4803 SHA512 73facb605f26edb05ce299cf40443a12d4508abc28a7a08bcb88e60edd12bd4c015023004abfc78794239f38e622e0b4309df63e40f8a5dd621fcd15cf1ede7a
-EBUILD deriving-compat-0.3.5.ebuild 885 BLAKE2B 4ea79834e8bd140d40a3e230010d664f5eb91f56a5c1d8b166429c44d02314efca5fbf2cacb622a5cd4ca033c6d9bbff7983fc772e382c623b32c9d57e8e3468 SHA512 2bde71595c6c6e3b00b947fb91ff23898e30ea1a5a091f5fc66615925f46c7e9659585455dea42bbe80e966dc4e578abd322b32563e2331a19d11db376f2e7db
-MISC metadata.xml 2105 BLAKE2B 36bb5e8a3c3b0615e744e6563eb066887ef34c1b73a4386aed41ef493bffa4eca1a26b7c53755f99c6605f69617d891f8e069ed189d580b585b94fdc98b35521 SHA512 b2d303350deb80e0ecb786c2721a3c2168952195f16d047e2b3fa2ea2f7d3fa8552dbd24fe15ffcf22a8fd81fc169f6908b325cb59073396babd41fcd3acc399
diff --git a/dev-haskell/deriving-compat/deriving-compat-0.3.5.ebuild b/dev-haskell/deriving-compat/deriving-compat-0.3.5.ebuild
deleted file mode 100644
index 4294c80a354e..000000000000
--- a/dev-haskell/deriving-compat/deriving-compat-0.3.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Backports of GHC deriving extensions"
-HOMEPAGE="https://github.com/haskell-compat/deriving-compat"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/base-compat-0.8.1 <dev-haskell/base-compat-1
-		>=dev-haskell/base-orphans-0.5 <dev-haskell/base-orphans-1
-		>=dev-haskell/hspec-1.8
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		>=dev-haskell/tagged-0.7 <dev-haskell/tagged-1 )
-"
diff --git a/dev-haskell/deriving-compat/metadata.xml b/dev-haskell/deriving-compat/metadata.xml
deleted file mode 100644
index 047211a1b6d5..000000000000
--- a/dev-haskell/deriving-compat/metadata.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Provides Template Haskell functions that mimic deriving
-		extensions that were introduced or modified in recent versions
-		of GHC. Currently, the following extensions are covered:
-		
-		* @DeriveFoldable@
-		
-		* @DeriveFunctor@
-		
-		* @DeriveTraversable@
-		
-		The following changes have been backported:
-		
-		* In GHC 8.0, @DeriveFoldable@ was changed to allow folding
-		over data types with existential constraints.
-		
-		* In GHC 8.0, @DeriveFoldable@ and @DeriveTraversable@ were
-		changed so as not to generate superfluous @mempty@ or @pure@
-		expressions in generated code. As a result, this allows
-		deriving @Traversable@ instances for datatypes with unlifted
-		argument types.
-		
-		* In GHC 8.0, deriving @Show@ was changed so that constructor fields
-		with unlifted types are no longer shown with parentheses, and
-		the output of showing an unlifted type is suffixed with the same
-		number of hash signs as the corresponding primitive literals.
-		
-		* In GHC 8.2, deriving `Ord` was changed so that it generates concrete
-		@if@-expressions that are not subject to @RebindableSyntax@.
-		
-		Note that some recent GHC extensions are not covered by this package:
-		
-		* @DeriveGeneric@, which was introducted in GHC 7.2 for deriving
-		@Generic@ instances, and modified in GHC 7.6 to allow derivation
-		of @Generic1@ instances. Use @Generics.Deriving.TH@ from
-		@&lt;http://hackage.haskell.org/package/generic-deriving generic-deriving&gt;@
-		to derive @Generic(1)@ using Template Haskell.
-		
-		* @DeriveLift@, which was introduced in GHC 8.0 for deriving
-		@Lift@ instances. Use @Language.Haskell.TH.Lift@ from
-		@&lt;http://hackage.haskell.org/package/th-lift th-lift&gt;@
-		to derive @Lift@ using Template Haskell.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">haskell-compat/deriving-compat</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/diff-0.1.3 b/dev-haskell/diff-0.1.3
new file mode 100644
index 000000000000..8809c525b9a6
--- /dev/null
+++ b/dev-haskell/diff-0.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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=O(ND) diff algorithm in haskell
+EAPI=4
+HOMEPAGE=http://hackage.haskell.org/package/Diff
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.8.2
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/Diff/0.1.3/Diff-0.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8239661b51f0a7af7f66029c73eab06b
diff --git a/dev-haskell/diff-0.3.0 b/dev-haskell/diff-0.3.0
new file mode 100644
index 000000000000..c00d52133ec9
--- /dev/null
+++ b/dev-haskell/diff-0.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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=O(ND) diff algorithm in haskell
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/Diff
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.3.0
+SRC_URI=mirror://hackage/packages/archive/Diff/0.3.0/Diff-0.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=76cf3614b454eb17fc87547fca8a858d
diff --git a/dev-haskell/diff-0.3.2 b/dev-haskell/diff-0.3.2
new file mode 100644
index 000000000000..ae210cce81d1
--- /dev/null
+++ b/dev-haskell/diff-0.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=O(ND) diff algorithm in haskell
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/Diff
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.2
+SRC_URI=mirror://hackage/packages/archive/Diff/0.3.2/Diff-0.3.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3ac4ebec7d9fcf0becdcff1daafae7db
diff --git a/dev-haskell/diff-0.3.4 b/dev-haskell/diff-0.3.4
new file mode 100644
index 000000000000..479f06a2fc3e
--- /dev/null
+++ b/dev-haskell/diff-0.3.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=O(ND) diff algorithm in haskell
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/Diff
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.4
+SRC_URI=mirror://hackage/packages/archive/Diff/0.3.4/Diff-0.3.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=942e4c2a7192442a6451a58b8d511338
diff --git a/dev-haskell/diff/Manifest b/dev-haskell/diff/Manifest
deleted file mode 100644
index 509bf0a69bf4..000000000000
--- a/dev-haskell/diff/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST Diff-0.1.3.tar.gz 2851 BLAKE2B e7a542443eeadad52f206dc8f3038197bd88947cd9c0ad32a2ffb73ab0a66702d7df375df3aadfdbdb353eb5c226e4f80b1776555e5ced3e56a5d39b8fbeb05d SHA512 6959d9fcd6f7a59b4a32779e8c96723b7219dd0a3b70a61a996d375825c84a8626de79cef9135d4ee8d24599ebdb4ba525a1a11234ade8b70278282f1544370e
-DIST Diff-0.3.0.tar.gz 4128 BLAKE2B 94855d33247d1cf44642ad3bc395dd6944442e48405d2987dce1550acb34e3a8408c139b160f0d26aa1e4c76dfe3680750d96662b197e4633cc891563b65a19a SHA512 6920802ba715a97f7650e8edbcc8469c1479d8be2c7fb61703fccaf77f4adc23ced7d26794e6210318afd98f350bc5cb08fd70c1b2797fde9f95546e55a85198
-DIST Diff-0.3.2.tar.gz 5024 BLAKE2B fbbccebe6627853649367e016487b0d01e671a1a6a495996413ed2f4f4d7bc63245ea915f9de2465aa8ebe92db1893c34812306afe18aaf466eafcdfd21911ae SHA512 b41c8482b1bcd4e332f85015f7ea99dc3c76d106327bf6b3a8676bb31ffbbdc80f09386f8044aae234a1be6a6304ec4860bb9c0ced95f8910db19d3e2cefe297
-DIST Diff-0.3.4.tar.gz 7979 BLAKE2B 937b90294b9e48a741577c7d240a1b02feaadd2aca8afc439e19b36a98c0e3bc319ee67307b77a2410bf2139a580166cbedbc964d5c9b9fc15dc7422ec2350db SHA512 7b8af9a668429d8de141b840e4b22abafb7ccafa9cdbe4c5ee21efe58802ac5889f1575fd6b3c83755b1128ecec68f3aa0213e99b65161f1e7b5681dc6978ad7
-EBUILD diff-0.1.3.ebuild 600 BLAKE2B 10c501685cf7dc2713b7de90bccdeef57dcf0d5d8dae3ff68b8a9511f763dada935855cd7d7d12f91f1b884888f66547674a361eb6bebdf9fe0d3cf088c1d3dc SHA512 b809d01fb2b54b48229002e6b8ab80ad3c4a3ed4c751fb1a6ad5a2083c0dcd0e553df2885c3c4b7bcc1f109f158ec15130a4624d4ad486efcd7baaf08900e82d
-EBUILD diff-0.3.0.ebuild 606 BLAKE2B 64adff70046f2cd8a75c8c374127afa2b1bf0cec85536db59110d7d063ab3a1c00b47f6f63f44050eec873bf871f94fe848d948dad2d5ba2f6867d3bff4afbc6 SHA512 0a9be95c3d2fb00f58c640e16e3d56115f3d339d82041822eefd52c4d552954398883c46945732c7622f5835c418451e056ae98ddc3e2f43e241f4dd69d28ed6
-EBUILD diff-0.3.2.ebuild 608 BLAKE2B 1fa685ce3a657f70658a249dc460d968a1aac15894673b3f32f37f262555e67579121c9163df9f2b4ffa96d02dd9c20c14f95820b5d39939c448b56fde8d5a45 SHA512 03617a39f1fd9a2cae6162dbfbace1a8af326d09c518df778bee8b45724d4708296a31de1ff3f85d09bb43c5426a42e755f7ec75b7da2c73cb77ca3b807532f0
-EBUILD diff-0.3.4.ebuild 723 BLAKE2B 3ba9459a3e3ce64e8b243e7618581c307c91c4a1637c4d376164850fd5a8c18f3f940cffafa51147461b77beca4a001cf4206029d8e94c59470dab432b3bbea2 SHA512 9bb10ca14ea1309199e473a6602e8c74688382b8eb0c3ce20ee1f0827794b5114efda7c83fe187a41ef5c3ef77340e9f58ea2e2030082fb50fd94477a0c04f4d
-MISC metadata.xml 343 BLAKE2B 8ade99ea53e57f6cbd50bbd149638601274414962c1950f608e153f23f5b06fdbc97045e1d50d02a9111adc2fa726bf0ba2c9fd281888e4a653919d459071e28 SHA512 db303177305c59a6ad2831d02ed384912c3255eb15bde6b48b2a6e06abb17d4e66d8e4de8f5fadd9bb027cbc5818a1c5a1b364e31eb8cd6711c343d4b6f42bf1
diff --git a/dev-haskell/diff/diff-0.1.3.ebuild b/dev-haskell/diff/diff-0.1.3.ebuild
deleted file mode 100644
index 795370e8c489..000000000000
--- a/dev-haskell/diff/diff-0.1.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.17.9999
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Diff"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="O(ND) diff algorithm in haskell"
-HOMEPAGE="http://hackage.haskell.org/package/Diff"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/diff/diff-0.3.0.ebuild b/dev-haskell/diff/diff-0.3.0.ebuild
deleted file mode 100644
index 202bf3d16d4a..000000000000
--- a/dev-haskell/diff/diff-0.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Diff"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="O(ND) diff algorithm in haskell"
-HOMEPAGE="http://hackage.haskell.org/package/Diff"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/diff/diff-0.3.2.ebuild b/dev-haskell/diff/diff-0.3.2.ebuild
deleted file mode 100644
index 09714388cccb..000000000000
--- a/dev-haskell/diff/diff-0.3.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Diff"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="O(ND) diff algorithm in haskell"
-HOMEPAGE="http://hackage.haskell.org/package/Diff"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/diff/diff-0.3.4.ebuild b/dev-haskell/diff/diff-0.3.4.ebuild
deleted file mode 100644
index 5896601f3090..000000000000
--- a/dev-haskell/diff/diff-0.3.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="Diff"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="O(ND) diff algorithm in haskell"
-HOMEPAGE="http://hackage.haskell.org/package/Diff"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-quickcheck2 )
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/diff/metadata.xml b/dev-haskell/diff/metadata.xml
deleted file mode 100644
index dfc8017acd0a..000000000000
--- a/dev-haskell/diff/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Basic implementation of the standard diff algorithm.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/digest-0.0.1.2 b/dev-haskell/digest-0.0.1.2
new file mode 100644
index 000000000000..6d74c265e23d
--- /dev/null
+++ b/dev-haskell/digest-0.0.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= sys-libs/zlib >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/digest
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=008cd1fea0b561a2e55faf5f8b68dafb
diff --git a/dev-haskell/digest/Manifest b/dev-haskell/digest/Manifest
deleted file mode 100644
index c0953098dd1d..000000000000
--- a/dev-haskell/digest/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST digest-0.0.1.2.tar.gz 3790 BLAKE2B 6fa19f1967dc6c8597d0ce2a1b29d3fecc8e47b0f652ca1319e4a7a10d3e9f8a299869ef43df2307f822568e04e109d946abe481aebd2decf8f72cafce4d6446 SHA512 f7961c098677c0e75561e3706446b073f60c6a8646aca6d139d6559952b2cba189221ac8af59f2dc6e4da65ee4a789f703e2ebbcf1e9c3df3f98167409bdf7c9
-EBUILD digest-0.0.1.2.ebuild 633 BLAKE2B 45ce64cce93911b4a548fa881f3cb359694b8b54510f2e526b57fcb05997cda3069bc80923ba6485e12d185fac3318c7f0983b689a445615a6b0c2dd6576bb59 SHA512 70bcfae92c12e52d59904e0b08cc70e698c64a838f78a0ccb0875a93e02c90a18e72063f090022a06c95bf76cf0b88bbf44d81d3b8f851c74f6d6544f1511a1f
-MISC metadata.xml 502 BLAKE2B 5e0e3d7246769ff38f7e8b191a133bddfcce9bb11ec8cf0359e83d10312d0417f1910e3b8d5a23d2cddec5a2cc0ae75e547fae2817275634b57303ea91b5d868 SHA512 167cc744a0303b3dff08214d9ce6fbf451120a8e1e6b286cca26b8dd6daa22803cf1e78294e7d5e177390bb3477f5e53acc43b06154ceb574735b3df88177b8b
diff --git a/dev-haskell/digest/digest-0.0.1.2.ebuild b/dev-haskell/digest/digest-0.0.1.2.ebuild
deleted file mode 100644
index 8f5d4067a0b4..000000000000
--- a/dev-haskell/digest/digest-0.0.1.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now"
-HOMEPAGE="http://hackage.haskell.org/package/digest"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-		sys-libs/zlib"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/digest/metadata.xml b/dev-haskell/digest/metadata.xml
deleted file mode 100644
index 06e7bab845b7..000000000000
--- a/dev-haskell/digest/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides efficient cryptographic hash implementations for
-		strict and lazy bytestrings. For now, CRC32 and Adler32 are supported;
-		they are implemented as FFI bindings to efficient code from zlib.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/disk-free-space-0.1.0.1 b/dev-haskell/disk-free-space-0.1.0.1
new file mode 100644
index 000000000000..8bb67d7bd5ba
--- /dev/null
+++ b/dev-haskell/disk-free-space-0.1.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Retrieve information about disk space usage
+EAPI=5
+HOMEPAGE=https://github.com/redneb/disk-free-space
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0.1
+SRC_URI=mirror://hackage/packages/archive/disk-free-space/0.1.0.1/disk-free-space-0.1.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0190cd818a1561bb72858c21d36daa1e
diff --git a/dev-haskell/disk-free-space/Manifest b/dev-haskell/disk-free-space/Manifest
deleted file mode 100644
index ce55df02ba99..000000000000
--- a/dev-haskell/disk-free-space/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST disk-free-space-0.1.0.1.tar.gz 2771 BLAKE2B 29c769acf9e60a88196197beb318cdab5b53583d979f7ab7fd9eda4e6252e991008b31f3f8d8cfcfd5f3ad46f7ebe90f55b8453d0666799dc04b31ba735783e2 SHA512 7e798e5428a8ee1a226c28172aca93940dae7aeec5f6fc0a7500da0299074a007f3b5a1d53d7282def245e4b829f86ff9f18ee1f8e824fa259052d5f2434729a
-EBUILD disk-free-space-0.1.0.1.ebuild 557 BLAKE2B 9a973fc946be494c12f0c2338c8ebff0142b3e9f877e37f1ee8a5aac8b51e78fcd9c90d2dd70b8def311f44ff5e3da5e6854a884fac55e8daeefb81a5cad33ae SHA512 50f7cff6209f0bd6dee977dfe79af137aeed731a274207f45f56bf29dbc11d5676ae7b47a4252871c71de22b98ac415c618dada2d252de73d434e946031b77cd
-MISC metadata.xml 453 BLAKE2B 5c6d22c3bb4ee71369797188b044a8531b3633581d7465b75a1281748ccb8609122a88b90ff9960d1467810504876da93be72470024941e9d83c4bfe6f62794d SHA512 398536957013f1ce1c20a200b2e5e11082cd82d9090cbe611df16867a4d13f1870e591fe7ed44b5444cfbbdb3f0549374fbe1ac7b2d92a1b0605b6787bd5c605
diff --git a/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild b/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild
deleted file mode 100644
index 914e76a90460..000000000000
--- a/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Retrieve information about disk space usage"
-HOMEPAGE="https://github.com/redneb/disk-free-space"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/disk-free-space/metadata.xml b/dev-haskell/disk-free-space/metadata.xml
deleted file mode 100644
index 345ccd01aa8d..000000000000
--- a/dev-haskell/disk-free-space/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A cross-platform library for retrieving information about disk space usage.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">redneb/disk-free-space</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/distributive-0.3.2 b/dev-haskell/distributive-0.3.2
new file mode 100644
index 000000000000..ab2438080d11
--- /dev/null
+++ b/dev-haskell/distributive-0.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-0.2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/doctest-0.9.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell 98 Distributive functors -- Dual to Traversable
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/distributive/
+IUSE=lib-werror doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-0.2:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.3.2
+SRC_URI=mirror://hackage/packages/archive/distributive/0.3.2/distributive-0.3.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c8f317c19b00cf5fd30f0e78403ec256
diff --git a/dev-haskell/distributive-0.4.4 b/dev-haskell/distributive-0.4.4
new file mode 100644
index 000000000000..07a6e515d575
--- /dev/null
+++ b/dev-haskell/distributive-0.4.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/doctest-0.9.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Distributive functors -- Dual to Traversable
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/distributive/
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.4.4
+SRC_URI=mirror://hackage/packages/archive/distributive/0.4.4/distributive-0.4.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=20d94931801eafea8972c6cbda75187d
diff --git a/dev-haskell/distributive-0.5.2 b/dev-haskell/distributive-0.5.2
new file mode 100644
index 000000000000..c7351e996184
--- /dev/null
+++ b/dev-haskell/distributive-0.5.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-orphans-0.5:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1 test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.12 >=dev-haskell/generic-deriving-1.11 <dev-haskell/generic-deriving-2 >=dev-haskell/hspec-2 <dev-haskell/hspec-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Distributive functors -- Dual to Traversable
+EAPI=6
+HOMEPAGE=https://github.com/ekmett/distributive/
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-orphans-0.5:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.5.2
+SRC_URI=mirror://hackage/packages/archive/distributive/0.5.2/distributive-0.5.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=56b3297e6ebd255d6c3012b4964a3c18
diff --git a/dev-haskell/distributive/Manifest b/dev-haskell/distributive/Manifest
deleted file mode 100644
index e5c46e120daa..000000000000
--- a/dev-haskell/distributive/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST distributive-0.3.2.tar.gz 5997 BLAKE2B dc92e2dae4ea335f7e1ca22432ee277c71b542cc26f6777d3a416d8de29acefe675f255b81c38d530b52965087902b115ac88fcb6d96c970417bb6cb0aa59201 SHA512 7b9d499c68a0e689c961ff6a1e33abad8d42fa714e6c45303559e58c962cb7fa1857a9dfa8514478a2c0abf464d0123ac12b8f86cee2d1c2c01a0875ad59bc1b
-DIST distributive-0.4.4.tar.gz 6686 BLAKE2B b408d3f7a95d11eabf7b59f5fced0373be66eb9ca96d22ceb3bad5ec77047d7e17b3cdf691bf9e214be52945d84511a77df01ce98b523ee35fbd35d6d8f308e1 SHA512 35f73d575f31b7ddc7ee5f58e4e2e871c3ea607c7147b96467937b5ffb80bcaeec6da616bfb596ffe1bc28bd7f4062d56496eb5b5cc9e45249865c216139dd4f
-DIST distributive-0.5.2.tar.gz 11824 BLAKE2B 7dd2bc3e4463ad44fba94a165f257343c171f185a8d8263d92db2dc3494b8ae5e2fb4a3174ac33c4864c009748ed5f30d1a2834ebf8c7e92b28b189391a6bb75 SHA512 1d16950598c25a9ce30ccd2711e085a5dba639dc0841af4fa0de1f1866fbea83142accf67fc95f230c466a5d17a5c9f2c577d6c3a72a913f7dbde77c8845175b
-EBUILD distributive-0.3.2.ebuild 903 BLAKE2B ba4860e431a3cfaa4d3dcff06043a50e33e71c6cc967193be1ed1b9f83d64eb1e3c18b16321c08dd5a5aa346e0adfef9d14d6882ef70e8cb478be4bdfca0cecf SHA512 ae9ac57a031cce1733f2cbfc9a5db72783695a1612de22c1b33adc0e51c046e24aeb6914926a928ab2b443a8355f383fbfb60e03b4f28d3cffef1bbe910fbc5e
-EBUILD distributive-0.4.4.ebuild 963 BLAKE2B b53ba98fdd09951076fdec0ecfd335bbb13b5e0b2a7c82f3d450c4397bb3e60c7436176fcea441a8162aa92a52cba86452fdc0e75bb344a730211ed9779c1957 SHA512 d6c7d975f01bf5c671102fad7eb00bfffc4cde4f652a6d7a9c00085f0bec27517e24bf82dcd3f567ac806ef9dda474498503ced12d6013f0d56def6d57b3c4e7
-EBUILD distributive-0.5.2.ebuild 1275 BLAKE2B 4ae70dc0f649716c3e8d6c5c3cf7e75a5ec8bb6202ee4f52cd6f2baf5f6ebe011c4488951d52d6d8c0048ac6e2008dd0c5fdc4e3f81e9a55eaef3491aa521d88 SHA512 450112ebce1f11eda3d1b0fddfe079477ad9ef2e1cea21de35960b505f80de033a986a2e990d29ca2948f2d8f21f2879ad59e303f2e24630fef2a21cd934193f
-MISC metadata.xml 514 BLAKE2B e720ae8ca046d7b45912e5d0118dff0afb9d3e6a057ee05af9cd6e706885d74426cae6518b720fb50ea9d2f1682d75d386c4c3b69aea33feb76916ed397fee8b SHA512 099854ea60b943b990d6627be340a882b8d480a00614fdda28b5532040194730f4504c0fb824fe28b843b0f738f5359ab0dbda124c036842739582a8fbc6620b
diff --git a/dev-haskell/distributive/distributive-0.3.2.ebuild b/dev-haskell/distributive/distributive-0.3.2.ebuild
deleted file mode 100644
index dbd9a772e2f0..000000000000
--- a/dev-haskell/distributive/distributive-0.3.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 Distributive functors -- Dual to Traversable"
-HOMEPAGE="https://github.com/ekmett/distributive/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="lib-werror"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-0.2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.9.1 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag lib-werror lib-werror)
-}
diff --git a/dev-haskell/distributive/distributive-0.4.4.ebuild b/dev-haskell/distributive/distributive-0.4.4.ebuild
deleted file mode 100644
index 38863c752f6e..000000000000
--- a/dev-haskell/distributive/distributive-0.4.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-#hackport: flags: -lib-werror
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Distributive functors -- Dual to Traversable"
-HOMEPAGE="https://github.com/ekmett/distributive/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.9.1 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-lib-werror
-}
diff --git a/dev-haskell/distributive/distributive-0.5.2.ebuild b/dev-haskell/distributive/distributive-0.5.2.ebuild
deleted file mode 100644
index ddd8dca19a2b..000000000000
--- a/dev-haskell/distributive/distributive-0.5.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: +tagged,+semigroups
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Distributive functors -- Dual to Traversable"
-HOMEPAGE="https://github.com/ekmett/distributive/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-orphans-0.5:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
-	test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.12
-		>=dev-haskell/generic-deriving-1.11 <dev-haskell/generic-deriving-2
-		>=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=semigroups \
-		--flag=tagged
-}
diff --git a/dev-haskell/distributive/metadata.xml b/dev-haskell/distributive/metadata.xml
deleted file mode 100644
index 00b25aaa934c..000000000000
--- a/dev-haskell/distributive/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haskell 98 Distributive functors -- Dual to Traversable
-	</longdescription>
-	<use>
-		<flag name="lib-werror">Compile with the ghc -Werror option</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ekmett/distributive</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/djinn-ghc-0.0.2.3 b/dev-haskell/djinn-ghc-0.0.2.3
new file mode 100644
index 000000000000..4148e9982a23
--- /dev/null
+++ b/dev-haskell/djinn-ghc-0.0.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/djinn-lib-0.0.1.2:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generate Haskell code from a type. Bridge from Djinn to GHC API
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/djinn-ghc
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/djinn-lib-0.0.1.2:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.0.2.3
+SRC_URI=mirror://hackage/packages/archive/djinn-ghc/0.0.2.3/djinn-ghc-0.0.2.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c0532a202e11a9351ab531bc676a9a02
diff --git a/dev-haskell/djinn-ghc/Manifest b/dev-haskell/djinn-ghc/Manifest
deleted file mode 100644
index ab0d0863bdd6..000000000000
--- a/dev-haskell/djinn-ghc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST djinn-ghc-0.0.2.3.tar.gz 3330 BLAKE2B 87a8b2671805b84eca1e67cace7fe2bdb9e18886a873ccbb25bb1e64aae716dc00ab4e1235c5e81b60b41e52ea8f4988691cbc91893aa1054382f0d690b998f6 SHA512 441b6ce7f5d7e4672394bcc6654db9405406540e68855c41b7db33ef9e267178aa56f20209c4a91ffda59a7e44847c7bfebfa3f0c3df3d0868600f34912d9ae8
-EBUILD djinn-ghc-0.0.2.3.ebuild 722 BLAKE2B 0ac5a78c45d7f561bc6515e344cd63ae6afce98f43ee19e3976c3e0b0aa5eaca5a12fc869b427e9a357581764e7aa9f4ec29b62f6a835c2d498f086e87413746 SHA512 6469c6cce42c0d822a12cd05c48f9fa90916a8cb8cbde111144f49a23bd157bdd140756d142ba9bfb0154ad81955f4accf0a3ab78fc6f40d5fbf722769d407f0
-MISC metadata.xml 460 BLAKE2B 2b4283dc204fa5b7486e73264cc89fa7dd4fea7136ebd756576264dd2daf675b2195bb62ca8119fa3221575aa5740365348092588b7ae9b1be8bc2cf9ace1e64 SHA512 7720271056a73393862fa94e4e04ad52320c78357660c878631ca4f5513a54e8f9d28bd57a535f7dea589373b68958bda9e3351c6bfe72d3257d7a2adab0e391
diff --git a/dev-haskell/djinn-ghc/djinn-ghc-0.0.2.3.ebuild b/dev-haskell/djinn-ghc/djinn-ghc-0.0.2.3.ebuild
deleted file mode 100644
index 6c59469923dd..000000000000
--- a/dev-haskell/djinn-ghc/djinn-ghc-0.0.2.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate Haskell code from a type. Bridge from Djinn to GHC API"
-HOMEPAGE="http://hackage.haskell.org/package/djinn-ghc"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/djinn-lib-0.0.1.2:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/djinn-ghc/metadata.xml b/dev-haskell/djinn-ghc/metadata.xml
deleted file mode 100644
index 927e4b37372f..000000000000
--- a/dev-haskell/djinn-ghc/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Djinn uses an theorem prover for intuitionistic propositional logic
-		to generate a Haskell expression when given a type.
-		This is the bridge from djinn-lib to GHC API.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/djinn-lib-0.0.1.2 b/dev-haskell/djinn-lib-0.0.1.2
new file mode 100644
index 000000000000..209a8b60db8b
--- /dev/null
+++ b/dev-haskell/djinn-lib-0.0.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generate Haskell code from a type. Library extracted from djinn package
+EAPI=5
+HOMEPAGE=http://www.augustsson.net/Darcs/Djinn/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.0.1.2
+SRC_URI=mirror://hackage/packages/archive/djinn-lib/0.0.1.2/djinn-lib-0.0.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ddb7b68d2dab4d149db8f847350c1553
diff --git a/dev-haskell/djinn-lib/Manifest b/dev-haskell/djinn-lib/Manifest
deleted file mode 100644
index f79295ce123a..000000000000
--- a/dev-haskell/djinn-lib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST djinn-lib-0.0.1.2.tar.gz 14608 BLAKE2B adc6fae2191fc1d1160bc1ce0b6f87ca9803f4431fb3cb2abb94357b7ed8867169e9eeba88e7e379361a5923ebea4237156e6bbf38b3ddfcc2b8905ad37fa850 SHA512 403878b72540362a6b6d545a65ded9f10d05c623180adf8a03e732fac30dd00a42b090b9e4f9da16baa5dc1fdbd6f29a97158174917f3c0527a37b6ecbcfbe8e
-EBUILD djinn-lib-0.0.1.2.ebuild 610 BLAKE2B 1000d386c9633377eb5c8887834e317dd472f3be2ef66a790a867b5c5f8dad50c02c8b44721d14e128d578375f7694679234c9f45d2584265bf0c41924a13948 SHA512 ec9d2ace4d69d978c20ed44eed73c728f1ea66405f623e7974f0bb286c3177e816f61ce2f61170a5a07800be2737e19057f1d4782169ec560d05d270e7f0396d
-MISC metadata.xml 462 BLAKE2B d34a73019456e301be155a651f84010a0c64da051e2c1d517a013c815a4a9c4cf421ff9bbcc345635bb1cb2601e4b1c278555caac646b08cba111c34159cdcd7 SHA512 9c584deb7c2de0824ab0d878a26c0005252a15792d479de4cbb4aadb4a6147e344467fcbceeb2965497c62c913d309ddd2c7f1aff23003b02552a8c40fbecff9
diff --git a/dev-haskell/djinn-lib/djinn-lib-0.0.1.2.ebuild b/dev-haskell/djinn-lib/djinn-lib-0.0.1.2.ebuild
deleted file mode 100644
index 643d0ea8c15a..000000000000
--- a/dev-haskell/djinn-lib/djinn-lib-0.0.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate Haskell code from a type. Library extracted from djinn package"
-HOMEPAGE="http://www.augustsson.net/Darcs/Djinn/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
diff --git a/dev-haskell/djinn-lib/metadata.xml b/dev-haskell/djinn-lib/metadata.xml
deleted file mode 100644
index bfe47b825574..000000000000
--- a/dev-haskell/djinn-lib/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Djinn uses an theorem prover for intuitionistic propositional logic
-		to generate a Haskell expression when given a type.
-		This is a library extracted from Djinn sources.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/dlist-0.5-r1 b/dev-haskell/dlist-0.5-r1
new file mode 100644
index 000000000000..95d68dd20bfa
--- /dev/null
+++ b/dev-haskell/dlist-0.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Differences lists
+EAPI=5
+HOMEPAGE=http://code.haskell.org/~dons/code/dlist/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.5
+SRC_URI=mirror://hackage/packages/archive/dlist/0.5/dlist-0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=72736398951149fa3583841e28d806ac
diff --git a/dev-haskell/dlist-0.6.0.1 b/dev-haskell/dlist-0.6.0.1
new file mode 100644
index 000000000000..f59f39d11cd2
--- /dev/null
+++ b/dev-haskell/dlist-0.6.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.9.2 test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.7 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Difference lists
+EAPI=5
+HOMEPAGE=https://github.com/spl/dlist
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.6.0.1
+SRC_URI=mirror://hackage/packages/archive/dlist/0.6.0.1/dlist-0.6.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0e5645a940fb688e61de60ed7e38362d
diff --git a/dev-haskell/dlist-0.7.1 b/dev-haskell/dlist-0.7.1
new file mode 100644
index 000000000000..f364c7660e7a
--- /dev/null
+++ b/dev-haskell/dlist-0.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Difference lists
+EAPI=5
+HOMEPAGE=https://github.com/spl/dlist
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.1
+SRC_URI=mirror://hackage/packages/archive/dlist/0.7.1/dlist-0.7.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c0819a59b0afb0db1d3c5025feb8d491
diff --git a/dev-haskell/dlist-0.7.1.2 b/dev-haskell/dlist-0.7.1.2
new file mode 100644
index 000000000000..9c88a5fd859c
--- /dev/null
+++ b/dev-haskell/dlist-0.7.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Difference lists
+EAPI=5
+HOMEPAGE=https://github.com/spl/dlist
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.1.2
+SRC_URI=mirror://hackage/packages/archive/dlist/0.7.1.2/dlist-0.7.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=96a5e42bdf82741f40b5ef4a3cdf252b
diff --git a/dev-haskell/dlist-0.8.0.2 b/dev-haskell/dlist-0.8.0.2
new file mode 100644
index 000000000000..cb63a96360d3
--- /dev/null
+++ b/dev-haskell/dlist-0.8.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.10 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Difference lists
+EAPI=6
+HOMEPAGE=https://github.com/spl/dlist
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.8.0.2
+SRC_URI=mirror://hackage/packages/archive/dlist/0.8.0.2/dlist-0.8.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=59d72b9b09ae67f11de0c74ca5160bde
diff --git a/dev-haskell/dlist-instances-0.1 b/dev-haskell/dlist-instances-0.1
new file mode 100644
index 000000000000..140beaf6fede
--- /dev/null
+++ b/dev-haskell/dlist-instances-0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/dlist:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.9.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Difference lists instances
+EAPI=5
+HOMEPAGE=https://github.com/gregwebs/dlist-instances
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/dlist:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.1
+SRC_URI=mirror://hackage/packages/archive/dlist-instances/0.1/dlist-instances-0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=71bbb7826de25d47dd9ac31eb99287ff
diff --git a/dev-haskell/dlist-instances-0.1.1.1 b/dev-haskell/dlist-instances-0.1.1.1
new file mode 100644
index 000000000000..8131f8150417
--- /dev/null
+++ b/dev-haskell/dlist-instances-0.1.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/dlist:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Difference lists instances
+EAPI=6
+HOMEPAGE=https://github.com/gregwebs/dlist-instances
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/dlist:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.1.1
+SRC_URI=mirror://hackage/packages/archive/dlist-instances/0.1.1.1/dlist-instances-0.1.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b45a389f2031ea25793ad428f307e305
diff --git a/dev-haskell/dlist-instances/Manifest b/dev-haskell/dlist-instances/Manifest
deleted file mode 100644
index 3e80db2d8105..000000000000
--- a/dev-haskell/dlist-instances/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST dlist-instances-0.1.1.1.tar.gz 1749 BLAKE2B a7a5f04fc3ee2586d5e51d9ef31a1d3429f403c9d119a643156f798501d39c63e284fe6be172cac5a7d37f1457eaded77541007c286c5469aa600c241eb83f6d SHA512 9a66f9f3d73466731c1b1a3f208c564f0fd8fe990e81dd274a86441e94b48c40d778535a9d346e9ff8160b23c19efa73cc836b4dcb3a6cb0e81817348bc5041a
-DIST dlist-instances-0.1.tar.gz 1676 BLAKE2B ecfd291f90ebfdd7351a68d9fa73a658154f1301a1fb5b98d36ce22a4e64b208af544e650e9019ce6f01b80cc960d986412e92c2edcce60d64a2c1099a28ec37 SHA512 8cc7d28a2db30008006df96e1bab090f43fd71ae80f6461e6f17581da661710b468afa5b0387de7f9296c41b01abe3fb42c659221479ed8d2c70b8621dbdb5ee
-EBUILD dlist-instances-0.1.1.1.ebuild 608 BLAKE2B 100b683dae8819fc2b3880f263cb95c1c0acae157e90ea6db8b30bfc0d977bea41fedc284fb60403b60a320de6863b6bbbdcafc8ca7f1f18e6218db22d83000b SHA512 279c21175b35e99dc6bd9222293b43fc244436999bcca1d6aff343fb2a3e1e24150d34320d1fd5a61ab72d5ba1e919505f9d890d9261f99e583d380822d9f6a4
-EBUILD dlist-instances-0.1.ebuild 611 BLAKE2B 7f883d071d899281b8de22a7d95fb221112610ceb2de369d7c1c904f341c5c11e148bbde692ad3383625998e52a72590776f0586a4075a7cb613231cf5264f34 SHA512 3f3f221203424308c0e7b4e6d8d8b4aee2e961a34e28a2e6d3a28ef8e3e090372810ec0884ffa098b80d6a2e7e20fc61554f68021a1b06e5183b564bc854e0d9
-MISC metadata.xml 537 BLAKE2B cf04c1fb73e192b1cf02812a567c2aa790fdfc23e18f06198a9a02a32614f502544a18491b32a73a55a1c18c8ff46aa7281b3eb500d706aa9d236ba6e2084719 SHA512 bdd8c19fc503749b52a5937a2f89e7d6f19f81616912f86341419c8180777ce69449deae3b1d1e8d9072abd295437a4043d2fc7ef167173997bcf3ab1116fa02
diff --git a/dev-haskell/dlist-instances/dlist-instances-0.1.1.1.ebuild b/dev-haskell/dlist-instances/dlist-instances-0.1.1.1.ebuild
deleted file mode 100644
index 2abcbf876317..000000000000
--- a/dev-haskell/dlist-instances/dlist-instances-0.1.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Difference lists instances"
-HOMEPAGE="https://github.com/gregwebs/dlist-instances"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/dlist:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-"
diff --git a/dev-haskell/dlist-instances/dlist-instances-0.1.ebuild b/dev-haskell/dlist-instances/dlist-instances-0.1.ebuild
deleted file mode 100644
index 1d2ae7d34876..000000000000
--- a/dev-haskell/dlist-instances/dlist-instances-0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Difference lists instances"
-HOMEPAGE="https://github.com/gregwebs/dlist-instances"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/dlist:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-"
diff --git a/dev-haskell/dlist-instances/metadata.xml b/dev-haskell/dlist-instances/metadata.xml
deleted file mode 100644
index a457afb41e46..000000000000
--- a/dev-haskell/dlist-instances/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		See the dlist packages.
-		This package is the canonical source for some orphan instances.
-		Orphan instances are placed here to avoid dependencies elsewhere.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">gregwebs/dlist-instances</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/dlist/Manifest b/dev-haskell/dlist/Manifest
deleted file mode 100644
index 9f411edcb76e..000000000000
--- a/dev-haskell/dlist/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST dlist-0.5.tar.gz 5962 BLAKE2B 1828c068ac5ef72860e4a425840f927305cbf12db3930bde7086ef2172eff22a9b9ee014026d16303f311f13ba21eaf5a4607c1bd52ac313bba7e8cd3cd90353 SHA512 79de39c7e13b8423290c7afd5fd0218dbd8b12e6d37722084bca68074dd0940cf5aa6c3e757eecad5aff769d70aef2c3ce70a5e3c986387e0fd14d26be15634d
-DIST dlist-0.6.0.1.tar.gz 5655 BLAKE2B 20cec7c6db2299efb8e67872168ad0108183b52a2c2c4943371193ccb7c0ba033c7919c2304d72ab0ecc3aadb73b83156483e946b67cb8bdd639d9e6b4cf523a SHA512 31f692e14f0bdddbbdec985e6e5b0262ac74f0d03cd97c77427bf5552e58f2f79c20d8f4ba03479b45dd3f54a1d141a275928878d1b2a9eb71c667745f8bd5e4
-DIST dlist-0.7.1.2.tar.gz 6301 BLAKE2B 372f26f3583647945b54eeca9cdd6bdd93b361d6891da35089748d439387ebe2cddbc590dd331c249c58f79504ec1ec2cb837346c61ebf0da5426a14414083b9 SHA512 471059e0a4702eca3c5c9457ea1179bf032ff48813776a283a0993abfb713e25fc12a0171b44535729f2c241dcb69496273abe9dbac181af5ef4404be95d5780
-DIST dlist-0.7.1.tar.gz 6137 BLAKE2B a08d9caa3bc985909938a0676648b05b5d63cf4bb94fb26aeb0649bdbfc046ab416cf83aebdc2c35b4a9280b9c233a536575dd0d6e5f355e1890502f8dbc22fd SHA512 0cb9408c0e7e30baa0489439858e4998d17d16c8c120ff3f84c8e256262110770131a96337020456ed4c4e224cc4a80f567b3f4afb0d0452a622940c4dac635a
-DIST dlist-0.8.0.2.tar.gz 8291 BLAKE2B 738ceabf3dc90a96190968a5f7727510842d1f326eff5009d5e1e6ae3c1543647f531318051f4c0d21522165240ddea3b8fd0b6ec5cd11a2edb42e0edc2d500e SHA512 49806edc04810fdd288c63c0b6f44e4c093844e9d47c57b059064d6b2426e1b75a9665e3209fcbd3e3781293cace79bf7532b195364fb259a5e24ea8774623ac
-EBUILD dlist-0.5-r1.ebuild 658 BLAKE2B 87e8e1dee3afa43e4b5a4dd3985fbbf453cecec85ab0b5b527265d30daca133dd9bffab2f044246fd3396021429a14d87c49b65619d9f040f1abcf3004bc3b62 SHA512 7c027fbf1d547b56599da3608a24f395d01b4e833b6755aa3d4767d4e6d9fc589f47ad79366356bb3907c32c98ad5b23764a3fe93b45fe28b55cdcd3f881c523
-EBUILD dlist-0.6.0.1.ebuild 645 BLAKE2B b3573272049f9980c8b84d00d6bd616c39d3caed843746b03151b235fdae6fa47af8164e4d36c36dd1440bc2216513b29d4d31024821c0e6d0a644f8009bdb0c SHA512 d3b93201866691a68e6b2905e497dbb6841b947b29c948f6c1a3c5d7a0614c0bebb1505b5a3a82ea81304dde25af660c924fa528d992108acc39b49ef6e44432
-EBUILD dlist-0.7.1.2.ebuild 644 BLAKE2B 6b6261ed1ab37bcfddc9dd083f56c83238da1bf50e84f5e91aac34a83fb42df2bdd8599104bbea8748e6a966dc49c6891684fb989f396bc175458e980932ba3e SHA512 1fdcda9fbfcb4f7fc96a44175884533e0dea59870eb23315cda31ce43a99bb2a5efff8b9dfd6133b6b65679bcfb99fdadc4dbcdf3db7b9bfe269441f8c023cc4
-EBUILD dlist-0.7.1.ebuild 644 BLAKE2B c0d236180ee3d02656f567f430e4ddbb87d1d3a3323314484f3f245f31a117fc60bda777e6f1817e4f1d46f331f6186e7e17a39ad76b13d6f76a41ae35bf9f30 SHA512 e344944ff1e63da976bbf2764ea67f778739c564c88a38e3638a11e76453721a757d5828a1e3a82163ee2d4554a2031aefab058fe5dcbf0047a832e1461c5bd0
-EBUILD dlist-0.8.0.2.ebuild 643 BLAKE2B 9da2d92c9301aa103ff17ba027db9c528e0f1871dc205e51a5db003dcf983143b18903eeb28e57dfe4e16e9df11915745fcb04652b8ddf6d0cd7390385fed806 SHA512 25969c2066a3c549c696f0497f4acc1778c78415fdd88633c36f687e8df7d752fa326762bef1bb35c8c5a9a3a16cbb0c3eeb76477f40c9bf61fe11f3c00f82fa
-MISC metadata.xml 580 BLAKE2B 72f9156d80854b8de020547a9ab629c3b9fa6a05a67462ad6d6153d672464e9904907e87069efab38691b7450eb6e18d193cf2e4800e3088f9ee3c38db833925 SHA512 727a9da664a5d91ee1323fd02f374f32c24c1a406f5146afca7d2f17205d0643efb88f37170901e551677eb4a432377afbc226269b18c85616de0f3ae5c6ea6a
diff --git a/dev-haskell/dlist/dlist-0.5-r1.ebuild b/dev-haskell/dlist/dlist-0.5-r1.ebuild
deleted file mode 100644
index fe5f6a25f63c..000000000000
--- a/dev-haskell/dlist/dlist-0.5-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Differences lists"
-HOMEPAGE="http://code.haskell.org/~dons/code/dlist/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=applicative-in-base
-}
diff --git a/dev-haskell/dlist/dlist-0.6.0.1.ebuild b/dev-haskell/dlist/dlist-0.6.0.1.ebuild
deleted file mode 100644
index b0ac26c0758d..000000000000
--- a/dev-haskell/dlist/dlist-0.6.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Difference lists"
-HOMEPAGE="https://github.com/spl/dlist"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.7 )
-"
diff --git a/dev-haskell/dlist/dlist-0.7.1.2.ebuild b/dev-haskell/dlist/dlist-0.7.1.2.ebuild
deleted file mode 100644
index af6b26b97fd9..000000000000
--- a/dev-haskell/dlist/dlist-0.7.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Difference lists"
-HOMEPAGE="https://github.com/spl/dlist"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9 )
-"
diff --git a/dev-haskell/dlist/dlist-0.7.1.ebuild b/dev-haskell/dlist/dlist-0.7.1.ebuild
deleted file mode 100644
index fac26586c260..000000000000
--- a/dev-haskell/dlist/dlist-0.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Difference lists"
-HOMEPAGE="https://github.com/spl/dlist"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.8 )
-"
diff --git a/dev-haskell/dlist/dlist-0.8.0.2.ebuild b/dev-haskell/dlist/dlist-0.8.0.2.ebuild
deleted file mode 100644
index add714e1f7e2..000000000000
--- a/dev-haskell/dlist/dlist-0.8.0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Difference lists"
-HOMEPAGE="https://github.com/spl/dlist"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.10 )
-"
diff --git a/dev-haskell/dlist/metadata.xml b/dev-haskell/dlist/metadata.xml
deleted file mode 100644
index d551ad50b800..000000000000
--- a/dev-haskell/dlist/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Differences lists: a list-like type supporting O(1) append.
-		This is particularly useful for efficient logging and pretty
-		printing, (e.g. with the Writer monad), where list append
-		quickly becomes too expensive.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">spl/dlist</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/dns-0.3.8 b/dev-haskell/dns-0.3.8
new file mode 100644
index 000000000000..5078b810b30c
--- /dev/null
+++ b/dev-haskell/dns-0.3.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/attoparsec:=[profile?] dev-haskell/attoparsec-conduit:=[profile?] dev-haskell/binary:=[profile?] dev-haskell/blaze-builder:=[profile?] dev-haskell/conduit:=[profile?] >=dev-haskell/iproute-1.2.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/network-bytestring:=[profile?] dev-haskell/network-conduit:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=DNS library in Haskell
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/dns
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/attoparsec:=[profile?] dev-haskell/attoparsec-conduit:=[profile?] dev-haskell/binary:=[profile?] dev-haskell/blaze-builder:=[profile?] dev-haskell/conduit:=[profile?] >=dev-haskell/iproute-1.2.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/network-bytestring:=[profile?] dev-haskell/network-conduit:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:=
+RESTRICT=test
+SLOT=0/0.3.8
+SRC_URI=mirror://hackage/packages/archive/dns/0.3.8/dns-0.3.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2e3e43ccafe50f517791849de05ab799
diff --git a/dev-haskell/dns-1.4.5 b/dev-haskell/dns-1.4.5
new file mode 100644
index 000000000000..a47e2979d237
--- /dev/null
+++ b/dev-haskell/dns-1.4.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/attoparsec:=[profile?] dev-haskell/binary:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] >=dev-haskell/iproute-1.3.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/random:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/doctest dev-haskell/hspec dev-haskell/word8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=DNS library in Haskell
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/dns
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/attoparsec:=[profile?] dev-haskell/binary:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] >=dev-haskell/iproute-1.3.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/random:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/1.4.5
+SRC_URI=mirror://hackage/packages/archive/dns/1.4.5/dns-1.4.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f8175c07c1b9fcbffdacaf3119d95eee
diff --git a/dev-haskell/dns-2.0.0 b/dev-haskell/dns-2.0.0
new file mode 100644
index 000000000000..f14499db2dc1
--- /dev/null
+++ b/dev-haskell/dns-2.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/attoparsec:=[profile?] dev-haskell/binary:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] >=dev-haskell/iproute-1.3.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/random:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/doctest dev-haskell/hspec dev-haskell/word8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=DNS library in Haskell
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/dns
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/attoparsec:=[profile?] dev-haskell/binary:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] >=dev-haskell/iproute-1.3.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/random:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/2.0.0
+SRC_URI=mirror://hackage/packages/archive/dns/2.0.0/dns-2.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f8175c07c1b9fcbffdacaf3119d95eee
diff --git a/dev-haskell/dns-2.0.2 b/dev-haskell/dns-2.0.2
new file mode 100644
index 000000000000..9b859a082a9d
--- /dev/null
+++ b/dev-haskell/dns-2.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/attoparsec:=[profile?] dev-haskell/binary:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] >=dev-haskell/iproute-1.3.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/random:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/doctest dev-haskell/hspec dev-haskell/word8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=DNS library in Haskell
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/dns
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/attoparsec:=[profile?] dev-haskell/binary:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] >=dev-haskell/iproute-1.3.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/random:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/2.0.2
+SRC_URI=mirror://hackage/packages/archive/dns/2.0.2/dns-2.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4cf80c2fd25ff6df9dd4d4e7b7ae2b7d
diff --git a/dev-haskell/dns-2.0.6 b/dev-haskell/dns-2.0.6
new file mode 100644
index 000000000000..29fe4b10467a
--- /dev/null
+++ b/dev-haskell/dns-2.0.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/attoparsec:=[profile?] dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] >=dev-haskell/iproute-1.3.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/random:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/doctest dev-haskell/hspec dev-haskell/word8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=DNS library in Haskell
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/dns
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/attoparsec:=[profile?] dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] >=dev-haskell/iproute-1.3.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/random:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/2.0.6
+SRC_URI=mirror://hackage/packages/archive/dns/2.0.6/dns-2.0.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=87075c022d868204f0dc5dbe64954385
diff --git a/dev-haskell/dns/Manifest b/dev-haskell/dns/Manifest
deleted file mode 100644
index cf912f582e4b..000000000000
--- a/dev-haskell/dns/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST dns-0.3.8.tar.gz 11313 BLAKE2B 175b85129ac505414a31794c1150eefb9d8e92d36cc5348272268c32825a442f7bc68e684fd635d42471e568a60acc5a05cf5b320d85ac9453de167609c3adf3 SHA512 dbd6d042866e1861a47660c7daba1f29ee445a48eae3c25e05306878a74f9758587430296222e3f67062a3c173d96dab833a6d43b5d3237d614cfd2bad92be9d
-DIST dns-1.4.5.tar.gz 20071 BLAKE2B ec116289a4b252a504a24b9ce79dce739b8b3008d69aa00a64d6abe04e930280494767af49e5d78f28aefad3ed9c0f5431a6892c5a81b711b448a69b3c6b8545 SHA512 a5b434fa868a3254234b4ffef579e007ff7a9e41867f1d81d554573d026d4de86967dc0e313c86d603287581020163365c9f2f795084a15efca3f05ad9daf538
-DIST dns-2.0.0.tar.gz 20570 BLAKE2B 7b15a58a8b2e6c6170db4bd5886c31e111a5237c1d6c5a1297cd34f7da26248d6d51b725d5d8e631f70767db28a75ad2583817cf3d87066ce862f018e1057743 SHA512 b681b3a6eed46a98b466df0e367b44cfc964d5b0a7d22912ece0a469e79b3176a2a3674fa1cd0d458037d413f5890362c47112c7f35a5f491c67b4ec6773405c
-DIST dns-2.0.2.tar.gz 20951 BLAKE2B de4785384bbfb626dd1a315b6df3768b20091d232c8ee6626e73d87197970282a5a1a3c98d03094fceddc81ae4df3ca5ada7b2a5d9fc738cbca49d78f1ba9387 SHA512 14f444e0c1074359e84ef854d7b3d5db0d70c93412db609263f9f5897cfe7269ee2a78154614007204732a81ca09610d445ae35520b07d7e0e46895089d0d0d9
-DIST dns-2.0.6.tar.gz 21907 BLAKE2B 08e426c26fe98d034973624ff75d164b2e6334cdec9fbe08a1e2b140eb76e01665c2ff8c10d93f354cc473afe483a41aee297f9bc56253b7f3c8c5e2cc311c44 SHA512 2bc3974ac128bc4da9ae19ff3edf40dbc9b1ce42353dab40819c3ff42b3ef27204e09b552b4a885c558d5cd6af65495ac305e6ada3eb3e6291e7b32dbd929ae8
-EBUILD dns-0.3.8.ebuild 1000 BLAKE2B 7f59d20f52b00b2c9b041523d31c55189ad92c94334e7691f6a1d0f91fad12e983e5037917d3e3771aa75b04b7c40b3ffacde07124ee8bcd9659c84127cb692a SHA512 04fa2c0e2e2853744e895a0b822ce0ee294db5d442500c75262f83d5cd16e660565c81996fe263feb34332822da0b2b3f73c1fa154971b568ec82b2fa9829990
-EBUILD dns-1.4.5.ebuild 1017 BLAKE2B b7d9c790e34bf71eeb3dc9473a0785f40510cbd6ba508bbe6157591832dbdcfa4a9b66c22562db35148c8e0b8b2039c75f237f776696293da1c67b95acf86b91 SHA512 7613a04d1125f37bc503ddf02cac560e918e75072878c4ab0da3d59b5e233df83765f6294a019b0e7c24f2e1b0c9f903a9db35fde94f3eb56b17af063d6fc643
-EBUILD dns-2.0.0.ebuild 1017 BLAKE2B b7d9c790e34bf71eeb3dc9473a0785f40510cbd6ba508bbe6157591832dbdcfa4a9b66c22562db35148c8e0b8b2039c75f237f776696293da1c67b95acf86b91 SHA512 7613a04d1125f37bc503ddf02cac560e918e75072878c4ab0da3d59b5e233df83765f6294a019b0e7c24f2e1b0c9f903a9db35fde94f3eb56b17af063d6fc643
-EBUILD dns-2.0.2.ebuild 1042 BLAKE2B 8d8c1be1bf569abe094a7f6a8d879767a14551f2065ccae05ada82f0bc1d2a41a487fdd3d1f16c6163d3e1044dc269b2ee8280f8298822b35cdc5a1d2b83b5fe SHA512 219f0d4e71ff58d2a36a6221fd5f46c4eb416a07b78aef53baa0b0c8164c78168119dd8b861038c6f88ccaa62ef3488d82f43761e064124ded7fa23f0d4a6db3
-EBUILD dns-2.0.6.ebuild 1071 BLAKE2B 7175349c5e36ce2916026eb2a8c15d35d98958b3df9170e3b41dce4c810055d6adea2ee1d6f339ba99df6176f73cd59e1251e11ea7427328cddb9b447882f158 SHA512 f71a9fec26bdc4b19eb2d24ff5003455db65e28cba9b86adcf50b2256bcb1292b9ad0b4c5782b631bc72b636c33094ed02801a6a7885b4f8e512210d68b9561c
-MISC metadata.xml 327 BLAKE2B e0f718c31838efedac5b94d5d7e5d82686f9918090db7472d2e8ec6c1cb4b82507efc630c71dd0ad5c031f85c4e4e81ee7514b9a55f95e0ee058a6fbd62119ec SHA512 acef7c51be1e93c7925446f5fafa69afe7b2a41695b3750da8b390e7bc7d097d3044c1abaadfde0bffa7b3c8a2eae7176e6b3d323d582d387ef5812a181800fe
diff --git a/dev-haskell/dns/dns-0.3.8.ebuild b/dev-haskell/dns/dns-0.3.8.ebuild
deleted file mode 100644
index ff9b3424d870..000000000000
--- a/dev-haskell/dns/dns-0.3.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="DNS library in Haskell"
-HOMEPAGE="http://hackage.haskell.org/package/dns"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # relies on external network #502534
-
-RDEPEND="dev-haskell/attoparsec:=[profile?]
-		dev-haskell/attoparsec-conduit:=[profile?]
-		dev-haskell/binary:=[profile?]
-		dev-haskell/blaze-builder:=[profile?]
-		dev-haskell/conduit:=[profile?]
-		>=dev-haskell/iproute-1.2.4:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		dev-haskell/network:=[profile?]
-		dev-haskell/network-bytestring:=[profile?]
-		dev-haskell/network-conduit:=[profile?]
-		dev-haskell/random:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10"
diff --git a/dev-haskell/dns/dns-1.4.5.ebuild b/dev-haskell/dns/dns-1.4.5.ebuild
deleted file mode 100644
index 9a1c35c99b6f..000000000000
--- a/dev-haskell/dns/dns-1.4.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="DNS library in Haskell"
-HOMEPAGE="http://hackage.haskell.org/package/dns"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # ambiguous modules
-
-RDEPEND="dev-haskell/attoparsec:=[profile?]
-	dev-haskell/binary:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?]
-	>=dev-haskell/iproute-1.3.2:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/doctest
-		dev-haskell/hspec
-		dev-haskell/word8 )
-"
diff --git a/dev-haskell/dns/dns-2.0.0.ebuild b/dev-haskell/dns/dns-2.0.0.ebuild
deleted file mode 100644
index 9a1c35c99b6f..000000000000
--- a/dev-haskell/dns/dns-2.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="DNS library in Haskell"
-HOMEPAGE="http://hackage.haskell.org/package/dns"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # ambiguous modules
-
-RDEPEND="dev-haskell/attoparsec:=[profile?]
-	dev-haskell/binary:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?]
-	>=dev-haskell/iproute-1.3.2:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/doctest
-		dev-haskell/hspec
-		dev-haskell/word8 )
-"
diff --git a/dev-haskell/dns/dns-2.0.2.ebuild b/dev-haskell/dns/dns-2.0.2.ebuild
deleted file mode 100644
index 002142d83604..000000000000
--- a/dev-haskell/dns/dns-2.0.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="DNS library in Haskell"
-HOMEPAGE="http://hackage.haskell.org/package/dns"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # ambiguous modules: ip-route / network-data
-
-RDEPEND="dev-haskell/attoparsec:=[profile?]
-	dev-haskell/binary:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?]
-	>=dev-haskell/iproute-1.3.2:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/doctest
-		dev-haskell/hspec
-		dev-haskell/word8 )
-"
diff --git a/dev-haskell/dns/dns-2.0.6.ebuild b/dev-haskell/dns/dns-2.0.6.ebuild
deleted file mode 100644
index bc904a2eea96..000000000000
--- a/dev-haskell/dns/dns-2.0.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="DNS library in Haskell"
-HOMEPAGE="http://hackage.haskell.org/package/dns"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # uses internet to test resolver
-
-RDEPEND="dev-haskell/attoparsec:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?]
-	>=dev-haskell/iproute-1.3.2:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/doctest
-		dev-haskell/hspec
-		dev-haskell/word8 )
-"
diff --git a/dev-haskell/dns/metadata.xml b/dev-haskell/dns/metadata.xml
deleted file mode 100644
index b0f91c19bb9f..000000000000
--- a/dev-haskell/dns/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		DNS library for clients and servers.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/doctemplates-0.1.0.2 b/dev-haskell/doctemplates-0.1.0.2
new file mode 100644
index 000000000000..94bf0d623d43
--- /dev/null
+++ b/dev-haskell/doctemplates-0.1.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/blaze-html:=[profile?] dev-haskell/blaze-markup:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pandoc-style document templates
+EAPI=6
+HOMEPAGE=https://github.com/jgm/doctemplates#readme
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/blaze-html:=[profile?] dev-haskell/blaze-markup:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.1.0.2
+SRC_URI=mirror://hackage/packages/archive/doctemplates/0.1.0.2/doctemplates-0.1.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=43dbe5fae909a00a8fd1c11744bba0f7
diff --git a/dev-haskell/doctemplates/Manifest b/dev-haskell/doctemplates/Manifest
deleted file mode 100644
index 387b15be29ec..000000000000
--- a/dev-haskell/doctemplates/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST doctemplates-0.1.0.2.tar.gz 5924 BLAKE2B 80c20a0dd097770d2e6fda2f38435393c65b9fa91bc521a6c52e91a7ac11a637787aa740be1cfaa051fa077d8dc20cb8b7949b930317e426d203d60458865471 SHA512 043cc1ff32c7b1b9ac2d528d647c08769ec6ffbf3cbf080422b6f435737030ed4085735ab9c1974bbae87099a31614b66ae800fefab7120e9add5ab03815c430
-EBUILD doctemplates-0.1.0.2.ebuild 864 BLAKE2B 5699bae7ab06a7950c587ea2975fbea860ddc67922090699407dd66105cba1ff302028738e4ca1778cad66003869c8e3852de9dce13e76c07f5ceeb659815ea2 SHA512 27d69f159e2bbbd5112dfa5d65c57c57abc296e64f0c412bc1f87436fafd4c3145b6e85705ecf2cbd2b6db90e26cab18024661a93f4d98188400dae639756826
-MISC metadata.xml 392 BLAKE2B d2e1fb4cd495de5e771a27e2982639991434dc9797b7d9c44ccccebfd4b9e0783d85384d31865055e5a882b39b4be8b954401350e4f1c71d089a60c5cff83b6e SHA512 083b9d618d32c53f48b9bcf72fccc3f6fcf600b4fb63a59e43caf11b0e3bd2d4effdd3804ddc69829c7108a9093f412cb1eb0df9a74ef22a6b12a497a93d4d1e
diff --git a/dev-haskell/doctemplates/doctemplates-0.1.0.2.ebuild b/dev-haskell/doctemplates/doctemplates-0.1.0.2.ebuild
deleted file mode 100644
index 76a9bd875b29..000000000000
--- a/dev-haskell/doctemplates/doctemplates-0.1.0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pandoc-style document templates"
-HOMEPAGE="https://github.com/jgm/doctemplates#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/blaze-html:=[profile?]
-	dev-haskell/blaze-markup:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/doctemplates/metadata.xml b/dev-haskell/doctemplates/metadata.xml
deleted file mode 100644
index 2caddd34f3d7..000000000000
--- a/dev-haskell/doctemplates/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Please see README.md
-	</longdescription>
-	<upstream>
-		<remote-id type="github">jgm/doctemplates</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/doctest-0.10.1 b/dev-haskell/doctest-0.10.1
new file mode 100644
index 000000000000..014d4468fe62
--- /dev/null
+++ b/dev-haskell/doctest-0.10.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ghc-paths-0.1.0.9:=[profile?] >=dev-haskell/syb-0.3:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/base-compat-0.4.2 >=dev-haskell/hspec-1.5.1 dev-haskell/hunit >=dev-haskell/quickcheck-2.5 dev-haskell/setenv >=dev-haskell/silently-1.2.4 >=dev-haskell/stringbuilder-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Test interactive Haskell examples
+EAPI=5
+HOMEPAGE=https://github.com/sol/doctest#readme
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/ghc-paths-0.1.0.9:=[profile?] >=dev-haskell/syb-0.3:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.10.1
+SRC_URI=mirror://hackage/packages/archive/doctest/0.10.1/doctest-0.10.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=45e0d2d3702c394e3cb5d052ca209162
diff --git a/dev-haskell/doctest-0.11.1 b/dev-haskell/doctest-0.11.1
new file mode 100644
index 000000000000..17b0e9227ff7
--- /dev/null
+++ b/dev-haskell/doctest-0.11.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-compat-0.7.0:=[profile?] >=dev-haskell/code-page-0.1:=[profile?] >=dev-haskell/ghc-paths-0.1.0.9:=[profile?] >=dev-haskell/syb-0.3:=[profile?] >=dev-lang/ghc-7.0:=[profile?] <dev-lang/ghc-8.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.5.1 dev-haskell/hunit >=dev-haskell/quickcheck-2.8.2 dev-haskell/setenv >=dev-haskell/silently-1.2.4 >=dev-haskell/stringbuilder-0.4 dev-haskell/with-location ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Test interactive Haskell examples
+EAPI=6
+HOMEPAGE=https://github.com/sol/doctest#readme
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/base-compat-0.7.0:=[profile?] >=dev-haskell/code-page-0.1:=[profile?] >=dev-haskell/ghc-paths-0.1.0.9:=[profile?] >=dev-haskell/syb-0.3:=[profile?] >=dev-lang/ghc-7.0:=[profile?] <dev-lang/ghc-8.2:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.11.1
+SRC_URI=mirror://hackage/packages/archive/doctest/0.11.1/doctest-0.11.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=eae3f8e33fec63c4c15e75b2e7263b01
diff --git a/dev-haskell/doctest-0.9.12 b/dev-haskell/doctest-0.9.12
new file mode 100644
index 000000000000..0ebb7a265b8c
--- /dev/null
+++ b/dev-haskell/doctest-0.9.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ghc-paths-0.1.0.9:=[profile?] >=dev-haskell/syb-0.3:=[profile?] <dev-haskell/syb-0.5:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/base-compat-0.4.2 >=dev-haskell/hspec-1.5.1 dev-haskell/hunit >=dev-haskell/quickcheck-2.5 dev-haskell/setenv >=dev-haskell/silently-1.2.4 >=dev-haskell/stringbuilder-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Test interactive Haskell examples
+EAPI=5
+HOMEPAGE=https://github.com/sol/doctest#readme
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/ghc-paths-0.1.0.9:=[profile?] >=dev-haskell/syb-0.3:=[profile?] <dev-haskell/syb-0.5:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.9.12
+SRC_URI=mirror://hackage/packages/archive/doctest/0.9.12/doctest-0.9.12.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a22e671f349cf9a9e4393d7382b91aa2
diff --git a/dev-haskell/doctest/Manifest b/dev-haskell/doctest/Manifest
deleted file mode 100644
index 0d6af8fb6974..000000000000
--- a/dev-haskell/doctest/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX doctest-0.11.0-unamb-2.patch 695 BLAKE2B 184ad9d6ab465278fd30e346e2cd5dcc024e882c1491fb7286c8d435d56adc4cc34b74d04c08b5b4a2a568fc7b56a0ea29a94376b5048faeacb16f86b0e6409a SHA512 365654f61f1a9dafc4d5eb8362ef8ab2ff74f5f9d4114f18e942bdf14da9a772634063c8100d5ab827bdb492f559b6bc11fea95fe52ee75aa7ec29c7161a4b7e
-AUX doctest-0.11.0-unamb.patch 1005 BLAKE2B 21fbda852728979e1469470f7a08dcf663266b5785a2ce3dae270f1c5818a30200ebb2264928d9d3e075e6b5fe4e66179eb5acf96ace2212e65e590a0b39d733 SHA512 aa527e0be7a13936c02a0c76dcd9ea841303f769c72aa5fe5729e3f52cfe2ec884eefd8859b19db2579f88bd79d40d6c59ade31222449de454ef5ab587c4e19c
-DIST doctest-0.10.1.tar.gz 18046 BLAKE2B b91529c81d8c23838933e5e46107e6249e9cc16a4fc2435de1bbc0f6ffa95ca6c9b8e7a5cf98d41409ae7765b5ab357ce080ea61cc2906726bb8aedbcb197384 SHA512 f12d3f30c6dcdd9e088362039b4d99d6b9fb499d0a78016e1e6e7b54968950490a1418dd5a7d94d5f509a08f3cf3111276ac15e84775278a77737099ac9bfd67
-DIST doctest-0.11.1.tar.gz 18086 BLAKE2B 577a86638aa67205df198444b5b8fd307e7bdce12b4a77ce2102cc95ef7f967c2e612a10ed2cef9ea35cf9455bf2f4e3a01920be1553bc35472ad442fd88f3d6 SHA512 ca95e0b5f09514e8236507856ae610016bd549b9e685b4a94cf1c0682d1cf7bffb344b471aab22ae3fd47c29ada0dcc0ba52b8f012800e9199c340b764971894
-DIST doctest-0.9.12.tar.gz 15806 BLAKE2B 20b63bc3451c81c646acc09dbde4fa77b3b7b82e2b8c4e5edf0940f33e71a8b3ed296e5337b673b5a1342ecf9bb1ed4ae82358c615abb7be420aa32dbf966ef6 SHA512 9d0d24ddba3f4ddaa386dc4ea7f15483f4d756dd48f62bcc8cad6e375c57a5660d8c7a12ff5bbc803bde04d65d8a28d3940cc390cd0d2ced2c5cc9895eba7916
-EBUILD doctest-0.10.1.ebuild 881 BLAKE2B d7c74c2a6b4aae1719c7cefd3ab39ae9c520f7375a4c1d3442ada0bbb3a0c745270974ab83aca69126f894e6a22a3216099f0a085eceb52be1ed6ae1b57b76b6 SHA512 3329a72e24c8724a562f89fa7b8dbcd8e16c5e9dd778fcc1240c1ba307e19fd4ac9f4b40b87d3f7692e77dce11f6e03f1c3f10e0155e3e9a4ef490faa5b045b0
-EBUILD doctest-0.11.1.ebuild 1083 BLAKE2B abbe9d07fab3c4511ec49359a4d0018698a96587295e6f7140a39815834fc196e97a8e357d0a7e7c7d5f0d05f7f7b022400947f5c7a48c1c19a6a2d2176b9b6a SHA512 90bde1d6ab61b6016ec46ca2a3a408eb7190d16aa7a4be86adb11ae06628aafb6cc1559d280a08cde707233af3c381f78b66c71dcc1c7fcb13392b5be5d8e94e
-EBUILD doctest-0.9.12.ebuild 914 BLAKE2B 028dec463a0daa8c5b718517fe301408e248bfbac7f03d9a28f948f9b8f78d51f58449dc2d99d550f925aee0ead270e20481a11d2dfa1841366a0c9d991a5617 SHA512 e184fac8d841475bd7ae11a2d55588e7d3f810926c91393de7382ce1e03b2de51f9c8f8260870eabd9dce1ccd38ed5f52de780e59c49c15b5308d8f2716376c1
-MISC metadata.xml 622 BLAKE2B 8d73447e653e98ac598157a57db77c576b4010575c712574456bd85d45a6a27a75f6dd583d9e7a480dcf78513acc5117afb5c223ce6d6dbca64f5cd4df5e0b03 SHA512 a9a18fe1831a4a70230ba2634aad01967e069710b6511de0489d62062393e1cb61c4139176830ab820e98b3784de84ad97d58683740162d64376a2b718c82671
diff --git a/dev-haskell/doctest/doctest-0.10.1.ebuild b/dev-haskell/doctest/doctest-0.10.1.ebuild
deleted file mode 100644
index 36eda5d15aba..000000000000
--- a/dev-haskell/doctest/doctest-0.10.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Test interactive Haskell examples"
-HOMEPAGE="https://github.com/sol/doctest#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ghc-paths-0.1.0.9:=[profile?]
-	>=dev-haskell/syb-0.3:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/base-compat-0.4.2
-		>=dev-haskell/hspec-1.5.1
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.5
-		dev-haskell/setenv
-		>=dev-haskell/silently-1.2.4
-		>=dev-haskell/stringbuilder-0.4 )
-"
diff --git a/dev-haskell/doctest/doctest-0.11.1.ebuild b/dev-haskell/doctest/doctest-0.11.1.ebuild
deleted file mode 100644
index 95dc7ee01fb8..000000000000
--- a/dev-haskell/doctest/doctest-0.11.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Test interactive Haskell examples"
-HOMEPAGE="https://github.com/sol/doctest#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-compat-0.7.0:=[profile?]
-	>=dev-haskell/code-page-0.1:=[profile?]
-	>=dev-haskell/ghc-paths-0.1.0.9:=[profile?]
-	>=dev-haskell/syb-0.3:=[profile?]
-	>=dev-lang/ghc-7.0:=[profile?] <dev-lang/ghc-8.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.5.1
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.8.2
-		dev-haskell/setenv
-		>=dev-haskell/silently-1.2.4
-		>=dev-haskell/stringbuilder-0.4
-		dev-haskell/with-location )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.11.0-unamb.patch
-	"${FILESDIR}"/${PN}-0.11.0-unamb-2.patch
-)
diff --git a/dev-haskell/doctest/doctest-0.9.12.ebuild b/dev-haskell/doctest/doctest-0.9.12.ebuild
deleted file mode 100644
index 2312e8de948a..000000000000
--- a/dev-haskell/doctest/doctest-0.9.12.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Test interactive Haskell examples"
-HOMEPAGE="https://github.com/sol/doctest#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ghc-paths-0.1.0.9:=[profile?]
-	>=dev-haskell/syb-0.3:=[profile?] <dev-haskell/syb-0.5:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/base-compat-0.4.2
-		>=dev-haskell/hspec-1.5.1
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.5
-		dev-haskell/setenv
-		>=dev-haskell/silently-1.2.4
-		>=dev-haskell/stringbuilder-0.4 )
-"
diff --git a/dev-haskell/doctest/files/doctest-0.11.0-unamb-2.patch b/dev-haskell/doctest/files/doctest-0.11.0-unamb-2.patch
deleted file mode 100644
index 9e8de3fe994a..000000000000
--- a/dev-haskell/doctest/files/doctest-0.11.0-unamb-2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/GhcUtil.hs b/src/GhcUtil.hs
-index baa9193..1792227 100644
---- a/src/GhcUtil.hs
-+++ b/src/GhcUtil.hs
-@@ -1,2 +1,3 @@
- {-# LANGUAGE CPP #-}
-+{-# LANGUAGE PackageImports #-}
- module GhcUtil (withGhc) where
-@@ -12,3 +13,3 @@ import           DynFlags (gopt_set)
- #endif
--import           Panic (throwGhcException)
-+import "ghc"     Panic (throwGhcException)
- 
-diff --git a/src/Run.hs b/src/Run.hs
-index fa9096f..dca590a 100644
---- a/src/Run.hs
-+++ b/src/Run.hs
-@@ -1,2 +1,3 @@
- {-# LANGUAGE CPP #-}
-+{-# LANGUAGE PackageImports #-}
- module Run (
-@@ -23,3 +24,3 @@ import           System.IO
- import qualified Control.Exception as E
--import           Panic
-+import "ghc"     Panic
- 
diff --git a/dev-haskell/doctest/files/doctest-0.11.0-unamb.patch b/dev-haskell/doctest/files/doctest-0.11.0-unamb.patch
deleted file mode 100644
index 88c5f89fb9b0..000000000000
--- a/dev-haskell/doctest/files/doctest-0.11.0-unamb.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit c3194e5e874bf7da4d9d1db3f435e902eeb60993
-Author: Sergei Trofimovich <siarheit@google.com>
-Date:   Wed Apr 13 09:35:29 2016 +0100
-
-    fix tests when config-value is present in system
-    
-    ghci fails to disambiguate 'Config' in this case as:
-    
-      src/Help.hs:8:18:
-        Ambiguous module name ‘Config’:
-          it was found in multiple packages:
-          config-value-0.4.0.1@confi_JzUyuyr9gPE2bcxdUwNhUS ghc-7.10.3
-    
-    Fixed by explicitly importing moduls from 'ghc' package.
-    
-    Signed-off-by: Sergei Trofimovich <siarheit@google.com>
-
-diff --git a/src/Help.hs b/src/Help.hs
-index b8e76cf..4c11f85 100644
---- a/src/Help.hs
-+++ b/src/Help.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE PackageImports #-}
- module Help (
-   usage
- , printVersion
-@@ -5,7 +6,7 @@ module Help (
- 
- import           Paths_doctest (version)
- import           Data.Version (showVersion)
--import           Config as GHC
-+import "ghc"     Config as GHC
- import           Interpreter (ghc)
- 
- usage :: String
diff --git a/dev-haskell/doctest/metadata.xml b/dev-haskell/doctest/metadata.xml
deleted file mode 100644
index e92269d61b9e..000000000000
--- a/dev-haskell/doctest/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The doctest program checks examples in source code comments.
-		It is modeled after doctest for Python
-		(&lt;http://docs.python.org/library/doctest.html&gt;).
-		
-		Documentation is at
-		&lt;https://github.com/sol/doctest-haskell#readme&gt;.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">sol/doctest-haskell#readme</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/drift-2.4.2 b/dev-haskell/drift-2.4.2
new file mode 100644
index 000000000000..cf3c1bf60262
--- /dev/null
+++ b/dev-haskell/drift-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/old-time:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Program to derive type class instances
+EAPI=5
+HOMEPAGE=http://repetae.net/computer/haskell/DrIFT/
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=dev-haskell/old-time:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/2.4.2
+SRC_URI=mirror://hackage/packages/archive/DrIFT/2.4.2/DrIFT-2.4.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fdacd066a6dd7b0fc985205c98567db9
diff --git a/dev-haskell/drift/Manifest b/dev-haskell/drift/Manifest
deleted file mode 100644
index c0fee5a2541d..000000000000
--- a/dev-haskell/drift/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX drift-2.4.2-ghc-7.10.patch 581 BLAKE2B 466fba075f3428dccdc6dc8dd5c6c18367bf37fed6d13b3d4d9bef02e9351d558a0c66ea99b14f6ff8a7f51c8c6a67ae791847a6eca0e64255adaa3c5c205bf2 SHA512 33d6ff669da9adf11f2a595748b6b1d726729186b0846c47951bb8fdc900d7c17ddf5cc5fc27a3e77c8766365c3b4e1f33b49a35a8f6f5ab88e7223fb1361014
-DIST DrIFT-2.4.2.tar.gz 69676 BLAKE2B 8b072b88e52f9106eeddd62c391805b17bab0cea59e6ac8eedb1c88d22dce91ba697174b2380ee2d2fd41036116fa41778d119bfa5b673444ee466815e49c7f0 SHA512 c6f36e9efad171c165ea8028b7d251e66d5b410aaa51a74e4b8745cf76b77fcfdf6f641fd375f15663b559ae6b8939622a175ba321537afdbb2a114a1550f7db
-EBUILD drift-2.4.2.ebuild 783 BLAKE2B f783cf1c965d42ada0f1431b2e9072d861abfae2b5ee039adae592ee5e88b78308e5bd0affc4a8521e19e7e4f2afbd33928c25ecabb51ca16ca5598bcd58d0c7 SHA512 eea2cec56304f19b3ada3267ce3cdb51bb2347cd6ae10d88721038b21fdd745ee1ecbf181a393ddd7e77a7737b74f48b3e457d7d86257cbd37130f4c1cd5f16c
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/drift/drift-2.4.2.ebuild b/dev-haskell/drift/drift-2.4.2.ebuild
deleted file mode 100644
index af0147fc3568..000000000000
--- a/dev-haskell/drift/drift-2.4.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-MY_PN="DrIFT"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Program to derive type class instances"
-HOMEPAGE="http://repetae.net/computer/haskell/DrIFT/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-haskell/old-time:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-}
diff --git a/dev-haskell/drift/files/drift-2.4.2-ghc-7.10.patch b/dev-haskell/drift/files/drift-2.4.2-ghc-7.10.patch
deleted file mode 100644
index c45a2945fd2a..000000000000
--- a/dev-haskell/drift/files/drift-2.4.2-ghc-7.10.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/ParseLib2.hs b/src/ParseLib2.hs
-index 730e4be..a7406fa 100644
---- a/src/ParseLib2.hs
-+++ b/src/ParseLib2.hs
-@@ -34,2 +34,3 @@ module ParseLib2
- import Data.Char
-+import Control.Applicative hiding ( many )
- import Control.Monad
-@@ -49,2 +50,6 @@ instance Functor Parser where
- 
-+instance Applicative Parser where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad Parser where
-@@ -58,2 +63,6 @@ instance Monad Parser where
- 
-+instance Alternative Parser where
-+    (<|>) = mplus
-+    empty = mzero
-+
- instance MonadPlus Parser where
diff --git a/dev-haskell/drift/metadata.xml b/dev-haskell/drift/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/drift/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/easy-file-0.2.1 b/dev-haskell/easy-file-0.2.1
new file mode 100644
index 000000000000..e0f8669dca31
--- /dev/null
+++ b/dev-haskell/easy-file-0.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Cross-platform File handling
+EAPI=5
+HOMEPAGE=https://github.com/kazu-yamamoto/easy-file
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.1
+SRC_URI=mirror://hackage/packages/archive/easy-file/0.2.1/easy-file-0.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=67bd3be512809fbde12d453bda567a85
diff --git a/dev-haskell/easy-file/Manifest b/dev-haskell/easy-file/Manifest
deleted file mode 100644
index 12ed9d0affb0..000000000000
--- a/dev-haskell/easy-file/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST easy-file-0.2.1.tar.gz 12610 BLAKE2B c2b1420563fb4070d927631f51119849d48f6e680506f2df3b84572729819311f3ba8eca3d25110a30f245a61da93edfc53de508411baeeccaf9eae94165bdc1 SHA512 48249b2662384cd766d8a7f66242c1d4c68b5b56a87583fd0363cd075c7fc0d8f013edb45fcab15ceaa8325e4f2fbb6ed920ca873e231c44934d6dae12e6102f
-EBUILD easy-file-0.2.1.ebuild 540 BLAKE2B 8d21e8d875c2927dde92d1f6114c1c0e473da8d21e3e088597c6a6c6fd3a3dc7adcd4163885df1761faa182f6c265237230b06cf49b7f6666fcee8aff1d838a9 SHA512 329a9a210a77b7a2b21938e18ccda4e2e164db6f45f32875eda0deacbcd6a835e79f8b26482ae6e003dc67a138586f4ed3ba835b544348d7170f3c27e1d8381d
-MISC metadata.xml 428 BLAKE2B 3d967b422f1f1b24e2150ca849abca3770cb8553beb40816697d68a867ab1b118b9345a74a00b6de1919e8378a06346571dcff9fea3ea4cfe6c6d34e378aa695 SHA512 99fc6e5c6e4a4d526619b65d7869e245c5296723895c5e543401c3d054bbdb345b7f1d5cd65bbf2608da026eef4e88fe2c8240ee41b33a1267d2c9c9c69956ad
diff --git a/dev-haskell/easy-file/easy-file-0.2.1.ebuild b/dev-haskell/easy-file/easy-file-0.2.1.ebuild
deleted file mode 100644
index acc4407e4ac4..000000000000
--- a/dev-haskell/easy-file/easy-file-0.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Cross-platform File handling"
-HOMEPAGE="https://github.com/kazu-yamamoto/easy-file"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/easy-file/metadata.xml b/dev-haskell/easy-file/metadata.xml
deleted file mode 100644
index 1400ac761de5..000000000000
--- a/dev-haskell/easy-file/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Cross-platform File handling for Unix/Mac/Windows
-	</longdescription>
-	<upstream>
-		<remote-id type="github">kazu-yamamoto/easy-file</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/ed25519-0.0.5.0 b/dev-haskell/ed25519-0.0.5.0
new file mode 100644
index 000000000000..6f607ca39012
--- /dev/null
+++ b/dev-haskell/ed25519-0.0.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/doctest-0.10 >=dev-haskell/quickcheck-2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Ed25519 cryptographic signatures
+EAPI=6
+HOMEPAGE=http://thoughtpolice.github.com/hs-ed25519
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.0.5.0
+SRC_URI=mirror://hackage/packages/archive/ed25519/0.0.5.0/ed25519-0.0.5.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f3e0bd7376b1fc01f9aa4a5b118b2ce7
diff --git a/dev-haskell/ed25519/Manifest b/dev-haskell/ed25519/Manifest
deleted file mode 100644
index c3383916712c..000000000000
--- a/dev-haskell/ed25519/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ed25519-0.0.5.0.tar.gz 80034 BLAKE2B 4de73a76576bc63a7c5e4e8c0d195d48c65901ad417a306ca0001856a3a37975cfbb527dd466c2a737006e44e8d440e9831c360c8c3063b45a704af79c165cbb SHA512 cd2bb28de905c6d659f80f15e82970a9634c959432c73b6fd3b10ebca42a1ce734429e7ac861d0ab328904d99651a6d2fcaaf4d74ab75a3c0be68607e8f54ce9
-EBUILD ed25519-0.0.5.0.ebuild 1101 BLAKE2B 3a00731fcb504213e838dc9a8dc5cc0b20be650c0005446d42a9f3e5ad0f48ab7df3cba7de6b7ee5c8e9a9adbaac4dcf4a3105854b06e526d7b4c80f4f3df0bb SHA512 60a3d086a31d002ac2de2c9f20a2674337f51dc9998b3435cebb58dfd20d9ff566f20e6eb3d0f84318c9c77d1fc0d80b9c6c3d748742995072d34c0aba2eed4c
-MISC metadata.xml 560 BLAKE2B 888f56c8e6e70d64bf97ded8786ceca38897a03f73efdab0bf041f62ff0acd53dbccf3dc6e8918ee69dc3f3201017346c4ae73aefd650b337c0b896079cbc68c SHA512 5f0785f4aafa940650ee52b473d8e89d8656d1db149f314a96018ea52961e210dad93b711025a00f41774b3daab2c6ea483d19ed8e0b8ebd4507dacfce32cc11
diff --git a/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild b/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild
deleted file mode 100644
index 7f1e4c43791c..000000000000
--- a/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +no-donna,+test-doctests,+test-properties,-test-hlint
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Ed25519 cryptographic signatures"
-HOMEPAGE="http://thoughtpolice.github.com/hs-ed25519"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/doctest-0.10
-		>=dev-haskell/quickcheck-2.4 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'ghc-prim    >= 0.1 && < 0.5' 'ghc-prim    >= 0.1' \
-		'doctest   >= 0.10 && < 0.11' 'doctest   >= 0.10' \
-		'QuickCheck  >= 2.4 && < 2.9' 'QuickCheck  >= 2.4' \
-		'directory >= 1.0  && < 1.3' 'directory >= 1.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=no-donna \
-		--flag=test-doctests \
-		--flag=-test-hlint \
-		--flag=test-properties
-}
diff --git a/dev-haskell/ed25519/metadata.xml b/dev-haskell/ed25519/metadata.xml
deleted file mode 100644
index af24f088297d..000000000000
--- a/dev-haskell/ed25519/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides a simple, fast, self-contained copy of the
-		Ed25519 public-key signature system with a clean interface. It also
-		includes support for detached signatures, and thorough documentation
-		on the design and implementation, including usage guidelines.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/edisonapi-1.3.1 b/dev-haskell/edisonapi-1.3.1
new file mode 100644
index 000000000000..e12ee1633672
--- /dev/null
+++ b/dev-haskell/edisonapi-1.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-1.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A library of efficient, purely-functional data structures (API)
+EAPI=5
+HOMEPAGE=http://rwd.rdockins.name/edison/home/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/mtl-1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.3.1
+SRC_URI=mirror://hackage/packages/archive/EdisonAPI/1.3.1/EdisonAPI-1.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=21c9cac47bb02e946c248a5950a65ab1
diff --git a/dev-haskell/edisonapi/Manifest b/dev-haskell/edisonapi/Manifest
deleted file mode 100644
index c22789196b04..000000000000
--- a/dev-haskell/edisonapi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST EdisonAPI-1.3.1.tar.gz 30512 BLAKE2B 7ed05eccc78814672538e3be05fa3d265cd883f080b3e0b10ef57a73473e26597c7c01673d842a9c16306ef67f17a5fed78b7a5060dfe73bbd68a5cdd4d9ea41 SHA512 677161da64856421c834856ee2f5ef7f59880883433d5c5c4061f0ab2faa0cb39c4eb83061820b77dab852acc4cce5dc75740fe454b15dbc2e67e6e84510ce42
-EBUILD edisonapi-1.3.1.ebuild 679 BLAKE2B 17def60d02558bd9a89a67d3cfce9e0ee22d44c8a976d1c3f13eeeebe74a16782bd8c9dd500da6deeb7254fdb4a285bb8a2950de8960a792784915b99f948f53 SHA512 1955ce83113e7c655e3c66315179cd3d87cd25a8963d35b88c416ef3f1a639c7cd64b4b8794a427fe11c935b33c21cfbd575be55148b2f7a6b0c6f5a664f90d6
-MISC metadata.xml 825 BLAKE2B df4da54ccc2fe1f75a6a9246e3c456e399c021b1a4955fa826a41ad753c5656153f831fc2b81b8f3c1ec9864c0e60a0815ed05dbbe5d3afc8d7b4aa1584b9487 SHA512 e9f396de6cf64bf70188595f431e434dccab4a8975ce21f03c25aa2d6c672c07ac8048106581a0729e79d7b2a7da9c3921a930afbd1f87a585bd8078d9bd210a
diff --git a/dev-haskell/edisonapi/edisonapi-1.3.1.ebuild b/dev-haskell/edisonapi/edisonapi-1.3.1.ebuild
deleted file mode 100644
index 9e3866aea2bb..000000000000
--- a/dev-haskell/edisonapi/edisonapi-1.3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="EdisonAPI"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library of efficient, purely-functional data structures (API)"
-HOMEPAGE="http://rwd.rdockins.name/edison/home/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/edisonapi/metadata.xml b/dev-haskell/edisonapi/metadata.xml
deleted file mode 100644
index dac5f3d4c343..000000000000
--- a/dev-haskell/edisonapi/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Edison is a library of purely functional data structures written by
-		Chris Okasaki.  It is named after Thomas Alva Edison and for the
-		mnemonic value EDiSon (Efficent Data Structures).
-		Edison provides several families of abstractions, each with
-		multiple implementations.  The main abstractions provided by Edison are:
-		Sequences such as stacks, queues, and dequeues;
-		Collections such as sets, bags and heaps; and
-		Associative Collections such as finite maps and priority queues
-		where the priority and element are distinct.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/edisoncore-1.3.1.1 b/dev-haskell/edisoncore-1.3.1.1
new file mode 100644
index 000000000000..be2c45a98b9e
--- /dev/null
+++ b/dev-haskell/edisoncore-1.3.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/edisonapi-1.3:=[profile?] <dev-haskell/edisonapi-1.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/quickcheck-2.8.2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A library of efficent, purely-functional data structures (Core Implementations)
+EAPI=5
+HOMEPAGE=http://rwd.rdockins.name/edison/home/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/edisonapi-1.3:=[profile?] <dev-haskell/edisonapi-1.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/quickcheck-2.8.2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.3.1.1
+SRC_URI=mirror://hackage/packages/archive/EdisonCore/1.3.1.1/EdisonCore-1.3.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=17960e52608f960dc3439fecd73834c1
diff --git a/dev-haskell/edisoncore/Manifest b/dev-haskell/edisoncore/Manifest
deleted file mode 100644
index 4c5d6169f3fb..000000000000
--- a/dev-haskell/edisoncore/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST EdisonCore-1.3.1.1.tar.gz 80699 BLAKE2B e92848bb282d478c84817e0c0c2515b0fcb227b8224b020e8e50df4deb53915ccb7aa172a86eef787aa985efaaffbb42deab0fbb5b8669adf9635129b017fee8 SHA512 2e290a5c792a136931387936f457a45913edeedb9eda8006649b974d9aea294b9f1b7e5b2aa020c3ed151934cef8b2bd228e2cb56f7db37f35d59dcb23f7bcb8
-EBUILD edisoncore-1.3.1.1.ebuild 854 BLAKE2B 5b3096af888a87da7e181f8071a98fd428e27cbc659ecb2f6a42535307775eed83f117d985af4f5cb8db71a687a36891bd1d11d1f1ad06f690e79f42e3ca007a SHA512 188f891fbeecfdf48e1f5663ae59450ca959611e18a9c96b5589cb0c5ddce534eb0d2f7853364bf946614af98ba94f0060ed39846bd43b1b2500ae4e0d3a4581
-MISC metadata.xml 604 BLAKE2B 470c5efc02f3d04ba57508b958cfcf4b5cceb00ae59e98b8d35d29eadcca522529f56a4a2f6b0d14424fee9c9fad879f719547557cab168508bf4eb862d5aab9 SHA512 025104263582c6b0f1c6c1016ca8b64094bfffae4c6778996da351bd8febcbe705227cb5eeb516f59211fecf0b1edac6f77eb2dffc2654175952621d678195e4
diff --git a/dev-haskell/edisoncore/edisoncore-1.3.1.1.ebuild b/dev-haskell/edisoncore/edisoncore-1.3.1.1.ebuild
deleted file mode 100644
index 1fc7a4d3e162..000000000000
--- a/dev-haskell/edisoncore/edisoncore-1.3.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="EdisonCore"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library of efficent, purely-functional data structures (Core Implementations)"
-HOMEPAGE="http://rwd.rdockins.name/edison/home/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/edisonapi-1.3:=[profile?] <dev-haskell/edisonapi-1.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/quickcheck-2.8.2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/edisoncore/metadata.xml b/dev-haskell/edisoncore/metadata.xml
deleted file mode 100644
index c483b30e0580..000000000000
--- a/dev-haskell/edisoncore/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides the core Edison data structure implementations,
-		including multiple sequence, set, bag, and finite map concrete
-		implementations with various performance characteristics. The
-		implementations in this package have no dependencies other than those
-		commonly bundled with Haskell compilers.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/edit-distance-0.2.2.1 b/dev-haskell/edit-distance-0.2.2.1
new file mode 100644
index 000000000000..5b75ac2f97e8
--- /dev/null
+++ b/dev-haskell/edit-distance-0.2.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/random-1.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9 >=dev-haskell/test-framework-0.1.1 dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Levenshtein and restricted Damerau-Levenshtein edit distances
+EAPI=5
+HOMEPAGE=https://github.com/phadej/edit-distance
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/random-1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.2.1
+SRC_URI=mirror://hackage/packages/archive/edit-distance/0.2.2.1/edit-distance-0.2.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2e720ea53e71676ffc473a00278749e5
diff --git a/dev-haskell/edit-distance-0.2.2.1-r1 b/dev-haskell/edit-distance-0.2.2.1-r1
new file mode 100644
index 000000000000..14a699f52b2d
--- /dev/null
+++ b/dev-haskell/edit-distance-0.2.2.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/random-1.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.1.1 dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Levenshtein and restricted Damerau-Levenshtein edit distances
+EAPI=5
+HOMEPAGE=https://github.com/phadej/edit-distance
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/random-1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.2.1
+SRC_URI=mirror://hackage/packages/archive/edit-distance/0.2.2.1/edit-distance-0.2.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2535f62f2e0cc055f35c3f7efab1922c
diff --git a/dev-haskell/edit-distance/Manifest b/dev-haskell/edit-distance/Manifest
deleted file mode 100644
index 013edd1ef7e4..000000000000
--- a/dev-haskell/edit-distance/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST edit-distance-0.2.2.1.tar.gz 13228 BLAKE2B a7e57e19f61497cfa24c1a038e860d2b0d616f4a3528db3c315c12f3bd04554e003009f1b07b2fdd6be7a8387b0205dde4d00da8b0a05f5c4b7ab0c17fca159f SHA512 67d19c9f5712191f88641d32ff0b84aaf05c2acd71cfa81a17675690ac9076b34aff687afa8501f8b22ddcece12a439e053265d14b70dc155b0e08406050fdd7
-EBUILD edit-distance-0.2.2.1-r1.ebuild 838 BLAKE2B 92111696593b9386bea3a157dd8766ec2b2693f2e1f0de25b20bf017bcb59b19264fb871f7f0cfdde14a72d698d8ec8e4df69edead22797d8fc7b8d8b1726a68 SHA512 44dba2d4514fe0d6a385b5ee9dabe306a2737b09e1f68f631bd84402175b0a088b7d64a31c636c8f76c1015d93c11ece407fbd638b65814d0315284ce342a496
-EBUILD edit-distance-0.2.2.1.ebuild 781 BLAKE2B a876ee85df8a62d6d0732922a9547ddb0c293b80e393f91781edc877cc46dfd8b0cd1e3739ae8b5cea39c76bfa7045f86e08294e210fd3c82b04690e65b26ecb SHA512 754f9971f54b0a0e21481b73cf0446960845f05806d2c1634140ec8c3281916d847d46b670b3b1f11eed8380c422b145a5c6fe3bba0c62473a353e5a7944a329
-MISC metadata.xml 497 BLAKE2B 934f2f3ee39e2f9d8d10b11961e3e97a464843310378f7121d1e96e06d7c75f7aa68e17a97a7009d3af5f23101b79267b2e57e19d281f42c59e88a33ee189d99 SHA512 f84d69e8385d45779047219523a748ff08e61ddf83649f37c0a253688006fbcc09ba72d81b78caa059fd73dc491ec9f96f524fbeae0cf333f86bbb0561df921c
diff --git a/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild b/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
deleted file mode 100644
index c26a93d9ee49..000000000000
--- a/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Levenshtein and restricted Damerau-Levenshtein edit distances"
-HOMEPAGE="https://github.com/phadej/edit-distance"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/random-1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.4
-		>=dev-haskell/test-framework-0.1.1
-		dev-haskell/test-framework-quickcheck2 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'QuickCheck >= 2.4 && <2.9' 'QuickCheck >= 2.4'
-}
diff --git a/dev-haskell/edit-distance/edit-distance-0.2.2.1.ebuild b/dev-haskell/edit-distance/edit-distance-0.2.2.1.ebuild
deleted file mode 100644
index 38b054001340..000000000000
--- a/dev-haskell/edit-distance/edit-distance-0.2.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Levenshtein and restricted Damerau-Levenshtein edit distances"
-HOMEPAGE="https://github.com/phadej/edit-distance"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/random-1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/test-framework-0.1.1
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/edit-distance/metadata.xml b/dev-haskell/edit-distance/metadata.xml
deleted file mode 100644
index a2d0a723f92f..000000000000
--- a/dev-haskell/edit-distance/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Optimized edit distances for fuzzy matching, including Levenshtein and restricted Damerau-Levenshtein algorithms.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">batterseapower/edit-distance</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/editline-0.2.1.1 b/dev-haskell/editline-0.2.1.1
new file mode 100644
index 000000000000..9ef846c7f275
--- /dev/null
+++ b/dev-haskell/editline-0.2.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= dev-libs/libedit >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Bindings to the editline library (libedit)
+EAPI=5
+HOMEPAGE=http://code.haskell.org/editline
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:= dev-libs/libedit
+SLOT=0/0.2.1.1
+SRC_URI=mirror://hackage/packages/archive/editline/0.2.1.1/editline-0.2.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=df554055414d8601d25cb8f852f8d2f5
diff --git a/dev-haskell/editline/Manifest b/dev-haskell/editline/Manifest
deleted file mode 100644
index e9aa66d21485..000000000000
--- a/dev-haskell/editline/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX editline-0.2.1.1-ghc-7.8.patch 564 BLAKE2B 522295c711fb091e9d06406505c522933599c95c7fa36ece36e02b365077ccf7972cbbbe83146aec1df74f071dde46ed92a61baf93b99d343de8bc68caacb6c2 SHA512 e3c9742d854294a77e6a646dc7d2b4fe96c9d2ad6d9c789278dfe7a6b20b55ee27da732f630211bcb705e5443cce1de716762dbe5f0b1c01fd5457a771cb8a93
-DIST editline-0.2.1.1.tar.gz 47240 BLAKE2B 7bd9d4d894856653e14a3ebde954ad17bb8b8e3ec03151edf8107c0ad5095e9bd467fa737d8b6af00fbe50da3fef54521e2ec32c214a6362df27e3f0137c0f6c SHA512 c4fa4438ecf318637ff42292411024f9df86d3edab5ac2107fe3978a9778ce03f62348fc4cf9c5a2f06e74e1abf0c8963f5a6d686113ba31a5c59fd7a75295d6
-EBUILD editline-0.2.1.1.ebuild 667 BLAKE2B e40c5ffbbb56fa7be88d0c0c8fdc2bc833b2909d983757bb58021c43c7a4ceafc7a800e30b6159783bc409664a6c04ea8662acf96d01ff0b29cf4d96dde4b9d8 SHA512 8db950e4372ee6bc9f0055787bcaebb7cf8723e29d09845f9197970c0f2c0a95a1879f47adb2b88c705ae28fcb8b5328ab5557a81f6621161264cb8b137438b8
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/editline/editline-0.2.1.1.ebuild b/dev-haskell/editline/editline-0.2.1.1.ebuild
deleted file mode 100644
index 27694c9a51f6..000000000000
--- a/dev-haskell/editline/editline-0.2.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Bindings to the editline library (libedit)"
-HOMEPAGE="http://code.haskell.org/editline"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-	dev-libs/libedit"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.8.patch
-
-	cabal_chdeps \
-		'base < 4.7' 'base'
-}
diff --git a/dev-haskell/editline/files/editline-0.2.1.1-ghc-7.8.patch b/dev-haskell/editline/files/editline-0.2.1.1-ghc-7.8.patch
deleted file mode 100644
index 4a55ecd5626b..000000000000
--- a/dev-haskell/editline/files/editline-0.2.1.1-ghc-7.8.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/System/Console/Editline/Readline.hsc b/System/Console/Editline/Readline.hsc
-index 1ea9d6c..3b95b59 100644
---- a/System/Console/Editline/Readline.hsc
-+++ b/System/Console/Editline/Readline.hsc
-@@ -173,7 +173,7 @@ import Foreign.Marshal.Array ( mallocArray, peekArray0, pokeArray0 )
- import Foreign.C.Types	( CInt(..), CChar, CFile )
- import Foreign.C.String	( newCString, peekCString, withCString,
- 			  castCharToCChar, castCCharToChar )
--import GHC.Handle	( fdToHandle )
-+import GHC.IO.Handle.FD	( fdToHandle )
- 
- {-# CFILES HsReadline_cbits.c #-}
- 
diff --git a/dev-haskell/editline/metadata.xml b/dev-haskell/editline/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/editline/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/either-4.3.3.2 b/dev-haskell/either-4.3.3.2
new file mode 100644
index 000000000000..7baffff04652
--- /dev/null
+++ b/dev-haskell/either-4.3.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/free-4.9:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/monadrandom-0.1:=[profile?] <dev-haskell/monadrandom-0.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An either monad transformer
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/either/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/free-4.9:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/monadrandom-0.1:=[profile?] <dev-haskell/monadrandom-0.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/4.3.3.2
+SRC_URI=mirror://hackage/packages/archive/either/4.3.3.2/either-4.3.3.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e1326a55a853672272f9a88ffee24bd9
diff --git a/dev-haskell/either-4.4.1 b/dev-haskell/either-4.4.1
new file mode 100644
index 000000000000..c4bb7dc65329
--- /dev/null
+++ b/dev-haskell/either-4.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/free-4.9:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/mmorph-1.0.0:=[profile?] <dev-haskell/mmorph-1.1:=[profile?] >=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/monadrandom-0.1:=[profile?] <dev-haskell/monadrandom-0.5:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An either monad transformer
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/either/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/free-4.9:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/mmorph-1.0.0:=[profile?] <dev-haskell/mmorph-1.1:=[profile?] >=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/monadrandom-0.1:=[profile?] <dev-haskell/monadrandom-0.5:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/4.4.1
+SRC_URI=mirror://hackage/packages/archive/either/4.4.1/either-4.4.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8a82ab28496068fb59cc1784804ee270
diff --git a/dev-haskell/either-4.4.1.1 b/dev-haskell/either-4.4.1.1
new file mode 100644
index 000000000000..e83275e1c98b
--- /dev/null
+++ b/dev-haskell/either-4.4.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/free-4.9:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/mmorph-1.0.0:=[profile?] <dev-haskell/mmorph-1.1:=[profile?] >=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/monadrandom-0.1:=[profile?] <dev-haskell/monadrandom-0.5:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An either monad transformer
+EAPI=6
+HOMEPAGE=https://github.com/ekmett/either/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/free-4.9:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/mmorph-1.0.0:=[profile?] <dev-haskell/mmorph-1.1:=[profile?] >=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/monadrandom-0.1:=[profile?] <dev-haskell/monadrandom-0.5:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/4.4.1.1
+SRC_URI=mirror://hackage/packages/archive/either/4.4.1.1/either-4.4.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=40bc13856ff6ce3f3b044329a3ede719
diff --git a/dev-haskell/either/Manifest b/dev-haskell/either/Manifest
deleted file mode 100644
index c7044c0bf846..000000000000
--- a/dev-haskell/either/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST either-4.3.3.2.tar.gz 8665 BLAKE2B f9308b05458add4afca329c9fd292265096f13d5a09cb9a783c8754b8c1ec3f71c4214aace38ca09bd7a11245ff9a896473981cbfc1e5a9075709de6ec35912d SHA512 35b0825cb34fef8cb673b808110c856d3be4b02a28c52ac59d5b31e34083095e7e72d1ea437e70a43500064f7fdd2baf90ca078729907b975192401c240b19e5
-DIST either-4.4.1.1.tar.gz 9376 BLAKE2B 5fecb832b018349360c62c3a6af2673bd8687ea6c1a652e60dedc392f31a5fa9e16ca1b1414501848eed23b884665ee69a32cdc6e6ab01110d3d6865cf1cdc50 SHA512 ebc61b0f83812c7479a4fe5422ae4b73f219f0d57938e8c43e0f1e8932374c874709453773b7577f98b07ab17c884e8f4f77a28d457291b5d3f988da71fb6195
-DIST either-4.4.1.tar.gz 9243 BLAKE2B c6917248fd2b53ba69ea18669fa1f29c41c202a474b0d86ecf1c0114987d88f28f238b4678405e2c5e84d62b43974abd1481356dd96c756b652c80093c8f9141 SHA512 d61a37fa5cbe9f4ff46ee6b0690405c41b503c30dcf2b06d15961539ee9c4f7e5414dfd7b377b984c4d710f148f43388d60cbdb5b86450f9a97f9b1fb8820bfc
-EBUILD either-4.3.3.2.ebuild 1427 BLAKE2B db638906b97c216a7e2a1ea64e8f4d6860b6d4f19b4b192baff2430ba85159f90df4bca6dddc8e166c13ca7a85ac9ccf9d03645ab542118445c0125b477ca74f SHA512 5736657c79096c8d85de6269aa22b9c8ae4fea6127ffaae7a3f438d6167c67c5cf85c1b1071811590e0fccf1126851964746ff109c809822b34d4e63fa5296b9
-EBUILD either-4.4.1.1.ebuild 1506 BLAKE2B 572c95dbf712a7d3f15619383be123835424463d36b30a64daf93b1886eee3278f3f0078b978ee4453e693d6b69cea1413530273de62c085b4beed441f6296ae SHA512 46a0817854ceb9914b3b6527f0684d6ae9693d73acfef410fe6b55e4a96acd0d8781f7c658bf016f5801510b3cb46cbe8357d96f78aeff4a82990e504e0259e6
-EBUILD either-4.4.1.ebuild 1508 BLAKE2B e7f51ba7d17ce174721fd6b97271dd2b34d8761dcb6caadfa527f9237fa76743655ffb44b9b760dd71ba11a9874f9747f37eba4728b41e26383f57f1d519497b SHA512 c1c47f304332a8511f74e7ea63a349094fe2f994abca29f75ae971322230ebdf1a469e1daf9de86f4703d8bfc07c9789ef0d206ffa07157595c8611137472195
-MISC metadata.xml 404 BLAKE2B 05a8facada54be9b19c9587ca9ed467975348f81148f4d577b9f3d24ba6300711323456a7b10519879cea2a8ecaab76730ab59bb71c9aeab0101fcdcc0631003 SHA512 7e73c19cd884a2dd7d42b7a5a3e9ab1a14fc6b88524a8814618b9291ec74a9f3946b1294c6219d77753dc72c3ae858083b089524897b827132e2207d2a763c0a
diff --git a/dev-haskell/either/either-4.3.3.2.ebuild b/dev-haskell/either/either-4.3.3.2.ebuild
deleted file mode 100644
index 2d2041672cbf..000000000000
--- a/dev-haskell/either/either-4.3.3.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="An either monad transformer"
-HOMEPAGE="https://github.com/ekmett/either/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?]
-	>=dev-haskell/exceptions-0.5:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
-	>=dev-haskell/free-4.9:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/monadrandom-0.1:=[profile?] <dev-haskell/monadrandom-0.4:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/either/either-4.4.1.1.ebuild b/dev-haskell/either/either-4.4.1.1.ebuild
deleted file mode 100644
index 5a268bab6fd6..000000000000
--- a/dev-haskell/either/either-4.4.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="An either monad transformer"
-HOMEPAGE="https://github.com/ekmett/either/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/exceptions-0.5:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
-	>=dev-haskell/free-4.9:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/mmorph-1.0.0:=[profile?] <dev-haskell/mmorph-1.1:=[profile?]
-	>=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/monadrandom-0.1:=[profile?] <dev-haskell/monadrandom-0.5:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/either/either-4.4.1.ebuild b/dev-haskell/either/either-4.4.1.ebuild
deleted file mode 100644
index 7a6e0676acfc..000000000000
--- a/dev-haskell/either/either-4.4.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="An either monad transformer"
-HOMEPAGE="https://github.com/ekmett/either/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/exceptions-0.5:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
-	>=dev-haskell/free-4.9:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/mmorph-1.0.0:=[profile?] <dev-haskell/mmorph-1.1:=[profile?]
-	>=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/monadrandom-0.1:=[profile?] <dev-haskell/monadrandom-0.5:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/either/metadata.xml b/dev-haskell/either/metadata.xml
deleted file mode 100644
index 8af902c7dab7..000000000000
--- a/dev-haskell/either/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haskell 98 either monad transformer
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/either</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/ekg-0.3.1.4 b/dev-haskell/ekg-0.3.1.4
new file mode 100644
index 000000000000..20824ddb04ae
--- /dev/null
+++ b/dev-haskell/ekg-0.3.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=<dev-haskell/aeson-0.8:=[profile?] <dev-haskell/network-2.5:=[profile?] <dev-haskell/snap-core-0.10:=[profile?] <dev-haskell/snap-server-0.10:=[profile?] <dev-haskell/text-1.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Remote monitoring of processes
+EAPI=5
+HOMEPAGE=https://github.com/tibbe/ekg
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=<dev-haskell/aeson-0.8:=[profile?] <dev-haskell/network-2.5:=[profile?] <dev-haskell/snap-core-0.10:=[profile?] <dev-haskell/snap-server-0.10:=[profile?] <dev-haskell/text-1.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.1.4
+SRC_URI=mirror://hackage/packages/archive/ekg/0.3.1.4/ekg-0.3.1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=168a103307c95e6c0f87ed561744b8e7
diff --git a/dev-haskell/ekg-0.4.0.11 b/dev-haskell/ekg-0.4.0.11
new file mode 100644
index 000000000000..bb7189f481d8
--- /dev/null
+++ b/dev-haskell/ekg-0.4.0.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=<dev-haskell/aeson-1.1:=[profile?] >=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?] >=dev-haskell/ekg-json-0.1:=[profile?] <dev-haskell/ekg-json-0.2:=[profile?] <dev-haskell/network-2.7:=[profile?] <dev-haskell/snap-core-1.1:=[profile?] <dev-haskell/snap-server-1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Remote monitoring of processes
+EAPI=6
+HOMEPAGE=https://github.com/tibbe/ekg
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=<dev-haskell/aeson-1.1:=[profile?] >=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?] >=dev-haskell/ekg-json-0.1:=[profile?] <dev-haskell/ekg-json-0.2:=[profile?] <dev-haskell/network-2.7:=[profile?] <dev-haskell/snap-core-1.1:=[profile?] <dev-haskell/snap-server-1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.4.0.11
+SRC_URI=mirror://hackage/packages/archive/ekg/0.4.0.11/ekg-0.4.0.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=78329f95651ebebb244c063a8bf3dadc
diff --git a/dev-haskell/ekg-0.4.0.8 b/dev-haskell/ekg-0.4.0.8
new file mode 100644
index 000000000000..f665b61ae2d3
--- /dev/null
+++ b/dev-haskell/ekg-0.4.0.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=<dev-haskell/aeson-0.11:=[profile?] >=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?] >=dev-haskell/ekg-json-0.1:=[profile?] <dev-haskell/ekg-json-0.2:=[profile?] <dev-haskell/network-2.7:=[profile?] <dev-haskell/snap-core-0.10:=[profile?] <dev-haskell/snap-server-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Remote monitoring of processes
+EAPI=5
+HOMEPAGE=https://github.com/tibbe/ekg
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=<dev-haskell/aeson-0.11:=[profile?] >=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?] >=dev-haskell/ekg-json-0.1:=[profile?] <dev-haskell/ekg-json-0.2:=[profile?] <dev-haskell/network-2.7:=[profile?] <dev-haskell/snap-core-0.10:=[profile?] <dev-haskell/snap-server-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.0.8
+SRC_URI=mirror://hackage/packages/archive/ekg/0.4.0.8/ekg-0.4.0.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=85c3fade45a5362231865555dbc74460
diff --git a/dev-haskell/ekg-0.4.0.9 b/dev-haskell/ekg-0.4.0.9
new file mode 100644
index 000000000000..ac3c62168bf7
--- /dev/null
+++ b/dev-haskell/ekg-0.4.0.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=<dev-haskell/aeson-0.12:=[profile?] >=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?] >=dev-haskell/ekg-json-0.1:=[profile?] <dev-haskell/ekg-json-0.2:=[profile?] <dev-haskell/network-2.7:=[profile?] <dev-haskell/snap-core-0.10:=[profile?] <dev-haskell/snap-server-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Remote monitoring of processes
+EAPI=5
+HOMEPAGE=https://github.com/tibbe/ekg
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=<dev-haskell/aeson-0.12:=[profile?] >=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?] >=dev-haskell/ekg-json-0.1:=[profile?] <dev-haskell/ekg-json-0.2:=[profile?] <dev-haskell/network-2.7:=[profile?] <dev-haskell/snap-core-0.10:=[profile?] <dev-haskell/snap-server-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.0.9
+SRC_URI=mirror://hackage/packages/archive/ekg/0.4.0.9/ekg-0.4.0.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2672b2e6ac1cf1b6a9cf8f7d4e5fb3d3
diff --git a/dev-haskell/ekg-core-0.1.1.0 b/dev-haskell/ekg-core-0.1.1.0
new file mode 100644
index 000000000000..fdb30b80e2c3
--- /dev/null
+++ b/dev-haskell/ekg-core-0.1.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=<dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Tracking of system metrics
+EAPI=5
+HOMEPAGE=https://github.com/tibbe/ekg-core
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=<dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/0.1.1.0
+SRC_URI=mirror://hackage/packages/archive/ekg-core/0.1.1.0/ekg-core-0.1.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5a484d617e3b43ad54109b935778a9c5
diff --git a/dev-haskell/ekg-core-0.1.1.1 b/dev-haskell/ekg-core-0.1.1.1
new file mode 100644
index 000000000000..e320da333438
--- /dev/null
+++ b/dev-haskell/ekg-core-0.1.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=<dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Tracking of system metrics
+EAPI=6
+HOMEPAGE=https://github.com/tibbe/ekg-core
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=<dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/0.1.1.1
+SRC_URI=mirror://hackage/packages/archive/ekg-core/0.1.1.1/ekg-core-0.1.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=af04c76531f32aba1c7af30d1994e30a
diff --git a/dev-haskell/ekg-core/Manifest b/dev-haskell/ekg-core/Manifest
deleted file mode 100644
index 466bffb74dba..000000000000
--- a/dev-haskell/ekg-core/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST ekg-core-0.1.1.0.tar.gz 12376 BLAKE2B 1b0b2ed3b7fc5b044058d5fa01db14db71657ad4398f9557583c4e78b6bc69220dd0bb4070dda50ca1cc89e8a873ccb93e215e2e0fd1ebc07250e611a32d1b9e SHA512 a383154b87e5de0995d57f368f04c725dc406c3cb7d824b0b4dc5c4b6620ff11df6547e2e64d123a35d0725155687e2600eb4c8b651cd9177c4ae73dcd409145
-DIST ekg-core-0.1.1.1.tar.gz 12426 BLAKE2B d05845f0a79974b9c1731eda8407049262330bca7d47b4dea090c31cfcf2ef8ea416d237e8e701865a43c41886410a12101798e669e2055fb179ab6361b5d5a1 SHA512 cdf27886a17679a396da9e85c55760ddb339080a3363c85321de11384b180db951bf95cb3c8e653d80683b942bfd363fcc1f465d114f914c2795269feedb3395
-EBUILD ekg-core-0.1.1.0.ebuild 620 BLAKE2B 33c3620b483ee34ffec2a28cd57b2e9d1a1125a91f5f20a3eaa67d59f5e934229ecf13874dc34d87cdaf237f5f35b4ce429a2ff114a2295f1798def3ae9d7d61 SHA512 e0ea9be745d40a9429331a18e1072eb84cd2347d6aa7aef279a89d22af4c084b4f9ee200dc4fb8efe98084cd418bca9aca916a2fd6ab1dea37a5a0849010ec43
-EBUILD ekg-core-0.1.1.1.ebuild 618 BLAKE2B b14b0febbe9520feb171e06e443f3ae89f3fc147fdf024725105cbda78476dc2171f103a08153ac2e780670dbc938cdab5b5f2a87b90abaa70130855b095f92a SHA512 de226d552a4c3f9dc96bb3ac2a3cfd44f000eeafb5926a98b2266a2c27757cf62eff3a395f90eec6bac455c9c11a79c0298a96575ad5a087c921380e04a95a18
-MISC metadata.xml 425 BLAKE2B 63dcd74cb6ed9b0cbf35209585e222a5d111eae82af0f5361751fb95837161c14fae818199cd4f9f06da97ab98c7b88ad85d428ffd0e5dbd4aa67cd32e612270 SHA512 5111f7b2916889e4d4d8c7aa828b628b4f0f70bb00352f1f500268c6a1d6acd11fb6d52158f42bb06a24d5943c0c2f886f4fdbb506c92c7530a36f658aba2e14
diff --git a/dev-haskell/ekg-core/ekg-core-0.1.1.0.ebuild b/dev-haskell/ekg-core/ekg-core-0.1.1.0.ebuild
deleted file mode 100644
index 05a8e277e794..000000000000
--- a/dev-haskell/ekg-core/ekg-core-0.1.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Tracking of system metrics"
-HOMEPAGE="https://github.com/tibbe/ekg-core"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/text-1.3:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/ekg-core/ekg-core-0.1.1.1.ebuild b/dev-haskell/ekg-core/ekg-core-0.1.1.1.ebuild
deleted file mode 100644
index 8d38100d2404..000000000000
--- a/dev-haskell/ekg-core/ekg-core-0.1.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Tracking of system metrics"
-HOMEPAGE="https://github.com/tibbe/ekg-core"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/text-1.3:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/ekg-core/metadata.xml b/dev-haskell/ekg-core/metadata.xml
deleted file mode 100644
index 4be2b274026f..000000000000
--- a/dev-haskell/ekg-core/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library lets you defined and track system metrics.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">tibbe/ekg-core</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/ekg-json-0.1.0.0 b/dev-haskell/ekg-json-0.1.0.0
new file mode 100644
index 000000000000..78a5cb1f4816
--- /dev/null
+++ b/dev-haskell/ekg-json-0.1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=<dev-haskell/aeson-0.11:=[profile?] >=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=JSON encoding of ekg metrics
+EAPI=5
+HOMEPAGE=https://github.com/tibbe/ekg-json
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=<dev-haskell/aeson-0.11:=[profile?] >=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0.0
+SRC_URI=mirror://hackage/packages/archive/ekg-json/0.1.0.0/ekg-json-0.1.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=23a5aa89a9df6681ad4ca19e43fd705e
diff --git a/dev-haskell/ekg-json-0.1.0.1 b/dev-haskell/ekg-json-0.1.0.1
new file mode 100644
index 000000000000..d14c44fc06af
--- /dev/null
+++ b/dev-haskell/ekg-json-0.1.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=<dev-haskell/aeson-0.12:=[profile?] >=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=JSON encoding of ekg metrics
+EAPI=5
+HOMEPAGE=https://github.com/tibbe/ekg-json
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=<dev-haskell/aeson-0.12:=[profile?] >=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0.1
+SRC_URI=mirror://hackage/packages/archive/ekg-json/0.1.0.1/ekg-json-0.1.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fefc0da7fff74ae5ac2327578a947c69
diff --git a/dev-haskell/ekg-json-0.1.0.3 b/dev-haskell/ekg-json-0.1.0.3
new file mode 100644
index 000000000000..d1cdb99af47e
--- /dev/null
+++ b/dev-haskell/ekg-json-0.1.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.4:=[profile?] <dev-haskell/aeson-1.1:=[profile?] >=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=JSON encoding of ekg metrics
+EAPI=6
+HOMEPAGE=https://github.com/tibbe/ekg-json
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.4:=[profile?] <dev-haskell/aeson-1.1:=[profile?] >=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0.3
+SRC_URI=mirror://hackage/packages/archive/ekg-json/0.1.0.3/ekg-json-0.1.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ef3008e869ec0c2a01504bc6274fa06d
diff --git a/dev-haskell/ekg-json/Manifest b/dev-haskell/ekg-json/Manifest
deleted file mode 100644
index ee29723406f5..000000000000
--- a/dev-haskell/ekg-json/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST ekg-json-0.1.0.0.tar.gz 2969 BLAKE2B d16870858a80ae7a95bfce3e948dfc2e7b8f1501e3246a448486087a38fced0f36cac3f732c5b4f73a0a3102955685f0d9902b01a82c40c377e3e3a515dad871 SHA512 6d9d2a5f7d8893cc9076b6817bf433fa3e525fe08e2686c7e21f0a58d8c0699f4a16859f3042e4d3aa0e79416301d43cac21fe80b767934ab9f0309f02558c51
-DIST ekg-json-0.1.0.1.tar.gz 2966 BLAKE2B 3656c910ce6fdd84e13027314c4334a641808fc4b0e42007ce9cd1b1954198395845161f09076207269b2270b955a4849b3b1a654742ba914cda98ab4df86f6d SHA512 c1ec9c0feedffdc7ff50997b5a851237507e0f9d2e841fa9cae5785dc26318abe1a3a0de9c433e3554a686869fa26a756a85d1cdae4bce6af198cfc641c1d508
-DIST ekg-json-0.1.0.3.tar.gz 3069 BLAKE2B 6683dba514dd62608cdbf3e5291a0216ec4aaec89d2e652721b8fa06819138dfa409d05ed364a18c3113bf2a04c7ed7f24e0e019e29b3eb62505fc01b59c026b SHA512 52f03c9758396a627a4b5c9a92aacb84e5f082ff5ecbfba2a5f870c0abe9d7c81d65a7a8f0ce16558634a3cc6fdd4834efed8dc95c73fed9a1b2aea049660ff9
-EBUILD ekg-json-0.1.0.0.ebuild 735 BLAKE2B d31267e2843ddd36cadd8b5aa0d6ba85ba5ee476ac27fbd72f2eacf39da1d632fe2075e812f1755b83340f90b321a7b9c99d8ca954da0abf0b340ee1027c9b92 SHA512 78cd87505de9c97b93d9f0f84230d1e3ab17f3237b8963a38792b37c60c30824a9e7a0ce437982abb0ca60cca721a21ed4c80d89fd9ccf7f1960f74fdb514aa5
-EBUILD ekg-json-0.1.0.1.ebuild 735 BLAKE2B 308a2b79b88e21808dcc639cf4aff66657a346736cf8e12771c4932ed85f0bcc0b0ea5bd0bb78670d12c78cc0cea5606a11ace6ee66a7d6c3b16163dd8140024 SHA512 e5cb685476fff5095da87b85ab6485c80f2eaa771d6234b0fd708f665f8349c90351cdbd5d51a81e8d243223ee201adf994a88793c4f2d18c4e7c35bc8cd9168
-EBUILD ekg-json-0.1.0.3.ebuild 768 BLAKE2B bf155b7303f125cb0a1bc3c25db4b0bd01cc50c5e01c07f820aaf3354c3e3b251d67446114b48af51247a6ea8a765387a48ca40764a9b88c09f5f2c4aa386e4e SHA512 bb2921e02e39c8ee243dc333296dc3a42047e6f02b5d7d29d1042b7875835dba82b665cba4076fdc6437e92cc49770d1fb052ea96facb88ea511cd5f591a9220
-MISC metadata.xml 553 BLAKE2B 37267e45c49b74117cebe6da3f2e18e26a1326339e91c420b0650ad05483f6c6c2fe6b694be9177de8e533cb04f967eaaf83ee5658b4127bcf184afee6e1e3b0 SHA512 82cf11540942ca0bb5a8ae7dd6ea26eedd91376d4250c42fa54b130b9fd55826781f8ffea89a70e33b7bda67f2fb9a20782e566927a4184aedef86ab4e665254
diff --git a/dev-haskell/ekg-json/ekg-json-0.1.0.0.ebuild b/dev-haskell/ekg-json/ekg-json-0.1.0.0.ebuild
deleted file mode 100644
index b9f73ad9a887..000000000000
--- a/dev-haskell/ekg-json/ekg-json-0.1.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="JSON encoding of ekg metrics"
-HOMEPAGE="https://github.com/tibbe/ekg-json"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/aeson-0.11:=[profile?]
-	>=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?]
-	<dev-haskell/text-1.3:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/ekg-json/ekg-json-0.1.0.1.ebuild b/dev-haskell/ekg-json/ekg-json-0.1.0.1.ebuild
deleted file mode 100644
index be484d2ae801..000000000000
--- a/dev-haskell/ekg-json/ekg-json-0.1.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="JSON encoding of ekg metrics"
-HOMEPAGE="https://github.com/tibbe/ekg-json"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/aeson-0.12:=[profile?]
-	>=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?]
-	<dev-haskell/text-1.3:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/ekg-json/ekg-json-0.1.0.3.ebuild b/dev-haskell/ekg-json/ekg-json-0.1.0.3.ebuild
deleted file mode 100644
index be1653099092..000000000000
--- a/dev-haskell/ekg-json/ekg-json-0.1.0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="JSON encoding of ekg metrics"
-HOMEPAGE="https://github.com/tibbe/ekg-json"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.4:=[profile?] <dev-haskell/aeson-1.1:=[profile?]
-	>=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?]
-	<dev-haskell/text-1.3:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/ekg-json/metadata.xml b/dev-haskell/ekg-json/metadata.xml
deleted file mode 100644
index 478b13fd3805..000000000000
--- a/dev-haskell/ekg-json/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Encodes ekg metrics as JSON, using the same encoding as used by the
-		ekg package, thus allowing ekg metrics to be served by other HTTP
-		servers than the one used by the ekg package.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">tibbe/ekg-json</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/ekg/Manifest b/dev-haskell/ekg/Manifest
deleted file mode 100644
index 79a49e17742c..000000000000
--- a/dev-haskell/ekg/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST ekg-0.3.1.4.tar.gz 161532 BLAKE2B 87ce524eb927b2deafa6f647805d5ff108b74fbcd9cc237d30b43a75bef2ccf6257bd82c8d9077febc398c1c6bd07fdc536280f9fe878f5d3e15318ba83f6182 SHA512 41ff15edc073b0d3c9912b7d5f85cfc025fefc547ecfce513c6c010c495208318e7a3f4c30b7daa39c89996328f115367b44722b8ca9cea794b14c5a2f34b8eb
-DIST ekg-0.4.0.11.tar.gz 170085 BLAKE2B 70682c9dc30083acbb65f5e624890d8935ed2a1d9008bb3e6e77b929ba5c515853cd694d46df72d5babb679e494c3a82f88728c03611e870090dde11d07c13b3 SHA512 af6d429d561505036d1f3366112ca2c5f2dd71a23f9418e372488b689bfb31383316e2498f56f881e1ba78077f2b1c89d8df0c94354c2aca115b3f7be8faf49d
-DIST ekg-0.4.0.8.tar.gz 169806 BLAKE2B 2bea3f2c1986794073171430f138bcf0f24be7ef0808f243971b11422d536eb17f5e687d7fd59bbd9d752d8ef3d4206e4e7640dd476744aca8006d95299ec659 SHA512 1c33b119f1df4ad596abfc1734a833a661ecce13392ba970b8535fdb1e58231309f66ede3849c383d7c3c43d05fc20f8cdf835759a9468f4f50e87f828bcc17a
-DIST ekg-0.4.0.9.tar.gz 169922 BLAKE2B 43bb85b7cc38c057cf07637f959c02603570836a609881c8b82e63e41ea71fbc4a24f8df7655ca9a7353e44a17d5384a7ef4aadc8c14cc594b312a66e6bbef20 SHA512 f62301326425c32fa99daca3024ecb536a66a5d0e74cc188b7fdf71654ba2daab7d6fe34f5a76dca197c1381e2783db3ba5e8d603d844d785af1cd7684f5bba5
-EBUILD ekg-0.3.1.4.ebuild 817 BLAKE2B 8eb9aec3f43e23ae038274cbe423698578aad7af5fbd4f9956243738aeb6d2fff4d6e532b7ca585e92c2cf9fb8fa5109e991fc45e4c3d492e0d5b6524effb307 SHA512 f9c091e2db19033ca9e6c101270f60d82f40351beadb3b18644e678e4ca2cdfb2e4779f9d88ed1e07f97dbf946bf09f63a85e332ae6f703b869f592e46ee5a39
-EBUILD ekg-0.4.0.11.ebuild 931 BLAKE2B 11c8e2fa0d6cf61b9948b4b581a653b20b08bedc50dc89f2e4e801651ee772c58964ef2fdce6bfabb80e7500cecb20f49b1bcf1325ed8baa887653b3c180ba30 SHA512 fe7a6fe94458e5b81d6435b7a19b585a703dae0dc0b252977e99acfdddbadca06f2bc0d0e9ff39d52a01541c8813cb52106c22a9154540529fe2a93e1eb366f1
-EBUILD ekg-0.4.0.8.ebuild 974 BLAKE2B 638e6f14bb5c7212808bfb122ded3992f6b33825e16398e060a51caacb49b83bab88d8db68c1ea964f5402fe68b3a8af4ed4f568b1d53ab3d729bac0e1d58cf1 SHA512 ad9a10700330f18b6c94fd58e2dce6c22deab51d0e851d277052a0bb2f6fd2eb706e33ff3af91f49bb5776c99e9ea037d3f4360d91ee20bfad42e9dc4ae30393
-EBUILD ekg-0.4.0.9.ebuild 974 BLAKE2B 837cc65f13639a47ca059aea5dbd4a892abd1e7ce4ee3e2ed82642c33c74b93026abdca61b4ccba8babe84810efdac55ba99662586453a11728b03c02297f573 SHA512 481c07f1b13bd783d8097463cb44db30ea28f1c3134f38a0b681e4403792fef1a2f88d5710eae898318ff59dfe647e010ebc9437cb2ac1bf7183631945fdc428
-MISC metadata.xml 516 BLAKE2B a6a0016ef3903e1ded31bff0a26b0990827db839593a48fd2a8b1bc8f92e32161c88dde0396c544a5ecba9944f5fe8c8fb0386a1b0e1813a4828bb107a6a64a5 SHA512 b5193ab4665caea0b015e7bfd80098a87940aafc0d0733212532fce7c1a8c849c264e7b4cbdd98f0251f53b1a9cf80a89aa8ec11288fa6a9545c490ee608e0fd
diff --git a/dev-haskell/ekg/ekg-0.3.1.4.ebuild b/dev-haskell/ekg/ekg-0.3.1.4.ebuild
deleted file mode 100644
index 8cca8ac167cd..000000000000
--- a/dev-haskell/ekg/ekg-0.3.1.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Remote monitoring of processes"
-HOMEPAGE="https://github.com/tibbe/ekg"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/aeson-0.8:=[profile?]
-	<dev-haskell/network-2.5:=[profile?]
-	<dev-haskell/snap-core-0.10:=[profile?]
-	<dev-haskell/snap-server-0.10:=[profile?]
-	<dev-haskell/text-1.2:=[profile?]
-	<dev-haskell/transformers-0.4:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/ekg/ekg-0.4.0.11.ebuild b/dev-haskell/ekg/ekg-0.4.0.11.ebuild
deleted file mode 100644
index d1ada36c6ef0..000000000000
--- a/dev-haskell/ekg/ekg-0.4.0.11.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Remote monitoring of processes"
-HOMEPAGE="https://github.com/tibbe/ekg"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/aeson-1.1:=[profile?]
-	>=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?]
-	>=dev-haskell/ekg-json-0.1:=[profile?] <dev-haskell/ekg-json-0.2:=[profile?]
-	<dev-haskell/network-2.7:=[profile?]
-	<dev-haskell/snap-core-1.1:=[profile?]
-	<dev-haskell/snap-server-1.1:=[profile?]
-	<dev-haskell/text-1.3:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/ekg/ekg-0.4.0.8.ebuild b/dev-haskell/ekg/ekg-0.4.0.8.ebuild
deleted file mode 100644
index 97cd3263ce00..000000000000
--- a/dev-haskell/ekg/ekg-0.4.0.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Remote monitoring of processes"
-HOMEPAGE="https://github.com/tibbe/ekg"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/aeson-0.11:=[profile?]
-	>=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?]
-	>=dev-haskell/ekg-json-0.1:=[profile?] <dev-haskell/ekg-json-0.2:=[profile?]
-	<dev-haskell/network-2.7:=[profile?]
-	<dev-haskell/snap-core-0.10:=[profile?]
-	<dev-haskell/snap-server-0.10:=[profile?]
-	<dev-haskell/text-1.3:=[profile?]
-	<dev-haskell/transformers-0.5:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/ekg/ekg-0.4.0.9.ebuild b/dev-haskell/ekg/ekg-0.4.0.9.ebuild
deleted file mode 100644
index d0988fdad0f2..000000000000
--- a/dev-haskell/ekg/ekg-0.4.0.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Remote monitoring of processes"
-HOMEPAGE="https://github.com/tibbe/ekg"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/aeson-0.12:=[profile?]
-	>=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?]
-	>=dev-haskell/ekg-json-0.1:=[profile?] <dev-haskell/ekg-json-0.2:=[profile?]
-	<dev-haskell/network-2.7:=[profile?]
-	<dev-haskell/snap-core-0.10:=[profile?]
-	<dev-haskell/snap-server-0.10:=[profile?]
-	<dev-haskell/text-1.3:=[profile?]
-	<dev-haskell/transformers-0.5:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/ekg/metadata.xml b/dev-haskell/ekg/metadata.xml
deleted file mode 100644
index 97b6668da8aa..000000000000
--- a/dev-haskell/ekg/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library lets you remotely monitor a running process over HTTP.
-		It provides a simple way to integrate a monitoring server into any
-		application.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">tibbe/ekg</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/email-validate-1.0.0 b/dev-haskell/email-validate-1.0.0
new file mode 100644
index 000000000000..e933c5e0bbf5
--- /dev/null
+++ b/dev-haskell/email-validate-1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10.0:=[profile?] >=dev-lang/ghc-6.10.4:= test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.4.1 dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Validating an email address string against RFC 5322
+EAPI=5
+HOMEPAGE=http://porg.es/blog/email-address-validation-simpler-faster-more-correct
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.10.0:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.0.0
+SRC_URI=mirror://hackage/packages/archive/email-validate/1.0.0/email-validate-1.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=966ee0cf0ab861c044b147551551a6c0
diff --git a/dev-haskell/email-validate-2.0.1 b/dev-haskell/email-validate-2.0.1
new file mode 100644
index 000000000000..344da14e00a1
--- /dev/null
+++ b/dev-haskell/email-validate-2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.4.1 dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Validating an email address string against RFC 5322
+EAPI=5
+HOMEPAGE=http://porg.es/blog/email-address-validation-simpler-faster-more-correct
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.10.0:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/2.0.1
+SRC_URI=mirror://hackage/packages/archive/email-validate/2.0.1/email-validate-2.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3323bc2c30e0f5d7a1d827f31abe2783
diff --git a/dev-haskell/email-validate/Manifest b/dev-haskell/email-validate/Manifest
deleted file mode 100644
index 3c07895ea8de..000000000000
--- a/dev-haskell/email-validate/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST email-validate-1.0.0.tar.gz 7205 BLAKE2B 11d5b70fa2a90a150f66a317c4ee7a990098201d96c4f47e3e6024b9c058fda6bea667e1191a8753ec8a19791a9785b55784e13ad2d6a23436145dff09350602 SHA512 e76ea41e7d2dbc5085e3afbd4cdddecf106dd9a308d14bd377d70392163d695cb2d1c538de81c510565b309846376864fc1977c520860c9b3ff9162854601f4b
-DIST email-validate-2.0.1.tar.gz 7462 BLAKE2B f385a0e585191a1810270397077f5f2b675dacc8ed89eb256e4e1848e40dafe79d037516c2ab0b7f7d5aae42a7d04399b9e9c9a5b12fc1b2eda753a3580de810 SHA512 d5eb0d48c81fa61c5bdecbb1cc35e370afbcb49277091b7358a01518711dfda94ec4074c7462f1efa088cc964408db083481da976d64283868baa130abf7089e
-EBUILD email-validate-1.0.0.ebuild 862 BLAKE2B d5b16573b4c134d32c1c27901bd9387f9152b362065673a9dfa7fb45a5ac374892653407e996e7bfb17385afb0e84c46b9c0805fcb9aac3f34314b8a4e9d93c4 SHA512 2b398695ff20f7064fe0419009cc1d69cadd8b3a6e4809ebc370ffdc9036751e68568085d101a4db75b68b22b4e0c914a951ab25c95fd8b93c86774b339cd013
-EBUILD email-validate-2.0.1.ebuild 850 BLAKE2B e6d7872b06d45e8057e966bde11254e85e1cc1d49c731daa851c8515efafb591a64e0c6f76424a00383b2265019d00feab5232b394ad790c0595bdaf3d81a2ee SHA512 f93df2bdb6d8203973a511bfe5f811b5df344399a42f51344505c6dccb0fc1793d8594da5a649a4770611c7f596308ec87999c3de34ad4cbba14cf40207246c4
-MISC metadata.xml 342 BLAKE2B e63671aadbb291066113ad5dc3e579d4bb726c3e1f16ffc6a701bc2954cf551395c1e362f936fecb682e2cde12f31b03813f07ea679c47920fa1dc9e859f150c SHA512 541a473b649f7b3826c4c49a685ec0fc48e01fa0569b67e805f073cc0f589df5630b30bb8a135b43c726c2cc5c32e9340519cbc607de0f8ddd7f7dd425aa14c7
diff --git a/dev-haskell/email-validate/email-validate-1.0.0.ebuild b/dev-haskell/email-validate/email-validate-1.0.0.ebuild
deleted file mode 100644
index 17b39f212e90..000000000000
--- a/dev-haskell/email-validate/email-validate-1.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Validating an email address string against RFC 5322"
-HOMEPAGE="http://porg.es/blog/email-address-validation-simpler-faster-more-correct"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.0:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		test? ( >=dev-haskell/hunit-1.2
-			<dev-haskell/hunit-2
-			>=dev-haskell/quickcheck-2.4
-			>=dev-haskell/test-framework-0.4.1
-			dev-haskell/test-framework-hunit
-			dev-haskell/test-framework-quickcheck2
-		)
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/email-validate/email-validate-2.0.1.ebuild b/dev-haskell/email-validate/email-validate-2.0.1.ebuild
deleted file mode 100644
index 28312d90270c..000000000000
--- a/dev-haskell/email-validate/email-validate-2.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Validating an email address string against RFC 5322"
-HOMEPAGE="http://porg.es/blog/email-address-validation-simpler-faster-more-correct"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/test-framework-0.4.1
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/email-validate/metadata.xml b/dev-haskell/email-validate/metadata.xml
deleted file mode 100644
index f18d6cef5b45..000000000000
--- a/dev-haskell/email-validate/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Validating an email address string against RFC 5322
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/enclosed-exceptions-1.0.1.1 b/dev-haskell/enclosed-exceptions-1.0.1.1
new file mode 100644
index 000000000000..e6b1879c1add
--- /dev/null
+++ b/dev-haskell/enclosed-exceptions-1.0.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/async-2.0:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Catching all exceptions from within an enclosed computation
+EAPI=5
+HOMEPAGE=https://github.com/jcristovao/enclosed-exceptions
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/async-2.0:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.1.1
+SRC_URI=mirror://hackage/packages/archive/enclosed-exceptions/1.0.1.1/enclosed-exceptions-1.0.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=74f65d9d3d622400b5cb6bfce4a21e2e
diff --git a/dev-haskell/enclosed-exceptions-1.0.2 b/dev-haskell/enclosed-exceptions-1.0.2
new file mode 100644
index 000000000000..718c539e1b6e
--- /dev/null
+++ b/dev-haskell/enclosed-exceptions-1.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/lifted-base-0.2:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/async-2.0 >=dev-haskell/hspec-1.3 dev-haskell/quickcheck dev-haskell/stm ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Catching all exceptions from within an enclosed computation
+EAPI=6
+HOMEPAGE=https://github.com/jcristovao/enclosed-exceptions
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/lifted-base-0.2:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.2
+SRC_URI=mirror://hackage/packages/archive/enclosed-exceptions/1.0.2/enclosed-exceptions-1.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d52af499b3e9315cdeb242202381f20c
diff --git a/dev-haskell/enclosed-exceptions/Manifest b/dev-haskell/enclosed-exceptions/Manifest
deleted file mode 100644
index 5b7da6c40b47..000000000000
--- a/dev-haskell/enclosed-exceptions/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST enclosed-exceptions-1.0.1.1.tar.gz 4566 BLAKE2B 10a109ae1313040eaf97096940c0faf209508bb63700060f18ea8082e637d8756d8e3567ef0801867224e6be8b9e6b222b085b1c25bd46cabe9abbc5fb58382f SHA512 69297633a1b55c22a2fa1cbfcd0f450f063997c5e088167f94b37e7bc92528047aa8d36072e7fc0be1550297cd5fb7d771c637627b3aa15eab9ffe4b19ff0c62
-DIST enclosed-exceptions-1.0.2.tar.gz 5266 BLAKE2B 0e6060c350ff64dda3de669f36d8bb24a3f5196fc160c8dd2f9d3a4c5b8d447df44862c0bccd59fd63a6ac1ebae37fb82a821562e5a485d80b5299738b37db67 SHA512 73b0196b0ec18acaf8a1c215abf7e4c8665c9df1ac07543796fadd7da1aa0b633167e10e1c923c609aa40e6af6f540574436825440da96918cd8066908781f40
-EBUILD enclosed-exceptions-1.0.1.1.ebuild 849 BLAKE2B a1d14cfbbe403bacde1a0abcfcacfe8a81ab1abc05f05d0abfa9be5289f40042c9d0d4906e94d23a384e7ea63355c21bd08aa4f917408a9f0774d873a44f863c SHA512 9c1a18899096ac0e680c70c24489756679ad22eb57b60c19193ff78fddde3cf82f82e642c61511c7300cb6450cdb7e2884679550c4ba863d556adb7de9195daa
-EBUILD enclosed-exceptions-1.0.2.ebuild 856 BLAKE2B feff70282d827d8e9cf2b1f3542d477bcbe0f715638965bf33f4e3721408d8f71aa51b86b59084b3c2c3877d08e62cb5ee56dc51f74b96fcc426094371e5e2ce SHA512 5c25f73d0dabda5ee5e94adb8699834c672866eaa8b141f755a596f123684268311a25c6b9bfa5d3e42b2871daf2dcc064e525a95eedffea8a78c9b736f95b65
-MISC metadata.xml 516 BLAKE2B 2897b7c07776e5cead2638e88182e45b840fc354b705c597496d5fc53776b0b9b4cbf33ab39f76c6e61513755d21064a1534906d7328e99ce31b294a0b0e806e SHA512 6d3c62ab0e7e8114808fd2d4a84d9423f6dfe60f96e7de0da401f75d096eb03e91d9b17c1c7df1daf21ac7267a050225a33ea6d837c816c120a1b0c33b057b80
diff --git a/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.1.1.ebuild b/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.1.1.ebuild
deleted file mode 100644
index d488ff979240..000000000000
--- a/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Catching all exceptions from within an enclosed computation"
-HOMEPAGE="https://github.com/jcristovao/enclosed-exceptions"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/async-2.0:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.2.ebuild b/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.2.ebuild
deleted file mode 100644
index 581459fab3c3..000000000000
--- a/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Catching all exceptions from within an enclosed computation"
-HOMEPAGE="https://github.com/jcristovao/enclosed-exceptions"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/lifted-base-0.2:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/async-2.0
-		>=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck
-		dev-haskell/stm )
-"
diff --git a/dev-haskell/enclosed-exceptions/metadata.xml b/dev-haskell/enclosed-exceptions/metadata.xml
deleted file mode 100644
index d6b71a606fdc..000000000000
--- a/dev-haskell/enclosed-exceptions/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Catching all exceptions raised within an enclosed computation,
-		while remaining responsive to (external) asynchronous exceptions.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">jcristovao/enclosed-exceptions</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/encoding-0.6.7.2-r2 b/dev-haskell/encoding-0.6.7.2-r2
new file mode 100644
index 000000000000..1c149b0a29de
--- /dev/null
+++ b/dev-haskell/encoding-0.6.7.2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/binary:=[profile?] dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/haxml-1.22:=[profile?] <dev-haskell/haxml-1.25:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/regex-compat:=[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 library for various character encodings
+EAPI=5
+HOMEPAGE=http://code.haskell.org/encoding/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/binary:=[profile?] dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/haxml-1.22:=[profile?] <dev-haskell/haxml-1.25:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.6.7.2
+SRC_URI=mirror://hackage/packages/archive/encoding/0.6.7.2/encoding-0.6.7.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c539c1589f1fb0a3517cb1e18b50a754
diff --git a/dev-haskell/encoding-0.7.0.2-r1 b/dev-haskell/encoding-0.7.0.2-r1
new file mode 100644
index 000000000000..f6f9baa11642
--- /dev/null
+++ b/dev-haskell/encoding-0.7.0.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=<dev-haskell/binary-0.8:=[profile?] dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/haxml-1.22:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A library for various character encodings
+EAPI=5
+HOMEPAGE=http://code.haskell.org/encoding/
+IUSE=+systemencoding doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=<dev-haskell/binary-0.8:=[profile?] dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/haxml-1.22:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.0.2
+SRC_URI=mirror://hackage/packages/archive/encoding/0.7.0.2/encoding-0.7.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=40e64713a965c0ba78efa5bbd4a7708f
diff --git a/dev-haskell/encoding-0.8 b/dev-haskell/encoding-0.8
new file mode 100644
index 000000000000..ff8937db3c62
--- /dev/null
+++ b/dev-haskell/encoding-0.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=<dev-haskell/binary-0.8:=[profile?] dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/haxml-1.22:=[profile?] <dev-haskell/haxml-1.26:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A library for various character encodings
+EAPI=5
+HOMEPAGE=http://code.haskell.org/encoding/
+IUSE=+systemencoding doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=<dev-haskell/binary-0.8:=[profile?] dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/haxml-1.22:=[profile?] <dev-haskell/haxml-1.26:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.8
+SRC_URI=mirror://hackage/packages/archive/encoding/0.8/encoding-0.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9bf01155be9f42419631d90213145fa5
diff --git a/dev-haskell/encoding-0.8.1 b/dev-haskell/encoding-0.8.1
new file mode 100644
index 000000000000..6d387a8662a3
--- /dev/null
+++ b/dev-haskell/encoding-0.8.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/binary:=[profile?] dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/haxml-1.22:=[profile?] <dev-haskell/haxml-1.26:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A library for various character encodings
+EAPI=6
+HOMEPAGE=http://code.haskell.org/encoding/
+IUSE=+systemencoding doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/binary:=[profile?] dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/haxml-1.22:=[profile?] <dev-haskell/haxml-1.26:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.8.1
+SRC_URI=mirror://hackage/packages/archive/encoding/0.8.1/encoding-0.8.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=802f25cfccac0fb2bab93080bca52585
diff --git a/dev-haskell/encoding/Manifest b/dev-haskell/encoding/Manifest
deleted file mode 100644
index 5a8f37f75ecc..000000000000
--- a/dev-haskell/encoding/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST encoding-0.6.7.2.tar.gz 832564 BLAKE2B b61a113be8ac4d26c85343d5e459c35a4cdf35ceea734370b12816e3c16b748b7c47d4720db2263f74952006802be2d735a15a9e8cd8709a925d58ad6ea87945 SHA512 2a258cb20d49ddc3f1c78f7392e4440d503774680f0da0d297ce27466bace8303b1364e9b4fc5937ca6b1753d0648a6ff8cfc99dd77d52d851dfe9e0481a3cb2
-DIST encoding-0.7.0.2.tar.gz 320988 BLAKE2B f1fdef3e4b9d247c03f9669b7506cbd9082acdd85bd2d96e988c8731b3e9c774bb498717e49089cf4030d50a94e24bc461d65ef3923a14a0212d4e8741547c91 SHA512 60ede0397d68bcea292ed9fb09fe2bafcbc0afdd7d374b098049afe9a7146cc4be5615a83dbfb13c1a44db2e52a77f231fbac3ab2249398d3fb9921041aadd04
-DIST encoding-0.8.1.tar.gz 1034198 BLAKE2B 67bcc5c36698e21eeb827d19585bafe4a8ce599703863295097c83b1c6908bec82bcf98c2d9b9c4ea492bfd79435d064330a7d1d1e57f7d7ea27f587145bcbbb SHA512 f77088138888673f0802b57cba3f14cf84a1bee15ad013a1335d8a9e8d7206d716078c3b2ab299545f49174d9de9db4c67089f1b01664c86337c31ec91c5cf46
-DIST encoding-0.8.tar.gz 321410 BLAKE2B ee87c14457c3474c571ebe25b5f98d50713b85666aeb5e099767d787bfaa9b10d03feb0e596c6c93ddf68bfc583285971f30d8e526cdc12d7570ae63b9b80f77 SHA512 c1f05333fa34eb0dc9ed1e1c82bc4d84e9fb3d0252a45519998a199ef1eafd49e9dea7ad60e8ae855b4efdaf4977f8a9aa6324d7b73bfd122bdef60341dea1e0
-EBUILD encoding-0.6.7.2-r2.ebuild 1003 BLAKE2B bef3b2088bfa14b30ded15a5b260d613afaabd0faadd6a3ee8406ef91ccb5b3f969b307b1c0082cfc79baaea63faf9c2a133eb81d29f1d2be158d8371b99192f SHA512 83b5d6aeb5daa1ba4d8778b94e17aa7e60be57ff1945e21a800edabc008f368aa4da69fccb83e21b5237271abb6d53942d1590968240e149c44fc2821f1bf6c4
-EBUILD encoding-0.7.0.2-r1.ebuild 927 BLAKE2B 09711e82a163ad844bee67ef0e09faff59454f2b3dfa5d3ce04d4cdf89ef52bd2ce453b661ddae2c7e46d1b6f27e5b41ad280ecf612c98ad5f1a829e25a10c2b SHA512 c2dea76ea8fd8f0f070cc39d998033c68341110f939b550ff19484eadcc300cb57e452ebd657c6b6ebf82b1d8ed298284eb84ef50b4e7f34b9bbb82a0849164d
-EBUILD encoding-0.8.1.ebuild 948 BLAKE2B c205373a7d6b77f49ca544eb9eb29db2095f3cd62952ba37129a5ae5536a7ff5bac5f775cf33b001a88bbf6ac4abf247d8724501ec834e85921cfeca7d365b10 SHA512 af03fb54c34117d81f6a51b6003794b8a8f8dc2144bc4f4bc99ee105caa58ea86425403083adaefb8a747b0538ea81db2fc7fa2408961c2df716cadbc6f30d35
-EBUILD encoding-0.8.ebuild 882 BLAKE2B ce1a2fca36b28e5e08e4477d11354f7a53c0a1da331ce93b4596eba58945ffe23b56d287f820ef56f2b5837fb419ca548777fe40d802d51180548ea6347e65cd SHA512 741f00ec6eb13c79436bbabd5ceb18b9bfc12bbf7115fcf3bc1ed5427bd7927d958ab537f2bb1408cc5ce2f88508d11ee7df3f7675b8534a19dd530a422ec107
-MISC metadata.xml 676 BLAKE2B e2bfda2c8e81fdbb369a7a99d555ab71d7cdd93517bc54a4f399d3ae9dafc384d1921a0f0e78f9b738bb0d72cbb9814ea75613b4ffaec0ff2615141b5f795014 SHA512 86d83b18876390cb974df3ea61782f32b5e8c893877664e7e9722e6ad5d596c2b6454c60fe6537c2c2492f9fa28d614fe0c473a5bc702a21632210f516328d3c
diff --git a/dev-haskell/encoding/encoding-0.6.7.2-r2.ebuild b/dev-haskell/encoding/encoding-0.6.7.2-r2.ebuild
deleted file mode 100644
index f6bf2eede29c..000000000000
--- a/dev-haskell/encoding/encoding-0.6.7.2-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A library for various character encodings"
-HOMEPAGE="http://code.haskell.org/encoding/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/binary:=[profile?]
-		dev-haskell/extensible-exceptions:=[profile?]
-		>=dev-haskell/haxml-1.22:=[profile?]
-		<dev-haskell/haxml-1.25:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		dev-haskell/regex-compat:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	cabal_chdeps \
-		'binary < 0.6' 'binary' \
-		'HaXml >= 1.22 && < 1.24' 'HaXml >= 1.22 && < 1.25'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=systemencoding \
-		--flag=newghc \
-		--flag=splitbase
-}
diff --git a/dev-haskell/encoding/encoding-0.7.0.2-r1.ebuild b/dev-haskell/encoding/encoding-0.7.0.2-r1.ebuild
deleted file mode 100644
index 52035758bb4b..000000000000
--- a/dev-haskell/encoding/encoding-0.7.0.2-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A library for various character encodings"
-HOMEPAGE="http://code.haskell.org/encoding/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+systemencoding"
-
-RDEPEND="<dev-haskell/binary-0.8:=[profile?]
-	dev-haskell/extensible-exceptions:=[profile?]
-	>=dev-haskell/haxml-1.22:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/regex-compat:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'HaXml >= 1.22 && < 1.25' 'HaXml >= 1.22'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag systemencoding systemencoding)
-}
diff --git a/dev-haskell/encoding/encoding-0.8.1.ebuild b/dev-haskell/encoding/encoding-0.8.1.ebuild
deleted file mode 100644
index d24729222a44..000000000000
--- a/dev-haskell/encoding/encoding-0.8.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A library for various character encodings"
-HOMEPAGE="http://code.haskell.org/encoding/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+systemencoding"
-
-RDEPEND="dev-haskell/binary:=[profile?]
-	dev-haskell/extensible-exceptions:=[profile?]
-	>=dev-haskell/haxml-1.22:=[profile?] <dev-haskell/haxml-1.26:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/regex-compat:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'binary < 0.8' 'binary'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag systemencoding systemencoding)
-}
diff --git a/dev-haskell/encoding/encoding-0.8.ebuild b/dev-haskell/encoding/encoding-0.8.ebuild
deleted file mode 100644
index 63792654b53c..000000000000
--- a/dev-haskell/encoding/encoding-0.8.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A library for various character encodings"
-HOMEPAGE="http://code.haskell.org/encoding/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+systemencoding"
-
-RDEPEND="<dev-haskell/binary-0.8:=[profile?]
-	dev-haskell/extensible-exceptions:=[profile?]
-	>=dev-haskell/haxml-1.22:=[profile?] <dev-haskell/haxml-1.26:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/regex-compat:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag systemencoding systemencoding)
-}
diff --git a/dev-haskell/encoding/metadata.xml b/dev-haskell/encoding/metadata.xml
deleted file mode 100644
index 91bcaa50b9b3..000000000000
--- a/dev-haskell/encoding/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haskell has excellect handling of unicode, the Char type covers all unicode chars. Unfortunatly, there's no possibility to read or write something to the outer world in an encoding other than ascii due to the lack of support for encodings. This library should help with that.
-	</longdescription>
-	<use>
-		<flag name="systemencoding">Provide the getSystemEncoding action to query the locale.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/entropy-0.2.2.4 b/dev-haskell/entropy-0.2.2.4
new file mode 100644
index 000000000000..d2c20c234a98
--- /dev/null
+++ b/dev-haskell/entropy-0.2.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A platform independent entropy source
+EAPI=5
+HOMEPAGE=https://github.com/TomMD/entropy
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.2.2.4
+SRC_URI=mirror://hackage/packages/archive/entropy/0.2.2.4/entropy-0.2.2.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e940b354c702805e8810732fb769ea1e
diff --git a/dev-haskell/entropy-0.3.7 b/dev-haskell/entropy-0.3.7
new file mode 100644
index 000000000000..1d06b95d49f3
--- /dev/null
+++ b/dev-haskell/entropy-0.3.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A platform independent entropy source
+EAPI=5
+HOMEPAGE=https://github.com/TomMD/entropy
+IUSE=halvm doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.7
+SRC_URI=mirror://hackage/packages/archive/entropy/0.3.7/entropy-0.3.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=96fb61d804996d54d6998d82fd3a8b18
diff --git a/dev-haskell/entropy/Manifest b/dev-haskell/entropy/Manifest
deleted file mode 100644
index a34923df1b3f..000000000000
--- a/dev-haskell/entropy/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST entropy-0.2.2.4.tar.gz 5107 BLAKE2B 646367fe9c067dae74a132488152ec04f8c3d1e6b58ea900be25c31ca860349a84bd0207723410125e28a84348a5350d986d4c0d3207377a49a09e17797614cb SHA512 257289daadb414ba82d7e18cadfc4e8a654297746984d22a7f202054271f4e19c29d4194cf21b3dadfd06f10d96bc6a29f909d4bd36a98eb18bdae4a13e56b49
-DIST entropy-0.3.7.tar.gz 6498 BLAKE2B 07e73ab051f55b2eebc0b5f3071615869ac447955984dbb8eab45d0fe05401204f4ae7803866ef1952a5bac363c349edb1133fb730557784807978cefee00731 SHA512 920521a35cba9c627ee97daa9675ad1764ac91762800371cc9e491320afeae7994a431ea6938cb7464a0e6affc274a24148c405d7eca2d401d925cc2e2a84f85
-EBUILD entropy-0.2.2.4.ebuild 543 BLAKE2B 1f6c6d5e62aa7d48796fdb67a90c4ebbf142579bd14ef2065e22b07168935521a2ac63920116c80c2f31e5db92efa47119fc9eedb914bbfc3a59fa67fa0ad58d SHA512 104938f2615ec6d06b5502d74c601ebc5d55d9dfaf8071e57cdc71631dc321cbe8af1a1ece8bdec4c0621793a89acbebe6e8fc8c96718eb0014a36c3867739c2
-EBUILD entropy-0.3.7.ebuild 638 BLAKE2B af1794ca97439c2065ef599163136dd89890b9854625ab036bcc66a0a01342a6cd340a625cf83b44fb83fde795a941dcce5e8f0ebbc3e6146da816768d20b99f SHA512 3dd64a236da95d3fd8bfbc564b1060f4b5b2babfd9b22b9d5443e1355cf87efefe3beb948cfdf017816fa63c514847ccd8961d3929dac538f5090290bc967650
-MISC metadata.xml 712 BLAKE2B 5d798b692bf1613cfff18c7044167b83a8706f240b7b95a2e05beb377a5436f0c4815375a0f47fecd26d24c90afd00610377192bc8f5f85874b5aa285f682d41 SHA512 252102b1a14184782b09ed964d7bca68e3500e265109419dba201279b6b9e18be73d651e347fee6a6a550d9506f5517e10a24e5763e68edbbd1c523754f261f0
diff --git a/dev-haskell/entropy/entropy-0.2.2.4.ebuild b/dev-haskell/entropy/entropy-0.2.2.4.ebuild
deleted file mode 100644
index a9d4a487eb18..000000000000
--- a/dev-haskell/entropy/entropy-0.2.2.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A platform independent entropy source"
-HOMEPAGE="https://github.com/TomMD/entropy"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/entropy/entropy-0.3.7.ebuild b/dev-haskell/entropy/entropy-0.3.7.ebuild
deleted file mode 100644
index 1b27b7ddb832..000000000000
--- a/dev-haskell/entropy/entropy-0.3.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A platform independent entropy source"
-HOMEPAGE="https://github.com/TomMD/entropy"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 x86"
-IUSE="halvm"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag halvm halvm)
-}
diff --git a/dev-haskell/entropy/metadata.xml b/dev-haskell/entropy/metadata.xml
deleted file mode 100644
index 8df01852a805..000000000000
--- a/dev-haskell/entropy/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A platform independent method to obtain cryptographically strong entropy
-		(RDRAND when available anywhere, urandom on nix, CryptAPI on Windows, patches welcome).
-		Users looking for cryptographically strong (number-theoretically
-		sound) PRNGs should see the 'DRBG' package too.
-	</longdescription>
-	<use>
-		<flag name="halvm">Build for the HaLVM.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">TomMD/entropy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/enumerator-0.4.20 b/dev-haskell/enumerator-0.4.20
new file mode 100644
index 000000000000..7e133e0c915d
--- /dev/null
+++ b/dev-haskell/enumerator-0.4.20
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Reliable, high-performance processing with left-fold enumerators
+EAPI=5
+HOMEPAGE=https://john-millikin.com/software/enumerator/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.4.20
+SRC_URI=mirror://hackage/packages/archive/enumerator/0.4.20/enumerator-0.4.20.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c66fe4f758ed6946d861f02fcaff6b71
diff --git a/dev-haskell/enumerator/Manifest b/dev-haskell/enumerator/Manifest
deleted file mode 100644
index a6ecea467f1c..000000000000
--- a/dev-haskell/enumerator/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST enumerator-0.4.20.tar.gz 53986 BLAKE2B dcb98c31e862194f712c2fe23193557c837d5ba658b89ea50005c2e62d2080d06740793fd4e4629d8dab5000062ef2e3908fea7071ca499e8a2e3f7ca0c1d085 SHA512 90711142b61cee2184420f4d5c9de9563afe6198cccbf5d9d8a75253b307c3df9fee388dc7770e8151f8d7b5570afdb30d8e4e597ce462302dda8430e64050ad
-EBUILD enumerator-0.4.20.ebuild 665 BLAKE2B 3a47e7691d1ed71e065d6ccce09c4f5636a10ba223b8b924d5a47beb62803fa069f8c938675a97ba4b4a6aa3a3f25ef4e4ff361125f8b062a5cc56658d695f79 SHA512 38e7d2fc4d7e078a53c9e6f9d9ea5136378a80d34a30aee14dba2ec98a8ca7d1adc42b360b6441fe6be4e87916b63a31b164c0c07e524da8b5dbb45285ed69f3
-MISC metadata.xml 2363 BLAKE2B ad70878e500caef88e6553e1c5954c424fc4fa26c8c7ad7ea9342ceaf14bd3721ecb05a91b2f586c09531bfd466bd92f6091de9319316679133c6c39a3f4f528 SHA512 94791c84968b175f7a28590522a264efc960277a56a61d18305d0e944b48d7e0b38f40f97932a152e5d501315c514e9db36cb9b36464045c65d5f07dd1ca9b16
diff --git a/dev-haskell/enumerator/enumerator-0.4.20.ebuild b/dev-haskell/enumerator/enumerator-0.4.20.ebuild
deleted file mode 100644
index 6c4fd6b7b874..000000000000
--- a/dev-haskell/enumerator/enumerator-0.4.20.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Reliable, high-performance processing with left-fold enumerators"
-HOMEPAGE="https://john-millikin.com/software/enumerator/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/enumerator/metadata.xml b/dev-haskell/enumerator/metadata.xml
deleted file mode 100644
index 53f0dd6438fd..000000000000
--- a/dev-haskell/enumerator/metadata.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Typical buffer&amp;#x2013;based incremental I/O is based around a single loop,
-		which reads data from some source (such as a socket or file), transforms
-		it, and generates one or more outputs (such as a line count, HTTP
-		responses, or modified file). Although efficient and safe, these loops are
-		all single&amp;#x2013;purpose; it is difficult or impossible to compose
-		buffer&amp;#x2013;based processing loops.
-		
-		Haskell&amp;#x2019;s concept of &amp;#x201C;lazy I/O&amp;#x201D; allows pure code to
-		operate on data from an external source. However, lazy I/O has several
-		shortcomings. Most notably, resources such as memory and file handles can
-		be retained for arbitrarily long periods of time, causing unpredictable
-		performance and error conditions.
-		
-		Enumerators are an efficient, predictable, and safe alternative to lazy
-		I/O. Discovered by Oleg Kiselyov, they allow large datasets to be processed
-		in near&amp;#x2013;constant space by pure code. Although somewhat more complex
-		to write, using enumerators instead of lazy I/O produces more correct
-		programs.
-		
-		This library contains an enumerator implementation for Haskell, designed to
-		be both simple and efficient. Three core types are defined, along with
-		numerous helper functions:
-		
-		* /Iteratee/: Data sinks, analogous to left folds. Iteratees consume
-		a sequence of /input/ values, and generate a single /output/ value.
-		Many iteratees are designed to perform side effects (such as printing to
-		@stdout@), so they can also be used as monad transformers.
-		
-		* /Enumerator/: Data sources, which generate input sequences. Typical
-		enumerators read from a file handle, socket, random number generator, or
-		other external stream. To operate, enumerators are passed an iteratee, and
-		provide that iteratee with input until either the iteratee has completed its
-		computation, or EOF.
-		
-		* /Enumeratee/: Data transformers, which operate as both enumerators and
-		iteratees. Enumeratees read from an /outer/ enumerator, and provide the
-		transformed data to an /inner/ iteratee.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/equivalence-0.2.5 b/dev-haskell/equivalence-0.2.5
new file mode 100644
index 000000000000..b921283595fa
--- /dev/null
+++ b/dev-haskell/equivalence-0.2.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/stmonadtrans:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 test? ( >=dev-haskell/quickcheck-2 dev-haskell/test-framework dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Maintaining an equivalence relation implemented as union-find using STT
+EAPI=5
+HOMEPAGE=https://bitbucket.org/paba/equivalence/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/stmonadtrans:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.5
+SRC_URI=mirror://hackage/packages/archive/equivalence/0.2.5/equivalence-0.2.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f0701c2f9956b0da0a7d1501accb53bd
diff --git a/dev-haskell/equivalence-0.3.1 b/dev-haskell/equivalence-0.3.1
new file mode 100644
index 000000000000..b42bf5ac35b8
--- /dev/null
+++ b/dev-haskell/equivalence-0.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.0.1:=[profile?] dev-haskell/stmonadtrans:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 test? ( >=dev-haskell/quickcheck-2 dev-haskell/test-framework dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Maintaining an equivalence relation implemented as union-find using STT
+EAPI=5
+HOMEPAGE=https://bitbucket.org/paba/equivalence/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-2.0.1:=[profile?] dev-haskell/stmonadtrans:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.1
+SRC_URI=mirror://hackage/packages/archive/equivalence/0.3.1/equivalence-0.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9cf4a5ddf9f31c628066a93567e09f13
diff --git a/dev-haskell/equivalence/Manifest b/dev-haskell/equivalence/Manifest
deleted file mode 100644
index a32551b18166..000000000000
--- a/dev-haskell/equivalence/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST equivalence-0.2.5.tar.gz 8013 BLAKE2B c5485fd7a8d4dd047b743c2821cd71fb8b5b278c10f47cd27d23b96286a6edb1675568b721f93d8ff06ba6aaee3f268db177eff7cd01ed825392cd9805f58600 SHA512 6417a8698826458b172fc5556b472f5ae06b29a8d2b54e7ea10d6665eb7a1691dc9d92d56a1b93b43d4ef3f71188b8878f8a43a123c9b6ad3641e4848a20d676
-DIST equivalence-0.3.1.tar.gz 8350 BLAKE2B 2c2b929f6abe9b38d834d854f3144a60e7173d7f4fdc30aab39050d7f054165da4f457b3aeba213e9d5508422dd4ba9d3b0311767bcd15e3bd9570f024979f6d SHA512 5d6f6adc2d31c48520c2120503b4a21e18044dbe75f3dddd5af188213887c714370b09c776c44c2eaabf41226719f6eb6f6bbc04eab558879d61157a67b2549e
-EBUILD equivalence-0.2.5.ebuild 770 BLAKE2B 8f2a64f21811f03ce5ea3dff34eca5f197d7943168cfadee78a3562901e08e64bd1e267eb6866c0480c2a7b038f41e4ebcdff1c771b25d1236b5cc7522706405 SHA512 a448c0bb4f4ab45f2e5df4f3894bb6139039ee82446e5e761da06a9fb1562c4db6feff5b7ea39c19c9e0b8bef3bbe4b845015ae435ceaa2c79790b1e2effb662
-EBUILD equivalence-0.3.1.ebuild 873 BLAKE2B 0b92429677f75294bf8b6d95888eb19fafd9c4f7aa92c13181ac239a983dede94ac6a60c20244203a6b1baff00b46342a604233debf6596416ae90b4871de6de SHA512 8ed346706749d9b771077bec9a23402acbf7f2a2c291c99f697ef63b804147966f99e172c4e585ba41c509cd1a48621b2a66599df0b4cdf73eadf1032cf6834d
-MISC metadata.xml 701 BLAKE2B a2f9d19b1f32744ff206d3445d0dc09c9a0fb9a51d3d748d5888899605a00e9d746666693329d1aec672ecafc1e8ffe8b7ca155d3775f694d9137ca510ac8c98 SHA512 4cf400a9dcf64de802d636d1852f9418db899922db765e318c6f77723f2ddb51803b97d3530176609082127fb38568e278e3696d5d1bf428490d4855e787bb69
diff --git a/dev-haskell/equivalence/equivalence-0.2.5.ebuild b/dev-haskell/equivalence/equivalence-0.2.5.ebuild
deleted file mode 100644
index bf92f9027f0c..000000000000
--- a/dev-haskell/equivalence/equivalence-0.2.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Maintaining an equivalence relation implemented as union-find using STT"
-HOMEPAGE="https://bitbucket.org/paba/equivalence/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/stmonadtrans:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( >=dev-haskell/quickcheck-2
-		dev-haskell/test-framework
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/equivalence/equivalence-0.3.1.ebuild b/dev-haskell/equivalence/equivalence-0.3.1.ebuild
deleted file mode 100644
index 444d5c811672..000000000000
--- a/dev-haskell/equivalence/equivalence-0.3.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Maintaining an equivalence relation implemented as union-find using STT"
-HOMEPAGE="https://bitbucket.org/paba/equivalence/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.0.1:=[profile?]
-	dev-haskell/stmonadtrans:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( >=dev-haskell/quickcheck-2
-		dev-haskell/test-framework
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/equivalence/metadata.xml b/dev-haskell/equivalence/metadata.xml
deleted file mode 100644
index b9608bc6a2af..000000000000
--- a/dev-haskell/equivalence/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This is an implementation of Tarjan's Union-Find algorithm (Robert
-		E. Tarjan. "Efficiency of a Good But Not Linear Set Union
-		Algorithm", JACM 22(2), 1975) in order to maintain an equivalence
-		relation.
-		This implementation is a port of the /union-find/ package using the
-		ST monad transformer (instead of the IO monad).
-	</longdescription>
-	<upstream>
-		<remote-id type="bitbucket">paba/equivalence</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/erf-2.0.0.0-r1 b/dev-haskell/erf-2.0.0.0-r1
new file mode 100644
index 000000000000..b42e12851d77
--- /dev/null
+++ b/dev-haskell/erf-2.0.0.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= dev-haskell/cabal doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=The error function, erf, and related functions
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/erf
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/2.0.0.0
+SRC_URI=mirror://hackage/packages/archive/erf/2.0.0.0/erf-2.0.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8a798d4b2640258a79d0a358e1b30019
diff --git a/dev-haskell/erf/Manifest b/dev-haskell/erf/Manifest
deleted file mode 100644
index a8b83732846f..000000000000
--- a/dev-haskell/erf/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST erf-2.0.0.0.tar.gz 1918 BLAKE2B 20cdbde143001196e96bf3bac9a4cff81c96369a34d8e76b43ee7d2ed3ed1d2553d1c6a67eb9e1d678b5e983581fb46028a099fdd7f4733d0dea472ab82ae904 SHA512 0803d78cbb4324c06174ec2162fb8408120acd7c644889fef51089de51c8165b075c6ea72d039e438ebf54ac5b8a0c0d6484077454e524fc1184cf82b778a0b1
-EBUILD erf-2.0.0.0-r1.ebuild 550 BLAKE2B fef2257ca6ff892be2a33f601446fbd9e6123ab883ba7cb2868ae3f31839ec9b107113056dd90871ba3498a81e6f286eff67958dd3ecba9cde205872c4cfa545 SHA512 c44f510ac8311844df2c782be9b40d8c846469c58256312c6453398a84a11a50ad5d58dd0088c7a635752ab0fe7a718dd370b8762157693a467b12c0d65c7d55
-MISC metadata.xml 389 BLAKE2B 8342b0efe9a4e9928c37686413ad376620815f89c054870fdbd921f519a81f4c9c7271b008db392a5b90f5d0fd465912082bda09aa3d77cb5c7236098de84687 SHA512 50d4490ec16d9a4c4a2ee8624a0621bf3ca47a4671967ee73bb6bd8bb7c0821f66329b0c7913a71a268f465583b4e8bf0eca6ad0ec7192227b61edad53b5a10e
diff --git a/dev-haskell/erf/erf-2.0.0.0-r1.ebuild b/dev-haskell/erf/erf-2.0.0.0-r1.ebuild
deleted file mode 100644
index 9ef16e99f922..000000000000
--- a/dev-haskell/erf/erf-2.0.0.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="The error function, erf, and related functions"
-HOMEPAGE="http://hackage.haskell.org/package/erf"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/cabal
-"
diff --git a/dev-haskell/erf/metadata.xml b/dev-haskell/erf/metadata.xml
deleted file mode 100644
index e039fc167968..000000000000
--- a/dev-haskell/erf/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A type class for the error function, erf, and related functions.
-		Instances for Float and Double.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/errorcall-eq-instance-0.1.0 b/dev-haskell/errorcall-eq-instance-0.1.0
new file mode 100644
index 000000000000..e65ec61c4e16
--- /dev/null
+++ b/dev-haskell/errorcall-eq-instance-0.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.5 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An orphan Eq instance for ErrorCall
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/errorcall-eq-instance
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.1.0
+SRC_URI=mirror://hackage/packages/archive/errorcall-eq-instance/0.1.0/errorcall-eq-instance-0.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fda1b87598d072ee43b349bd0f8ba05f
diff --git a/dev-haskell/errorcall-eq-instance/Manifest b/dev-haskell/errorcall-eq-instance/Manifest
deleted file mode 100644
index 13b0952f62d5..000000000000
--- a/dev-haskell/errorcall-eq-instance/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST errorcall-eq-instance-0.1.0.tar.gz 1629 BLAKE2B 052a614678a72d1bc5c5b5b71e07a9a51a80247f91256bd247981dda3fb162b7b948104222b4ae43f923feb6ec21035bc73dc0b8405409a3f46e12bcc6648ae5 SHA512 313f3537a927c606aaf9df1078c1da23ea8173f2a06d5c0a834ab6826fd8aea86469ac866bd292d2864afbd228d5b5365929d1c7a09defd3b7f21ac685a4d082
-EBUILD errorcall-eq-instance-0.1.0.ebuild 633 BLAKE2B e12b9b49c40ad8cefc6d4489b0a1034f5ec7721d587807a1547ba4f4e080d21cf360ba6530048b9ccdea96f2c650a4e06acf14a9e94cd6642af56f60d0ced23a SHA512 bd65af96302c192b5701b4401f7a8cb04f93136109ab2a620787592b357d9aa9d4c5830a78a73c2c129f1c152d0b1ac8f02c8c3f5e2264aa75c3e97a88884fb3
-MISC metadata.xml 403 BLAKE2B d91f6c24dcbadbd55fc00ce8c51fa9df861b025124d679850dd10e79c9ae8676d2a58c194791743c8c16893be9562674e5e112ea7672b4579d3e2804864205b0 SHA512 2db46308a0fb8d443c6369bb1275709cb975a0900552d0d0752c8bc6e689929d4e666428903aa914129f2cb8f493d379786adbcc38f4813e7b31aebc5cff6277
diff --git a/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.1.0.ebuild b/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.1.0.ebuild
deleted file mode 100644
index e8d6bff0df50..000000000000
--- a/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An orphan Eq instance for ErrorCall"
-HOMEPAGE="http://hackage.haskell.org/package/errorcall-eq-instance"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.5
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/errorcall-eq-instance/metadata.xml b/dev-haskell/errorcall-eq-instance/metadata.xml
deleted file mode 100644
index 0dc85cfde05d..000000000000
--- a/dev-haskell/errorcall-eq-instance/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Prior to @base-4.7.0.0@ there was no @Eq@ instance for
-		@ErrorCall@.  This package provides an orphan instance.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/errors-1.4.7 b/dev-haskell/errors-1.4.7
new file mode 100644
index 000000000000..3e6e341c27e8
--- /dev/null
+++ b/dev-haskell/errors-1.4.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/either-3.1:=[profile?] <dev-haskell/either-5:=[profile?] >=dev-haskell/safe-0.3.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simplified error-handling
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/errors
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/either-3.1:=[profile?] <dev-haskell/either-5:=[profile?] >=dev-haskell/safe-0.3.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.4.7
+SRC_URI=mirror://hackage/packages/archive/errors/1.4.7/errors-1.4.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=466e22beab61ada1d8ec04c138fc5baa
diff --git a/dev-haskell/errors-2.1.3 b/dev-haskell/errors-2.1.3
new file mode 100644
index 000000000000..babc349a84f3
--- /dev/null
+++ b/dev-haskell/errors-2.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/safe-0.3.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-haskell/unexceptionalio-0.3:=[profile?] <dev-haskell/unexceptionalio-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simplified error-handling
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/errors
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/safe-0.3.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-haskell/unexceptionalio-0.3:=[profile?] <dev-haskell/unexceptionalio-0.4:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/2.1.3
+SRC_URI=mirror://hackage/packages/archive/errors/2.1.3/errors-2.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9c592ca173ed0c3231fb1ae00f8db534
diff --git a/dev-haskell/errors/Manifest b/dev-haskell/errors/Manifest
deleted file mode 100644
index 51afe5b9c63f..000000000000
--- a/dev-haskell/errors/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST errors-1.4.7.tar.gz 7922 BLAKE2B 40bd2019f87df2fae5af82fad574375fed6717787fad84c5da74696c827a954e88059db771a06f07de3ab1b99757d26e4b345f030e3b5f9a5814eb531a0cdb42 SHA512 14873d32c744758000c6c8eb954aa659a57d78a32519d88e80e0f5b34a3f528e64293703da950475d89db2f79a7f2c80bc46a8824fee91cf3fe5668bda22a77c
-DIST errors-2.1.3.tar.gz 8559 BLAKE2B cd350d74d7836432dd5a204a4a3f5fe915a050979fe9053be6282f59f2f77c63159544221541b64aea806fcaeabe5f81ea2196347bb9e422c6c1458f13ff9ed3 SHA512 8950d043b883395a69ccab6b655219d035ff3b4a22911a23d54834642cc5c98b5044b7aee170dd004f86b3b8c7e991ceddfeae87ed592e7d5e1cd6e44c4e0144
-EBUILD errors-1.4.7.ebuild 770 BLAKE2B 9f50c42941dc77dec925c1b0eef9bf65136ffbdee3db76e527c748871f8466d79b31aa55cb75711510066dca2f07e794d75f6c66c5fa474efa07b6c250c1040a SHA512 be376d721b858e86b3c63510172a7f66792b0096210fd2cf08d274ea64d7d14493a16d1436a87ab74777a03e52a76457d07a5eeefe578c0576e24dd901b60111
-EBUILD errors-2.1.3.ebuild 807 BLAKE2B 109c1d64ace2fc4c5932752d9985e3857868134a6cc453a37a556828f49e772050c0f51b5f93196ce0883a504e9600558751e519b6dc2d2ec468ac53d83a3f0e SHA512 237d4c450db677a247be3efbbc5d7d62fecab7feda4ed7a3f9fa8e3d1f688c1e7cff059f9c6e0b06fc0bd40be48ef0bf8141611ffa03d9ba4a7b9bd4a167b76e
-MISC metadata.xml 502 BLAKE2B 3c097e09a0f3cd40d27ba7bb9484b3dd44b6dcc61147fbc49fb885bcab850810895e0ac0f2a749d2981420d534a2fbfd0e3b89c5a39f7428f644e99bbd58e552 SHA512 6b581bdc7ed765ecdef99407f3b1be3c97d42826f7605c40241fcf9e922a05db13d1cc894b241a6692b83087398ebbb2e73a963c5d53f1b7979b6ef3f5505d1a
diff --git a/dev-haskell/errors/errors-1.4.7.ebuild b/dev-haskell/errors/errors-1.4.7.ebuild
deleted file mode 100644
index 617938b21a1c..000000000000
--- a/dev-haskell/errors/errors-1.4.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simplified error-handling"
-HOMEPAGE="http://hackage.haskell.org/package/errors"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/either-3.1:=[profile?] <dev-haskell/either-5:=[profile?]
-	>=dev-haskell/safe-0.3.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/errors/errors-2.1.3.ebuild b/dev-haskell/errors/errors-2.1.3.ebuild
deleted file mode 100644
index 938612cc31bd..000000000000
--- a/dev-haskell/errors/errors-2.1.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simplified error-handling"
-HOMEPAGE="http://hackage.haskell.org/package/errors"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/safe-0.3.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-haskell/unexceptionalio-0.3:=[profile?] <dev-haskell/unexceptionalio-0.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/errors/metadata.xml b/dev-haskell/errors/metadata.xml
deleted file mode 100644
index 05963a52954f..000000000000
--- a/dev-haskell/errors/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The one-stop shop for all your error-handling needs!  Just import
-		"Control.Error".
-		
-		This library encourages an error-handling style that directly uses the type
-		system, rather than out-of-band exceptions.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/esqueleto-2.1.3 b/dev-haskell/esqueleto-2.1.3
new file mode 100644
index 000000000000..4daab8995b94
--- /dev/null
+++ b/dev-haskell/esqueleto-2.1.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/conduit-1.1:=[profile?] dev-haskell/monad-logger:=[profile?] >=dev-haskell/persistent-2.1.1.7:=[profile?] <dev-haskell/persistent-2.2:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] >=dev-haskell/tagged-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.8 dev-haskell/hunit dev-haskell/monad-control >=dev-haskell/monad-logger-0.3 >=dev-haskell/persistent-sqlite-2.1 <dev-haskell/persistent-sqlite-2.2 >=dev-haskell/persistent-template-2.1 <dev-haskell/persistent-template-2.2 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Type-safe EDSL for SQL queries on persistent backends
+EAPI=5
+HOMEPAGE=https://github.com/prowdsponsor/esqueleto
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/conduit-1.1:=[profile?] dev-haskell/monad-logger:=[profile?] >=dev-haskell/persistent-2.1.1.7:=[profile?] <dev-haskell/persistent-2.2:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] >=dev-haskell/tagged-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/2.1.3
+SRC_URI=mirror://hackage/packages/archive/esqueleto/2.1.3/esqueleto-2.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2949073e00da3e43b626bf2315de9d1f
diff --git a/dev-haskell/esqueleto-2.4.3-r1 b/dev-haskell/esqueleto-2.4.3-r1
new file mode 100644
index 000000000000..53afb42ce1a1
--- /dev/null
+++ b/dev-haskell/esqueleto-2.4.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/blaze-html:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] dev-haskell/monad-logger:=[profile?] >=dev-haskell/persistent-2.1.1.7:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] >=dev-haskell/tagged-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.8 dev-haskell/hunit dev-haskell/monad-control >=dev-haskell/monad-logger-0.3 >=dev-haskell/persistent-sqlite-2.1 >=dev-haskell/persistent-template-2.1 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Type-safe EDSL for SQL queries on persistent backends
+EAPI=6
+HOMEPAGE=https://github.com/prowdsponsor/esqueleto
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/blaze-html:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] dev-haskell/monad-logger:=[profile?] >=dev-haskell/persistent-2.1.1.7:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] >=dev-haskell/tagged-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.4.3
+SRC_URI=mirror://hackage/packages/archive/esqueleto/2.4.3/esqueleto-2.4.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d1eaebdcc65d7d37839566b0a8c78c21
diff --git a/dev-haskell/esqueleto/Manifest b/dev-haskell/esqueleto/Manifest
deleted file mode 100644
index 760b0aaeedef..000000000000
--- a/dev-haskell/esqueleto/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX esqueleto-2.4.3-persistent-2.5.patch 6114 BLAKE2B 594cb0dfd2f6e6fb5ac28df75a1e6451bee2483036f5e465fbcb6bcbc98a10214fa7ec534558022b60096b849e68440060f8c1b4f95c235691a4b32b4d2e05d7 SHA512 a229ebc9e9f513102324e78641a4eb4e86d9fa87764f2f88fdf8512d96c6eb223ad870d20dcd0c7805d3a695cebb7e03bb3912421fa25cd7647d804b21320b65
-DIST esqueleto-2.1.3.tar.gz 33024 BLAKE2B 3d028c495f44ba3757ee5b9df463d35c4fad382ad4cb980877cd6589981dd0e2fb219944830e0a3d1f5426e9773416178b3781b1aaee340cb8b491549689af15 SHA512 b0508daec0f248458581155c731d307f039d04fae7e76697d2a8bb8498a5072b31499d1d3b041314b34b4034e4357e10323483d04f7ce3218da7489a00683fbc
-DIST esqueleto-2.4.3.tar.gz 39664 BLAKE2B 03f56caca53815bf751503eaba55d0c6c225d9bcd2751371aeadaa1244c90649babf7cc2f05f8dcc2206fc5a7e235de14c11cde3f246c1fb78967defe566cc88 SHA512 50ad774bbd83c587775887320e24b329b575c9b3dad5aed920d83da7b8e5fa259624c38a40c457a3c12258e2b34cce39042c1b33002a06dcd3020bf370a06cbb
-EBUILD esqueleto-2.1.3.ebuild 1433 BLAKE2B 2b54992f33b1ce5303f5513d36f6be6dd78f82b9a8d19a86318f80f735a8016b2fecbb38d538bb3de6a19cc66535a1f8b12e872ef650966598495612d8563f8a SHA512 5f5a7b4f13f774a519572a34bcfeeeade2e82be6e7f71a9a5810141e292a5cb0111735143a6ad6fc617a46d24dd18f271220a1a9ed201a9bdd08693214655d30
-EBUILD esqueleto-2.4.3-r1.ebuild 1380 BLAKE2B f2de31037a90dd2bede882df3240fdc59d82a7209277f6c1e9c351a1171d574834995509aa1ed988885fd8131ab1583b67099060891ab0b885fb7d7bed630dc0 SHA512 244489533d2fc1a884f4f643105be8f6884536860a1b5ec893782b0703ca5c7c6f3934c82f8791808dcdbc9e7d0c13227d881b6443b62cc9f40c37a6fc0bb4e3
-MISC metadata.xml 2043 BLAKE2B 7b418084368f204d12010f088f55544feed211ed193787a9698a45c891f5c5c579a9e9b583cc606401ff43975755fbe73725588ebcf27e8dcfd77b3344534596 SHA512 162af6c274fb74b5df2c040c8dc8de89ab08bf5839f6c80b099a7c906e4168c92a1c49a09ecae0dda69e45239002625abdf70fa323ab1258d55c314931875599
diff --git a/dev-haskell/esqueleto/esqueleto-2.1.3.ebuild b/dev-haskell/esqueleto/esqueleto-2.1.3.ebuild
deleted file mode 100644
index 6b5489747a64..000000000000
--- a/dev-haskell/esqueleto/esqueleto-2.1.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -mysql,-postgresql
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe EDSL for SQL queries on persistent backends"
-HOMEPAGE="https://github.com/prowdsponsor/esqueleto"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # tests hang
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	>=dev-haskell/persistent-2.1.1.7:=[profile?] <dev-haskell/persistent-2.2:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	>=dev-haskell/tagged-0.2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.8
-		dev-haskell/hunit
-		dev-haskell/monad-control
-		>=dev-haskell/monad-logger-0.3
-		>=dev-haskell/persistent-sqlite-2.1 <dev-haskell/persistent-sqlite-2.2
-		>=dev-haskell/persistent-template-2.1 <dev-haskell/persistent-template-2.2
-		dev-haskell/quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-mysql \
-		--flag=-postgresql
-}
diff --git a/dev-haskell/esqueleto/esqueleto-2.4.3-r1.ebuild b/dev-haskell/esqueleto/esqueleto-2.4.3-r1.ebuild
deleted file mode 100644
index 86530317a1a4..000000000000
--- a/dev-haskell/esqueleto/esqueleto-2.4.3-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -mysql,-postgresql
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe EDSL for SQL queries on persistent backends"
-HOMEPAGE="https://github.com/prowdsponsor/esqueleto"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-html:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	>=dev-haskell/persistent-2.1.1.7:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	>=dev-haskell/tagged-0.2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.8
-		dev-haskell/hunit
-		dev-haskell/monad-control
-		>=dev-haskell/monad-logger-0.3
-		>=dev-haskell/persistent-sqlite-2.1
-		>=dev-haskell/persistent-template-2.1
-		dev-haskell/quickcheck )
-"
-
-PATCHES=("${FILESDIR}"/${P}-persistent-2.5.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-mysql \
-		--flag=-postgresql
-}
diff --git a/dev-haskell/esqueleto/files/esqueleto-2.4.3-persistent-2.5.patch b/dev-haskell/esqueleto/files/esqueleto-2.4.3-persistent-2.5.patch
deleted file mode 100644
index ebff5cb0bd9a..000000000000
--- a/dev-haskell/esqueleto/files/esqueleto-2.4.3-persistent-2.5.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From 675018c54227ce5db4a91a153092d5f4d06f9af0 Mon Sep 17 00:00:00 2001
-From: Paul Rouse <pgr@doynton.org>
-Date: Thu, 9 Jun 2016 20:25:34 +0100
-Subject: [PATCH 1/3] Changes for persistent-2.5
-
----
- esqueleto.cabal                                     |  2 +-
- src/Database/Esqueleto.hs                           |  8 ++++----
- src/Database/Esqueleto/Internal/Language.hs         | 15 +++++----------
- src/Database/Esqueleto/Internal/PersistentImport.hs | 12 +++++++++++-
- test/Test.hs                                        |  8 ++++----
- 5 files changed, 25 insertions(+), 20 deletions(-)
-
-diff --git a/esqueleto.cabal b/esqueleto.cabal
-index 65aa237..1768d2d 100644
---- a/esqueleto.cabal
-+++ b/esqueleto.cabal
-@@ -66,7 +66,7 @@ library
-       base                 >= 4.5     && < 4.9
-     , bytestring
-     , text                 >= 0.11    && < 1.3
--    , persistent           >= 2.1.1.7 && < 2.3
-+    , persistent           >= 2.1.1.7
-     , transformers         >= 0.2
-     , unordered-containers >= 0.2
-     , tagged               >= 0.2
-diff --git a/src/Database/Esqueleto.hs b/src/Database/Esqueleto.hs
-index eb135c2..97e3211 100644
---- a/src/Database/Esqueleto.hs
-+++ b/src/Database/Esqueleto.hs
-@@ -430,8 +430,8 @@ valJ = val . unValue
- 
- -- | Synonym for 'Database.Persist.Store.delete' that does not
- -- clash with @esqueleto@'s 'delete'.
--deleteKey :: ( PersistStore (PersistEntityBackend val)
--             , MonadIO m
--             , PersistEntity val )
--          => Key val -> ReaderT (PersistEntityBackend val) m ()
-+deleteKey :: ( PersistStore backend
-+             , PersistRecordBackend val backend
-+             , MonadIO m )
-+          => Key val -> ReaderT backend m ()
- deleteKey = Database.Persist.delete
-diff --git a/src/Database/Esqueleto/Internal/Language.hs b/src/Database/Esqueleto/Internal/Language.hs
-index fbe88e2..ab18999 100644
---- a/src/Database/Esqueleto/Internal/Language.hs
-+++ b/src/Database/Esqueleto/Internal/Language.hs
-@@ -74,13 +74,11 @@ class (Functor query, Applicative query, Monad query) =>
-   --   In the end, 'fromFinish' is called to materialize the
-   --   @JOIN@.
-   fromStart
--    :: ( PersistEntity a
--       , PersistEntityBackend a ~ backend )
-+    :: PersistRecordBackend a backend
-     => query (expr (PreprocessedFrom (expr (Entity a))))
-   -- | (Internal) Same as 'fromStart', but entity may be missing.
-   fromStartMaybe
--    :: ( PersistEntity a
--       , PersistEntityBackend a ~ backend )
-+    :: PersistRecordBackend a backend
-     => query (expr (PreprocessedFrom (expr (Maybe (Entity a)))))
-   -- | (Internal) Do a @JOIN@.
-   fromJoin
-@@ -926,8 +924,7 @@ class ToBaseId ent where
- -- @
- -- person
- --   :: ( Esqueleto query expr backend
----      , PersistEntity Person
----      , PersistEntityBackend Person ~ backend
-+--      , PersistRecordBackend Person backend
- --      ) => expr (Entity Person)
- -- (person, blogPost)
- --   :: (...) => (expr (Entity Person), expr (Entity BlogPost))
-@@ -1054,14 +1051,12 @@ class Esqueleto query expr backend => FromPreprocess query expr backend a where
-   fromPreprocess :: query (expr (PreprocessedFrom a))
- 
- instance ( Esqueleto query expr backend
--         , PersistEntity val
--         , PersistEntityBackend val ~ backend
-+         , PersistRecordBackend val backend
-          ) => FromPreprocess query expr backend (expr (Entity val)) where
-   fromPreprocess = fromStart
- 
- instance ( Esqueleto query expr backend
--         , PersistEntity val
--         , PersistEntityBackend val ~ backend
-+         , PersistRecordBackend val backend
-          ) => FromPreprocess query expr backend (expr (Maybe (Entity val))) where
-   fromPreprocess = fromStartMaybe
- 
-diff --git a/src/Database/Esqueleto/Internal/PersistentImport.hs b/src/Database/Esqueleto/Internal/PersistentImport.hs
-index ad193e0..02fbd20 100644
---- a/src/Database/Esqueleto/Internal/PersistentImport.hs
-+++ b/src/Database/Esqueleto/Internal/PersistentImport.hs
-@@ -1,7 +1,13 @@
-+{-# LANGUAGE CPP                        #-}
-+{-# LANGUAGE ConstraintKinds            #-}
-+{-# LANGUAGE TypeFamilies               #-}
- -- | Re-export "Database.Persist.Sql" without any clashes with
- -- @esqueleto@.
- module Database.Esqueleto.Internal.PersistentImport
-   ( module Database.Persist.Sql
-+#if ! MIN_VERSION_persistent(2,5,0)
-+    , PersistRecordBackend
-+#endif
-   ) where
- 
- import Database.Persist.Sql hiding
-@@ -10,4 +16,8 @@ import Database.Persist.Sql hiding
-   , selectKeysList, deleteCascadeWhere, (=.), (+=.), (-=.), (*=.), (/=.)
-   , (==.), (!=.), (<.), (>.), (<=.), (>=.), (<-.), (/<-.), (||.)
-   , listToJSON, mapToJSON, getPersistMap, limitOffsetOrder, selectSource
--  , update )
-+  , update, count )
-+
-+#if ! MIN_VERSION_persistent(2,5,0)
-+type PersistRecordBackend record backend = (PersistEntity record, PersistEntityBackend record ~ backend)
-+#endif
-diff --git a/test/Test.hs b/test/Test.hs
-index 80c6784..524bd7c 100644
---- a/test/Test.hs
-+++ b/test/Test.hs
-@@ -1396,10 +1396,10 @@ main = do
- 
- 
- insert' :: ( Functor m
--           , PersistStore (PersistEntityBackend val)
--           , MonadIO m
--           , PersistEntity val )
--        => val -> ReaderT (PersistEntityBackend val) m (Entity val)
-+           , PersistStore backend
-+           , PersistRecordBackend val backend
-+           , MonadIO m )
-+        => val -> ReaderT backend m (Entity val)
- insert' v = flip Entity v <$> insert v
- 
- 
--- 
-2.9.0
-
-From 4c9ecd94f2748be52c50c85ca8ed7314e21b9e82 Mon Sep 17 00:00:00 2001
-From: Paul Rouse <pgr@doynton.org>
-Date: Thu, 9 Jun 2016 20:29:45 +0100
-Subject: [PATCH 2/3] Allow base-4.9 for GHC 8
-
----
- esqueleto.cabal | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/esqueleto.cabal b/esqueleto.cabal
-index 1768d2d..3b9efb9 100644
---- a/esqueleto.cabal
-+++ b/esqueleto.cabal
-@@ -63,7 +63,7 @@ library
-   other-modules:
-     Database.Esqueleto.Internal.PersistentImport
-   build-depends:
--      base                 >= 4.5     && < 4.9
-+      base                 >= 4.5     && < 5
-     , bytestring
-     , text                 >= 0.11    && < 1.3
-     , persistent           >= 2.1.1.7 && < 2.6
--- 
-2.9.0
-
diff --git a/dev-haskell/esqueleto/metadata.xml b/dev-haskell/esqueleto/metadata.xml
deleted file mode 100644
index 05174613075d..000000000000
--- a/dev-haskell/esqueleto/metadata.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		@persistent@ is a library for type-safe data serialization.  It
-		has many kinds of backends, such as SQL backends
-		(@persistent-mysql@, @persistent-postgresql@,
-		@persistent-sqlite@) and NoSQL backends (@persistent-mongoDB@).
-		
-		While @persistent@ is a nice library for storing and retrieving
-		records, currently it has a poor interface for SQL backends
-		compared to SQL itself.  For example, it's extremely hard to do
-		a type-safe @JOIN@ on a many-to-one relation, and simply
-		impossible to do any other kinds of @JOIN@s (including for the
-		very common many-to-many relations).  Users have the option of
-		writing raw SQL, but that's error prone and not type-checked.
-		
-		@esqueleto@ is a bare bones, type-safe EDSL for SQL queries
-		that works with unmodified @persistent@ SQL backends.  Its
-		language closely resembles SQL, so (a) you don't have to learn
-		new concepts, just new syntax, and (b) it's fairly easy to
-		predict the generated SQL and optimize it for your backend.
-		Most kinds of errors committed when writing SQL are caught as
-		compile-time errors---although it is possible to write
-		type-checked @esqueleto@ queries that fail at runtime.
-		
-		Currently only @SELECT@s are supported.  Not all SQL features
-		are available, but most of them can be easily added (especially
-		functions), so please open an issue or send a pull request if
-		you need anything that is not covered by @esqueleto@ on
-		&lt;https://github.com/meteficha/esqueleto/&gt;.
-		
-		The name of this library means \"skeleton\" in Portuguese and
-		contains all three SQL letters in the correct order =).  It was
-		inspired by Scala's Squeryl but created from scratch.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">prowdsponsor/esqueleto</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/exceptions-0.3.3 b/dev-haskell/exceptions-0.3.3
new file mode 100644
index 000000000000..eed7b39afdbd
--- /dev/null
+++ b/dev-haskell/exceptions-0.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-7.0.1:= >=dev-haskell/cabal-1.10.0.0 test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.7 >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Extensible optionally-pure exceptions
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/exceptions/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-7.0.1:=
+SLOT=0/0.3.3
+SRC_URI=mirror://hackage/packages/archive/exceptions/0.3.3/exceptions-0.3.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ff7da1f4d0e7b4ce6e05c83ba6d1c9c8
diff --git a/dev-haskell/exceptions-0.6.1 b/dev-haskell/exceptions-0.6.1
new file mode 100644
index 000000000000..c05ca0466b56
--- /dev/null
+++ b/dev-haskell/exceptions-0.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.0.1:= >=dev-haskell/cabal-1.10.0.0 test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.8 >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Extensible optionally-pure exceptions
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/exceptions/
+IUSE=doc hscolour profile test
+KEYWORDS=alpha amd64 ppc sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.0.1:=
+SLOT=0/0.6.1
+SRC_URI=mirror://hackage/packages/archive/exceptions/0.6.1/exceptions-0.6.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=366f186e763e27b0e1045b6a77a3805a
diff --git a/dev-haskell/exceptions-0.8.0.2 b/dev-haskell/exceptions-0.8.0.2
new file mode 100644
index 000000000000..653c4ff3e1f3
--- /dev/null
+++ b/dev-haskell/exceptions-0.8.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/quickcheck-2.5:2 >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Extensible optionally-pure exceptions
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/exceptions/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.8.0.2
+SRC_URI=mirror://hackage/packages/archive/exceptions/0.8.0.2/exceptions-0.8.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=988f0b5d5b128ae161df6e7ada4dbd0f
diff --git a/dev-haskell/exceptions-0.8.2.1 b/dev-haskell/exceptions-0.8.2.1
new file mode 100644
index 000000000000..d777c04e2c52
--- /dev/null
+++ b/dev-haskell/exceptions-0.8.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.9 >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Extensible optionally-pure exceptions
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/exceptions/
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.8.2.1
+SRC_URI=mirror://hackage/packages/archive/exceptions/0.8.2.1/exceptions-0.8.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=262abed88bb914752435f10c61df50c2
diff --git a/dev-haskell/exceptions-0.8.3 b/dev-haskell/exceptions-0.8.3
new file mode 100644
index 000000000000..4703485c722f
--- /dev/null
+++ b/dev-haskell/exceptions-0.8.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.10 >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Extensible optionally-pure exceptions
+EAPI=6
+HOMEPAGE=https://github.com/ekmett/exceptions/
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.8.3
+SRC_URI=mirror://hackage/packages/archive/exceptions/0.8.3/exceptions-0.8.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d40f45ef01654a5ab1f38eeda282b23c
diff --git a/dev-haskell/exceptions/Manifest b/dev-haskell/exceptions/Manifest
deleted file mode 100644
index b5e6a04287cb..000000000000
--- a/dev-haskell/exceptions/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST exceptions-0.3.3.tar.gz 13036 BLAKE2B 021e8c3f40f9ef9a734f8cf0f8491767d4d2c5c1f1b659a089525a346cea7ecb67058f7405d6659361c6d83b76603527dd956e6244843ceeb5b7bd8c6fb0efdd SHA512 3264f78b950a3ea737f577e5ee406bddc1916bf93271ff6e78a477b1575bb105ce0c47324c4f56288a7ef6e7cba398dfb66ea66ee07baf5aaa17012cd6cc4da4
-DIST exceptions-0.6.1.tar.gz 11392 BLAKE2B 6ec2c1b2603da2a33c663996f13b522fad3fd6b8c3683c13c58b07459e03ae67c2cb21cac3114bdc089ba563c9ef8754a187bdbc8a805fa5a041989c7498fde5 SHA512 92413cfa9fccd877303ec4f100c4ac94d3e30df0563600733a940c3a3ee9d4e1e934bd6d09774faed684c8ea9821b8c44cf501cc44fe8c834dd19e2efbed5070
-DIST exceptions-0.8.0.2.tar.gz 12241 BLAKE2B b84c642451fa957cbe23d63b86cee0fdef7977d09dd9bc28f2ba87e81a2e4803dd016951c85ac139b81c584d73893cbdae249504cb6a7457810f3e11f41058ac SHA512 8ed232f97f9d705f694aa9e0261c7920666cb0052d00370883b08fa6f61a97f8b17643512bdda5189760a51b42a9340e153521abafec20d42ffa193f3b0369b3
-DIST exceptions-0.8.2.1.tar.gz 12354 BLAKE2B edff8b7dd4488d4a01fd7d7416106dd130dcd06f86d0a849eda06ab381491c9ba49928d952f46d3af2f77dad14203ed3f401cc258638510b62725186a0ce4380 SHA512 0de9862ea3e71b7511b059c90363856b0ed445bdd6aa24ba39630d31a2cde601ef29f6a8c9f39ef80be7682c6f58a5d74d17552a8f64d544fa67aef6017f254f
-DIST exceptions-0.8.3.tar.gz 12986 BLAKE2B 31ae066b5bc71a01c3542495d5ba1efe379c9d8ea170b5175c94a822c90f859fe5519e1c4747327bea19ebe4fa2e16953546b7208f3ea21e231849ae44ed676d SHA512 1b650d979e27c3307a7b58ea09fe19bfd97a35fb75aa526237cfe4fe68c99560794dc8985b601da1fc6cefb8358c76f60df822b709c621172785343233cee89a
-EBUILD exceptions-0.3.3.ebuild 949 BLAKE2B 9b57744d46c26292dfa905facf9a8fe4f1fef2daefa36b8337641d0a36573c1d0a4719f68746d7fa60d0fa985a13bd209f18063085327799498143f5833737d3 SHA512 94b42057486247635bc74cfca50e442ae1955599da7daca9d6c6da4d75daa75f319bf7535c92a206cd97e84f29469da937aac188f6e95a8675f5b6c662bdb1a5
-EBUILD exceptions-0.6.1.ebuild 956 BLAKE2B 7f5d164bfb1f88f30473b0b97c2cc11ee599b451b7a36ee3765b858193d2ffb35836a8f16fb9465ca549f1c78910d81e62a60c0f89b30b1331d8047551b8bcfd SHA512 77f7c35bcd7c23ff05b1ae889ffe5318dc577d74183c523aabfe1caf53b83f2f40819ef7eeef2fa52b1c8f5111503f952de59b68c55862e84e7da7ffb236e84e
-EBUILD exceptions-0.8.0.2.ebuild 1200 BLAKE2B 6fbc4d33db96456ccd7c420cc652a584355c5b7bee98c95833c6650151b64581ce63381eb184f5c95ac90dc926a06074b3e68a7b4f1c281b9318f6f636ab27c2 SHA512 78b0bc5baea3735b09419f895b01cbee9304a5e386d74f2b0d772b0bdf746777ffd6dd42b0206900eae658bcf6baa0748fba120a98616697d92db752b01055fd
-EBUILD exceptions-0.8.2.1.ebuild 1101 BLAKE2B aa33b56b94b7a0c32672983c2fe259437e1b4faa836c6a2df125681a2d2ec83155cf03fdf3fd87165b3389519ffe3762b167d8652ac1813d42eb74724f24978f SHA512 672e03ebda6a0b7b2d7b69d379d92691c0225ae9ceda9d269d4ee43c504c54bc9d87cf368d804205608bb325197d64a310d758612017562b8dc32b5875b67a2c
-EBUILD exceptions-0.8.3.ebuild 1100 BLAKE2B 199e14a96818254ff7af83d800005df06f71ceebb48e880edc6e3a1b166d71ae4279ac995812e9993acc675faf77870f16f813adbdc8b710e75b25fdcfdd9444 SHA512 17ca03a64eb1ee2cde569186899728e9cab9ad2df8567b689ef308e452b4d4663447818d455605ae3e41eccf6406d4abc5fe25e84bc1fd794ac74f3ae6b7798a
-MISC metadata.xml 410 BLAKE2B 852ade6928809b3239450dabbd5d9303f26b0ebe15d724894cf98d72e2a6e1c6a8daa61b2aa04139cb800ea07f941fb30e3801dc7f94ffa565e6895ab44ae144 SHA512 8897b25beba9a4eb2305f352f171cb57079928cb5faf7d236c1ce41815665af0a1e6bc037e55bdccf1102b4065997df240e94a72de5027d7628830b3c3ac0ff3
diff --git a/dev-haskell/exceptions/exceptions-0.3.3.ebuild b/dev-haskell/exceptions/exceptions-0.3.3.ebuild
deleted file mode 100644
index 07719fb827ff..000000000000
--- a/dev-haskell/exceptions/exceptions-0.3.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extensible optionally-pure exceptions"
-HOMEPAGE="https://github.com/ekmett/exceptions/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.7
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/exceptions/exceptions-0.6.1.ebuild b/dev-haskell/exceptions/exceptions-0.6.1.ebuild
deleted file mode 100644
index bd428df64cc1..000000000000
--- a/dev-haskell/exceptions/exceptions-0.6.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extensible optionally-pure exceptions"
-HOMEPAGE="https://github.com/ekmett/exceptions/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.8
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/exceptions/exceptions-0.8.0.2.ebuild b/dev-haskell/exceptions/exceptions-0.8.0.2.ebuild
deleted file mode 100644
index 093ba8a38a79..000000000000
--- a/dev-haskell/exceptions/exceptions-0.8.0.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extensible optionally-pure exceptions"
-HOMEPAGE="https://github.com/ekmett/exceptions/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/quickcheck-2.5:2
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'QuickCheck                 >= 2.5      && < 2.8' 'QuickCheck                 >= 2.5'
-}
diff --git a/dev-haskell/exceptions/exceptions-0.8.2.1.ebuild b/dev-haskell/exceptions/exceptions-0.8.2.1.ebuild
deleted file mode 100644
index b1e2558a61ea..000000000000
--- a/dev-haskell/exceptions/exceptions-0.8.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extensible optionally-pure exceptions"
-HOMEPAGE="https://github.com/ekmett/exceptions/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/exceptions/exceptions-0.8.3.ebuild b/dev-haskell/exceptions/exceptions-0.8.3.ebuild
deleted file mode 100644
index 08e17f628f66..000000000000
--- a/dev-haskell/exceptions/exceptions-0.8.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extensible optionally-pure exceptions"
-HOMEPAGE="https://github.com/ekmett/exceptions/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.10
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/exceptions/metadata.xml b/dev-haskell/exceptions/metadata.xml
deleted file mode 100644
index 11d542dedfa3..000000000000
--- a/dev-haskell/exceptions/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Extensible optionally-pure exceptions
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/exceptions</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/executable-path-0.0.3-r1 b/dev-haskell/executable-path-0.0.3-r1
new file mode 100644
index 000000000000..91634dab44d0
--- /dev/null
+++ b/dev-haskell/executable-path-0.0.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Finding out the full path of the executable
+EAPI=5
+HOMEPAGE=http://code.haskell.org/~bkomuves/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=public-domain
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.0.3
+SRC_URI=mirror://hackage/packages/archive/executable-path/0.0.3/executable-path-0.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8745f21935743cf2f2c3b2a17ffd89e6
diff --git a/dev-haskell/executable-path/Manifest b/dev-haskell/executable-path/Manifest
deleted file mode 100644
index c66059fba0f8..000000000000
--- a/dev-haskell/executable-path/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST executable-path-0.0.3.tar.gz 6619 BLAKE2B 2b452d57c6b9aa64b8ebfd98e19c816afd377ba8a7bda5a23f9e346395bed326775682922d1fcfdf2350cad73cd6ac1f2c21df515d912138985768e1f00d2fb9 SHA512 96be7d997648226d549f80bac2bf49ffb2cf4043cf6ed9a9b175520df9d851599ec1b5f5c60a6ff8d12dadc1037193cebb2d5e0c956433e90cb3d023a46fa987
-EBUILD executable-path-0.0.3-r1.ebuild 557 BLAKE2B 8f1dff3146b7ce9f97d52168b3dd97fb9051ff8be9e8c81a4c8474946259df9177fa47d592ef2bdcf63c177e7e2af301753f60ff8e49352b0e11267bfef18d81 SHA512 35176b16d43d6c406379c1c4bb0f7cc341dc7a190658d6204dc1b76ad13346a7030e97ab4490ac0fe68459ebb095b9fd067a8d2505f9f16b35296745a764f5f7
-MISC metadata.xml 578 BLAKE2B 0f95917754165bea918f57494a849d5bbda9cc0cc7bc5dd74d470f278be4690b83f1bdb07ba95e05b89651bb0dbda51a6ca0651fbb3b5cf957b9c5e68ff1238b SHA512 6d8221ddefc24a31f9989c921ec7da9009f8a3259c12ffa7e1262e2030ba3db3007dccbd1a9fce4f0b6ffed7061fbb0eb7e1c348d0c8ce1062a893ce7aaa50d7
diff --git a/dev-haskell/executable-path/executable-path-0.0.3-r1.ebuild b/dev-haskell/executable-path/executable-path-0.0.3-r1.ebuild
deleted file mode 100644
index 9f9e6e011d00..000000000000
--- a/dev-haskell/executable-path/executable-path-0.0.3-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Finding out the full path of the executable"
-HOMEPAGE="http://code.haskell.org/~bkomuves/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
diff --git a/dev-haskell/executable-path/metadata.xml b/dev-haskell/executable-path/metadata.xml
deleted file mode 100644
index 4401a3b26987..000000000000
--- a/dev-haskell/executable-path/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The documentation of "System.Environment.getProgName" says that
-		\"However, this is hard-to-impossible to implement on some non-Unix OSes,
-		so instead, for maximum portability, we just return the leafname
-		of the program as invoked.\"
-		This library tries to provide the missing path.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/extensible-exceptions-0.1.1.4 b/dev-haskell/extensible-exceptions-0.1.1.4
new file mode 100644
index 000000000000..ef946fd95a2e
--- /dev/null
+++ b/dev-haskell/extensible-exceptions-0.1.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.2.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=91bc03cfbb4b0ffc3d565d758d980ec6
diff --git a/dev-haskell/extensible-exceptions/Manifest b/dev-haskell/extensible-exceptions/Manifest
deleted file mode 100644
index 98dddde531f6..000000000000
--- a/dev-haskell/extensible-exceptions/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST extensible-exceptions-0.1.1.4.tar.gz 8531 BLAKE2B 2156f9c719737286d720bd52e57172386639c95f559e8e4a257ee7f67e61a9948ab042d8befd72b3aa15993faeed6bd7ef2918553d47e0c819c2a29262289cc2 SHA512 b63bb6b8bc846571db37c23801b711748a10a27a6a6b25035e992013f6705ad9b3ad86e61a7de839c9ac61c26ad3640b9642a8747d6b76a03336834c39e93dca
-EBUILD extensible-exceptions-0.1.1.4.ebuild 725 BLAKE2B 3df826749ff2627ff312c2decc08cfdc7c7ca8343e63e44255625069fb882a78d8e8b82e64eb84b7af1c4e9a09393313f34a8b64ce4cb6a437aaba38d5d6c11b SHA512 d281b91f276c8d2f8f8c9f4d39c58a7f7be9c61a0cfbe9da4630e80fe6efaf6120d61e38f4e52f8dfba3329d0181b090f83790ca10ef200d5ae1f7b49dae9ca3
-MISC metadata.xml 392 BLAKE2B a352774fda01c5ce6f0b551c53c60e99c521bb73da029d064001a93a6414036e2227ce890b184dc55f61e3917a68133eb676e5f8795a1327a87894fa40c6be57 SHA512 3ab7f177bb899d2483d85f13d47c046dd596eec67cb5ccb8672d26086fe605ca46c53a3171747979655a6ed8f6fc0d95a9184ae445ef965d1814f6aa0bc62d9b
diff --git a/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild b/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
deleted file mode 100644
index 715637e6a7e9..000000000000
--- a/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Extensible exceptions"
-HOMEPAGE="http://hackage.haskell.org/package/extensible-exceptions"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2.3"
-
-CABAL_CORE_LIB_GHC_PV="7.4.0.20111219 7.4.0.20120126 7.4.1 7.4.2"
diff --git a/dev-haskell/extensible-exceptions/metadata.xml b/dev-haskell/extensible-exceptions/metadata.xml
deleted file mode 100644
index 75ba039e9bde..000000000000
--- a/dev-haskell/extensible-exceptions/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides extensible exceptions for both new and
-		old versions of GHC (i.e., &lt; 6.10).
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/extra-1.3.1 b/dev-haskell/extra-1.3.1
new file mode 100644
index 000000000000..e6dd246598f6
--- /dev/null
+++ b/dev-haskell/extra-1.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Extra functions I use
+EAPI=5
+HOMEPAGE=https://github.com/ndmitchell/extra#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=2/1.3.1
+SRC_URI=mirror://hackage/packages/archive/extra/1.3.1/extra-1.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=17576ad8da7a0a0014eb02295aa568c5
diff --git a/dev-haskell/extra-1.4.10 b/dev-haskell/extra-1.4.10
new file mode 100644
index 000000000000..638e69fe73b2
--- /dev/null
+++ b/dev-haskell/extra-1.4.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Extra functions I use
+EAPI=6
+HOMEPAGE=https://github.com/ndmitchell/extra#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=2/1.4.10
+SRC_URI=mirror://hackage/packages/archive/extra/1.4.10/extra-1.4.10.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=133b611b8d6456c31bdd4a6d1db527aa
diff --git a/dev-haskell/extra-1.4.2 b/dev-haskell/extra-1.4.2
new file mode 100644
index 000000000000..2693ca77da14
--- /dev/null
+++ b/dev-haskell/extra-1.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Extra functions I use
+EAPI=5
+HOMEPAGE=https://github.com/ndmitchell/extra#readme
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=2/1.4.2
+SRC_URI=mirror://hackage/packages/archive/extra/1.4.2/extra-1.4.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d3aaf682024051eec3c09ac2c80eeffe
diff --git a/dev-haskell/extra-1.5.1 b/dev-haskell/extra-1.5.1
new file mode 100644
index 000000000000..99de02ff2ca2
--- /dev/null
+++ b/dev-haskell/extra-1.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/clock-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18 test? ( >=dev-haskell/quickcheck-2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Extra functions I use
+EAPI=6
+HOMEPAGE=https://github.com/ndmitchell/extra#readme
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/clock-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=2/1.5.1
+SRC_URI=mirror://hackage/packages/archive/extra/1.5.1/extra-1.5.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=847cafb1eaaaccb2572ffa8d547591b6
diff --git a/dev-haskell/extra/Manifest b/dev-haskell/extra/Manifest
deleted file mode 100644
index 3cfe3bdfc53d..000000000000
--- a/dev-haskell/extra/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX extra-1.4.10-QC-2.9.patch 680 BLAKE2B 40ad2e352f72a4c69aeb7450a42eadc8cde75af6525ab5e4b15e41b22041c46975dd021632e1b16872cc1b464d6db8c2e269febc7c6ea9c738ab3440f0badf7b SHA512 cf6702f2ab99967c23f04ae859bbc38a4d905676e3e87e6bbe4901033735f4e13804626fc820c4876e195b6f48c0f519c2004328a0716dc23529edf9307db6c9
-DIST extra-1.3.1.tar.gz 30439 BLAKE2B d1a550e8e09376490c25497ace158418679a971e3d0113f727b3815f80b20b20a85ed87349302d6065d5af7c930adaba2f26fb939952ff06b01cfa2355025ad7 SHA512 d6e736a021ee39139855516647b91a328e8ff075b94bdcc84c1296586d9f58a20819fcf78a45bd0fc9b3e9516780c68fb27ec0dc406964b6d9d5c93e26bfc9c5
-DIST extra-1.4.10.tar.gz 34981 BLAKE2B e1601f3d6f782a3b0138fa47929afb2bd2fef74305c4e6f8d41aea9eb12c00975da9a3edb200f4ff4e613c049f08239c993ebc11eca600992d831ed54a59058d SHA512 16b7bbe3944d7013a54dfe629f997bb46a24c9b933a6be9570cd86f6b1bace9c001acb0b5b8d92ddf50aa21ca67d5694d3705029116644012345d20f1e3386fd
-DIST extra-1.4.2.tar.gz 31311 BLAKE2B 4039e3c0ca573d782a4bc6db2d892d22ffcc5e012e752f065c9f98d6e580a5b43e772e49345681bb9a31ef9679295d459aceadbca9bf79b4f496b8a1a7b08e8e SHA512 5d0c5ee70d51fa4d132b5e7813908a65badbf339cfcae4182932933b70cb7b8faf659d22c624086757c38973aeff769b5175bf533bbb51c3ec419ba09bb28409
-DIST extra-1.5.1.tar.gz 35989 BLAKE2B 637533fd0b175892c58b341d5dc8c3d97a28291a638f2cc185a7338077d2f6ced21a1efe0859ee8f4e9fa1636c3f8ef4423c83a0a683a9accd25efd70cafdac9 SHA512 c3a0d7abc589e4a175c5c090b4a850751b0f231a3934db3bb87f4a11044acfcb161aa366789b3c6b5415778578ca126c3469f648fa326fa5ebec0889c59005e8
-EBUILD extra-1.3.1.ebuild 650 BLAKE2B 90cf129ac9176e5c1145892d7425c8f1f0d84d5a51f3444ad95bc0f1be02508a67e8090bacdb3d0a5a1be09e42858749a74c4aa6abd79ec5bee4ea394f161cf0 SHA512 3436c47dbc1374b452aa92abd7cc817603db724b50b3482752c04da7b24faf2cab3500e2c606916abe9643350b676a868ec20e79171471b85fc88ce01c8c40e5
-EBUILD extra-1.4.10.ebuild 622 BLAKE2B c21b04a8cfd3d95716030b3c318034845020366c6c531c8e1499f2dd51b9a64fbea786349a0de20cbff56b010b69dc8cf20c7b1f2dfb169dcb165a92ba7da824 SHA512 ee1cbbb474483312abde682f3792ca755303936234bd0ef271dabe4a952bcaa74987528aded2567ddca869c87cc0f1e19bce314d5eb93b067d7d1ccb99bc6ed9
-EBUILD extra-1.4.2.ebuild 643 BLAKE2B c4445e1be87dfb1bed3be38cf2433715fead123b4e67ac0c70acd4fa1d0cd9f313d5a80cdf1dd948ba4276ad92243554ee9e5f1f1fada1a26ca4672617732e76 SHA512 fa3a99e573cac19cd2d3184024e00204b1f21f526601bfccff5d8b19507506de948f31f7c57796cf97d2d5ab554698d52984a0f52d6b44e2ae5036b30e71683b
-EBUILD extra-1.5.1.ebuild 622 BLAKE2B 5c85122a655517214013f3cb9491f5b9799aa1a152e8e33060983bdc24fe01290812a7714a4d58e3528057ae5b5d2dd45a8187feacd336d43f8eaa0c996cc834 SHA512 9d4b4ca89376720167da94bf3079314fbe6bf3cfe4dcc11a6969bd873449163bb34d731ee7270dba820d013d023ab483b455a842df0c898183beab011fedbbd4
-MISC metadata.xml 330 BLAKE2B 02bc69029c346d132aca400cfbc70f13d9bffaa36fcafd9c01a7f8213c27623b9fc19ae9c9a8c75ca898c5a251d5f5189239f16b805316a2edb32f7eef5424b4 SHA512 67832d58fae9b3c4ad5d3943f35135a20f2d26af7debff66857e36316ed9e697f5cfb285d2e67da2422c626dcac38c8bfbf1e1320237ead4cfb10514a6d1df4c
diff --git a/dev-haskell/extra/extra-1.3.1.ebuild b/dev-haskell/extra/extra-1.3.1.ebuild
deleted file mode 100644
index e8fe10cf2632..000000000000
--- a/dev-haskell/extra/extra-1.3.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extra functions I use"
-HOMEPAGE="https://github.com/ndmitchell/extra#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-# this package has nothing to do with extra:0 (aka Extra on hackage)
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/extra/extra-1.4.10.ebuild b/dev-haskell/extra/extra-1.4.10.ebuild
deleted file mode 100644
index 7e11a2ca264a..000000000000
--- a/dev-haskell/extra/extra-1.4.10.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extra functions I use"
-HOMEPAGE="https://github.com/ndmitchell/extra#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/quickcheck )
-"
-
-PATCHES=("${FILESDIR}"/${P}-QC-2.9.patch)
diff --git a/dev-haskell/extra/extra-1.4.2.ebuild b/dev-haskell/extra/extra-1.4.2.ebuild
deleted file mode 100644
index fe848cc34ee8..000000000000
--- a/dev-haskell/extra/extra-1.4.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extra functions I use"
-HOMEPAGE="https://github.com/ndmitchell/extra#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-# this package has nothing to do with extra:0 (aka Extra on hackage)
-SLOT="2/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/extra/extra-1.5.1.ebuild b/dev-haskell/extra/extra-1.5.1.ebuild
deleted file mode 100644
index 73560c02e4e6..000000000000
--- a/dev-haskell/extra/extra-1.5.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extra functions I use"
-HOMEPAGE="https://github.com/ndmitchell/extra#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/clock-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-	test? ( >=dev-haskell/quickcheck-2.9 )
-"
diff --git a/dev-haskell/extra/files/extra-1.4.10-QC-2.9.patch b/dev-haskell/extra/files/extra-1.4.10-QC-2.9.patch
deleted file mode 100644
index 14b861060b18..000000000000
--- a/dev-haskell/extra/files/extra-1.4.10-QC-2.9.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/test/TestUtil.hs b/test/TestUtil.hs
-index 87f3417..cda262f 100644
---- a/test/TestUtil.hs
-+++ b/test/TestUtil.hs
-@@ -72,3 +72,5 @@ instance Testable () where
-     property = property . (`seq` True)
-+#if ! MIN_VERSION_QuickCheck(2,9,0)
-     exhaustive _ = True
-+#endif
- 
-@@ -76,3 +78,6 @@ instance Testable a => Testable (IO a) where
-     property = property . unsafePerformIO
-+#if ! MIN_VERSION_QuickCheck(2,9,0)
-     exhaustive = exhaustive . unsafePerformIO
-+#endif
-+
- 
-@@ -107,3 +112,5 @@ instance Arbitrary DiffTime where
- 
-+#if ! MIN_VERSION_QuickCheck(2,9,2)
- instance Arbitrary Version where
-     arbitrary = makeVersion . map abs <$> listOf1 arbitrary
-+#endif
diff --git a/dev-haskell/extra/metadata.xml b/dev-haskell/extra/metadata.xml
deleted file mode 100644
index 7bcf2b68f1eb..000000000000
--- a/dev-haskell/extra/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ndmitchell/extra</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/fail-4.9.0.0 b/dev-haskell/fail-4.9.0.0
new file mode 100644
index 000000000000..fd1d52ef4178
--- /dev/null
+++ b/dev-haskell/fail-4.9.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10
+DESCRIPTION=Forward-compatible MonadFail class
+EAPI=5
+HOMEPAGE=https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail
+IUSE=profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/4.9.0.0
+SRC_URI=mirror://hackage/packages/archive/fail/4.9.0.0/fail-4.9.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4c99b4a0a35871c2f955a50d377f52f9
diff --git a/dev-haskell/fail/Manifest b/dev-haskell/fail/Manifest
deleted file mode 100644
index 7b5004c14f03..000000000000
--- a/dev-haskell/fail/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fail-4.9.0.0.tar.gz 2416 BLAKE2B cad36efcb3b93245dd3f90643694d85e6797fce5ee1866c6e8691d9b2845774846b99a7436f854c26daec985f07a9700fe4b2c1a467f2d33bd8a8fa0e6d3058b SHA512 0b4e6111387768482ff10b8ee55ff0b3b04750d8def057b7935bef814902de4536d0825e18b95a342722735b29cf88aafec21eb3b2a75eb4f0c55aa7c6b80108
-EBUILD fail-4.9.0.0.ebuild 599 BLAKE2B d7e56c4da73f12f25255c7de0d3dffa1f852a062299a0bf9627bc920aa77b7187013ddc436c0a8a4755494fe323447bf84908e13dfded214e3a282a6165061b6 SHA512 67d054854a3bcb5125f93697615770d01cc970445136a9434462caaf86d23cda57a96581728bfd978a20b30e9b19d44d1205fee85fb7756db6073acbb041f670
-MISC metadata.xml 802 BLAKE2B 3233af197b69239c6cec5f3711c9b6ef976fc3a71251298515866d786afb360c02bed95e4d0b614828f91b2fce9ae496c72072423468fba2453f898c95f7f141 SHA512 45b162d2aafda8927d5fd066b5db9340830998aae3093717910e5d39863c329060741e7318312c5f26c0115dd0b583fe77c89a82eca7ad15ac54013be29835c4
diff --git a/dev-haskell/fail/fail-4.9.0.0.ebuild b/dev-haskell/fail/fail-4.9.0.0.ebuild
deleted file mode 100644
index 9bc3a0e08a03..000000000000
--- a/dev-haskell/fail/fail-4.9.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile" # ghc-8 already provides module; haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Forward-compatible MonadFail class"
-HOMEPAGE="https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/fail/metadata.xml b/dev-haskell/fail/metadata.xml
deleted file mode 100644
index 498e6ece3d08..000000000000
--- a/dev-haskell/fail/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package contains the &quot;Control.Monad.Fail&quot; module providing the
-		&lt;https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail MonadFail&gt;
-		class that became available in
-		&lt;https://hackage.haskell.org/package/base-4.9.0.0 base-4.9.0.0&gt;
-		for older @base@ package versions.
-		
-		This package turns into an empty package when used with GHC versions
-		which already provide the &quot;Control.Monad.Fail&quot; module to make way for
-		GHC&#39;s own &quot;Control.Monad.Fail&quot; module.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/failure-0.2.0.3 b/dev-haskell/failure-0.2.0.3
new file mode 100644
index 000000000000..5042d64eb27d
--- /dev/null
+++ b/dev-haskell/failure-0.2.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A simple type class for success/failure computations. (deprecated)
+EAPI=5
+HOMEPAGE=http://www.haskell.org/haskellwiki/Failure
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.0.3
+SRC_URI=mirror://hackage/packages/archive/failure/0.2.0.3/failure-0.2.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9677b5bfe7a3fe08b82b35bd95ea272b
diff --git a/dev-haskell/failure/Manifest b/dev-haskell/failure/Manifest
deleted file mode 100644
index a022eecb597b..000000000000
--- a/dev-haskell/failure/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST failure-0.2.0.3.tar.gz 1797 BLAKE2B a25a3276cdd8c5f68be61effb2f65a94fe1ebe612e1aecc3d6dd697e998fb60f81d9e07dfe1e5b57c79da7111a442ac648af4bf55128340350eb1acf3e7088be SHA512 ef8c9904d899381a281ee79235054af6bd156d2b2819e70bcd2a122c1c505c10311189f9280c39bd836c0f3ba35bc7536ce83b58a42978616ebd89c64d692c96
-EBUILD failure-0.2.0.3.ebuild 622 BLAKE2B b1c2032dc3af544cfa844a95cd6bb44602ddbcaeb61df7d36925ce62aee6a5e233db6ba6c8b4b5d72ac1fc42958874a1c24fce2422bf4538a7da82add103f45d SHA512 44ba8cd74832b1e36d74d83b6eb9cd812806c6aa06c1f5a4aec31b995bf299e602226e7a6db0541cee81bb83523c721d0d4eb458ae4488c9320df0995f265f71
-MISC metadata.xml 344 BLAKE2B e08db4bebfd4b6503412c486c4cc1387a3e7e7295d5005333eea09ea8d4e1d0a69774749e7765ed3f3495d47d40717d0f6631e33097ce01ece1572065515cddc SHA512 7fa9484f5a18ea4d346b396ddfc833e74d3d87142a09f263c68452599c42e3f982ad7b85a44ddaf3afcb89decb1d09495494ed10754720a5e12292ce55846846
diff --git a/dev-haskell/failure/failure-0.2.0.3.ebuild b/dev-haskell/failure/failure-0.2.0.3.ebuild
deleted file mode 100644
index 08803d7d9d89..000000000000
--- a/dev-haskell/failure/failure-0.2.0.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A simple type class for success/failure computations. (deprecated)"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Failure"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/failure/metadata.xml b/dev-haskell/failure/metadata.xml
deleted file mode 100644
index 644669fb8ae7..000000000000
--- a/dev-haskell/failure/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A simple type class for success/failure computations.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/fast-logger-2.4.6 b/dev-haskell/fast-logger-2.4.6
new file mode 100644
index 000000000000..abb92c359e76
--- /dev/null
+++ b/dev-haskell/fast-logger-2.4.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/auto-update-0.1.2:=[profile?] dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/easy-file-0.2:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unix-time-0.2.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A fast logging system
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/fast-logger
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/auto-update-0.1.2:=[profile?] dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/easy-file-0.2:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unix-time-0.2.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.4.6
+SRC_URI=mirror://hackage/packages/archive/fast-logger/2.4.6/fast-logger-2.4.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8c9ed41f00d3b2744341ab789890384c
diff --git a/dev-haskell/fast-logger-2.4.7 b/dev-haskell/fast-logger-2.4.7
new file mode 100644
index 000000000000..3e8b09b33e4f
--- /dev/null
+++ b/dev-haskell/fast-logger-2.4.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/auto-update-0.1.2:=[profile?] dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/easy-file-0.2:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unix-time-0.2.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A fast logging system
+EAPI=6
+HOMEPAGE=https://github.com/kazu-yamamoto/logger
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/auto-update-0.1.2:=[profile?] dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/easy-file-0.2:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unix-time-0.2.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.4.7
+SRC_URI=mirror://hackage/packages/archive/fast-logger/2.4.7/fast-logger-2.4.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c20ac28bfa243b972ff8a018cf129ad8
diff --git a/dev-haskell/fast-logger/Manifest b/dev-haskell/fast-logger/Manifest
deleted file mode 100644
index 4b4698a4800b..000000000000
--- a/dev-haskell/fast-logger/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST fast-logger-2.4.6.tar.gz 9039 BLAKE2B 47923e51c30074bb35194a26c03d2f013f8c5b5b83c0424075dce6575064d0f705f6d71c691b3fd7d7c91d67bf4ea38f6e4056f5f60894c153bd6daff36e0a70 SHA512 724498a0ec9c0774f1be31f36819594e8393eac6667d922a92157ef4725381420095d9fed7bdb1791e0959e800710aa877055847312013249399ccbb9778e283
-DIST fast-logger-2.4.7.tar.gz 9321 BLAKE2B b2f2bb94df6dbed2d9642f15208a46496eb4c6c1a1f82ad27079d8c89768ea5ae4138e8e6727e730efecabb85818dab5907f76c02394fe27118ac1291fd9a144 SHA512 9f9154fb1c9e941ac43bf3064aeebc3b2a845a1eca3d1a62b77f02fd0a9327a459e3a870803c0f1a292294f7e4d7f77b8a9b5a3182873e77e169bd517025dfc4
-EBUILD fast-logger-2.4.6.ebuild 778 BLAKE2B 50a45b6ceb3a64c016c2c430906cb21e8daf628e3459d1684d9be7cc542c9798488550b7b423f48fd3ee77d2f91b3f94bc85f2d64538d77ba5f9891cc2ef6c94 SHA512 c1262e02a18945393b972c1ef8d25633afcf1fe5bf7e05276216c48139576eff7eab85a9e70a4eb538d16ed8959088e19e9604602fbbb685c32dd5f6a75481b1
-EBUILD fast-logger-2.4.7.ebuild 773 BLAKE2B b0af02b7597381ab7fa7ac13edcf47cc0d1007c3f950e488a392a5be1731808598ea9144e379e649fa6004f122a71fc2eb43d2719435cdee2f923d98aac20a86 SHA512 07a1fc22fbf80b2df0a0ddfa3df627366be94938362b038e9b0ac8e4181bc69dcc76544f8b85635c87bfc3a41b5f2c5e72324cd3f73b7fe398580ffe3718e968
-MISC metadata.xml 397 BLAKE2B e084281d8153eff9bdc5bfd0427face68a634b98eeeed38ad3109123a3dc8f282c066cbddfeb072383b722ad77114de9688690308f59858f025da927129ef6b0 SHA512 33dd8b48f8f93d25e30e8f616744515dd4030d2fa1e47f932611866f634b39bcce1eaedfec7db4cd4419b28b2ef13aca32c5f054eafe8db1986c242df510bf05
diff --git a/dev-haskell/fast-logger/fast-logger-2.4.6.ebuild b/dev-haskell/fast-logger/fast-logger-2.4.6.ebuild
deleted file mode 100644
index 1ddf8aa35e9e..000000000000
--- a/dev-haskell/fast-logger/fast-logger-2.4.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A fast logging system"
-HOMEPAGE="http://hackage.haskell.org/package/fast-logger"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/auto-update-0.1.2:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/easy-file-0.2:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/unix-time-0.2.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/fast-logger/fast-logger-2.4.7.ebuild b/dev-haskell/fast-logger/fast-logger-2.4.7.ebuild
deleted file mode 100644
index 38aaa282f4d0..000000000000
--- a/dev-haskell/fast-logger/fast-logger-2.4.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A fast logging system"
-HOMEPAGE="https://github.com/kazu-yamamoto/logger"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/auto-update-0.1.2:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/easy-file-0.2:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/unix-time-0.2.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/fast-logger/metadata.xml b/dev-haskell/fast-logger/metadata.xml
deleted file mode 100644
index 7835967339fe..000000000000
--- a/dev-haskell/fast-logger/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A fast logging system
-	</longdescription>
-	<upstream>
-		<remote-id type="github">kazu-yamamoto/logger</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/fclabels-2.0.2.3 b/dev-haskell/fclabels-2.0.2.3
new file mode 100644
index 000000000000..3f333c1f93ac
--- /dev/null
+++ b/dev-haskell/fclabels-2.0.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=First class accessor labels implemented as lenses
+EAPI=5
+HOMEPAGE=https://github.com/sebastiaanvisser/fclabels
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.0.2.3
+SRC_URI=mirror://hackage/packages/archive/fclabels/2.0.2.3/fclabels-2.0.2.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8f16ae3b36e8d5189e456befb7afce49
diff --git a/dev-haskell/fclabels-2.0.3 b/dev-haskell/fclabels-2.0.3
new file mode 100644
index 000000000000..f8170e00708c
--- /dev/null
+++ b/dev-haskell/fclabels-2.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=First class accessor labels implemented as lenses
+EAPI=5
+HOMEPAGE=https://github.com/sebastiaanvisser/fclabels
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/2.0.3
+SRC_URI=mirror://hackage/packages/archive/fclabels/2.0.3/fclabels-2.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=503c3b0fb4dea74d30443cdc798afcd7
diff --git a/dev-haskell/fclabels-2.0.3.1 b/dev-haskell/fclabels-2.0.3.1
new file mode 100644
index 000000000000..300828c1f735
--- /dev/null
+++ b/dev-haskell/fclabels-2.0.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.5 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=First class accessor labels implemented as lenses
+EAPI=6
+HOMEPAGE=https://github.com/sebastiaanvisser/fclabels
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/2.0.3.1
+SRC_URI=mirror://hackage/packages/archive/fclabels/2.0.3.1/fclabels-2.0.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=42b8ddced18c66b9b52e9824848042cb
diff --git a/dev-haskell/fclabels/Manifest b/dev-haskell/fclabels/Manifest
deleted file mode 100644
index 018d9c8922ef..000000000000
--- a/dev-haskell/fclabels/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST fclabels-2.0.2.3.tar.gz 22787 BLAKE2B f07d4c04e92b5a127e578fe6bb81581c51b0c1856ded72fd5f34f6662ec792324e19ba62a7ebaaaf3bb80e80548af6328149212b9bb2d528a074b31e24710b4e SHA512 54e6391ec9fa3c3032c9609a1df0f2082947342a6ea48f3378686eec5bf14bc29ca2f7243ab74fa69b2b18a0749ab40417f59e7338cb5fdc1c4404fb00b6dd7d
-DIST fclabels-2.0.3.1.tar.gz 24536 BLAKE2B f917c7c382979f5fac26c4637f8c0ea979acf9814abf3ba4751c77af68c6bbf2a8f68744478e8d734ce2c1dc105ce6678c45bc49abe5fb81ea921bc3c13a3f52 SHA512 031e86184c363188ff638f51fa4fa0b7a8fcfc2ffd76013694a56488e938c7bd7dcfe1b3cdd7fec95c69ccc4eedf9a1d0fba11318ac3022358d16d201fe3d98d
-DIST fclabels-2.0.3.tar.gz 24475 BLAKE2B cb7455c9d3a55e0d3902b176d4b156fb34e40516d853591d2da1538675c7b6a99245da82ebc83692d40fc38e13e62cf7fa2b2605d3bcebe90a16b79e0f79ef44 SHA512 efc203a90eae0e3ff23b977c642009281fc46724735c646638a312788df5edd1adc9f62d1199fe5b4260cf4dce2e55b6eb3999d8f31aec8b2e952e8fbfea1b90
-EBUILD fclabels-2.0.2.3.ebuild 788 BLAKE2B 834aef5f5525bc53bcee2aced4212317db4c0b60253bb8a94b124e6ff2ed9f8ee20544868453cb674daa4ccc1c5d30d4a78169b3fb95a8ce333f5195791e6233 SHA512 a5ce25272e72fa82f1ceaad90cae9bedf51763dd08a53530e256443150823cee6f9316bb718b621c4f8a074063ff1a0deadcb8427aabb6c6e0dc8701541ab9c8
-EBUILD fclabels-2.0.3.1.ebuild 705 BLAKE2B d19980bc1d9f0a57569d50add5c6f5e72f7d92e688653775ea465fd78b7dd283821f8d8a8a98845fafef86b12d002eabef2340f8283fc2a574bdad58593b2c5d SHA512 02a7fed2443bb5fc52c7aafdf92f5bbdf0aa139b51336009219625d66ea88f65e50814354362e73aeb28e3e60add4fec137b600c0908050353c86ba8b28d1946
-EBUILD fclabels-2.0.3.ebuild 791 BLAKE2B 4885710c7918461c75fad297019f7d239f90ae5ad0ca10f69b505dd2ecedd4f2af73cc702599cef70b6d304fd599a73f016e17bf83db95d6464dfe231e23b8c5 SHA512 b9ef834afc521f905ab9483c0cc9ae8e28501fa4d610d252d3c05021f9b5bffea19c31227a84d85bb7be9e0482d2880e394caee3fd0942b6ce9545e5a5625673
-MISC metadata.xml 1246 BLAKE2B 094973c2bd67ad69c84e3eb85c74bf4a1a5411f48a57a5b5c066da7ad2bc9b0d59282a8ecc06ddf857621e2ae381511717b7de552be637be1a5c6b5b86282424 SHA512 6000016c8b6806cc9352e0cd76a2655c9c9d09f36a3264a8451a235b2f877d74fe403984d187d3477ed744de562a6493459bc54aec0fe588a23e5ee7e6ce236c
diff --git a/dev-haskell/fclabels/fclabels-2.0.2.3.ebuild b/dev-haskell/fclabels/fclabels-2.0.2.3.ebuild
deleted file mode 100644
index 42abe53defea..000000000000
--- a/dev-haskell/fclabels/fclabels-2.0.2.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="First class accessor labels implemented as lenses"
-HOMEPAGE="https://github.com/sebastiaanvisser/fclabels"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 )
-"
diff --git a/dev-haskell/fclabels/fclabels-2.0.3.1.ebuild b/dev-haskell/fclabels/fclabels-2.0.3.1.ebuild
deleted file mode 100644
index 76c3ed02704f..000000000000
--- a/dev-haskell/fclabels/fclabels-2.0.3.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="First class accessor labels implemented as lenses"
-HOMEPAGE="https://github.com/sebastiaanvisser/fclabels"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.5 )
-"
diff --git a/dev-haskell/fclabels/fclabels-2.0.3.ebuild b/dev-haskell/fclabels/fclabels-2.0.3.ebuild
deleted file mode 100644
index 1d4f5902f0bb..000000000000
--- a/dev-haskell/fclabels/fclabels-2.0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="First class accessor labels implemented as lenses"
-HOMEPAGE="https://github.com/sebastiaanvisser/fclabels"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 )
-"
diff --git a/dev-haskell/fclabels/metadata.xml b/dev-haskell/fclabels/metadata.xml
deleted file mode 100644
index 84d3d0c77894..000000000000
--- a/dev-haskell/fclabels/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides first class labels that can act as
-		bidirectional record fields. The labels can be derived
-		automatically using Template Haskell which means you don't have
-		to write any boilerplate yourself. The labels are implemented as
-		lenses and are fully composable. Labels can be used to /get/,
-		/set/ and /modify/ parts of a datatype in a consistent way.
-		
-		See "Data.Label" for an introductory explanation.
-		
-		Internally lenses are not tied to Haskell functions directly,
-		but are implemented as arrows. Arrows allow the lenses to be run
-		in custom computational contexts. This approach allows us to
-		make partial lenses that point to fields of multi-constructor
-		datatypes in an elegant way.
-		
-		See the "Data.Label.Maybe" module for the use of partial labels.
-		
-		&gt; 1.0.3 -&gt; 1.0.4
-		&gt;   - Bugfix to compile on GHC 6.12 again.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">sebastiaanvisser/fclabels</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/fdo-notify-0.3.1 b/dev-haskell/fdo-notify-0.3.1
new file mode 100644
index 000000000000..443bb03e18aa
--- /dev/null
+++ b/dev-haskell/fdo-notify-0.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/dbus-0.10.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2.1 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Desktop Notifications client
+EAPI=5
+HOMEPAGE=https://bitbucket.org/taejo/fdo-notify/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/dbus-0.10.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.1
+SRC_URI=mirror://hackage/packages/archive/fdo-notify/0.3.1/fdo-notify-0.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a46b9a15de65706d7e737718a52fe313
diff --git a/dev-haskell/fdo-notify/Manifest b/dev-haskell/fdo-notify/Manifest
deleted file mode 100644
index 76d0ac138f8b..000000000000
--- a/dev-haskell/fdo-notify/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fdo-notify-0.3.1.tar.gz 4882 BLAKE2B 9ebf5bed4b17601b4deabc523e1ad529b95856ff6c0e6e83966fdee0373a37f8432c0fa34a6322157da1b3a93b12d10de2ff97da83c8ab9b2659932050083757 SHA512 d9193899d5eebd7c36e9464571827bd5b560fcc156e89822877b3b67a1f376c7abea9958f7e0aa6f79da06ad5f35a8738ad30a40d447b64ad557ed341054e6b6
-EBUILD fdo-notify-0.3.1.ebuild 580 BLAKE2B d313e58f71ec09ecd75a6fc3428dda2da6e11f4e188b4199ee6fd9621dc78b4184c1ba182c1e2c186fa25a48af28bd5079decbc4f460bd7ec382115c1d46740c SHA512 725faf490bcda535133995d270a65a0119547fdff7709dd5096a9a988281f16cc28a699a38996c15e4feed8f1f844c3e320c8b71b6e26dd90c29ca27bf8d06d0
-MISC metadata.xml 536 BLAKE2B 31be543a7693f10bd9c173f228721cb2aa7f66d22fd49cee45d18b66ae9d9745b370e21063da38ac702b48de65e7fb09d83e2bc1c3c357c6c6a80f756314fae7 SHA512 eac2da57fe1ef122fc1ecd76a8d8bb683cac15ba94efc917819866927cf493e990100628da025016aa48facee67a9e09bfaf83ae5ac3f3c43277cf1d710fbe67
diff --git a/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild b/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
deleted file mode 100644
index ba5034855ca4..000000000000
--- a/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Desktop Notifications client"
-HOMEPAGE="https://bitbucket.org/taejo/fdo-notify/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/dbus-0.10.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.1
-"
diff --git a/dev-haskell/fdo-notify/metadata.xml b/dev-haskell/fdo-notify/metadata.xml
deleted file mode 100644
index 55d3ac445104..000000000000
--- a/dev-haskell/fdo-notify/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A library for issuing notifications using FreeDesktop.org's Desktop
-		Notifications protcol. This protocol is supported by services such
-		as Ubuntu's NotifyOSD.
-	</longdescription>
-	<upstream>
-		<remote-id type="bitbucket">taejo/fdo-notify</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/feed-0.3.11.1 b/dev-haskell/feed-0.3.11.1
new file mode 100644
index 000000000000..e5a59ab91e9c
--- /dev/null
+++ b/dev-haskell/feed-0.3.11.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/xml-1.2.6:=[profile?] <dev-haskell/xml-1.3.15:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds
+EAPI=5
+HOMEPAGE=https://github.com/bergmark/feed
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/xml-1.2.6:=[profile?] <dev-haskell/xml-1.3.15:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.11.1
+SRC_URI=mirror://hackage/packages/archive/feed/0.3.11.1/feed-0.3.11.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d4c4bc216a26cf6ff261417cde632c75
diff --git a/dev-haskell/feed/Manifest b/dev-haskell/feed/Manifest
deleted file mode 100644
index 487b9deb4408..000000000000
--- a/dev-haskell/feed/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST feed-0.3.11.1.tar.gz 101392 BLAKE2B 3a208015edf06255359d7ed2c05191fd01383f35c2d1611176b4ac3c180cb0f9843c0494259d3bc338421cb437028d2fc73a3e1d283486931eb0edbcf381a18c SHA512 29c310c4d206c4a6088c3fcc242faccfa57f8337ecd54b5eee30f892acacadd519d65c66e490b55bd91d0e9a39540ae77a2ed10e8e260e6de750a44ed9132ffc
-EBUILD feed-0.3.11.1.ebuild 1236 BLAKE2B abe8518d6983b5db99fbbc95389ec82471c969c6d098cc6ff77ed4abd4b74cbbef71d4a5ab344b23fe30d75224326e5510dc89797ae1a3b7d820f69679d24d69 SHA512 0701396b4be4c99441c518cdf4991e59b2c6eaa241423f8287d2ec1ea4b3a098a38f4ff7aa635989eb508dc6d82f1da39304a9fa29e3f915a07843018d43646b
-MISC metadata.xml 417 BLAKE2B a23c62c688b3cb75a784096f85482aae555984209c8991e9c49ff072180f78c54ad037c44fa5358c2a933f9694debf42405f9f0a1029a2ffd042c4b027c3f29f SHA512 fc48f0f9cb5ad4a47fe86e32d4fefc32d09d766054c23fb8321fa82b777116b2a9459e7d5cb723bbcfd497264f2db13c958ac23fece523f1e2ed79f50a9565c7
diff --git a/dev-haskell/feed/feed-0.3.11.1.ebuild b/dev-haskell/feed/feed-0.3.11.1.ebuild
deleted file mode 100644
index 20613bfcada4..000000000000
--- a/dev-haskell/feed/feed-0.3.11.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds"
-HOMEPAGE="https://github.com/bergmark/feed"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/old-time-1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
-	<dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/xml-1.2.6:=[profile?] <dev-haskell/xml-1.3.15:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >= 4 && < 4.9' 'base >= 4' \
-		'time < 1.6' 'time'
-}
diff --git a/dev-haskell/feed/metadata.xml b/dev-haskell/feed/metadata.xml
deleted file mode 100644
index f227a9b7de42..000000000000
--- a/dev-haskell/feed/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">sof/feed</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/fgl-5.4.2.4 b/dev-haskell/fgl-5.4.2.4
new file mode 100644
index 000000000000..d1e4de4ed36c
--- /dev/null
+++ b/dev-haskell/fgl-5.4.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl[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=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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3972db30f676493393d3e0ae2dbfae71
diff --git a/dev-haskell/fgl-5.4.2.4-r1 b/dev-haskell/fgl-5.4.2.4-r1
new file mode 100644
index 000000000000..2e2c589d6f08
--- /dev/null
+++ b/dev-haskell/fgl-5.4.2.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[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=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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6766ac41e27f3a1d8b525dc62277e8c2
diff --git a/dev-haskell/fgl-5.5.0.1 b/dev-haskell/fgl-5.5.0.1
new file mode 100644
index 000000000000..12a78d0de551
--- /dev/null
+++ b/dev-haskell/fgl-5.5.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d1c4ccd64a068e35d35d3167f18deee6
diff --git a/dev-haskell/fgl-5.5.2.3 b/dev-haskell/fgl-5.5.2.3
new file mode 100644
index 000000000000..263381962bf3
--- /dev/null
+++ b/dev-haskell/fgl-5.5.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.3 >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Martin Erwig's Functional Graph Library
+EAPI=5
+HOMEPAGE=https://hackage.haskell.org/package/fgl
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/5.5.2.3
+SRC_URI=mirror://hackage/packages/archive/fgl/5.5.2.3/fgl-5.5.2.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f7b57d3f8069f6a084808d40f20f8106
diff --git a/dev-haskell/fgl-5.5.3.0 b/dev-haskell/fgl-5.5.3.0
new file mode 100644
index 000000000000..e786a41fc45b
--- /dev/null
+++ b/dev-haskell/fgl-5.5.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.3 >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.10 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Martin Erwig's Functional Graph Library
+EAPI=6
+HOMEPAGE=https://hackage.haskell.org/package/fgl
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/5.5.3.0
+SRC_URI=mirror://hackage/packages/archive/fgl/5.5.3.0/fgl-5.5.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=405acc480d4ba051557ba5fbc74f833b
diff --git a/dev-haskell/fgl-arbitrary-0.2.0.1 b/dev-haskell/fgl-arbitrary-0.2.0.1
new file mode 100644
index 000000000000..900fa20cd436
--- /dev/null
+++ b/dev-haskell/fgl-arbitrary-0.2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/fgl-5.5.2.0:=[profile?] <dev-haskell/fgl-6:=[profile?] >=dev-haskell/quickcheck-2.3:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=QuickCheck support for fgl
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/fgl-arbitrary
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/fgl-5.5.2.0:=[profile?] <dev-haskell/fgl-6:=[profile?] >=dev-haskell/quickcheck-2.3:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.0.1
+SRC_URI=mirror://hackage/packages/archive/fgl-arbitrary/0.2.0.1/fgl-arbitrary-0.2.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=818bb04f7bd4417a6ec0dcbe85d9153f
diff --git a/dev-haskell/fgl-arbitrary-0.2.0.2 b/dev-haskell/fgl-arbitrary-0.2.0.2
new file mode 100644
index 000000000000..8c5513cecd71
--- /dev/null
+++ b/dev-haskell/fgl-arbitrary-0.2.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/fgl-5.5.2.0:=[profile?] <dev-haskell/fgl-6:=[profile?] >=dev-haskell/quickcheck-2.3:2=[profile?] <dev-haskell/quickcheck-2.10:2=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=QuickCheck support for fgl
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/fgl-arbitrary
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/fgl-5.5.2.0:=[profile?] <dev-haskell/fgl-6:=[profile?] >=dev-haskell/quickcheck-2.3:2=[profile?] <dev-haskell/quickcheck-2.10:2=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.0.2
+SRC_URI=mirror://hackage/packages/archive/fgl-arbitrary/0.2.0.2/fgl-arbitrary-0.2.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2e678a169081e1edbdd89f3c7a803786
diff --git a/dev-haskell/fgl-arbitrary/Manifest b/dev-haskell/fgl-arbitrary/Manifest
deleted file mode 100644
index 662b2b12ae5e..000000000000
--- a/dev-haskell/fgl-arbitrary/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST fgl-arbitrary-0.2.0.1.tar.gz 6080 BLAKE2B 0bdc70e420aa4989d636b984274ec35806a721fda38501aa5a1cab5c1a6806bb81446fb9918c278752d07d817f18fe202f72604689d862a3538252453b065889 SHA512 841aac5e72c840180a25a3f8132c801c216c25a1cc1e66a91e4a3dd81b4b684ff29aed7bd6780d18c62e200db83eed1bdec6d34abec3e2b77bb5767a4f43915e
-DIST fgl-arbitrary-0.2.0.2.tar.gz 6068 BLAKE2B 8034e36d5f98ec6f00619bcf1885315ce4f95354f22a8763914a748f0652df818ec665da26835b2d1579dfd749e25d39d10c543f56f5ce49975e653cbf0d736a SHA512 294850708d511ed52e6973820e44dffb3c183e64d1c10b1324ee46e0fd3966abf0bce7bca1c5831e67b88965e715f2e2e85a5abdd201fd584a10f720b419b57e
-EBUILD fgl-arbitrary-0.2.0.1.ebuild 768 BLAKE2B 4aa142df971c67347e89b3c898780848338e94d142c551a5dc63adb91d01f7bb7e18e3f8cbfc7119cfb79d9e7e81bb9b77404b6ac9707fdafe26c018ba022852 SHA512 a69c8e037a60e6436e342432721e76e9f61932f0603440c1a217b5a9f41a9f6d0c5a2b26a1b72599b82daccbe1b84571fc48cdeffc74f4194c9fc2a6f2834929
-EBUILD fgl-arbitrary-0.2.0.2.ebuild 767 BLAKE2B 6ffd2280be8dc5bde3fc61612e7c74ce6f527eb465a495cc773ea7327d8bef25ada6e953081359b38cb01d436409b3047cc8f7e9126e29e37009398143278783 SHA512 772ab7f89ad0ea9f4e17fc3b18aaf5324607f9dd444b60751ff4afa50909fa679cb92c673d8466538077971635d527d1550ac1070ee7d7b23ec2302de0f1cadd
-MISC metadata.xml 539 BLAKE2B 4a70ec7a93f29d3e1252bac145520da2a2c02c3041e795801364455f29a2d3659d16435c93b3d779e177a2625631c42c24d546303d1643558b0177882374ee1d SHA512 09430ba886d3f58c1e428ac092d89a96806bc449e01c59d43324552d92a76ea62c6b31c30319ae5ebfc769099291642495815f1bc618e97eb9c416c95b1d4475
diff --git a/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.1.ebuild b/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.1.ebuild
deleted file mode 100644
index 81eec9a810c4..000000000000
--- a/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck support for fgl"
-HOMEPAGE="http://hackage.haskell.org/package/fgl-arbitrary"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fgl-5.5.2.0:=[profile?] <dev-haskell/fgl-6:=[profile?]
-	>=dev-haskell/quickcheck-2.3:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.3 )
-"
diff --git a/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.2.ebuild b/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.2.ebuild
deleted file mode 100644
index e644fa233ff2..000000000000
--- a/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck support for fgl"
-HOMEPAGE="http://hackage.haskell.org/package/fgl-arbitrary"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fgl-5.5.2.0:=[profile?] <dev-haskell/fgl-6:=[profile?]
-	>=dev-haskell/quickcheck-2.3:2=[profile?] <dev-haskell/quickcheck-2.10:2=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.3 )
-"
diff --git a/dev-haskell/fgl-arbitrary/metadata.xml b/dev-haskell/fgl-arbitrary/metadata.xml
deleted file mode 100644
index 44e7a3677e37..000000000000
--- a/dev-haskell/fgl-arbitrary/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Provides Arbitrary instances for fgl graphs (to avoid adding a
-		QuickCheck dependency for fgl whilst still making the instances
-		available to others).
-		
-		Also available are non-fgl-specific functions for generating
-		graph-like data structures.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/fgl/Manifest b/dev-haskell/fgl/Manifest
deleted file mode 100644
index 5e19a7171ce6..000000000000
--- a/dev-haskell/fgl/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST fgl-5.4.2.4.tar.gz 36574 BLAKE2B 16d12bd889198e54f0950706351873f4f2a47fd5be30f9f69a4ad88162cc932789f41bba681a710a843cc29926bd001e450070576cffff1650b831642eaa5493 SHA512 9c0c145f43d1b5671af99e9d62d485c5af1336779463f3e9519e6db98fb3c3dacadecb5241aca2e9326ad795d143efd1b3b04a5cb21077dce28579f430fd8d11
-DIST fgl-5.5.0.1.tar.gz 35963 BLAKE2B bcc8864184d7020405d918c626734bee636a01713b1471bfe01737d5fb991bc26d8c1be04ce969ec53814f00ae25fddae0fb4d71dfe2613e6a51623d38ae5d51 SHA512 0f2b5224e36291ca044bce512b04e1a87e30f8d79ae76bf4f4725d15b26079521c012085125c92ea3133da5d6318595245d4b321669e772f88cabbc90b4a468a
-DIST fgl-5.5.2.3.tar.gz 52223 BLAKE2B 63c5eecab0f8748516c182721f97c8b3cda3387c387f55331807a02345d19e637a39e538ca865122e54e5fe00b713d0e446e16d388481195900e4c36df97cb51 SHA512 4e092048256704e852f13f59046313df83cd00f37c5c32daf69ef13d1ab680296cdcd2b793cbf7383225ecb3caa5c5a1e6110c467d67276eaea6041942856a33
-DIST fgl-5.5.3.0.tar.gz 52923 BLAKE2B 7d35433acdbb967ed7504f3f69ada0fa6913655335e55d8cbf53866e318de2e07dffbec61c20007d7223560f212038b0cc55d8012a44c164f1da7e8890984b6e SHA512 a7f5e4cb9d9cbd6f3063780fb03cf8abbb3311c22848a8eb377238113e55ebf92ddd283326128baabce38faca311ceb270bc1d55dbaf708a935c5e96ceb2df9e
-EBUILD fgl-5.4.2.4-r1.ebuild 633 BLAKE2B b7e050ac7be758d58e1ce1ce1a977e8c395e4047e386b85de2bfe6e4cf741e812468d9dacec535d7ee48dc612d5ed514943a7e81a64c97254105ec54bfe459dc SHA512 23840d655621e09d6412ae6ccd0091314d15c8db1e4c7e48d82c4c5afdb3b0e5f158974f00d553b3e2e6fe8ba7eb35b3a0ba0bee8b8ed0ca3fec510da49cbb36
-EBUILD fgl-5.4.2.4.ebuild 618 BLAKE2B 4adb2e351972f844a0f470b9236ec5de275b3d051fcde03936d44c093905032c653262c37f9c0273c0d0cde7838033cd04f355e275b9dfee9d0b78664742605e SHA512 11b0ec91b1954fbab7fca64838cd53f8450eba840b3e5d8020d07000684a1ff410283ca7fc803460b33416db95f5eea9caa9aa01b305dc5814be347cb3dda5cb
-EBUILD fgl-5.5.0.1.ebuild 623 BLAKE2B 08ac8c8978b4f020eeb99e4ba6483cf6cd9fa8aeba7005cf343f73567c0275ed25eb64a752c016f106f82d314384128f71282d4d912039e1d4da074c6d739f41 SHA512 fa1dbac762685684131fdaebc1ba105b7a44a9bd062d9423565cbaf8b04b0d05b8b227720f4f7695991bee3aa3e7ee09e0b9454158861c44252030b5b9661684
-EBUILD fgl-5.5.2.3.ebuild 715 BLAKE2B fca385f7a170f3e508152c9d6856f5c32bb8d60f9b21fbe0e0e4a53713f04228b2b839d1130e251295139d1f5794df157e7c7bd3520edaae44a6eff79c5cbf21 SHA512 93e0865fe53506b6ddaa8f6fbd5d846b86912b73c775abc9d9acc50b33cc3e27e9e2181708a9f1c1fae8833c35f0da63d0483a5bef70d10093f13ef8126a154f
-EBUILD fgl-5.5.3.0.ebuild 714 BLAKE2B 7e75c1053aa41695ba9009a35ddf327873ff015ec1b3f7c549d44ca05b8e8fc5ca26978814643a5295356ded5d4d5c5c64d3c30567495491da26c379812b1f93 SHA512 5ed464760505b3b7573f09557011b7773f25229efdc4f11678236eb9e52432a7dd7a83227eebd1f3079c636d29aec72a27f2a01f11222c8e16359045a70e6dd1
-MISC metadata.xml 330 BLAKE2B 8f25b35230273f76d6c2dde245293cf8a1ce77d924ea68058d85e0a6afc15c016877c3b3d3abd4653620719e78f26e214a7232e5b64e4e3a49bd1b42392a9846 SHA512 1520b8d184e9a17712ebd3417fceb326f6e974baebc7e1c96fe8b253b825086b6a022fd537a7a229823d935714347498a50ccb677034e6af3a80f05da3dd44c3
diff --git a/dev-haskell/fgl/fgl-5.4.2.4-r1.ebuild b/dev-haskell/fgl/fgl-5.4.2.4-r1.ebuild
deleted file mode 100644
index 3ce26a10de93..000000000000
--- a/dev-haskell/fgl/fgl-5.4.2.4-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Martin Erwig's Functional Graph Library"
-HOMEPAGE="http://web.engr.oregonstate.edu/~erwig/fgl/haskell"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/fgl/fgl-5.4.2.4.ebuild b/dev-haskell/fgl/fgl-5.4.2.4.ebuild
deleted file mode 100644
index bfbddd1cd1a7..000000000000
--- a/dev-haskell/fgl/fgl-5.4.2.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.17.9999
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Martin Erwig's Functional Graph Library"
-HOMEPAGE="http://web.engr.oregonstate.edu/~erwig/fgl/haskell"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl[profile?]
-		>=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/fgl/fgl-5.5.0.1.ebuild b/dev-haskell/fgl/fgl-5.5.0.1.ebuild
deleted file mode 100644
index b302c37489aa..000000000000
--- a/dev-haskell/fgl/fgl-5.5.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Martin Erwig's Functional Graph Library"
-HOMEPAGE="http://web.engr.oregonstate.edu/~erwig/fgl/haskell"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/fgl/fgl-5.5.2.3.ebuild b/dev-haskell/fgl/fgl-5.5.2.3.ebuild
deleted file mode 100644
index 32bee8e07fc9..000000000000
--- a/dev-haskell/fgl/fgl-5.5.2.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Martin Erwig's Functional Graph Library"
-HOMEPAGE="https://hackage.haskell.org/package/fgl"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.3
-		>=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.9 )
-"
diff --git a/dev-haskell/fgl/fgl-5.5.3.0.ebuild b/dev-haskell/fgl/fgl-5.5.3.0.ebuild
deleted file mode 100644
index 91bec359c2d6..000000000000
--- a/dev-haskell/fgl/fgl-5.5.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Martin Erwig's Functional Graph Library"
-HOMEPAGE="https://hackage.haskell.org/package/fgl"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.3
-		>=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.10 )
-"
diff --git a/dev-haskell/fgl/metadata.xml b/dev-haskell/fgl/metadata.xml
deleted file mode 100644
index 8c89ced67086..000000000000
--- a/dev-haskell/fgl/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Martin Erwig's Functional Graph Library
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/file-embed-0.0.10 b/dev-haskell/file-embed-0.0.10
new file mode 100644
index 000000000000..14bbaf070ef9
--- /dev/null
+++ b/dev-haskell/file-embed-0.0.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Use Template Haskell to embed file contents directly
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/file-embed
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.0.10
+SRC_URI=mirror://hackage/packages/archive/file-embed/0.0.10/file-embed-0.0.10.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0a64084b39550c7aa80cf835d4a91944
diff --git a/dev-haskell/file-embed-0.0.7 b/dev-haskell/file-embed-0.0.7
new file mode 100644
index 000000000000..9922321289df
--- /dev/null
+++ b/dev-haskell/file-embed-0.0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Use Template Haskell to embed file contents directly
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/file-embed
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.0.7
+SRC_URI=mirror://hackage/packages/archive/file-embed/0.0.7/file-embed-0.0.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f991f08520554368ccd64d86f8cf083d
diff --git a/dev-haskell/file-embed-0.0.9 b/dev-haskell/file-embed-0.0.9
new file mode 100644
index 000000000000..c871f84bb02e
--- /dev/null
+++ b/dev-haskell/file-embed-0.0.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Use Template Haskell to embed file contents directly
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/file-embed
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.0.9
+SRC_URI=mirror://hackage/packages/archive/file-embed/0.0.9/file-embed-0.0.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dd575b9b1be02ec60fca148b955fd600
diff --git a/dev-haskell/file-embed/Manifest b/dev-haskell/file-embed/Manifest
deleted file mode 100644
index 1c69aa2e1578..000000000000
--- a/dev-haskell/file-embed/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST file-embed-0.0.10.tar.gz 6247 BLAKE2B b8ab7590d0ac8ad9539b07732b589053a98b4ef87feaf2fc816ea81a2b87a9a41bcac9ef44d7180dcec52ea3a266eca7ba01236b3c5699c77685a9119582ba00 SHA512 aa0ef37987b9f84685e064411de080d608d5b9a8c839a332fc163eb218c1a8fcb1fb9dc6bfba0033717f10252e07bb5f72183c3b64bb83488553e9b97bdf3111
-DIST file-embed-0.0.7.tar.gz 4283 BLAKE2B 54b6eb380f2894838e05b0c08a29f9092077d73284632c8b1daa211b08dc8a183fae329c0f5bb66741a6018a9b87f65efd6fcf3868afab5616a230f3024f9e8b SHA512 ae87b0df303261d7a36d1388c7d92f021e36e58feece5f9a12d55fbc16a74aa0553fda2bbaaf34e819108d39655997a44d8b473b48de1b410b00a993de439b26
-DIST file-embed-0.0.9.tar.gz 5624 BLAKE2B a67eec3f43e6c89ec97a4b68295e5da376536fc0565fa55a6db47ab4b6534f0a95bef31b26873fea9bd62dd85891b0409f4588ac5dc1bee066c9f132f6ba96e9 SHA512 897ebcf06eaf6e5ba0c08763adf5f5c47321599cac884e856bac21c178b9116bb3117bab89bb5a1ed2369711a8998c37c2daaf6f7555c403c55c09c5204ce1f7
-EBUILD file-embed-0.0.10.ebuild 573 BLAKE2B 2863f787142d776fa191eac493fd8292db1669f6a8d7896ade48fa368b412f7f221615a0733e05c0d18633b8deca5f1a9099718634b7a3979ae4d0f39fcd58e4 SHA512 0153377905c259354e21acef7b3c35a6716e496c8c5615de627b3d2e7742b9f9aa7b79181fa1977f8b5436f2fd4aeb1010cb4b7b9a83c5b5d5fed1c1d7790fb8
-EBUILD file-embed-0.0.7.ebuild 598 BLAKE2B 5eef93718a4a040ece00f2a299359dbcae0bdd89c0dad1364b441db2c5dd1e60e75f669a8c3bd1e61da6136c6c1f800091a02783674b67467e78350f5d274279 SHA512 cf015ccb73e1d309d46c1eb3bbf6d2728b6bea0cbd345605d2466a1f4d0c7828a261811118b8f6898a97d63e273f2df1bd757d454d0cbd87db7d5714ca1d766e
-EBUILD file-embed-0.0.9.ebuild 602 BLAKE2B ddedf3c08591a6a9d5a9b95b075f5a92043ff280dbfc6b356cb04d0c2843ac95a183df6373f36f04408834783ad1b53fbbfb3e1b84bdb7c720e43381d5213219 SHA512 e25358dcde4158b77e9d1c83062e1b59c6965559116fbd5419185fddb5dfac43e6d5ab0cc77f998be9c8b52a762c9ac89590b847cd00e6d10982a7356110ec80
-MISC metadata.xml 428 BLAKE2B d7afe344d7499a8994b67e7a660e157796948d97e098e469bac498fa4305054d5bcb9f59b16093e975cfd6f08a1a5ca01d39d26142e8958e17bb68870e9c4254 SHA512 f55712fbd177f3d40cba95e8c61fc794917c2196d81f1c6bce8bbbf8d284d27c61c92faf8f525786e17a0e9cf371f22bc4f79587f445b6758862be118dab07a2
diff --git a/dev-haskell/file-embed/file-embed-0.0.10.ebuild b/dev-haskell/file-embed/file-embed-0.0.10.ebuild
deleted file mode 100644
index 892f6e6e75b6..000000000000
--- a/dev-haskell/file-embed/file-embed-0.0.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Use Template Haskell to embed file contents directly"
-HOMEPAGE="https://github.com/snoyberg/file-embed"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/file-embed/file-embed-0.0.7.ebuild b/dev-haskell/file-embed/file-embed-0.0.7.ebuild
deleted file mode 100644
index 39a490fb9cae..000000000000
--- a/dev-haskell/file-embed/file-embed-0.0.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Use Template Haskell to embed file contents directly"
-HOMEPAGE="https://github.com/snoyberg/file-embed"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit )
-"
diff --git a/dev-haskell/file-embed/file-embed-0.0.9.ebuild b/dev-haskell/file-embed/file-embed-0.0.9.ebuild
deleted file mode 100644
index e15ffc18c279..000000000000
--- a/dev-haskell/file-embed/file-embed-0.0.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Use Template Haskell to embed file contents directly"
-HOMEPAGE="https://github.com/snoyberg/file-embed"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit )
-"
diff --git a/dev-haskell/file-embed/metadata.xml b/dev-haskell/file-embed/metadata.xml
deleted file mode 100644
index bdb8b9de6129..000000000000
--- a/dev-haskell/file-embed/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Use Template Haskell to embed file contents directly.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/file-embed</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/file-location-0.4.9 b/dev-haskell/file-location-0.4.9
new file mode 100644
index 000000000000..2c135c3df3fd
--- /dev/null
+++ b/dev-haskell/file-location-0.4.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/hunit:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/th-orphans-0.9:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=common functions that show file location information
+EAPI=5
+HOMEPAGE=https://github.com/gregwebs/FileLocation.hs
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/hunit:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/th-orphans-0.9:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.9
+SRC_URI=mirror://hackage/packages/archive/file-location/0.4.9/file-location-0.4.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2a9692f0458404ca96c8460fafd21351
diff --git a/dev-haskell/file-location-0.4.9-r1 b/dev-haskell/file-location-0.4.9-r1
new file mode 100644
index 000000000000..fc2805353b98
--- /dev/null
+++ b/dev-haskell/file-location-0.4.9-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/hunit:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/th-orphans-0.9:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=common functions that show file location information
+EAPI=5
+HOMEPAGE=https://github.com/gregwebs/FileLocation.hs
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/hunit:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/th-orphans-0.9:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.4.9
+SRC_URI=mirror://hackage/packages/archive/file-location/0.4.9/file-location-0.4.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=62cff939817599a7dd3f998d68951204
diff --git a/dev-haskell/file-location/Manifest b/dev-haskell/file-location/Manifest
deleted file mode 100644
index 01867e66e817..000000000000
--- a/dev-haskell/file-location/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST file-location-0.4.9.tar.gz 6959 BLAKE2B 1cc083a9fb71fb80a11b56e27d8fc468f806d1417efbaf618ea07a4f68df5addf7c479bf5490d50bf07b34ff6babdaefc11536068c15bff274b07bbf4189be74 SHA512 cbea7ef5a6797efd242219a32c7d46b5a0fe2b20d4c93e7ab758cf27519b021c2e2c34ab91d4eedfba8a61a51f81312346d575f8c83296b87b1f7bea8985d40f
-EBUILD file-location-0.4.9-r1.ebuild 881 BLAKE2B 7fca8873c49653ef64c34319f76faa9281e5eb0ccfc2707e6e1d937c8e52e52cf6ad4186e6e5558c1731892ce24bc6fc82dd3e890f971e7f617ae44f2b6fbc9c SHA512 5fa82b5758a587f64849546d33e4fdcc2bd44d46e9e197753d20f9b86445e0b0ae2c17c3f9f6f7176fa3da021f27abe52c726725b7b624c95846369e5fdd57da
-EBUILD file-location-0.4.9.ebuild 774 BLAKE2B 9dd1bde12108bb2b9bc20a814e56b8097bb56d269900b6f52e04f39ee9596ae22bc7c0564f01475e73e78445ce264c6a8363bfd631974f6fd5da5429cadb94c0 SHA512 3b930e24b6859a5e2e1aa70fa3b117d5041b08888b46b2a73e9392795142875217f4c2afbfc8384ab8e3535d16f50510bafa51e82242b6db5252a060bfae5b33
-MISC metadata.xml 1438 BLAKE2B 7790bc6d1bab559c7961458b3fee13af2861c8bda34d39045044179e973892fbe01471c53faa9bcf32f3a4bec902f1590bead1b9bed2e6d653b52ad9438be230 SHA512 becf41f547c76f329ae69bd5518a96cffcdf3161c05d9ffaecf3f6ba91d9a20855e3aefba473c37d4e7d004fc5d923459f50fd8a7a4f657ccfb52482d15c753e
diff --git a/dev-haskell/file-location/file-location-0.4.9-r1.ebuild b/dev-haskell/file-location/file-location-0.4.9-r1.ebuild
deleted file mode 100644
index ba606f8ae4be..000000000000
--- a/dev-haskell/file-location/file-location-0.4.9-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="common functions that show file location information"
-HOMEPAGE="https://github.com/gregwebs/FileLocation.hs"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # error stack changed from ghc-7.10
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-	dev-haskell/lifted-base:=[profile?]
-	>=dev-haskell/th-orphans-0.9:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'transformers     >= 0.2 && < 0.5' 'transformers     >= 0.2'
-}
diff --git a/dev-haskell/file-location/file-location-0.4.9.ebuild b/dev-haskell/file-location/file-location-0.4.9.ebuild
deleted file mode 100644
index a245d34a0e23..000000000000
--- a/dev-haskell/file-location/file-location-0.4.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="common functions that show file location information"
-HOMEPAGE="https://github.com/gregwebs/FileLocation.hs"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-	dev-haskell/lifted-base:=[profile?]
-	>=dev-haskell/th-orphans-0.9:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/file-location/metadata.xml b/dev-haskell/file-location/metadata.xml
deleted file mode 100644
index fd1840e49f39..000000000000
--- a/dev-haskell/file-location/metadata.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Common debugging/error/exception functions that give file location information
-		
-		&gt; $(err "OH NO!")
-		&gt;
-		&gt; main:Main main.hs:16:1 OH NO!
-		
-		Notice how it displays package:module file:line:character
-		It exposes the functions err (error), undef (undefined), and trc (Debug.Trace.trace). All of these behave the same as their normal counterpart but also spit out a location.
-		
-		Here is my favorite helper, debug, which is like trace but just show the value.
-		
-		&gt; debug [1,2,3]
-		&gt;
-		&gt; DEBUG: [1,2,3]
-		&gt; [1,2,3]
-		
-		And The Template Haskell version.
-		
-		&gt; $(dbg) [1,2,3]
-		&gt;
-		&gt; DEBUG main:Main main.hs:1:3 [1,2,3]
-		&gt; [1,2,3]
-		
-		Also there is a version of thrwIO that gives location information
-		&gt; ($(thrwIO) $ AException) `catch` \e -&gt; putStrLn ("Caught " ++ show (e :: AException))
-		&gt;
-		&gt; Caught AException "main:Main test/main.hs:25:6"
-		
-		See module for a listing of all the functions with short descriptions, and the homepage for some more examples https://github.com/gregwebs/ErrorLocation.hs
-	</longdescription>
-	<upstream>
-		<remote-id type="github">gregwebs/FileLocation.hs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/filelock-0.1.0.1 b/dev-haskell/filelock-0.1.0.1
new file mode 100644
index 000000000000..d4246716beb4
--- /dev/null
+++ b/dev-haskell/filelock-0.1.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.2:= >=dev-haskell/cabal-1.14.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Portable interface to file locking (flock / LockFileEx)
+EAPI=6
+HOMEPAGE=https://github.com/takano-akio/filelock
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=>=dev-lang/ghc-7.4.2:=
+SLOT=0/0.1.0.1
+SRC_URI=mirror://hackage/packages/archive/filelock/0.1.0.1/filelock-0.1.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=503b1a0d4f14c675029454df6837f2ba
diff --git a/dev-haskell/filelock/Manifest b/dev-haskell/filelock/Manifest
deleted file mode 100644
index 933c17195b49..000000000000
--- a/dev-haskell/filelock/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST filelock-0.1.0.1.tar.gz 5884 BLAKE2B 27596191c70ca71f11fdcd3bd66362d51407774dcda2e9f31220981af5e259edbf7cac8db87fb7899741c937caf240e7e1af210f569b33600c3407956c1fa975 SHA512 73cc119bcca61b040692738aefcc779debef8815182a9f74e9e0700d9b1e5de0e12812f573f9daa8a127d99269f69e3cfc572cd5cd104d1fddb04ec8d4bf0c97
-EBUILD filelock-0.1.0.1.ebuild 579 BLAKE2B 8e6f7b90217f07e86f0820abec81e3b727e5186f72d681c7e67379c01e8704dd8f7602d4e4e83690e5bac3e684254d582a98e81412c58c3844f179d2f46ce405 SHA512 0a2ade8e4a39dc9e1cc281d874ca83e1eb2e0f1d79aab9484b0e1b8f6820c4a66b7b3e6dd1c0bf0683e540b38ba734fd50021537468a63801af8bfc56c39ef19
-MISC metadata.xml 377 BLAKE2B 752a7f7145365ceb57f3e07d726843acf7d62a476af56bfde35138c63e79171aa8d4b0af5209d28c69d13e2d8e597d80137e44218f72615f8d495b2cb615da02 SHA512 82aa6e68e477c7332df560e453c6ca40d97872f0dfe1bc29a28c00df29aed3b1c9329fbd6c40b009318e1675d23f2eadbc84b9fc5434044dc99605bf520e4b60
diff --git a/dev-haskell/filelock/filelock-0.1.0.1.ebuild b/dev-haskell/filelock/filelock-0.1.0.1.ebuild
deleted file mode 100644
index 8b500a36e9b4..000000000000
--- a/dev-haskell/filelock/filelock-0.1.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Portable interface to file locking (flock / LockFileEx)"
-HOMEPAGE="https://github.com/takano-akio/filelock"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.14.0
-"
diff --git a/dev-haskell/filelock/metadata.xml b/dev-haskell/filelock/metadata.xml
deleted file mode 100644
index 8bf42d916cfe..000000000000
--- a/dev-haskell/filelock/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides an interface to Windows and Unix
-		file locking functionalities.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/filemanip-0.3.6.3 b/dev-haskell/filemanip-0.3.6.3
new file mode 100644
index 000000000000..e95175299baf
--- /dev/null
+++ b/dev-haskell/filemanip-0.3.6.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Expressive file and directory manipulation for Haskell
+EAPI=5
+HOMEPAGE=https://github.com/bos/filemanip
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.6.3
+SRC_URI=mirror://hackage/packages/archive/filemanip/0.3.6.3/filemanip-0.3.6.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2c067eefe255753e14cb81b09a1fb169
diff --git a/dev-haskell/filemanip/Manifest b/dev-haskell/filemanip/Manifest
deleted file mode 100644
index 49178d234af4..000000000000
--- a/dev-haskell/filemanip/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST filemanip-0.3.6.3.tar.gz 10369 BLAKE2B 19f68d3c130ff5d2f40cae100eeee4ae079d86c0d23138e44b7f22d07584c941a8a0ad8cddb04b474a86729872699ac72991a0dcf6c9807377a761570138710c SHA512 5cb6ad4e310c1ae3b038ccfa3154536db73145e4dea4a7be1ae0563ba44565494e378fa8e459f449feac2bcc140f1128b0b3ec915acd2300e73cf012ada85160
-EBUILD filemanip-0.3.6.3.ebuild 617 BLAKE2B 083d7d1eee8a95d847ae45f8850061c99d41b7de808995c6f2221d28f8612d6cea59d6c02d4bdf04425ae4f5be47bdb327d86d5db800f87475dafc711a7f7fd1 SHA512 818a9bc4a93850ef9a3fecf62ce09c151b29bc1ea3c90b8a92c234da1c94ddbd914a07dca8f1901e83999e3c729ff5bc599311acb732a0a0aca4853aa0a9d24e
-MISC metadata.xml 516 BLAKE2B 61b30369e5a46af92e588ac196e00822cef6919e4cce101a204045280e5311b3e0b2475755e2778a7d2fe7f1ee39852e50e9d54ceb67b9cc8b0fec32cfae566a SHA512 6dc2a8084fd770c5e6da7536c09dcba528b8db906acf39d49ba91bf34cdb3eaca72cc6127d8ff1b9e0d938c27e07382fc4c57b65732829ecf3414c423f7d00b3
diff --git a/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild b/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild
deleted file mode 100644
index 111b8a885768..000000000000
--- a/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Expressive file and directory manipulation for Haskell"
-HOMEPAGE="https://github.com/bos/filemanip"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/filemanip/metadata.xml b/dev-haskell/filemanip/metadata.xml
deleted file mode 100644
index 445e6f97d517..000000000000
--- a/dev-haskell/filemanip/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A Haskell library for working with files and directories.
-		Includes code for pattern matching, finding files,
-		modifying file contents, and more.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bos/filemanip</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/filestore-0.6.1 b/dev-haskell/filestore-0.6.1
new file mode 100644
index 000000000000..c12b8902ec45
--- /dev/null
+++ b/dev-haskell/filestore-0.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/diff-0.2:=[profile?] <dev-haskell/diff-0.4:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/xml-1.3:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 dev-haskell/mtl ) test? ( dev-vcs/darcs dev-vcs/git dev-vcs/mercurial ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Interface for versioning file stores
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/filestore
+IUSE=+maxcount doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/diff-0.2:=[profile?] <dev-haskell/diff-0.4:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/xml-1.3:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.6.1
+SRC_URI=mirror://hackage/packages/archive/filestore/0.6.1/filestore-0.6.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dca168274171ceed5554df6af0e571d3
diff --git a/dev-haskell/filestore-0.6.2 b/dev-haskell/filestore-0.6.2
new file mode 100644
index 000000000000..ac0b21f7173c
--- /dev/null
+++ b/dev-haskell/filestore-0.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/diff-0.2:=[profile?] <dev-haskell/diff-0.4:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/xml-1.3:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 dev-haskell/mtl ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Interface for versioning file stores
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/filestore
+IUSE=+maxcount doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/diff-0.2:=[profile?] <dev-haskell/diff-0.4:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/xml-1.3:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.6.2
+SRC_URI=mirror://hackage/packages/archive/filestore/0.6.2/filestore-0.6.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2105341e5ef9d1e6fc66e1e68b2cef93
diff --git a/dev-haskell/filestore/Manifest b/dev-haskell/filestore/Manifest
deleted file mode 100644
index 516e5baa4b4b..000000000000
--- a/dev-haskell/filestore/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX filestore-0.6.1-ghc-8.patch 634 BLAKE2B 349e6b02906366c1d0900bf4a69cdb70507a0820c79503a9697e8cc08a0b280ec79ccd27cce8ca5d940d189c4e47bef0be0c7ef456d03213ae9844930f64c112 SHA512 bb16f55cf092c2f4fd6c3a0d285775d8ecea50b52f9ce4fa4bf92d44040d1e6c59206554cca641c9eecb537f67220feeca4d6a254eca4fee5b8d10024d6009e7
-DIST filestore-0.6.1.tar.gz 31837 BLAKE2B 8aa628da69bb84fbc0654c8d82bad208f0cecb4749f7ec82e8e4261a48464e008f2a7690e504e442cec368afef5d977073cb1544a346d1e915adc0dc3f2c35ee SHA512 48d307b928c7a79974e057b604cde80cb4394f6840300aae637f82884f7741553a7edc791f5b0d7c002eec2a025f4ae015a326453525c351368050fe5cf255b4
-DIST filestore-0.6.2.tar.gz 31096 BLAKE2B 2477879d7cb361e96bc030dfdf1bd6e00b865d5a77133d428b358c8aac514f64c957d8500f5ca96ea2f905bdcc0c98b5138da212faba83589117feb5491f86b5 SHA512 3cc3ab2e46cbd6210dc507a6411db347c626219cc9bdfc39fcdc63f10f813b6066c069b3f614a2a4e2f5522608be11f64a11742570270f2d06da4b330ea97b44
-EBUILD filestore-0.6.1.ebuild 1612 BLAKE2B afa0e8fd2e34f4dc918257adc27c1e6731a8075949a19410f1df0057323be22f946ef6921fa9646a865d4b9602823e9eedcc05005828d2e414a4d859c0241775 SHA512 89ba0fab17075bdfe27ee035548a02c62a35444a1803ca8b4168a2bc3333da140be190ce9e680593bc1f43027c8a1fba4372f5f445d6a8119c1641d86065a2db
-EBUILD filestore-0.6.2.ebuild 1364 BLAKE2B edeb8c5166b6252e92946b2a1e309d4c8f14eff0e211ab8246b0a0e598f65201b6bad4277bfb706e95583b84937861c8adb96605db49fcdbc2798c2fba988a16 SHA512 a0033ebd13d264e419e3d8b0613c4c2cc38891b84d453ea8dea16194af98ba77a37e75e6406986c71391c0b73d43a12140c4dea67ba883385c3a906dd7e0c6e0
-MISC metadata.xml 796 BLAKE2B 375f217f68beae2145186476ace228a86b22bc18296934a7a811d0a54847a73d730c3dfa93483947f6f87c4a7e6ffcfa3afe68fe4b9b2bb7314c7f1a7724fc43 SHA512 8f45afc127a379b15396f639424cd31b9e241b547ccf743c5509eb80d07dc74dc7cbf3a0edc17f62e9a4202ed2fd420c6a055f0bc1325d09c36662bd695891d9
diff --git a/dev-haskell/filestore/files/filestore-0.6.1-ghc-8.patch b/dev-haskell/filestore/files/filestore-0.6.1-ghc-8.patch
deleted file mode 100644
index 126a0564b4db..000000000000
--- a/dev-haskell/filestore/files/filestore-0.6.1-ghc-8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Data/FileStore/Types.hs b/Data/FileStore/Types.hs
-index e950c7a..e116761 100644
---- a/Data/FileStore/Types.hs
-+++ b/Data/FileStore/Types.hs
-@@ -152,3 +152,3 @@ data FileStore = FileStore {
-     -- | Save contents in the filestore.
--  , save           :: Contents a
-+  , save           :: forall a . Contents a
-                    => FilePath          -- Resource to save.
-@@ -160,3 +160,3 @@ data FileStore = FileStore {
-     -- | Retrieve the contents of the named resource.
--  , retrieve       :: Contents a
-+  , retrieve       :: forall a . Contents a
-                    => FilePath          -- Resource to retrieve.
diff --git a/dev-haskell/filestore/filestore-0.6.1.ebuild b/dev-haskell/filestore/filestore-0.6.1.ebuild
deleted file mode 100644
index 75d53eaeabb7..000000000000
--- a/dev-haskell/filestore/filestore-0.6.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Interface for versioning file stores"
-HOMEPAGE="http://hackage.haskell.org/package/filestore"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+maxcount"
-
-RESTRICT=test # one darcs test fails
-
-RDEPEND=">=dev-haskell/diff-0.2:=[profile?] <dev-haskell/diff-0.4:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/xml-1.3:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		dev-haskell/mtl )
-"
-DEPEND+="
-	test? ( dev-vcs/darcs
-		dev-vcs/git
-		dev-vcs/mercurial
-	)
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-8.patch
-
-	cabal_chdeps \
-		'time >= 1.1 && < 1.6' 'time >= 1.1' \
-		'process >= 1.0 && < 1.3' 'process >= 1.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag maxcount maxcount)
-}
-
-src_test() {
-	export HOME=${T}/
-	git config --global user.email "git@src_test"
-	git config --global user.name "Mr. ${P} The Test"
-
-	haskell-cabal_src_test
-}
diff --git a/dev-haskell/filestore/filestore-0.6.2.ebuild b/dev-haskell/filestore/filestore-0.6.2.ebuild
deleted file mode 100644
index ff22aa392912..000000000000
--- a/dev-haskell/filestore/filestore-0.6.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Interface for versioning file stores"
-HOMEPAGE="http://hackage.haskell.org/package/filestore"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+maxcount"
-
-RESTRICT=test # one darcs test fails
-
-RDEPEND=">=dev-haskell/diff-0.2:=[profile?] <dev-haskell/diff-0.4:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/xml-1.3:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		dev-haskell/mtl )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'directory >= 1.1 && < 1.3' 'directory >= 1.1' \
-		'directory >= 1.0 && < 1.3' 'directory >= 1.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag maxcount maxcount)
-}
diff --git a/dev-haskell/filestore/metadata.xml b/dev-haskell/filestore/metadata.xml
deleted file mode 100644
index 4bc0a50f8610..000000000000
--- a/dev-haskell/filestore/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The filestore library provides an abstract interface for a versioning
-		file store, and modules that instantiate this interface.  Currently
-		Git, Darcs, and Mercurial modules are provided, and other VCSs
-		or databases could be added.
-	</longdescription>
-	<use>
-		<flag name="maxcount">Make use of a recent (&gt;= 2.3.0) Darcs feature which vastly improves the performance
-		of 'latest'.  You should disable this flag if you plan to use gitit with an
-		older version of Darcs, or 'latest' will raise an error.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/findbin-0.0.5-r1 b/dev-haskell/findbin-0.0.5-r1
new file mode 100644
index 000000000000..aad650d4769c
--- /dev/null
+++ b/dev-haskell/findbin-0.0.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Locate directory of original program
+EAPI=5
+HOMEPAGE=https://github.com/audreyt/findbin
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.0.5
+SRC_URI=mirror://hackage/packages/archive/FindBin/0.0.5/FindBin-0.0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6775d0f81f2b9c57630184e96084d63a
diff --git a/dev-haskell/findbin/Manifest b/dev-haskell/findbin/Manifest
deleted file mode 100644
index 4a3ca4af2fd3..000000000000
--- a/dev-haskell/findbin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST FindBin-0.0.5.tar.gz 2277 BLAKE2B e63fb63739f1418d43fabd919276e9b4fe4ba91e2b8d961df232e824443d0f39ab7dc9ef55f4628f22216e312f1d7a8e81a6d8bb9f748fce8ba17ea6880eadf9 SHA512 427eff520ea9b88bc928d4330d4550d1d7d2254512e63cc8afad5f45b94a58cf4758a704db5b8ca4dd33f5bfced6557965192bd41d621a33eecc0c517548fa9a
-EBUILD findbin-0.0.5-r1.ebuild 634 BLAKE2B c1478801c42a2331aa543ae9112b21202b3a6eb6888c96b56b5182a382a8f88365eaeb0f53fe5ddc92bf9f08a10daa6502e4e1279939c6bfaa1a1b301f5dedd2 SHA512 f7a6df145345a2c32196dcb92f0d2ab8ac74355befe2d76756e0b983dd41bd01c4bc868b2a5e6ee2028dfebeb220ac012d3095171606d05d2b1fbdbfb276df69
-MISC metadata.xml 604 BLAKE2B cc6f08be08301d38a1d361d186e345df487482806e3e3686f92f8b078d650524efa4e4c81308e2e19c2ce22d750975e5e39685ef1dde0975223600b2cc725a84 SHA512 b67a98cde7a83d63a13c7b3760866638a35cd115c8157d373d0a38dfe30fa9f52d1204f7fd28abeb62ba3c991fe86438aab8b2c8511eb429fe39c35f3a7a8ae3
diff --git a/dev-haskell/findbin/findbin-0.0.5-r1.ebuild b/dev-haskell/findbin/findbin-0.0.5-r1.ebuild
deleted file mode 100644
index 270281145216..000000000000
--- a/dev-haskell/findbin/findbin-0.0.5-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="FindBin"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Locate directory of original program"
-HOMEPAGE="https://github.com/audreyt/findbin"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-0"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/findbin/metadata.xml b/dev-haskell/findbin/metadata.xml
deleted file mode 100644
index 10897c810b1a..000000000000
--- a/dev-haskell/findbin/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This module locates the full directory to the running program,
-		to allow the use of paths relative to it.
-		FindBin supports invocation of Haskell programs via "ghci",
-		via "runhaskell/runghc", as well as compiled as an executable.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">audreyt/findbin</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/fingertree-0.1.1.0 b/dev-haskell/fingertree-0.1.1.0
new file mode 100644
index 000000000000..f9215f8d3b42
--- /dev/null
+++ b/dev-haskell/fingertree-0.1.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generic finger-tree structure, with example instances
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/fingertree
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.1.0
+SRC_URI=mirror://hackage/packages/archive/fingertree/0.1.1.0/fingertree-0.1.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=311b7733eac22ddf68709605e8e270f4
diff --git a/dev-haskell/fingertree/Manifest b/dev-haskell/fingertree/Manifest
deleted file mode 100644
index bbc7727d5404..000000000000
--- a/dev-haskell/fingertree/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fingertree-0.1.1.0.tar.gz 14415 BLAKE2B b05ce26d0275ac9910607927914759008ed1c7e8ceeeeebbe6200ec5a96e39efc10372a69edc71cde01bbd8f5ba8600e7dd7ec7e31e676225127a133607e5edb SHA512 47d7387e11cf05a2df323c6af76a12e6cf02a857f7131203400cbc6ba9ee4c3c9e2c721a8423e6456a385f5ea0c4aedd0e9a2600d2d33609c0457cd259337016
-EBUILD fingertree-0.1.1.0.ebuild 740 BLAKE2B e6bacaa43900911a09405a0b3d6e78f1d3d243769f85cb83755634c82c9770f73942981ef5cc1af0431b63cc81080aed33d1d6b44144714badab3283e7612a41 SHA512 ab07e2fc6f1d8d8cce7884f9023835fc2a68b117c93e5a70ff105ade2c6c65ebcce7fc49e745b3c54642a1769278399914079f63f2a7d99e2c8418474d867c46
-MISC metadata.xml 824 BLAKE2B 282a5af4cf2bdb333afd0079c4c845bf6dc5d09574828dcd74742a18e3ef6c09578199f6117f0d7bd707ab23e16f9dd44a30e8b0d3b2f2d54f78807e934b805a SHA512 94278f3b50b18615d69752ef69012cf4996f4bbc90e2195688a47510290fff8d6a1bdb32cb04ec0a5b728d01221d5e15250bcf4dbddac6e05a3619e90ed60c8d
diff --git a/dev-haskell/fingertree/fingertree-0.1.1.0.ebuild b/dev-haskell/fingertree/fingertree-0.1.1.0.ebuild
deleted file mode 100644
index 395439ae1202..000000000000
--- a/dev-haskell/fingertree/fingertree-0.1.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Generic finger-tree structure, with example instances"
-HOMEPAGE="http://hackage.haskell.org/package/fingertree"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/fingertree/metadata.xml b/dev-haskell/fingertree/metadata.xml
deleted file mode 100644
index e1edfac92e74..000000000000
--- a/dev-haskell/fingertree/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A general sequence representation with arbitrary
-		annotations, for use as a base for implementations of
-		various collection types, with examples, as described
-		in section 4 of
-		
-		* Ralf Hinze and Ross Paterson,
-		\"Finger trees: a simple general-purpose data structure\",
-		/Journal of Functional Programming/ 16:2 (2006) pp 197-217.
-		&lt;http://www.soi.city.ac.uk/~ross/papers/FingerTree.html&gt;
-		
-		For a tuned sequence type, see @Data.Sequence@ in the
-		@containers@ package, which is a specialization of
-		this structure.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/fixed-0.2.1.1 b/dev-haskell/fixed-0.2.1.1
new file mode 100644
index 000000000000..5b9672ee2729
--- /dev/null
+++ b/dev-haskell/fixed-0.2.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Signed 15.16 precision fixed point arithmetic
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/fixed
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.8.2:=
+SLOT=0/0.2.1.1
+SRC_URI=mirror://hackage/packages/archive/fixed/0.2.1.1/fixed-0.2.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d1182145ef8e6dcbcd75abbf1a21cba1
diff --git a/dev-haskell/fixed/Manifest b/dev-haskell/fixed/Manifest
deleted file mode 100644
index d20375648b21..000000000000
--- a/dev-haskell/fixed/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fixed-0.2.1.1.tar.gz 4346 BLAKE2B 9821b0a7a14b338f964cce55699fbd31c1802334f6d9b8d0717e1d673d284a503e01b91328bdf307f1429ddbdd8c7a6ec3395bfbe465d6af531bfa5e27daf20b SHA512 99f0410deffbecaf4ffb15543e3fd060cc679b238644490cbb0a608dda9957fc4c0020bce667f6ca25fc02c52fced7e9ca40dabe899ec8649b522fdec75eb9c0
-EBUILD fixed-0.2.1.1.ebuild 553 BLAKE2B 4b914ea442394d83f2adb8d6de63ea5e3766b1512d5a9b971164842467c6ad5c2e18a0b4cf8d2c1e7bd3f8d78302f7d24ae5e19e77d47e560636fc0a628b4fc6 SHA512 b34d802fe7c324a713cfc37d8bc90be017e85b7ca71d21b27795ee37159372a9bf1a66debb9ad605b67909c289d407383a6cf9c8debcd7330f7a73fd6d4cb84f
-MISC metadata.xml 413 BLAKE2B 5d3a548e2da109d2aebe76a402bf7846c07ad08cbe5a91aef12bd2961b8c9dcd8ef882043252850e5e7d19d5feae566a383c5b5525a2ba359a8796efca418f76 SHA512 df96a590fc59749e413354ba4dc73fa84d836adde69fa287a8ddeb6fffbd25860b50cb53bd1e496dd52301147b0cad00ca3dd468804174731af0ada89d09ccdd
diff --git a/dev-haskell/fixed/fixed-0.2.1.1.ebuild b/dev-haskell/fixed/fixed-0.2.1.1.ebuild
deleted file mode 100644
index 1ed882c7fdde..000000000000
--- a/dev-haskell/fixed/fixed-0.2.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Signed 15.16 precision fixed point arithmetic"
-HOMEPAGE="https://github.com/ekmett/fixed"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/fixed/metadata.xml b/dev-haskell/fixed/metadata.xml
deleted file mode 100644
index 86b35f9b7118..000000000000
--- a/dev-haskell/fixed/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Signed 15.16 precision fixed point arithmetic
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/fixed</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/fmlist-0.9 b/dev-haskell/fmlist-0.9
new file mode 100644
index 000000000000..d488afb695cc
--- /dev/null
+++ b/dev-haskell/fmlist-0.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=FoldMap lists
+EAPI=5
+HOMEPAGE=https://github.com/sjoerdvisscher/fmlist
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.9
+SRC_URI=mirror://hackage/packages/archive/fmlist/0.9/fmlist-0.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=02607d19b50ef83ba0b9be86740bd3fc
diff --git a/dev-haskell/fmlist/Manifest b/dev-haskell/fmlist/Manifest
deleted file mode 100644
index bb58c0cfd680..000000000000
--- a/dev-haskell/fmlist/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fmlist-0.9.tar.gz 4256 BLAKE2B b6dff5a18f3e13c16c7aed41eb4b22d6fa01ee0a8fe8250fab706a0d07b38cf50bf09b40f0b794aae304c6c4e93fd30ede2ab1765cbbdede2a08e9b12b5d07ea SHA512 ddead2f2742e91365381ac9c003f59ea57441c4e9a32b01f3d1aa989120d954b01bb6b19f148a4d89c0cb7332093c39f17567d8c479d47133a0568b8abc757d4
-EBUILD fmlist-0.9.ebuild 526 BLAKE2B 9aca785245f50223a31c73931266956272b2346cd1cac65512b1cf04cd1e6a0467842436c111c08a8aa9538bafbfd6bde50793e01055278294832eb8a381e2e3 SHA512 3db79e7023c70d5248033069b1798dd24826cc8de76932e42e51fe39f9c8d20c1a6583f204889be023c801b1de771aefdc389f18d3029fc65ee16d0f0c8bd204
-MISC metadata.xml 649 BLAKE2B edaee174f4fae81ec0428208341edc01ae2b99148f4393e498c39aea47152a1cfdef44f9cfd68f3a7313172e565620b0645e187c0ab1b4e3570f0aaea16bb7a2 SHA512 338f1edee5049def417c74b8b5e30db76b34525ea6c5a308b80ab3bf9a64f34799e98a8b617b4715b488d864a92a16aa2642c57ce4322dedea0a5477fef69b9d
diff --git a/dev-haskell/fmlist/fmlist-0.9.ebuild b/dev-haskell/fmlist/fmlist-0.9.ebuild
deleted file mode 100644
index b245be87694c..000000000000
--- a/dev-haskell/fmlist/fmlist-0.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="FoldMap lists"
-HOMEPAGE="https://github.com/sjoerdvisscher/fmlist"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/fmlist/metadata.xml b/dev-haskell/fmlist/metadata.xml
deleted file mode 100644
index d3d264a012cf..000000000000
--- a/dev-haskell/fmlist/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		FoldMap lists are lists represented by their foldMap function.
-		FoldMap lists have O(1) cons, snoc and append, just like DLists,
-		but other operations might have favorable performance
-		characteristics as well. These wild claims are still completely
-		unverified though.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">sjoerdvisscher/fmlist</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/foldl-1.0.7 b/dev-haskell/foldl-1.0.7
new file mode 100644
index 000000000000..e37ebc6a8acf
--- /dev/null
+++ b/dev-haskell/foldl-1.0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=<dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Composable, streaming, and efficient left folds
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/foldl
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=<dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.7
+SRC_URI=mirror://hackage/packages/archive/foldl/1.0.7/foldl-1.0.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3ac0c816a8cdcdf3b4605a5a5823ff67
diff --git a/dev-haskell/foldl-1.1.3 b/dev-haskell/foldl-1.1.3
new file mode 100644
index 000000000000..e0554b5574fe
--- /dev/null
+++ b/dev-haskell/foldl-1.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/mwc-random-0.13.1.0:=[profile?] <dev-haskell/mwc-random-0.14:=[profile?] <dev-haskell/primitive-0.7:=[profile?] <dev-haskell/profunctors-5.3:=[profile?] >=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Composable, streaming, and efficient left folds
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/foldl
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/mwc-random-0.13.1.0:=[profile?] <dev-haskell/mwc-random-0.14:=[profile?] <dev-haskell/primitive-0.7:=[profile?] <dev-haskell/profunctors-5.3:=[profile?] >=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.3
+SRC_URI=mirror://hackage/packages/archive/foldl/1.1.3/foldl-1.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cde7af27211a7b559b0428504dffa9cd
diff --git a/dev-haskell/foldl-1.2.3 b/dev-haskell/foldl-1.2.3
new file mode 100644
index 000000000000..2d27bd107d58
--- /dev/null
+++ b/dev-haskell/foldl-1.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?] <dev-haskell/contravariant-1.5:=[profile?] >=dev-haskell/mwc-random-0.13.1.0:=[profile?] <dev-haskell/mwc-random-0.14:=[profile?] <dev-haskell/primitive-0.7:=[profile?] <dev-haskell/profunctors-5.3:=[profile?] >=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Composable, streaming, and efficient left folds
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/foldl
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?] <dev-haskell/contravariant-1.5:=[profile?] >=dev-haskell/mwc-random-0.13.1.0:=[profile?] <dev-haskell/mwc-random-0.14:=[profile?] <dev-haskell/primitive-0.7:=[profile?] <dev-haskell/profunctors-5.3:=[profile?] >=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.2.3
+SRC_URI=mirror://hackage/packages/archive/foldl/1.2.3/foldl-1.2.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=03939bfe712aee95403c12324adff68f
diff --git a/dev-haskell/foldl/Manifest b/dev-haskell/foldl/Manifest
deleted file mode 100644
index 8d518f4639ab..000000000000
--- a/dev-haskell/foldl/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST foldl-1.0.7.tar.gz 8533 BLAKE2B 2467457cc4d54e5f4061b902ce2a8ee766038278b17b9d10b2c1d0c647e5bbc366ba409e8593267084580bed51651de5c5bf1e288c49b4ce43b37e41a51ac878 SHA512 b2dd75560b48430be67ba11503b7f639739ba83e340a93df37a04f729d42e4fb06c46bb7fc878855737848de67e40988a184d78ff4500ac8d21890ccc112b033
-DIST foldl-1.1.3.tar.gz 10640 BLAKE2B b805d112d34bb1cbc18f530c7ea5f080eb139137e819b981bcd8078de4708838d506bb156fafa6789ea4d8722ea96ff1fbf51e514f190e76f9662631f3670ce6 SHA512 a833e9a81f154337ef17dd746dc46175dc8d4862ca4e945dd994004e3891497787df6b6e74a48372e43ca59c1c69b1d2d32a91e2d3ae27673975dc0fcd86da8b
-DIST foldl-1.2.3.tar.gz 14782 BLAKE2B d9c394711e3ef8f72cd4d2aa5d9a3d58a4d7494b5a912efcb984019ccfc4b795ff8dae5b648e1b091fb885e64a58d8c29e6d5fe310d0e69b1eda169d00fbbf2b SHA512 30ba640561eafee690333e4741a7065e91bc5da5e5dc62a158d9f1fd21e723e0a0c2df9a29c783699fb746277ebb3ecd66bfbbeebf34d3db952e2ce0e4aba475
-EBUILD foldl-1.0.7.ebuild 843 BLAKE2B 8e2d358005d1774a32148aa270b4ed1e46faac5ad7d411da621f29ae165c24c4933926c4ecb43fe16ebfaacd520a48970ec66cc21e81f891147e1d930b260ffb SHA512 9df5cad6a114ed0d38b14973fc5e57fb9336718ca64e4eac66ad338fef7a483f79786aa4935834f60242bdba2f644c9ae0bda60a5977ef334580712f381e8313
-EBUILD foldl-1.1.3.ebuild 1045 BLAKE2B 312587dfe6279d5dcf4238a776f0be878a4343bfa43ee72c67fe1718851cc90880f02f9433e9ec70acf5f46c3adab24a4d20c28da13ea4fd0606d9800de61b61 SHA512 d0a194d28d57ea85f4bbb72adc3bbad9ca094096b8547ee581f194abf40360b8a16f96da3edfaf6d54c80cf0740731afe00c4bbd718ce2ffa2359e5edb88b8f8
-EBUILD foldl-1.2.3.ebuild 1002 BLAKE2B b208758e8c546dff17264f84ef7f8d58eed8f92714b527fbd617833be5b040bbe2da4480e767ac487be43559c39f6aa7e9e12f7518b73dd27a56e2ad08500fde SHA512 b153b6fc7150dc09993039fa6e7daaff10b6dffbe3c02c301b6772474cefb9e2563c4b44647f039ac09cb70a9bb1ce9515ae245870d051e05bd57a919e7195a9
-MISC metadata.xml 545 BLAKE2B cf41305d52b7585b2ba32f6f97f4572d229e200121f4221703f3d4f13c760f9bcece8641c8316ac280753211b0d347fe0da178a03a9bc716c2c0dadf8acca077 SHA512 96bde433f0f86ea8ec8fb8e167a6cbf8dd595317dd18e5b2a3ec251990660007b82c7a0943a33fb3445f0fc3cbb2fe2c0ee7cbcc080d736a5259b7a540ec1b76
diff --git a/dev-haskell/foldl/foldl-1.0.7.ebuild b/dev-haskell/foldl/foldl-1.0.7.ebuild
deleted file mode 100644
index 7a4e511e2ba7..000000000000
--- a/dev-haskell/foldl/foldl-1.0.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Composable, streaming, and efficient left folds"
-HOMEPAGE="http://hackage.haskell.org/package/foldl"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/primitive-0.6:=[profile?]
-	>=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/foldl/foldl-1.1.3.ebuild b/dev-haskell/foldl/foldl-1.1.3.ebuild
deleted file mode 100644
index ee62017ef267..000000000000
--- a/dev-haskell/foldl/foldl-1.1.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Composable, streaming, and efficient left folds"
-HOMEPAGE="http://hackage.haskell.org/package/foldl"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/mwc-random-0.13.1.0:=[profile?] <dev-haskell/mwc-random-0.14:=[profile?]
-	<dev-haskell/primitive-0.7:=[profile?]
-	<dev-haskell/profunctors-5.3:=[profile?]
-	>=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/foldl/foldl-1.2.3.ebuild b/dev-haskell/foldl/foldl-1.2.3.ebuild
deleted file mode 100644
index 0e333ace9484..000000000000
--- a/dev-haskell/foldl/foldl-1.2.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Composable, streaming, and efficient left folds"
-HOMEPAGE="http://hackage.haskell.org/package/foldl"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	<dev-haskell/contravariant-1.5:=[profile?]
-	>=dev-haskell/mwc-random-0.13.1.0:=[profile?] <dev-haskell/mwc-random-0.14:=[profile?]
-	<dev-haskell/primitive-0.7:=[profile?]
-	<dev-haskell/profunctors-5.3:=[profile?]
-	>=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/foldl/metadata.xml b/dev-haskell/foldl/metadata.xml
deleted file mode 100644
index b5335a58f258..000000000000
--- a/dev-haskell/foldl/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library provides strict left folds that stream in constant
-		memory, and you can combine folds using @Applicative@ style to derive new
-		folds.  Derived folds still traverse the container just once and are often as
-		efficient as hand-written folds.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/free-4.10.0.1 b/dev-haskell/free-4.10.0.1
new file mode 100644
index 000000000000..d8459743659f
--- /dev/null
+++ b/dev-haskell/free-4.10.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/distributive-0.2.1:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/prelude-extras-0.4:=[profile?] <dev-haskell/prelude-extras-1:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monads for free
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/free/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/distributive-0.2.1:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/prelude-extras-0.4:=[profile?] <dev-haskell/prelude-extras-1:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/4.10.0.1
+SRC_URI=mirror://hackage/packages/archive/free/4.10.0.1/free-4.10.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=06407405f233bf0affd7633dc2527fb9
diff --git a/dev-haskell/free-4.11 b/dev-haskell/free-4.11
new file mode 100644
index 000000000000..5e68bf3c88dd
--- /dev/null
+++ b/dev-haskell/free-4.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/distributive-0.2.1:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/prelude-extras-0.4:=[profile?] <dev-haskell/prelude-extras-1:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monads for free
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/free/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/distributive-0.2.1:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/prelude-extras-0.4:=[profile?] <dev-haskell/prelude-extras-1:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/4.11
+SRC_URI=mirror://hackage/packages/archive/free/4.11/free-4.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c4f15c8de58221049e1eb860d03bca58
diff --git a/dev-haskell/free-4.12.4 b/dev-haskell/free-4.12.4
new file mode 100644
index 000000000000..9225695765f2
--- /dev/null
+++ b/dev-haskell/free-4.12.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/distributive-0.2.1:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/prelude-extras-0.4:=[profile?] <dev-haskell/prelude-extras-1:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monads for free
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/free/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/distributive-0.2.1:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/prelude-extras-0.4:=[profile?] <dev-haskell/prelude-extras-1:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/4.12.4
+SRC_URI=mirror://hackage/packages/archive/free/4.12.4/free-4.12.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6a5d38993dcd5d30fae78d60c2c7d2aa
diff --git a/dev-haskell/free-4.2 b/dev-haskell/free-4.2
new file mode 100644
index 000000000000..f8916d375465
--- /dev/null
+++ b/dev-haskell/free-4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/distributive-0.2.1:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monads for free
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/free/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/distributive-0.2.1:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/4.2
+SRC_URI=mirror://hackage/packages/archive/free/4.2/free-4.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a6cd21332fd081887a7d2d005ec050a6
diff --git a/dev-haskell/free-4.5 b/dev-haskell/free-4.5
new file mode 100644
index 000000000000..a155c45244ed
--- /dev/null
+++ b/dev-haskell/free-4.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/distributive-0.2.1:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monads for free
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/free/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/distributive-0.2.1:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/4.5
+SRC_URI=mirror://hackage/packages/archive/free/4.5/free-4.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=663c5b4525e506e48b5f4c5df30de548
diff --git a/dev-haskell/free-4.9 b/dev-haskell/free-4.9
new file mode 100644
index 000000000000..24a40e322e7b
--- /dev/null
+++ b/dev-haskell/free-4.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/distributive-0.2.1:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/prelude-extras-0.4:=[profile?] <dev-haskell/prelude-extras-1:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monads for free
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/free/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/distributive-0.2.1:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/prelude-extras-0.4:=[profile?] <dev-haskell/prelude-extras-1:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/4.9
+SRC_URI=mirror://hackage/packages/archive/free/4.9/free-4.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3e3a1d5f8a8e31a4c47146be1b8cf52b
diff --git a/dev-haskell/free/Manifest b/dev-haskell/free/Manifest
deleted file mode 100644
index d0a24bf1f94d..000000000000
--- a/dev-haskell/free/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-DIST free-4.10.0.1.tar.gz 46324 BLAKE2B db97bb05a8b03317b117208f50e2aaf6ea620074c2c04e089f0e44fd5fda7c6a6d41ee772f7e11d2d1767f949f9f378239d936f4649945f0eb6ade3cad792462 SHA512 bde1fc1b7ef1d3b51eba55b5122df5a6a694fc079d536e427ae9bdfc18ba6c4224d126d55b66b62d6f77911561201622c4f24434db8c1897a8e6713dc83b3531
-DIST free-4.11.tar.gz 47937 BLAKE2B bf1408322559d09c0ce0cbf40eec8d529db0477698d7dab091371821c04903e793f79ce0333cbe8ff692e17ea3f135f84ab1ac217462c111350e546331dc13a4 SHA512 693fdf0d639b9446b4081159d768aa89b42fae351458ef007dd479a1de58a6d84f2e58cb9f0a4393617bcf8078484cf00abd78479c9add5beb20b072c7cd8298
-DIST free-4.12.4.tar.gz 50601 BLAKE2B 9216251304335fc75090d97e97e6bf93532aa23286267fef1aff0429eac93527fdce966dd3a1f788c8b2a427e7cda5601fd909fdff5bf2b6c0b3b1b51a900e76 SHA512 208175008782349b7c9f94f9b2a818f59020ab7ef62421881127847428f28819f5d3f2f0a2ee9ac9be8a08f9f4d4f3349e666cac13098035fcbef14136043a60
-DIST free-4.2.tar.gz 17972 BLAKE2B f54f98f0bb277eae28f3b8487a2c2c2e4f786c7a6e7ed5c7a78109c8c141c20f097d5d0647b101102ca9e85e82b07de856d172fe8bf57c61562312aaab62ee22 SHA512 9f5d124c783bc43399d787c5f233f873800e121e7c9e0629b528dcb4e063e37b12b44e5ba74ac3731cc77949de72d76641a47070e0237c9e02f16137a80ef96f
-DIST free-4.5.tar.gz 22856 BLAKE2B 9d9e7e382c199a9ddf02f6d13830e53b40a2a5b48bd91ceefa69310a646e2cf304d4831197969ab31f6c4f65b95e7441a01097db787d6eb11a8e44db8324d874 SHA512 a7ddaf84dcf2dca584e487f8c9fe633a18b14201217142192784cce516497bd338abfdcc861c9578937b0b123ab737288062ad32fb1981c2eb97e88b0942238b
-DIST free-4.9.tar.gz 43414 BLAKE2B 9122aafff9c676378085a08f7779230cf3d82919d172e130bdfd3ca51de522d89abe77a90dca228b42883ff42b2ac07125192f0cd38294ec353f598053ba9489 SHA512 1e5c49b7e3e61a8348520522f6bcbfd04e5187c31c391eea30793baac023c9c939ebe6f44cdad0a71f099f137fbe3dae73a31652dc8cef3cac5ce9b42d461b67
-EBUILD free-4.10.0.1.ebuild 1211 BLAKE2B 2eadf804e7248b4425a033ea04b0e0eb450990924b59b9aa0cf330d019db10897846ae8dfd977bd9ac77cbbcd6e818e60957ade41522d46603f17d3b4e6545d0 SHA512 944cd8c7b0658f54161d2e25d4841c8ccbfec7855a069834b68b943194fa978cbaed7e0a78872cb168ebe6f10ee7d7a015805bf37f839f3675fdc0e4fb643f4c
-EBUILD free-4.11.ebuild 1211 BLAKE2B 8c386d8592fc13625608164705cea836886970b0645ffab2fefd3ffad9b5738f2a21dc4d81b5dc1f66a887300a0a26d37ce231ac04a9461951ed97a500ac472a SHA512 7beea62e4934394bd89c353034b94386a982c88d2a555552be83c1fc006dd20a9c765e081965cee2cee0e1ed7d1bb84e3b8c5ee0503e7015a9b8ebba95cad4af
-EBUILD free-4.12.4.ebuild 1389 BLAKE2B d3775d0a8fdb44b606dfe5c8cb8e75928ea203866d6124477f20a3bb59d182be28ab1d3335665d4c89faebbab0e4388fe251e7c56a31f5059147658e06dfca31 SHA512 bf58ae08d15b9324f67405b973cc51d32a79b118fd3299a46189e4a9db567ca2a785d2dc5f2664b541d032c376c383b33e988c03b95ee9ea732dff84492dfe09
-EBUILD free-4.2.ebuild 1124 BLAKE2B f917caf30ade14755ef294fec4d9195284b4bf57c6993c2405da8191019ca247dc9fc6fa028f5b74d8b4265c6634eec538b10f36cdf0764d6c2b4bf4fe1687e7 SHA512 e66989be216dce8f84a1a41d45f730f461af99412b1a721f4ced9d913456c65bc707336869d8a7d9655508a64b4501d51041050a7bfda18be4187d1679425d0f
-EBUILD free-4.5.ebuild 1123 BLAKE2B 4313e2af02df01821d8de3f3d927ab7fe958524874389d0ec280244c39cd13a256ab0d0dd3c702ac2e6a1e0e664499aa8556bdd221d32a5a7ef3bd42cbccc61c SHA512 795c25fd1c2a44031e887773888897e3e149307f2ce009e6a1bb55babd88bfbac75b6e8c71763237fcf2c2701419bbbd40e8e2c3c7202e473ce1ad4521b8a47f
-EBUILD free-4.9.ebuild 1211 BLAKE2B 61ae22492f71684a37218aca9d04e08f95d005df40bc1e7a73358c0474757a8339ced3c7788fb650803827919c2c16d776af28725926fe12bda718e175e83ba8 SHA512 f0ffa43b5843335fbb2b5cbe2c76bae4a39ffb87c80d14a73b4f2d48200fffbad1c03a3bd2b07c227f54df62340be1d6302e5f6d4a8d0f5b24fb67b6adcb959e
-MISC metadata.xml 382 BLAKE2B 4254876ed44c9f2b5c412484cec6a832aecb00c1e19aa24f7525eb0a50cd3c7e61742886ec145c4ee79dd65ded3a421316350101e3de0cb8a63ff9177ea85ed7 SHA512 c18059e802afa4cb8ec632859c010eb2bebe8344615b28cbe03586998f163f4492b9c7ae9e4a9ac7ff4783500f427eb059678e56bd585a25a7680e5c2156fdc1
diff --git a/dev-haskell/free/free-4.10.0.1.ebuild b/dev-haskell/free/free-4.10.0.1.ebuild
deleted file mode 100644
index ae7a467b907d..000000000000
--- a/dev-haskell/free/free-4.10.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monads for free"
-HOMEPAGE="https://github.com/ekmett/free/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/distributive-0.2.1:=[profile?]
-	>=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/prelude-extras-0.4:=[profile?] <dev-haskell/prelude-extras-1:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/free/free-4.11.ebuild b/dev-haskell/free/free-4.11.ebuild
deleted file mode 100644
index da1298ce9d1a..000000000000
--- a/dev-haskell/free/free-4.11.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monads for free"
-HOMEPAGE="https://github.com/ekmett/free/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/distributive-0.2.1:=[profile?]
-	>=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/prelude-extras-0.4:=[profile?] <dev-haskell/prelude-extras-1:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/free/free-4.12.4.ebuild b/dev-haskell/free/free-4.12.4.ebuild
deleted file mode 100644
index c82331bc10fb..000000000000
--- a/dev-haskell/free/free-4.12.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monads for free"
-HOMEPAGE="https://github.com/ekmett/free/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/distributive-0.2.1:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
-	>=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/prelude-extras-0.4:=[profile?] <dev-haskell/prelude-extras-1:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/free/free-4.2.ebuild b/dev-haskell/free/free-4.2.ebuild
deleted file mode 100644
index a5730ef9ae76..000000000000
--- a/dev-haskell/free/free-4.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monads for free"
-HOMEPAGE="https://github.com/ekmett/free/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/distributive-0.2.1:=[profile?]
-	>=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/free/free-4.5.ebuild b/dev-haskell/free/free-4.5.ebuild
deleted file mode 100644
index 9492929f90c0..000000000000
--- a/dev-haskell/free/free-4.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monads for free"
-HOMEPAGE="https://github.com/ekmett/free/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/distributive-0.2.1:=[profile?]
-	>=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/free/free-4.9.ebuild b/dev-haskell/free/free-4.9.ebuild
deleted file mode 100644
index 6490dc336cac..000000000000
--- a/dev-haskell/free/free-4.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monads for free"
-HOMEPAGE="https://github.com/ekmett/free/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/distributive-0.2.1:=[profile?]
-	>=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/prelude-extras-0.4:=[profile?] <dev-haskell/prelude-extras-1:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/free/metadata.xml b/dev-haskell/free/metadata.xml
deleted file mode 100644
index 3c2ac2f762d5..000000000000
--- a/dev-haskell/free/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Monads for free
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/free</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/frown-0.6.2.3 b/dev-haskell/frown-0.6.2.3
new file mode 100644
index 000000000000..7e47b1f3793a
--- /dev/null
+++ b/dev-haskell/frown-0.6.2.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6
+DESCRIPTION=LALR(k) parser generator
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/frown
+KEYWORDS=amd64 ppc ppc64 sparc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/frown/0.6.2.3/frown-0.6.2.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6a264e2a346a0b89f3c7f783a23cc6e8
diff --git a/dev-haskell/frown/Manifest b/dev-haskell/frown/Manifest
deleted file mode 100644
index a285e7712720..000000000000
--- a/dev-haskell/frown/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST frown-0.6.2.3.tar.gz 1269219 BLAKE2B 131e3291460019e171f436569237a4ab00ebd15b77a37bd308f257bdef25083dd5be87fd58d54f59a586c7376a0454a2db14ecd271d0490672099aeec7c1a8aa SHA512 a9166dd723db2836214704f1837b9629af03bc1aa5bdeed8a58eedca7a91140ba21db8d7be2884bc13b9f35346704329980bec44d253fa53c33f71e68160a963
-EBUILD frown-0.6.2.3.ebuild 607 BLAKE2B bb9652a80e7f78eb5c9b871880eaf5fcebf609a08fc15c5fb8ef5f3e99641934c6c210470d3746ebe805157d795a68c99ead5ccd48044c9edd01394b9682b18b SHA512 91da829dbd22c969f33c9ff854f58e1f187187e0eed83039ba4d091682f46f23aadca6d9d7120a8ba00d300d89a6199a90d126d98b1f6f7af8c204f6d192ea4d
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/frown/frown-0.6.2.3.ebuild b/dev-haskell/frown/frown-0.6.2.3.ebuild
deleted file mode 100644
index dfa789debb73..000000000000
--- a/dev-haskell/frown/frown-0.6.2.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="LALR(k) parser generator"
-HOMEPAGE="http://hackage.haskell.org/package/frown"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_install() {
-	haskell-cabal_src_install
-	dohtml -r Manual/html
-	dodoc Manual/Manual.ps
-}
diff --git a/dev-haskell/frown/metadata.xml b/dev-haskell/frown/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/frown/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/fsnotify-0.0.11 b/dev-haskell/fsnotify-0.0.11
new file mode 100644
index 000000000000..421ab3e4e69f
--- /dev/null
+++ b/dev-haskell/fsnotify-0.0.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hinotify-0.3.5:=[profile?] <dev-haskell/hinotify-0.4:=[profile?] >=dev-haskell/system-fileio-0.3.8:=[profile?] <dev-haskell/system-fileio-0.4:=[profile?] >=dev-haskell/system-filepath-0.4.6:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.11.0:=[profile?] >=dev-lang/ghc-7.0.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/glob-0.7.1 >=dev-haskell/hspec-1.3.0 >=dev-haskell/quickcheck-2.4.2 >=dev-haskell/random-1.0.1.1 >=dev-haskell/uniqueid-0.1.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Cross platform library for file change notification
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/fsnotify
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hinotify-0.3.5:=[profile?] <dev-haskell/hinotify-0.4:=[profile?] >=dev-haskell/system-fileio-0.3.8:=[profile?] <dev-haskell/system-fileio-0.4:=[profile?] >=dev-haskell/system-filepath-0.4.6:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.11.0:=[profile?] >=dev-lang/ghc-7.0.1:=
+SLOT=0/0.0.11
+SRC_URI=mirror://hackage/packages/archive/fsnotify/0.0.11/fsnotify-0.0.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=703cf061ec2affe578f6003e86653a31
diff --git a/dev-haskell/fsnotify-0.1.0.3 b/dev-haskell/fsnotify-0.1.0.3
new file mode 100644
index 000000000000..43770f4602d0
--- /dev/null
+++ b/dev-haskell/fsnotify-0.1.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/async-2.0.1:=[profile?] >=dev-haskell/hinotify-0.3.7:=[profile?] >=dev-haskell/system-fileio-0.3.8:=[profile?] >=dev-haskell/system-filepath-0.4.6:=[profile?] >=dev-haskell/text-0.11.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/system-fileio-0.3.11 >=dev-haskell/system-filepath-0.4.7 >=dev-haskell/tasty-0.5 dev-haskell/tasty-hunit dev-haskell/temporary-rc ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Cross platform library for file change notification
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/fsnotify
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/async-2.0.1:=[profile?] >=dev-haskell/hinotify-0.3.7:=[profile?] >=dev-haskell/system-fileio-0.3.8:=[profile?] >=dev-haskell/system-filepath-0.4.6:=[profile?] >=dev-haskell/text-0.11.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0.3
+SRC_URI=mirror://hackage/packages/archive/fsnotify/0.1.0.3/fsnotify-0.1.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6aa20444d9d1e1cf4dc4c900d54d4f1a
diff --git a/dev-haskell/fsnotify-0.2.1 b/dev-haskell/fsnotify-0.2.1
new file mode 100644
index 000000000000..116ac6258905
--- /dev/null
+++ b/dev-haskell/fsnotify-0.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/async-2.0.1:=[profile?] >=dev-haskell/hinotify-0.3.7:=[profile?] >=dev-haskell/text-0.11.0:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/tasty-0.5 dev-haskell/tasty-hunit dev-haskell/temporary-rc ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Cross platform library for file change notification
+EAPI=5
+HOMEPAGE=https://github.com/haskell-fswatch/hfsnotify
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/async-2.0.1:=[profile?] >=dev-haskell/hinotify-0.3.7:=[profile?] >=dev-haskell/text-0.11.0:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.1
+SRC_URI=mirror://hackage/packages/archive/fsnotify/0.2.1/fsnotify-0.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2e1f5d157506e33736979bf4d718272d
diff --git a/dev-haskell/fsnotify/Manifest b/dev-haskell/fsnotify/Manifest
deleted file mode 100644
index cc7a67fd4ce1..000000000000
--- a/dev-haskell/fsnotify/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST fsnotify-0.0.11.tar.gz 14530 BLAKE2B 983357e6f119a0b5cf1c43d5cf2355b11f49141c933110698f5e07a1d4509e6d6909969d3e902a3b07c5c6df89e9114ef3a688e105527e551bff5a2c47aff558 SHA512 e992864b349a134c3dac7a5a9da3452ba6c17c61b3a27a322f03eed3dd078923516604899a1d028fc6563a2677b86e6cf2f1eb1f92e2b3b33887e0df2a14573e
-DIST fsnotify-0.1.0.3.tar.gz 14116 BLAKE2B 4697f755028a876409d34138c00a084b1986990cfff9fcdb1f638be5d4be1d91a25f2d4077300582f7340f61fd874de3c5b463b9d8a06b288d59ea53a650ead4 SHA512 6835670a27bd0607c8dae7bfb4c197f78217eaa46d9a03d84ca53f5ade3fba78e85bbb0c1cc9621d9b17a2d415012a34eefb3ee2f63d518a9d7e354e07ce91ec
-DIST fsnotify-0.2.1.tar.gz 14689 BLAKE2B 06e8d05232b16c49045d4e737a587fb9c0a5e0f2706981949a579fa9ed3abb0795d5ecf60abddefb4eca86cd7a76313b8280e2badefe487ce2cdc9132039474b SHA512 b9c6505d27f7010b60dbd4cb2fdfe65efacd33398fda9f95526dd0d828b82b1afd029e6457aa1ece3421cffcb1a6189badc34b644faf8386e2631967380f1372
-EBUILD fsnotify-0.0.11.ebuild 1055 BLAKE2B 43b99d34cedb366bc1cfcbe3ab498eefa1d8a056cb3197d9e26fc78abe6d01fa386353c44db3eba2af24a5fcea721b3d6376bbe75a0530676d3d2e7c3d210c21 SHA512 e0a26f8a55dc769135aa8c34a787160bca363c6ced77cd24079d05bb3a7ac23e97b191fb42a8ddf3cb6746c44784fca13f8520b4bc45e3a194e4dcd80ec81f02
-EBUILD fsnotify-0.1.0.3.ebuild 956 BLAKE2B 47504bc64fcc177696ad0e2b56cfac55eb58236c84a8d4a90cc20ec80e7e89dd3b2c08e4de28818d2289b9f382ed485410eb86a34fee620a8434b5216a73cba2 SHA512 1e97b1b77e086996872d8c99a4ba676ec4bef38eb340afeef19dce67811cf92dc24ec0fede736cbcf8707dc532cd7bb8091a29a81ccbf4c19fa306262795d604
-EBUILD fsnotify-0.2.1.ebuild 824 BLAKE2B 4f020c381d452251fc078bdc77b5c0a866a7c50ce126039c57a5db7e47eb2f7810d9bd057621dbebbd7c40bbc526263f6e2043f64676ebf246b8885bf637df61 SHA512 32e05c002b01173aca0777fe65d6b6b5419403e086aa62274314772e1f5d7e01e5d2f46d335d7a377494dd499b0364882fc160453724e8045ae701707317ec99
-MISC metadata.xml 589 BLAKE2B a490eef4605f583796539a7a7b376641589b09ee023c60fbef6937dea0577cac4d07098eb05a5b7ba787a93f4281912d0178722d02d095d76e0897944767b0ea SHA512 96e4707db65cf8709dd613c725a0c9d5944841b2ba81b94d669cdcac4f9bb2dd2ba060e2109744046825be4455485f9af8b0b052e9eb90648ad52428d4c5154b
diff --git a/dev-haskell/fsnotify/fsnotify-0.0.11.ebuild b/dev-haskell/fsnotify/fsnotify-0.0.11.ebuild
deleted file mode 100644
index e315ba5298a6..000000000000
--- a/dev-haskell/fsnotify/fsnotify-0.0.11.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cross platform library for file change notification"
-HOMEPAGE="http://hackage.haskell.org/package/fsnotify"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hinotify-0.3.5:=[profile?]
-		<dev-haskell/hinotify-0.4:=[profile?]
-		>=dev-haskell/system-fileio-0.3.8:=[profile?]
-		<dev-haskell/system-fileio-0.4:=[profile?]
-		>=dev-haskell/system-filepath-0.4.6:=[profile?]
-		<dev-haskell/system-filepath-0.5:=[profile?]
-		>=dev-haskell/text-0.11.0:=[profile?]
-		>=dev-lang/ghc-7.0.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/glob-0.7.1
-			>=dev-haskell/hspec-1.3.0
-			>=dev-haskell/quickcheck-2.4.2
-			>=dev-haskell/random-1.0.1.1
-			>=dev-haskell/uniqueid-0.1.1
-		)"
diff --git a/dev-haskell/fsnotify/fsnotify-0.1.0.3.ebuild b/dev-haskell/fsnotify/fsnotify-0.1.0.3.ebuild
deleted file mode 100644
index 0f07a2ce2a2c..000000000000
--- a/dev-haskell/fsnotify/fsnotify-0.1.0.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cross platform library for file change notification"
-HOMEPAGE="http://hackage.haskell.org/package/fsnotify"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/async-2.0.1:=[profile?]
-	>=dev-haskell/hinotify-0.3.7:=[profile?]
-	>=dev-haskell/system-fileio-0.3.8:=[profile?]
-	>=dev-haskell/system-filepath-0.4.6:=[profile?]
-	>=dev-haskell/text-0.11.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/system-fileio-0.3.11
-		>=dev-haskell/system-filepath-0.4.7
-		>=dev-haskell/tasty-0.5
-		dev-haskell/tasty-hunit
-		dev-haskell/temporary-rc )
-"
diff --git a/dev-haskell/fsnotify/fsnotify-0.2.1.ebuild b/dev-haskell/fsnotify/fsnotify-0.2.1.ebuild
deleted file mode 100644
index 21a07e11e84c..000000000000
--- a/dev-haskell/fsnotify/fsnotify-0.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cross platform library for file change notification"
-HOMEPAGE="https://github.com/haskell-fswatch/hfsnotify"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/async-2.0.1:=[profile?]
-	>=dev-haskell/hinotify-0.3.7:=[profile?]
-	>=dev-haskell/text-0.11.0:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/tasty-0.5
-		dev-haskell/tasty-hunit
-		dev-haskell/temporary-rc )
-"
diff --git a/dev-haskell/fsnotify/metadata.xml b/dev-haskell/fsnotify/metadata.xml
deleted file mode 100644
index a4beea52ea8b..000000000000
--- a/dev-haskell/fsnotify/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Cross platform library for file creation, modification,
-		and deletion notification. This library builds upon
-		existing libraries for platform-specific Window, Mac,
-		and Linux filesystem event notification.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">haskell-fswatch/hfsnotify</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/generic-deriving-1.11.1 b/dev-haskell/generic-deriving-1.11.1
new file mode 100644
index 000000000000..bb7d917257b1
--- /dev/null
+++ b/dev-haskell/generic-deriving-1.11.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generic programming library for generalised deriving
+EAPI=6
+HOMEPAGE=https://github.com/dreixel/generic-deriving
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.11.1
+SRC_URI=mirror://hackage/packages/archive/generic-deriving/1.11.1/generic-deriving-1.11.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=71133aff7b1a8987c0f324b44d531ee7
diff --git a/dev-haskell/generic-deriving-1.6.3 b/dev-haskell/generic-deriving-1.6.3
new file mode 100644
index 000000000000..e42792e79505
--- /dev/null
+++ b/dev-haskell/generic-deriving-1.6.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generic programming library for generalised deriving
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/generic-deriving
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.12.1:=
+SLOT=0/1.6.3
+SRC_URI=mirror://hackage/packages/archive/generic-deriving/1.6.3/generic-deriving-1.6.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9781225a6d151969492e6269e3cbf270
diff --git a/dev-haskell/generic-deriving-1.7.0 b/dev-haskell/generic-deriving-1.7.0
new file mode 100644
index 000000000000..efd29949d26f
--- /dev/null
+++ b/dev-haskell/generic-deriving-1.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generic programming library for generalised deriving
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/generic-deriving
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.7.0
+SRC_URI=mirror://hackage/packages/archive/generic-deriving/1.7.0/generic-deriving-1.7.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=55b7654e88eed759f6a7603be9475c5b
diff --git a/dev-haskell/generic-deriving/Manifest b/dev-haskell/generic-deriving/Manifest
deleted file mode 100644
index 2e5c10ed4720..000000000000
--- a/dev-haskell/generic-deriving/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST generic-deriving-1.11.1.tar.gz 65456 BLAKE2B 6c93c737ac312a90af03d64f3abc9aea23d10218212e1933d2f995da080df260d47a0f6383c31db214e42878371a9fb5f043c524aef2ec8c5e8d959611773ebb SHA512 c0f8a1fb4a705eec43b71b6b578968beff889bb43551086fa520a311fbcbfceb49fb49844e68698842ebbb50ed57d75263b6a6a79e3b8a080240da07ecd8f61d
-DIST generic-deriving-1.6.3.tar.gz 25268 BLAKE2B 57e82a46e072370a1c0027032427740f1ac9f243c1573c5e6318e3c86f13a64019c52b4e514ff3ad4822d67b8563971d6e39cfb0031241b83997190cb2cc8983 SHA512 0730c792b96d21c9a078032d4446f1d994b5bc8e0a7fe4a22256de77e13ce3c01838ce4f962f2a9a3f18a4143b6deee167cc6cac648714f100f129b81ed2cf16
-DIST generic-deriving-1.7.0.tar.gz 25341 BLAKE2B 1250ccdf00c8a73f8f5e61e757f7ec178cd3fadc46d5a71f91f2e8aa9b856e0278125cfd124c7cf898201a9cd8e8af0e397e39ac823143c5d9a5563cd6545782 SHA512 d773eb0463a7814071fb05512c211fdf6efcb3245d6cb6046e0c3bb8d0634fd397636e3f8f2e37833878e3452ac2b0fab35542fa336ad1e36270b0e876b395dd
-EBUILD generic-deriving-1.11.1.ebuild 629 BLAKE2B f21f3c44ea6ac5a252726f32efdcec30128c604b70014187dcc78bc2d8973692a870975f4aed68db1b8577c0048a38e2f72ce707afc5655aa8e641b331763d64 SHA512 c74bb85e69e9a12c8bd625b53e16b32552ff9b0ef38fa2d9c92d0044d8513bcce861437358bb2530f505fef53a2c4c6f1730bfa8d11a68e8c8c9db56c923ff41
-EBUILD generic-deriving-1.6.3.ebuild 580 BLAKE2B 4e8a73f7600a9a741d0ce17a34265ae9c6a2bc3a1606d61a7964864c2e9a0943edf44763b0dc7847957ad3bc81e87d6ed6588dd8dacf6b84a165ac5bd2fc58dc SHA512 d27a986185ddebc54e26819b0c9866159e03b449d8ae5786a45c07ef892405798e386e68a9acee7d7c64d09369bb93e9067de09308323373ff465361e7d0e78a
-EBUILD generic-deriving-1.7.0.ebuild 573 BLAKE2B c3b017c5f4ed3a3308219409febebc9196f3089c0ca3d0f254c98e44ee0f32c1a033436d9f5657ae91db1b39e6355748d1965eb8c84150af41b0918752b9353c SHA512 477194c843ce80e4679b5a2598b4565968a92adc0c4d1f71e892820dc2233da568adf513dbca50f8f2b3b7ca86b8a380c99fac0844ca306a0030b2cdd27a6113
-MISC metadata.xml 889 BLAKE2B 335604ba68647b47cc2248fc5a9908f69972a0cafe685f9ef638e4b4da1cefa966ece2967f1531060c42b7ce51e2fb386d054dd3574957c4e10501ba276b1b89 SHA512 6504da89504ed73583423762aaf87c38cf35abf9ca05818540f157062c26f85d29341310c03ad4045f7a8642528e09bca8cf81433b02f5a724b89371156d354f
diff --git a/dev-haskell/generic-deriving/generic-deriving-1.11.1.ebuild b/dev-haskell/generic-deriving/generic-deriving-1.11.1.ebuild
deleted file mode 100644
index af02a0937902..000000000000
--- a/dev-haskell/generic-deriving/generic-deriving-1.11.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Generic programming library for generalised deriving"
-HOMEPAGE="https://github.com/dreixel/generic-deriving"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
-"
diff --git a/dev-haskell/generic-deriving/generic-deriving-1.6.3.ebuild b/dev-haskell/generic-deriving/generic-deriving-1.6.3.ebuild
deleted file mode 100644
index 67a0e5553696..000000000000
--- a/dev-haskell/generic-deriving/generic-deriving-1.6.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generic programming library for generalised deriving"
-HOMEPAGE="http://hackage.haskell.org/package/generic-deriving"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/generic-deriving/generic-deriving-1.7.0.ebuild b/dev-haskell/generic-deriving/generic-deriving-1.7.0.ebuild
deleted file mode 100644
index 32ea3dfb0d40..000000000000
--- a/dev-haskell/generic-deriving/generic-deriving-1.7.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generic programming library for generalised deriving"
-HOMEPAGE="http://hackage.haskell.org/package/generic-deriving"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/generic-deriving/metadata.xml b/dev-haskell/generic-deriving/metadata.xml
deleted file mode 100644
index 9ea87ee12d69..000000000000
--- a/dev-haskell/generic-deriving/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides functionality for generalizing the deriving mechanism
-		in Haskell to arbitrary classes. It was first described in the paper:
-		
-		*  /A generic deriving mechanism for Haskell/.
-		Jose Pedro Magalhaes, Atze Dijkstra, Johan Jeuring, and Andres Loeh.
-		Haskell'10.
-		
-		The current implementation integrates with the new GHC Generics. See
-		&lt;http://www.haskell.org/haskellwiki/Generics&gt; for more information.
-		Template Haskell code is provided for supporting GHC before version 7.2.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">dreixel/generic-deriving</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/generics-sop-0.2.4.0 b/dev-haskell/generics-sop-0.2.4.0
new file mode 100644
index 000000000000..7b4b5bf506c9
--- /dev/null
+++ b/dev-haskell/generics-sop-0.2.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generic Programming using True Sums of Products
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/generics-sop
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.2.4.0
+SRC_URI=mirror://hackage/packages/archive/generics-sop/0.2.4.0/generics-sop-0.2.4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5aa48d99b7bb4421cc9e9d3da7844299
diff --git a/dev-haskell/generics-sop/Manifest b/dev-haskell/generics-sop/Manifest
deleted file mode 100644
index 66c0ea122db8..000000000000
--- a/dev-haskell/generics-sop/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST generics-sop-0.2.4.0.tar.gz 32986 BLAKE2B 8d4d426452f710a57fdcb4bfadd68f2b7faa208127feb7a55b9446cf2d455f799d703748c09ca2590140326f6f5a1f2e86bd609e7d52245ede4624f2c95c2baa SHA512 ce0d92214e622c58febced5684ba92b117e413d5718c6fdea1471f0fc5ea48ea53b212a536618086228542985f304dc4434c75c6ab919a72e6f49ccce342d866
-EBUILD generics-sop-0.2.4.0.ebuild 682 BLAKE2B 6e74f149e5b9f554b05e4f994c013d831eeedd7cac135b2775316c5922e9d34977b67ed34a7c017d9937695265506bfd512212faf0166d4a62b4e950648cacd3 SHA512 6d227c2fe4372ff57180656db92547b0c4988fc85cfa49f132dd79a30603608d9a53f61c53a90cfde7012a9711274a9aff1e15d30a57fb47b0d5ddd6ab48136d
-MISC metadata.xml 1381 BLAKE2B 451c24e7bc9714a9b579a9b26b9c1709c3e678fee0ac943a26829ae6c51416d4b3290fa50a7055705b49e423289ef7d68e60d6125db0671c4af16cdc57c30f15 SHA512 75abab067f073654bc8323421e2a758400965935603e68639e3b2fe7e8069b04205830c6e2bd9fa05ae2f1fc310ad7a2a35310872b46572f4b846f72c005ca19
diff --git a/dev-haskell/generics-sop/generics-sop-0.2.4.0.ebuild b/dev-haskell/generics-sop/generics-sop-0.2.4.0.ebuild
deleted file mode 100644
index b62e41cc55d5..000000000000
--- a/dev-haskell/generics-sop/generics-sop-0.2.4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Generic Programming using True Sums of Products"
-HOMEPAGE="http://hackage.haskell.org/package/generics-sop"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/generics-sop/metadata.xml b/dev-haskell/generics-sop/metadata.xml
deleted file mode 100644
index af041149fe29..000000000000
--- a/dev-haskell/generics-sop/metadata.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A library to support the definition of generic functions.
-		Datatypes are viewed in a uniform, structured way:
-		the choice between constructors is represented using an n-ary
-		sum, and the arguments of each constructor are represented using
-		an n-ary product.
-		
-		The module "Generics.SOP" is the main module of this library and contains
-		more detailed documentation.
-		
-		Examples of using this library are provided by the following
-		packages:
-		
-		* @&lt;https://hackage.haskell.org/package/basic-sop basic-sop&gt;@ basic examples,
-		
-		* @&lt;https://hackage.haskell.org/package/pretty-sop pretty-sop&gt;@ generic pretty printing,
-		
-		* @&lt;https://hackage.haskell.org/package/lens-sop lens-sop&gt;@ generically computed lenses,
-		
-		* @&lt;https://hackage.haskell.org/package/json-sop json-sop&gt;@ generic JSON conversions.
-		
-		A detailed description of the ideas behind this library is provided by
-		the paper:
-		
-		* Edsko de Vries and Andres Löh.
-		&lt;http://www.andres-loeh.de/TrueSumsOfProducts True Sums of Products&gt;.
-		Workshop on Generic Programming (WGP) 2014.
-		
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/geniplate-0.6.0.5 b/dev-haskell/geniplate-0.6.0.5
new file mode 100644
index 000000000000..c8ca9d4feb54
--- /dev/null
+++ b/dev-haskell/geniplate-0.6.0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= <dev-lang/ghc-8 >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Use Template Haskell to generate Uniplate-like functions
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/geniplate
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= <dev-lang/ghc-8
+SLOT=0/0.6.0.5
+SRC_URI=mirror://hackage/packages/archive/geniplate/0.6.0.5/geniplate-0.6.0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cfd5f7ea80b53048cac6aaee9ea69e1b
diff --git a/dev-haskell/geniplate-mirror-0.7.1 b/dev-haskell/geniplate-mirror-0.7.1
new file mode 100644
index 000000000000..1da5b66d62b1
--- /dev/null
+++ b/dev-haskell/geniplate-mirror-0.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Use Template Haskell to generate Uniplate-like functions
+EAPI=5
+HOMEPAGE=https://github.com/danr/geniplate
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.1
+SRC_URI=mirror://hackage/packages/archive/geniplate-mirror/0.7.1/geniplate-mirror-0.7.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=df07bd3d7f7061521cf727945bd9174c
diff --git a/dev-haskell/geniplate-mirror-0.7.4 b/dev-haskell/geniplate-mirror-0.7.4
new file mode 100644
index 000000000000..0d295abac73d
--- /dev/null
+++ b/dev-haskell/geniplate-mirror-0.7.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Use Template Haskell to generate Uniplate-like functions
+EAPI=6
+HOMEPAGE=https://github.com/danr/geniplate
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.4
+SRC_URI=mirror://hackage/packages/archive/geniplate-mirror/0.7.4/geniplate-mirror-0.7.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=da3e73c4784b0ac0e2e2b6ec9f7d110d
diff --git a/dev-haskell/geniplate-mirror/Manifest b/dev-haskell/geniplate-mirror/Manifest
deleted file mode 100644
index b27de7fe6d66..000000000000
--- a/dev-haskell/geniplate-mirror/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST geniplate-mirror-0.7.1.tar.gz 9259 BLAKE2B 498ec095a2d34a7602ab1b48fc37f89a082766541dbf33bf8efe75e732043cbc6d1bd900f4b03d7bb0059d4a669f84cc27a8749de585f2645be1184ab440a14a SHA512 51e831034cf806b1de8bbe3e8f935894d38c61046b1a093ec837dac96972e8aef126d903fc70afb09e6f1edb143d716c3faae303bfece6d0bcb86a6be1b1210c
-DIST geniplate-mirror-0.7.4.tar.gz 9273 BLAKE2B 39aa51fb2824238498c174bdaeb88f76bed69bafb05ddb52ea37a0e64418447327158cd1043a6ff468c4c6ac783545e237909e1b7e965e011ea9f2538f6faa31 SHA512 52c2cd33320df0deaa1dc1e95d1a4874cd8493425542fcea375b81a5f85e8156a9ead67f4dc4b0e4d2e30553e2a914dd342133b4c2210501bf3442966baef8be
-EBUILD geniplate-mirror-0.7.1.ebuild 590 BLAKE2B 64ed1bffa481e730a59c9744d427952ed09b5b6e39033a2a54a28186e44183b8ad70f08f77a6f7c85db36c19ca00968438bef7c27c25772229e18b50a2f833d7 SHA512 fecf7b00d553186be73fbd1c9c3c16f886cda9ba6cf3bb563ec36010c8162374a2f1211a30dcaaa8fbe5d4682ea1b9eda1bf88abc4b6530f45ea0789aaf393d3
-EBUILD geniplate-mirror-0.7.4.ebuild 588 BLAKE2B 278605664f671557ff62fe1d7fb87a5825cba51ac4a557d453e7f8c462423ccbf2f1b5bc5fcdc109ce54784f08c8c743c978e6445515a4a675a4ff3e51e1cf6e SHA512 f8663cc68a3260d10d2516b8600074fa3e5165e6bf69a2f8d05700f04a3714dfec616aa1f2bf130d477cbccbe1dc31962663481f985b41b70ce6c3385c3c9c10
-MISC metadata.xml 574 BLAKE2B 66814aa21e87b5ecd4927c070853205bc8fc8d217e6b20549cd6ea7c564b272fffa67b6b754f83f3cc30de4de0c3f3e1ba56e33fcc8a98a81f18e700f78b6ac9 SHA512 958067d84a44be432884e02fe3dbc81621a7c9f94df2149695282e4a60a125280e6d31402f3f7b96e6f2fcf038adcdddcc59ce45ecf11414ec40b50dfc355a6c
diff --git a/dev-haskell/geniplate-mirror/geniplate-mirror-0.7.1.ebuild b/dev-haskell/geniplate-mirror/geniplate-mirror-0.7.1.ebuild
deleted file mode 100644
index 0c6de7220550..000000000000
--- a/dev-haskell/geniplate-mirror/geniplate-mirror-0.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Use Template Haskell to generate Uniplate-like functions"
-HOMEPAGE="https://github.com/danr/geniplate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/geniplate-mirror/geniplate-mirror-0.7.4.ebuild b/dev-haskell/geniplate-mirror/geniplate-mirror-0.7.4.ebuild
deleted file mode 100644
index d9807fd18def..000000000000
--- a/dev-haskell/geniplate-mirror/geniplate-mirror-0.7.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Use Template Haskell to generate Uniplate-like functions"
-HOMEPAGE="https://github.com/danr/geniplate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/geniplate-mirror/metadata.xml b/dev-haskell/geniplate-mirror/metadata.xml
deleted file mode 100644
index 731fc10dbe37..000000000000
--- a/dev-haskell/geniplate-mirror/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Use Template Haskell to generate Uniplate-like functions.
-		
-		This is a maintained mirror of the
-		&lt;http://hackage.haskell.org/package/geniplate geniplate&gt; package,
-		written by Lennart Augustsson.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">danr/geniplate</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/geniplate/Manifest b/dev-haskell/geniplate/Manifest
deleted file mode 100644
index d33c42cf0de2..000000000000
--- a/dev-haskell/geniplate/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST geniplate-0.6.0.5.tar.gz 7738 BLAKE2B e60c36ba553034400740c4b42828cb8e333331846ce719243761b9a4f8cd5a9875ee00856bf7cac1f03658392df920b9a41b2295d807f6926db1e80eba333232 SHA512 37127fa364ef0a8c67abbbadc025b932ddc62aaf09e4096548263c140b232b5442889d24f18fbb4ed3ea5eb0643b6afb4634b73471a2ec35b626dcd0c1781987
-EBUILD geniplate-0.6.0.5.ebuild 699 BLAKE2B 4d5b2fa3ed081337adb4ae72106b1beaffde232405c86ff8e07b994847dc1bc192cd196dcd1b4e4719257cf5a6017fa057d6a33376a38e9e6416aa15153b847a SHA512 699c77bda63e7d304bfdcedddf8e09dd63b39799ee31df83f030427fa2087252cdd5d190a6aedf080656c938a11253c0685e801f6ce18698c2fd0b957d5a403d
-MISC metadata.xml 348 BLAKE2B dff6d8a9fa11cc5549b68da8ee02986095dbecd84a4a21dd7d69159a3bd5da15bb36cbfbd61aac1582815984a59dc6cc7b4866a8023f33f49cfca256a828827d SHA512 af111202012b1b86a90beaf425455fd28819723302b30810c24cbcb3ef13c3552a0f7da2bac92425d174ea61285fccd29ed9da0d182973d24b55f75d29e6dbcc
diff --git a/dev-haskell/geniplate/geniplate-0.6.0.5.ebuild b/dev-haskell/geniplate/geniplate-0.6.0.5.ebuild
deleted file mode 100644
index 1e1fed2def43..000000000000
--- a/dev-haskell/geniplate/geniplate-0.6.0.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Use Template Haskell to generate Uniplate-like functions"
-HOMEPAGE="http://hackage.haskell.org/package/geniplate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:= <dev-lang/ghc-8
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'template-haskell < 2.10' 'template-haskell'
-}
diff --git a/dev-haskell/geniplate/metadata.xml b/dev-haskell/geniplate/metadata.xml
deleted file mode 100644
index 917d4595fec0..000000000000
--- a/dev-haskell/geniplate/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Use template Haskell to generate Uniplate-like functions.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/getopt-generics-0.13.0.1 b/dev-haskell/getopt-generics-0.13.0.1
new file mode 100644
index 000000000000..5c7cd6de8b5f
--- /dev/null
+++ b/dev-haskell/getopt-generics-0.13.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-compat-0.8:=[profile?] dev-haskell/base-orphans:=[profile?] >=dev-haskell/generics-sop-0.1:=[profile?] <dev-haskell/generics-sop-0.4:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-2.1.8 dev-haskell/quickcheck dev-haskell/safe dev-haskell/silently ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Create command line interfaces with ease
+EAPI=6
+HOMEPAGE=https://github.com/soenkehahn/getopt-generics#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-compat-0.8:=[profile?] dev-haskell/base-orphans:=[profile?] >=dev-haskell/generics-sop-0.1:=[profile?] <dev-haskell/generics-sop-0.4:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.13.0.1
+SRC_URI=mirror://hackage/packages/archive/getopt-generics/0.13.0.1/getopt-generics-0.13.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3c9f2ee9a197c0c44bdc1b864801ca47
diff --git a/dev-haskell/getopt-generics/Manifest b/dev-haskell/getopt-generics/Manifest
deleted file mode 100644
index 83e5723b1ad9..000000000000
--- a/dev-haskell/getopt-generics/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST getopt-generics-0.13.0.1.tar.gz 27772 BLAKE2B abe9dc94069dbc3cca4296290f2ca4d34a5088443cdcae018da36854963948ca7758c3622ad243f1284e39d08f420d3e9f885557d23c785520325dea11d4d278 SHA512 df27c67bd92047b5213404220389200cf72c79d20a761c390120d13a82fb126aa38ef5afbb826ae2be0fe65941f4fe5be42bb49301fabd6343e8b0c8a7f3e707
-EBUILD getopt-generics-0.13.0.1.ebuild 879 BLAKE2B 3d378cda1cc556e44ca65e255a611d939c1731478f8d435bf75420de3e7872383ff76e0ec5ee02302f9f70f7606ebe17aaf88ac42427222c80524a3cd36803bd SHA512 4a684f9939274aec4a33fc791508a1eb1afc9f07707a29ce53c0ade6eb75844492db3d0d4f6a1a2aa18154c1fbd75a5eca16f4ca0adf237251478861147baf19
-MISC metadata.xml 331 BLAKE2B 90de0cc495a27588aa77cbdc836f145d77610be2726f494636f2e414f3cadd1ca1dcd3fa647b869af5f122458bc730663495a5c32fb86e97917f6e1d0bb7a1ed SHA512 8d3aef20869df87f4d7522bb24eb031a35c7713e86d3281911ef6097a689fdaba5cfe6b73421202a1f532548f139586956ca4d2ab416a066ed91ac8700b52680
diff --git a/dev-haskell/getopt-generics/getopt-generics-0.13.0.1.ebuild b/dev-haskell/getopt-generics/getopt-generics-0.13.0.1.ebuild
deleted file mode 100644
index 58d292fcfb33..000000000000
--- a/dev-haskell/getopt-generics/getopt-generics-0.13.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Create command line interfaces with ease"
-HOMEPAGE="https://github.com/soenkehahn/getopt-generics#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-compat-0.8:=[profile?]
-	dev-haskell/base-orphans:=[profile?]
-	>=dev-haskell/generics-sop-0.1:=[profile?] <dev-haskell/generics-sop-0.4:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-2.1.8
-		dev-haskell/quickcheck
-		dev-haskell/safe
-		dev-haskell/silently )
-"
diff --git a/dev-haskell/getopt-generics/metadata.xml b/dev-haskell/getopt-generics/metadata.xml
deleted file mode 100644
index 3198e24c64f7..000000000000
--- a/dev-haskell/getopt-generics/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Create command line interfaces with ease
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/ghc-paths-0.1.0.9 b/dev-haskell/ghc-paths-0.1.0.9
new file mode 100644
index 000000000000..f9d21fd384ba
--- /dev/null
+++ b/dev-haskell/ghc-paths-0.1.0.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-6.8.2:= >=dev-haskell/cabal-1.6
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4bbef77b6fde727ec31060c9b31d2850
diff --git a/dev-haskell/ghc-paths/Manifest b/dev-haskell/ghc-paths/Manifest
deleted file mode 100644
index b3ad848089d4..000000000000
--- a/dev-haskell/ghc-paths/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ghc-paths-0.1.0.9.tar.gz 2402 BLAKE2B ba84e058a09fabe4b386120855966daeef0d71e0ccc4f131cacdd12cfe064c415715ef3dcbc33a1c5f0e5339f58d61b37d8842c2ca0f97245f56926716bf834b SHA512 0aa38add4a6f27ced115d769603f98eff6fe3e8b60a6477f4b1e669031cbb6408b87d2fed023d790169b623b9cb2b7983871a9bf9d5cfcc298774a34808e2094
-EBUILD ghc-paths-0.1.0.9.ebuild 1417 BLAKE2B 8550d681b8e6e0df74df22e3ee40bcb72dc0eea5a7202609c78a7cbead6f99221cf59a2c9a65458d3ddccfcbe34f6fd2166fb53d45ec1999b45572fc08020ddf SHA512 28cde9a8638588d65028218fbbab3a552073c530101731f10d8a1d750e534d43854d530f2ecc77a26a77407a7f1a861e420bfa50ad2a0d977e3e7da172bd6f25
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/ghc-paths/ghc-paths-0.1.0.9.ebuild b/dev-haskell/ghc-paths/ghc-paths-0.1.0.9.ebuild
deleted file mode 100644
index f1330e2e1f62..000000000000
--- a/dev-haskell/ghc-paths/ghc-paths-0.1.0.9.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# haddock feature is explicitely disabled, as this library can be used as haddock depend
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Knowledge of GHC's installation directories"
-HOMEPAGE="http://hackage.haskell.org/package/ghc-paths"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	# ghc-patch it has awfully unportable (across cabal versions) ghc detection code
-	# but in gentoo we install it to fixed patch, so remove Setup.hs detection code
-	cabal-mksetup
-
-	# and use gentoo's hardcoded one:
-	# a few things we need to replace, and example values
-	# GHC_PATHS_LIBDIR /usr/lib64/ghc-6.12.0.20091010
-	# GHC_PATHS_DOCDIR /usr/share/doc/ghc-6.12.0.20091010/html
-	# GHC_PATHS_GHC_PKG /usr/bin/ghc-pkg
-	# GHC_PATHS_GHC /usr/bin/ghc (be careful: GHC_PATHS_GHC is a substring of GHC_PATHS_GHC_PKG)
-
-	cat >"${S}/GHC/Paths.hs" <<-EOF
-	module GHC.Paths ( ghc, ghc_pkg, libdir, docdir ) where
-
-	libdir, docdir, ghc, ghc_pkg :: FilePath
-
-	libdir  = "$(ghc-libdir)"
-	docdir  = "/usr/share/doc/ghc-$(ghc-version)/html"
-
-	ghc     = "$(ghc-getghc)"
-	ghc_pkg = "$(ghc-getghcpkg)"
-	EOF
-}
diff --git a/dev-haskell/ghc-paths/metadata.xml b/dev-haskell/ghc-paths/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/ghc-paths/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/ghc-syb-utils-0.2.3 b/dev-haskell/ghc-syb-utils-0.2.3
new file mode 100644
index 000000000000..28f7eaf155c8
--- /dev/null
+++ b/dev-haskell/ghc-syb-utils-0.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/syb-0.1.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Scrap Your Boilerplate utilities for the GHC API
+EAPI=5
+HOMEPAGE=https://github.com/nominolo/ghc-syb
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/syb-0.1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.3
+SRC_URI=mirror://hackage/packages/archive/ghc-syb-utils/0.2.3/ghc-syb-utils-0.2.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e1cf379781de1d7fea8b71f5902a0a4f
diff --git a/dev-haskell/ghc-syb-utils/Manifest b/dev-haskell/ghc-syb-utils/Manifest
deleted file mode 100644
index 577061621448..000000000000
--- a/dev-haskell/ghc-syb-utils/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ghc-syb-utils-0.2.3.tar.gz 4689 BLAKE2B c1403610fd6e34e97d68a2ad5ca2c74adbdf1e16fa3605a6350469ec20187aa0db90f8fb0484f7c1c60a4440310796c23d017433bad690ad71ac840915085efb SHA512 af311d21396c1f7e98c532b1192d2aad27a942f66f4e09eea4cb0d6c1fe444a49c4e14ce4030504f544c796818a887e1ce6bf828cbd28c69c1123e224793cd32
-EBUILD ghc-syb-utils-0.2.3.ebuild 592 BLAKE2B d596d39f0528bf9541e7b819c5124e955c570482ae97adb52ffee3bcf0f7f6ef3f1917aa029fead3c446b7378cd39464485e7775299b6005a5245d2c01d5df02 SHA512 64ed3a2f508220f855b973fc5ccf49db19163235f25d68513de7d816eeab0e54771147a6989e45313e82cea7034ff99567ae3dc842c2cda522f61836c7dc515c
-MISC metadata.xml 421 BLAKE2B 1bbcda313fadbe835cc5d158ca98ac8f3aea41728b8db6c5530239af254ae0ec627aef32162bab901887373f3b425be4d24c0bc705fd72c22eac0ec4fd15d7d0 SHA512 3b3714c271cf08d299d3cbd3a00673dcca28648c194658174886e24d7b7cdfce4068b0e4d522de72e3b2a52afd2cf19cf94de98cfa71d1110e7cba3488bc6058
diff --git a/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.2.3.ebuild b/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.2.3.ebuild
deleted file mode 100644
index 1d77f904a58a..000000000000
--- a/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.2.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Scrap Your Boilerplate utilities for the GHC API"
-HOMEPAGE="https://github.com/nominolo/ghc-syb"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/syb-0.1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/ghc-syb-utils/metadata.xml b/dev-haskell/ghc-syb-utils/metadata.xml
deleted file mode 100644
index 01a2a48cb9eb..000000000000
--- a/dev-haskell/ghc-syb-utils/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Scrap Your Boilerplate utilities for the GHC API.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">nominolo/ghc-syb</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/gio-0.12.5.3 b/dev-haskell/gio-0.12.5.3
new file mode 100644
index 000000000000..42eab07d1581
--- /dev/null
+++ b/dev-haskell/gio-0.12.5.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/glib-0.12.5.3:0=[profile?] <dev-haskell/glib-0.13:0=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/glib:2 >=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0= virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binding to the GIO
+EAPI=5
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/glib-0.12.5.3:0=[profile?] <dev-haskell/glib-0.13:0=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/glib:2
+SLOT=0/0.12.5.3
+SRC_URI=mirror://hackage/packages/archive/gio/0.12.5.3/gio-0.12.5.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2e57eaf945d9e5aeeae83caccb98a574
diff --git a/dev-haskell/gio-0.13.1.1 b/dev-haskell/gio-0.13.1.1
new file mode 100644
index 000000000000..6f2dd108ae52
--- /dev/null
+++ b/dev-haskell/gio-0.13.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 >=dev-haskell/cabal-1.18 dev-haskell/gtk2hs-buildtools virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binding to GIO
+EAPI=5
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2
+SLOT=0/0.13.1.1
+SRC_URI=mirror://hackage/packages/archive/gio/0.13.1.1/gio-0.13.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9aad2c2ee12f1bc9e04f25728541b02b
diff --git a/dev-haskell/gio-0.13.3.1 b/dev-haskell/gio-0.13.3.1
new file mode 100644
index 000000000000..9d81e699695f
--- /dev/null
+++ b/dev-haskell/gio-0.13.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 >=dev-haskell/cabal-1.24 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binding to GIO
+EAPI=6
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2
+SLOT=0/0.13.3.1
+SRC_URI=mirror://hackage/packages/archive/gio/0.13.3.1/gio-0.13.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b835476a84576d8c36d1bb3b5232beec
diff --git a/dev-haskell/gio/Manifest b/dev-haskell/gio/Manifest
deleted file mode 100644
index 884a4e6095b8..000000000000
--- a/dev-haskell/gio/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST gio-0.12.5.3.tar.gz 79099 BLAKE2B 0c54108185f183489ed342162766937d104a9cff9e169485fd049d81e67c140808241a7110d8fddebb0f7ad7f49ff1a408d67595012f973b979019db5ae553e0 SHA512 51a72df085091847967ddf37e707a479c055a1e39f81edd1a302f2bbc2f1a4214fd9ea82bafd5a32f5e045944fcfa64c6ba6427481acee820280456ae80f413f
-DIST gio-0.13.1.1.tar.gz 79378 BLAKE2B 03b0b3dbe73fca50dd913ea024534be31c6364c2bf7416aba0c6b4a09ac71b56bc01f3a147625f3d7b1871c945589d8841d2fab62637b40ba401d3e3e3986f5c SHA512 7256450cc3bfe5469ed304ea093fef9ee11033331e2520c9deb420ff725d95c5ebfbc8cdfa24d3138a1799b70ca178b8d113957f6e09b871f270c0af168207d9
-DIST gio-0.13.3.1.tar.gz 70058 BLAKE2B a5a7b0a7fd8da7feaa5e1f7af06bf67bdec2c95b6c14e607659d3a4d27e3ccc55bf14e84a530d311176eb3ee5daf781b4d37a92fcc21b7f976c909701fb3804b SHA512 3273de2a04afc90ae569f8c36147bb4391ee4d45b64e21baeb259d67489c40a1d497587647885137e90bba21e2a460430aa56138e2099ce9e1d105b876ef33e8
-EBUILD gio-0.12.5.3.ebuild 802 BLAKE2B 2420c7cfd0a28f60e4d68b03ba6c613d4157acc532a5353022459f53ed61350d38f90dffaebcdd7972984acf9508deeac4315776d24c12906f47e86098fad5f5 SHA512 bb77f35923dcd1827b8eade7866960cc6a01f45535e886ff1bb0b62b9a59f183d769833cf2d4ea0ff1479ac8921ad28355e98f846bb890dc686113d7a0d1e60a
-EBUILD gio-0.13.1.1.ebuild 729 BLAKE2B ebf9ae507f5d759abc1f93624f8589c772fbd3724c53f1cf62ade2acbbc721919315a970203554314c47433c8f426778cf2021db0ff356e6ef89caf5186439cb SHA512 42188a800d3c1035677e35bc0f3d891a0c83a771c66febcbcea3bd69fed27e09b3c4634dc7e45e97435fbd08f31c812682f19018c70a21fbb7cc8f3ac1058779
-EBUILD gio-0.13.3.1.ebuild 696 BLAKE2B c021934722dd9116bc62f7713853393f56630f65be8e32b1b0e4b63481b13944850a4f2640fb55b2f58e94d603888ecd3b3dd2c22e4192edb4c12699be7408ac SHA512 f17e353d717cffc541c14bae71c7fc604cec113a37daf16e43ab3456084f3ae7ecb6dc9597c9b3b8ce3a20a79d69c5f65ce134b57f7ecb705cea774f2eaeefea
-MISC metadata.xml 685 BLAKE2B 900dd8aca993e34ee8693a4eb16114630ad3fd4bb832842054c8eda6639fc8a9c3cc6196a95c124c9f17320860794f9af442736a60c4d2dea8babb25f7bee05b SHA512 043977788c4a55bd9ff47a7429b2b2ffc2862713540d7076e346d1637ea48083ba4e00bcc2f0929568da82df1cdfa51773393c1f4c17351853d0ee7601af7c5a
diff --git a/dev-haskell/gio/gio-0.12.5.3.ebuild b/dev-haskell/gio/gio-0.12.5.3.ebuild
deleted file mode 100644
index 9109a99a0ada..000000000000
--- a/dev-haskell/gio/gio-0.12.5.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-#nocabaldep is for the fancy cabal-detection feature at build-time
-CABAL_FEATURES="lib profile haddock hoogle hscolour nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the GIO"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/glib-0.12.5.3:0=[profile?] <dev-haskell/glib-0.13:0=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	dev-libs/glib:2
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0=
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/gio/gio-0.13.1.1.ebuild b/dev-haskell/gio/gio-0.13.1.1.ebuild
deleted file mode 100644
index 9ade367732a6..000000000000
--- a/dev-haskell/gio/gio-0.13.1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to GIO"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/glib:2
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-	dev-haskell/gtk2hs-buildtools
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/gio/gio-0.13.3.1.ebuild b/dev-haskell/gio/gio-0.13.3.1.ebuild
deleted file mode 100644
index 4dab7916c907..000000000000
--- a/dev-haskell/gio/gio-0.13.3.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to GIO"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/glib:2
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/gio/metadata.xml b/dev-haskell/gio/metadata.xml
deleted file mode 100644
index 4f89c61927ae..000000000000
--- a/dev-haskell/gio/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		GIO is striving to provide a modern, easy-to-use VFS API that sits at the right level in the library stack.
-		The goal is to overcome the shortcomings of GnomeVFS and provide an API that is
-		so good that developers prefer it over raw POSIX calls.
-		Among other things that means using GObject.
-		It also means not cloning the POSIX API, but providing higher-level, document-centric interfaces.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/gitrev-1.2.0 b/dev-haskell/gitrev-1.2.0
new file mode 100644
index 000000000000..eae608e1f264
--- /dev/null
+++ b/dev-haskell/gitrev-1.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Compile git revision info into Haskell projects
+EAPI=5
+HOMEPAGE=https://github.com/acfoltzer/gitrev
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.6.1:=
+SLOT=0/1.2.0
+SRC_URI=mirror://hackage/packages/archive/gitrev/1.2.0/gitrev-1.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8a0b230af039f841db84b0a425248d62
diff --git a/dev-haskell/gitrev-1.3.1 b/dev-haskell/gitrev-1.3.1
new file mode 100644
index 000000000000..d06e24801403
--- /dev/null
+++ b/dev-haskell/gitrev-1.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-compat-0.6.0:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Compile git revision info into Haskell projects
+EAPI=6
+HOMEPAGE=https://github.com/acfoltzer/gitrev
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-compat-0.6.0:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/1.3.1
+SRC_URI=mirror://hackage/packages/archive/gitrev/1.3.1/gitrev-1.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8a129b825a62d7fc9f9b8695b9dfd070
diff --git a/dev-haskell/gitrev/Manifest b/dev-haskell/gitrev/Manifest
deleted file mode 100644
index 3577d1fd5bde..000000000000
--- a/dev-haskell/gitrev/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gitrev-1.2.0.tar.gz 3238 BLAKE2B 09d1a3bc132c7e28d65246e3805323f610f5d9f9f129e1f0f26316523c11639ddb44d8b439b7de979976431d4257940387ba6ae8311058fb1eac3aa3d19e1360 SHA512 ba794dfdec21a5b8ca19dff3ce712cb31f254ac59e166aad4fd33435649a7a5209fe9952cff230edc88d81e3622fe3b4f6199f3ef89e153d6e31cc6bca14d303
-DIST gitrev-1.3.1.tar.gz 3756 BLAKE2B 6871cb2c036bba9d6e727749778e0e16939a4ff84cf5ca74caf0c198a998265a8cbeea2019ba12e1e6190413499ed1b82874bd002416d620b70bcfd85bfcce1f SHA512 8639e356490fba3461f8d7030326a6913846427255524213a73ee2ac5abf708f75efed99a0d9d574a73a2db88833814d1b634e6a5ec93c4bc03052435e0ea4cd
-EBUILD gitrev-1.2.0.ebuild 557 BLAKE2B 8857552d63e2e5834284f954895a8867ae51f51040c4c7a2b345c94e46b8acf36407d80b1a37df9333cbff2a4c795c039cda93f99cf049980184efdb49ca6885 SHA512 d093d71469b4f469478e53b6391d1a306d6d89a3ba6a62b992cb703c3283fe234e0f8f038e308341a45423c9abe55ae797625fd953a9104ea308ddc09f46f5e9
-EBUILD gitrev-1.3.1.ebuild 597 BLAKE2B c14edfbbe12b533f1061fc82484330cdcd7695cb959dcbc8df03838f3071d77f6dea0912d44071b87a0ec248c0a6dc8abb94368b7087e2164b42f18bd7b5b393 SHA512 70147af878419d30d061536749f59aa67eba82429516b9dd03afedc2f7d6e1209d970e0eb2aa15515a54773b9440fbbc59d538ff6f23769320145fb54e8e3a55
-MISC metadata.xml 595 BLAKE2B 5a06ef55070d88cb66e56e0355747df3eac531e986104588ced77148f56c9279920d6dc3f700ce9b3d3d6a4be18e8643ca2f7ad449a83e73f9562c64c1d52892 SHA512 cc629c279fc1e19e374e312f42b1cc26850aed821b51aa2f1660abf8a131c17c66d184279b4a127138f74ad5405fbd05ae871b38c41bf054f117507a2cbf0c80
diff --git a/dev-haskell/gitrev/gitrev-1.2.0.ebuild b/dev-haskell/gitrev/gitrev-1.2.0.ebuild
deleted file mode 100644
index 15f20d60bacb..000000000000
--- a/dev-haskell/gitrev/gitrev-1.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Compile git revision info into Haskell projects"
-HOMEPAGE="https://github.com/acfoltzer/gitrev"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/gitrev/gitrev-1.3.1.ebuild b/dev-haskell/gitrev/gitrev-1.3.1.ebuild
deleted file mode 100644
index a6b2b895465b..000000000000
--- a/dev-haskell/gitrev/gitrev-1.3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Compile git revision info into Haskell projects"
-HOMEPAGE="https://github.com/acfoltzer/gitrev"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-compat-0.6.0:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/gitrev/metadata.xml b/dev-haskell/gitrev/metadata.xml
deleted file mode 100644
index 8f5eeed7fe9d..000000000000
--- a/dev-haskell/gitrev/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Some handy Template Haskell splices for including the current git hash and branch in the code of your project. Useful for including in panic messages, @--version@ output, or diagnostic info for more informative bug reports.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">acfoltzer/gitrev</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/glade-0.12.5.0-r100 b/dev-haskell/glade-0.12.5.0-r100
new file mode 100644
index 000000000000..dc8ddcdde227
--- /dev/null
+++ b/dev-haskell/glade-0.12.5.0-r100
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/glib-0.12.5.0:0=[profile?] >=dev-haskell/gtk-0.12.5.0:2=[profile?] >=dev-lang/ghc-6.10.4:= gnome-base/libglade:2.0 >=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0= >=dev-haskell/cabal-1.24 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binding to the glade library
+EAPI=5
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/glib-0.12.5.0:0=[profile?] >=dev-haskell/gtk-0.12.5.0:2=[profile?] >=dev-lang/ghc-6.10.4:= gnome-base/libglade:2.0
+SLOT=2/0.12.5.0
+SRC_URI=mirror://hackage/packages/archive/glade/0.12.5.0/glade-0.12.5.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=faa824aef97bfcaf1fea514858c23b45
diff --git a/dev-haskell/glade-0.12.5.0-r2 b/dev-haskell/glade-0.12.5.0-r2
new file mode 100644
index 000000000000..74116015f269
--- /dev/null
+++ b/dev-haskell/glade-0.12.5.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/glib-0.12.5.0:0=[profile?] <dev-haskell/glib-0.14:0=[profile?] >=dev-haskell/gtk-0.12.5.0:2=[profile?] <dev-haskell/gtk-0.14:2=[profile?] >=dev-lang/ghc-6.10.4:= gnome-base/libglade:2.0 >=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0= virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binding to the glade library
+EAPI=5
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ppc ppc64 sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/glib-0.12.5.0:0=[profile?] <dev-haskell/glib-0.14:0=[profile?] >=dev-haskell/gtk-0.12.5.0:2=[profile?] <dev-haskell/gtk-0.14:2=[profile?] >=dev-lang/ghc-6.10.4:= gnome-base/libglade:2.0
+SLOT=2/0.12.5.0
+SRC_URI=mirror://hackage/packages/archive/glade/0.12.5.0/glade-0.12.5.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0abbcf2c4570ee30746f24d168d85e98
diff --git a/dev-haskell/glade/Manifest b/dev-haskell/glade/Manifest
deleted file mode 100644
index ae8dcd911880..000000000000
--- a/dev-haskell/glade/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX Setup.hs 259 BLAKE2B e80e1fd9229f91e4b8960640eaf4f6f36e688a4c42fbf7d342301a0f9cf42d8531f177c2fa980b3f9ab6d1e346d39ae83ef7e5016b0045519a4f7b19f90c373d SHA512 62ad31d073a26c0465f82fdf521151aa622fc4eb0539f765536b4bccbbfbd30166b019fa9012412b025ee2ea1d9244614e4ad8d6941bfe63f4354cf333269993
-AUX glade-0.12.5.0-ghc-7.10.patch 8817 BLAKE2B f0daebe94458e9ef3704943b215312791a93c9dd3469fb05ca0e3d48780ba61dbb84770f5a4e4c70ef89289d46d0e6a139802a36fd7af54c05d37ae0e687f811 SHA512 dfc6ab3e97b2ec281c66454bac20ab64ac96c567c9bdeac849471b03b9b1fd18940389023ad19f2bdc0c2e1d78af1de0eecdea0aa006167c94890c407a5f8e1f
-DIST glade-0.12.5.0.tar.gz 152942 BLAKE2B ddcdaf5b74feff1992e754f11367cdccddb19c7e08c89d86af337c90c5cb0b450f04a0a45568b4f0837033d297a7b636fea09097462497b6abcef959a6fd1121 SHA512 5ea6ac03e919b881b53649c340d23eacc4c7e7055d9425b581c38bbc08192ad65e009b9bf03e9f224cee69ee2301354b2e42f4c7c845349b2b34fcdf8994c865
-EBUILD glade-0.12.5.0-r100.ebuild 1034 BLAKE2B ab00c00e6b23b8004cf4faab4cac68b46afd7abfcaa53e2562b629870a7c129cf50d7167f6c97cdde04aaecf9572feb6a6c55ba83bb43b839a2f65a050c61ec1 SHA512 2136b0a40af4d8b6e94b33e630a3c517305332b73bf68c8f8bd0b902a3259ff1bcb3db386e9f0cd1577c188c5d298ba1ad68797a5d7750ba172ca70edb84fb3a
-EBUILD glade-0.12.5.0-r2.ebuild 1052 BLAKE2B 2d3ac4249bd08080b043b569b63956478e11e83dc732ae128be13d28f4879edc19853d8ae550a7658f679ded7778590fc5f2842ee405332a8fd60874500c0b3b SHA512 e73dfebfe2a43c600fdc1265f81ef521eacbed2115c656917840521e592141f983d09c9db1b02ed202696e05383c03c62c46625a373a53b7f1102c9287224826
-MISC metadata.xml 597 BLAKE2B 76105e5cba3a760b7b4ed8c904b46798b07d90e0f3f20b5ee8e882f972e9d7fb920f75a99291329f137d336aa63691f056f1c1db7e4a19f552ca00351249e496 SHA512 949a3f88b0af3944a268f389e7cfb202f4bb7ccb725c52c28bd127814b853f34cc201c1a9859d97804cf1eb911a5aaa70f7a0415680476343bf0bcb5fa12e63c
diff --git a/dev-haskell/glade/files/Setup.hs b/dev-haskell/glade/files/Setup.hs
deleted file mode 100644
index 5fbe833309e9..000000000000
--- a/dev-haskell/glade/files/Setup.hs
+++ /dev/null
@@ -1,8 +0,0 @@
--- Adjustments specific to this package,
--- all Gtk2Hs-specific boilerplate is kept in
--- gtk2hs-buildtools:Gtk2HsSetup
---
-import Gtk2HsSetup ( gtk2hsUserHooks )
-import Distribution.Simple ( defaultMainWithHooks )
-
-main = defaultMainWithHooks gtk2hsUserHooks
diff --git a/dev-haskell/glade/files/glade-0.12.5.0-ghc-7.10.patch b/dev-haskell/glade/files/glade-0.12.5.0-ghc-7.10.patch
deleted file mode 100644
index 3e5d673661d3..000000000000
--- a/dev-haskell/glade/files/glade-0.12.5.0-ghc-7.10.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-diff --git a/Gtk2HsSetup.hs b/Gtk2HsSetup.hs
-index 371090a..8c60eec 100644
---- a/Gtk2HsSetup.hs
-+++ b/Gtk2HsSetup.hs
-@@ -8,5 +8,5 @@
- --
--module Gtk2HsSetup ( 
--  gtk2hsUserHooks, 
--  getPkgConfigPackages, 
-+module Gtk2HsSetup (
-+  gtk2hsUserHooks,
-+  getPkgConfigPackages,
-   checkGtk2hsBuildtools,
-@@ -57,4 +57,5 @@ import Distribution.Verbosity
- import Control.Monad (when, unless, filterM, liftM, forM, forM_)
--import Data.Maybe ( isJust, isNothing, fromMaybe, maybeToList )
--import Data.List (isPrefixOf, isSuffixOf, stripPrefix, nub)
-+import Data.Maybe ( isJust, isNothing, fromMaybe, maybeToList, catMaybes )
-+import Data.List (isPrefixOf, isSuffixOf, nub, minimumBy, stripPrefix, tails )
-+import Data.Ord as Ord (comparing)
- import Data.Char (isAlpha, isNumber)
-@@ -115,5 +116,12 @@ fixLibs dlls = concatMap $ \ lib ->
-     case filter (isLib lib) dlls of
--                dll:_ -> [dropExtension dll]
--                _     -> if lib == "z" then [] else [lib]
-+                dlls@(_:_) -> [dropExtension (pickDll dlls)]
-+                _          -> if lib == "z" then [] else [lib]
-   where
-+    -- If there are several .dll files matching the one we're after then we
-+    -- just have to guess. For example for recent Windows cairo builds we get
-+    -- libcairo-2.dll libcairo-gobject-2.dll libcairo-script-interpreter-2.dll
-+    -- Our heuristic is to pick the one with the shortest name.
-+    -- Yes this is a hack but the proper solution is hard: we would need to
-+    -- parse the .a file and see which .dll file(s) it needed to link to.
-+    pickDll = minimumBy (Ord.comparing length)
-     isLib lib dll =
-@@ -123,3 +131,3 @@ fixLibs dlls = concatMap $ \ lib ->
-             _                           -> False
--        
-+
- -- The following code is a big copy-and-paste job from the sources of
-@@ -156,8 +164,12 @@ register :: PackageDescription -> LocalBuildInfo
-          -> IO ()
--register pkg@(library       -> Just lib )
--         lbi@(libraryConfig -> Just clbi) regFlags
-+register pkg@PackageDescription { library       = Just lib  } lbi regFlags
-   = do
-+    let clbi = LBI.getComponentLocalBuildInfo lbi LBI.CLibName
- 
-     installedPkgInfoRaw <- generateRegistrationInfo
-+#if CABAL_VERSION_CHECK(1,22,0)
-+                           verbosity pkg lib lbi clbi inplace False distPref packageDb
-+#else
-                            verbosity pkg lib lbi clbi inplace distPref
-+#endif
- 
-@@ -170,3 +182,3 @@ register pkg@(library       -> Just lib )
-     case () of
--     _ | modeGenerateRegFile   -> die "Generate Reg File not supported"
-+     _ | modeGenerateRegFile   -> writeRegistrationFile installedPkgInfo
-        | modeGenerateRegScript -> die "Generate Reg Script not supported"
-@@ -182,2 +194,4 @@ register pkg@(library       -> Just lib )
-     modeGenerateRegFile = isJust (flagToMaybe (regGenPkgConf regFlags))
-+    regFile             = fromMaybe (display (packageId pkg) <.> "conf")
-+                                    (fromFlag (regGenPkgConf regFlags))
-     modeGenerateRegScript = fromFlag (regGenScript regFlags)
-@@ -190,2 +204,6 @@ register pkg@(library       -> Just lib )
- 
-+    writeRegistrationFile installedPkgInfo = do
-+      notice verbosity ("Creating package registration file: " ++ regFile)
-+      writeUTF8File regFile (showInstalledPackageInfo installedPkgInfo)
-+
- register _ _ regFlags = notice verbosity "No package to register"
-@@ -249,3 +267,3 @@ getCppOptions bi lbi
-    ++ [opt | opt@('-':c:_) <- PD.cppOptions bi ++ PD.ccOptions bi, c `elem` "DIU"]
--   ++ ["-D__GLASGOW_HASKELL__="++show (ghcDefine . versionBranch . compilerVersion $ LBI.compiler lbi)]
-+   ++ ["-D__GLASGOW_HASKELL__="++show (ghcDefine . ghcVersion . compilerId $ LBI.compiler lbi)]
-  where
-@@ -254,2 +272,15 @@ getCppOptions bi lbi
- 
-+  ghcVersion :: CompilerId -> [Int]
-+-- This version is nicer, but we need to know the Cabal version that includes the new CompilerId
-+-- #if CABAL_VERSION_CHECK(1,19,2)
-+--   ghcVersion (CompilerId GHC v _) = versionBranch v
-+--   ghcVersion (CompilerId _ _ (Just c)) = ghcVersion c
-+-- #else
-+--   ghcVersion (CompilerId GHC v) = versionBranch v
-+-- #endif
-+--   ghcVersion _ = []
-+-- This version should work fine for now
-+  ghcVersion = concat . take 1 . map (read . (++"]") . takeWhile (/=']')) . catMaybes
-+               . map (stripPrefix "CompilerId GHC (Version {versionBranch = ") . tails . show
-+
- installCHI :: PackageDescription -- ^information from the .cabal file
-@@ -264,3 +295,3 @@ installCHI pkg@PD.PackageDescription { library = Just lib } lbi verbosity copyde
-                    (PD.libModules lib)
--                 
-+
-   let files = [ f | Just f <- mFiles ]
-@@ -268,3 +299,3 @@ installCHI pkg@PD.PackageDescription { library = Just lib } lbi verbosity copyde
- 
--  
-+
- installCHI _ _ _ _ = return ()
-@@ -294,3 +325,2 @@ genSynthezisedFiles :: Verbosity -> PackageDescription -> LocalBuildInfo -> IO (
- genSynthezisedFiles verb pd lbi = do
--
-   cPkgs <- getPkgConfigPackages verb lbi pd
-@@ -300,3 +330,3 @@ genSynthezisedFiles verb pd lbi = do
-       typeOpts :: String -> [ProgArg]
--      typeOpts tag = concat [ map (\val -> '-':'-':drop (length tag) field++'=':val) (words content)
-+      typeOpts tag = concat [ map (\val -> '-':'-':drop (length tag) field ++ '=':val) (words content)
-                             | (field,content) <- xList,
-@@ -308,4 +338,5 @@ genSynthezisedFiles verb pd lbi = do
-                  , tag <- name'
--                        : [ name' ++ "-" ++ show major ++ "." ++ show digit
--                          | digit <- [0,2..minor] ]
-+                        :[ name' ++ "-" ++ show maj ++ "." ++ show d2
-+                          | (maj, d2) <- [(maj,   d2) | maj <- [0..(major-1)], d2 <- [0,2..20]]
-+                                      ++ [(major, d2) | d2 <- [0,2..minor]] ]
-                  ]
-@@ -400,11 +431,6 @@ fixDeps pd@PD.PackageDescription {
-   modDeps <- mapM extractDeps modDeps
--  let (expMods, othMods) = span mdExposed $ sortTopological modDeps
--      badOther = map (fromMaybe "<no file>" . mdLocation) $
--                 filter (not . mdExposed) expMods
--  unless (null badOther) $
--    die ("internal chs modules "++intercalate "," badOther++
--         " depend on exposed chs modules; cabal needs to build internal modules first")
-+  let (othMods, expMods) = span (not . mdExposed) $ reverse $ sortTopological modDeps
-   return pd { PD.library = Just lib {
--    PD.exposedModules = map mdOriginal expMods,
--    PD.libBuildInfo = bi { PD.otherModules = map mdOriginal othMods }
-+    PD.exposedModules = map mdOriginal (reverse expMods),
-+    PD.libBuildInfo = bi { PD.otherModules = map mdOriginal (reverse othMods) }
-   }}
-@@ -428,3 +454,3 @@ instance Ord ModDep where
- -- ignores CPP conditionals. We just require everything which means that the
---- existance of a .chs module may not depend on some CPP condition.  
-+-- existance of a .chs module may not depend on some CPP condition.
- extractDeps :: ModDep -> IO ModDep
-@@ -435,3 +461,3 @@ extractDeps md@ModDep { mdLocation = Just f } = withUTF8FileContents f $ \con ->
-           case simpleParse (takeWhile ('#' /=) ys) of
--            Just m -> findImports (m:acc) xxs 
-+            Just m -> findImports (m:acc) xxs
-             Nothing -> die ("cannot parse chs import in "++f++":\n"++
-@@ -469,3 +495,3 @@ checkGtk2hsBuildtools programs = do
-   let printError name = do
--        putStrLn $ "Cannot find " ++ name ++ "\n" 
-+        putStrLn $ "Cannot find " ++ name ++ "\n"
-                  ++ "Please install `gtk2hs-buildtools` first and check that the install directory is in your PATH (e.g. HOME/.cabal/bin)."
-@@ -473,2 +499,2 @@ checkGtk2hsBuildtools programs = do
-   forM_ programInfos $ \ (name, location) ->
--    when (isNothing location) (printError name) 
-+    when (isNothing location) (printError name)
-diff --git a/SetupMain.hs b/SetupMain.hs
-index 201ee8f..2d1a782 100644
---- a/SetupMain.hs
-+++ b/SetupMain.hs
-@@ -12,2 +12,2 @@ main = do
-   defaultMainWithHooks gtk2hsUserHooks
--  
-+
-diff --git a/SetupWrapper.hs b/SetupWrapper.hs
-index aa825ec..44a20f8 100644
---- a/SetupWrapper.hs
-+++ b/SetupWrapper.hs
-@@ -11,3 +11,3 @@ import Distribution.Simple.Compiler
- import Distribution.Simple.BuildPaths (exeExtension)
--import Distribution.Simple.Configure (configCompiler)
-+import Distribution.Simple.Configure (configCompilerEx)
- import Distribution.Simple.GHC (getInstalledPackages)
-@@ -20,3 +20,3 @@ import System.Environment
- import System.Process
--import System.Exit
-+import System.Exit (ExitCode(..), exitWith)
- import System.FilePath
-@@ -117,3 +117,3 @@ setupWrapper setupHsFile = do
- 
--        (comp, conf)    <- configCompiler (Just GHC) Nothing Nothing
-+        (comp, _, conf) <- configCompilerEx (Just GHC) Nothing Nothing
-                              defaultProgramConfiguration verbosity
diff --git a/dev-haskell/glade/glade-0.12.5.0-r100.ebuild b/dev-haskell/glade/glade-0.12.5.0-r100.ebuild
deleted file mode 100644
index 9ce6673eca8e..000000000000
--- a/dev-haskell/glade/glade-0.12.5.0-r100.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the glade library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="2/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/glib-0.12.5.0:0=[profile?]
-	>=dev-haskell/gtk-0.12.5.0:2=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	gnome-base/libglade:2.0
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0=
-	>=dev-haskell/cabal-1.24
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-
-	# update to latest gtk2hs-buildtools
-	rm Setup.hs || die
-	rm Gtk2HsSetup.hs || die
-	cp "${FILESDIR}"/Setup.hs ./ || die
-
-	cabal_chdeps \
-		'glib >= 0.12.5.0 && < 0.13' 'glib >= 0.12.5.0' \
-		'gtk >= 0.12.5.0 && < 0.13' 'gtk >= 0.12.5.0'
-}
diff --git a/dev-haskell/glade/glade-0.12.5.0-r2.ebuild b/dev-haskell/glade/glade-0.12.5.0-r2.ebuild
deleted file mode 100644
index c82ce4d22572..000000000000
--- a/dev-haskell/glade/glade-0.12.5.0-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-#nocabaldep is for the fancy cabal-detection feature at build-time
-CABAL_FEATURES="lib profile haddock hoogle hscolour nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the glade library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="2/${PV}"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/glib-0.12.5.0:0=[profile?] <dev-haskell/glib-0.14:0=[profile?]
-	>=dev-haskell/gtk-0.12.5.0:2=[profile?] <dev-haskell/gtk-0.14:2=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	gnome-base/libglade:2.0
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0=
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-
-	cabal_chdeps \
-		'glib >= 0.12.5.0 && < 0.13' 'glib >= 0.12.5.0 && < 0.14' \
-		'gtk >= 0.12.5.0 && < 0.13' 'gtk >= 0.12.5.0 && < 0.14'
-}
diff --git a/dev-haskell/glade/metadata.xml b/dev-haskell/glade/metadata.xml
deleted file mode 100644
index 2ba679a49549..000000000000
--- a/dev-haskell/glade/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library allows to load externally stored user interfaces into
-		programs. This allows alteration of the interface without recompilation
-		of the program.
-		
-		Note that this functionality is now provided in gtk directly
-		(as of version 2.12 of the gtk+ C lib) by the
-		Graphics.UI.Gtk.Builder module.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/glib-0.12.5.4 b/dev-haskell/glib-0.12.5.4
new file mode 100644
index 000000000000..cc7a2b17eedf
--- /dev/null
+++ b/dev-haskell/glib-0.12.5.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 >=dev-haskell/cabal-1.8 >=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0= virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binding to the GLIB library for Gtk2Hs
+EAPI=5
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=+closure_signals doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2
+SLOT=0/0.12.5.4
+SRC_URI=mirror://hackage/packages/archive/glib/0.12.5.4/glib-0.12.5.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8a776c60d90b4c981106e9c7cccf5ca0
diff --git a/dev-haskell/glib-0.13.2.2 b/dev-haskell/glib-0.13.2.2
new file mode 100644
index 000000000000..ecab1fd5edd7
--- /dev/null
+++ b/dev-haskell/glib-0.13.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 >=dev-haskell/cabal-1.18 dev-haskell/gtk2hs-buildtools virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binding to the GLIB library for Gtk2Hs
+EAPI=5
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=+closure_signals doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2
+SLOT=0/0.13.2.2
+SRC_URI=mirror://hackage/packages/archive/glib/0.13.2.2/glib-0.13.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=95501df7ecfe9f76363107e595080cd7
diff --git a/dev-haskell/glib-0.13.4.1 b/dev-haskell/glib-0.13.4.1
new file mode 100644
index 000000000000..9b0b8d664810
--- /dev/null
+++ b/dev-haskell/glib-0.13.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 >=dev-haskell/cabal-1.24 <dev-haskell/cabal-1.25 >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binding to the GLIB library for Gtk2Hs
+EAPI=6
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=+closure_signals doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2
+SLOT=0/0.13.4.1
+SRC_URI=mirror://hackage/packages/archive/glib/0.13.4.1/glib-0.13.4.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ec1d701b9b8d8cfbddc61cc74563118e
diff --git a/dev-haskell/glib/Manifest b/dev-haskell/glib/Manifest
deleted file mode 100644
index 25adfc7a044d..000000000000
--- a/dev-haskell/glib/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST glib-0.12.5.4.tar.gz 46080 BLAKE2B f787a9dddfd3eb826fb156a4c53ee2d75d7fd87c23deb39af71e08a6cbe84cba2bdf9da3808c9cdc49379f46e740d3dcb98381fa835b665351983c28e1a74d57 SHA512 2ae2b70d839c88461c6dc38bd370e336b004b94316cbffee158203a311e8b9d0ffe93063d431740f1b3c42d2c55bc8fd46ebfbd4e591a447704ceb68a5815312
-DIST glib-0.13.2.2.tar.gz 48662 BLAKE2B c64359438c7f202036f27df68b6210b1f8011200ae69d060878d30a9487e8634e48e3afc195263710cd8f1c066e95b77a3a16f265e576118dffd232106dbf075 SHA512 97c49911cc53a1a01df4cdacb0aa715b41988d3689a7dbdd2c9499c9a4858497f3deb6fb492394751210899af5569efba2171468417c5961b7fb73863ce652c1
-DIST glib-0.13.4.1.tar.gz 39441 BLAKE2B e6340021276a8bc5de4101c910a5d03c16474ddff402f3327433ca4b03a7bd300195b45045d99a9379b6f21d6474ef3043f77405060d8baca6285fca3bf42f6f SHA512 537f70688e398b8c68727b8260080790569e7f1b87633912a1438c5b1ed590221ac633168a83e7bc49728292ae53f8eaaf268d78c0be0df81527c5a3ce810869
-EBUILD glib-0.12.5.4.ebuild 859 BLAKE2B a12d76b803b324da9c091921eba8ade53ee45a1da4288ae376bfc1c786c3fc8f33484f2918ca2fcc20765eeef7f98f9b9bc1456bd3a8243e90c9d4528009a48c SHA512 41b0b78aa34308bd223659a2bb8b320855f1bf1d46a5bb557bf31d41c0d5d7ff3c57322550e79f96175892b38ea041c33e7613fecb412e1b627831f8a72e3532
-EBUILD glib-0.13.2.2.ebuild 922 BLAKE2B 85223f2f13acd32ac31f6a2701e1bae71614f2507a68bd68f2d313f3a6dbbedb8574c18b29051e2b9016d7a819616361c37cfcb2ca4086f4337977b175553262 SHA512 ba6d0ed42cab5f3263ce08620a3ad20ffddd40c6a8937e8224517ab05f927e5f54817a4ef75a7b2b89b01a091066a7a988dc74b6459507f37dbf3b827e27982e
-EBUILD glib-0.13.4.1.ebuild 993 BLAKE2B ab24039766a617941bba53df95204f298fdd4797d9011fb8ac94371c0f9523bd90f9fd5dc06915ea890b873ceb5db9914907dc3450a19a8ff1506dc669bf0384 SHA512 b383993b7af736cbffcd7ca04fc02b195c07eea01357f9861bd23da660f108bed6e9cfd317e9d31e7a7aa32fa7637f901da09dd084a8223d7e4b11a8fb277daa
-MISC metadata.xml 637 BLAKE2B 70cbba162f8aab7d358770ffded474242b0c19e80835a308405a68ec0e1f55ea2f65264b5b3a777e410c61b4854a14da4324a822b594796fdcc9843e8dc64bf4 SHA512 044ef3eab2c4e5fdc416acba4343c45fdef37ec6326868b2d0d01055f4dbb3b7f478261d5a063fcbd63b5923d2282001ca065113f86d721f2c8d54e2a8d3c875
diff --git a/dev-haskell/glib/glib-0.12.5.4.ebuild b/dev-haskell/glib/glib-0.12.5.4.ebuild
deleted file mode 100644
index 4e4b8a2cba01..000000000000
--- a/dev-haskell/glib/glib-0.12.5.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the GLIB library for Gtk2Hs"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="+closure_signals"
-
-RDEPEND=">=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/glib:2
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	>=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0=
-	virtual/pkgconfig
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag closure_signals closure_signals)
-}
diff --git a/dev-haskell/glib/glib-0.13.2.2.ebuild b/dev-haskell/glib/glib-0.13.2.2.ebuild
deleted file mode 100644
index eb6d807807d7..000000000000
--- a/dev-haskell/glib/glib-0.13.2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the GLIB library for Gtk2Hs"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+closure_signals"
-
-RDEPEND=">=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/glib:2
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-	dev-haskell/gtk2hs-buildtools
-	virtual/pkgconfig
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag closure_signals closure_signals)
-}
diff --git a/dev-haskell/glib/glib-0.13.4.1.ebuild b/dev-haskell/glib/glib-0.13.4.1.ebuild
deleted file mode 100644
index d278d4cb7089..000000000000
--- a/dev-haskell/glib/glib-0.13.4.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the GLIB library for Gtk2Hs"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+closure_signals"
-
-RDEPEND=">=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/glib:2
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24 <dev-haskell/cabal-1.25
-	>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
-	virtual/pkgconfig
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag closure_signals closure_signals)
-}
diff --git a/dev-haskell/glib/metadata.xml b/dev-haskell/glib/metadata.xml
deleted file mode 100644
index e57b11cbbed2..000000000000
--- a/dev-haskell/glib/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The GNU Library is a collection of C data structures and utility
-		function for dealing with Unicode. This package only binds as
-		much functionality as required to support the packages that
-		wrap libraries that are themselves based on GLib.
-	</longdescription>
-	<use>
-		<flag name="closure_signals">Use the the GClosure-based signals implementation.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/glob-0.7.14 b/dev-haskell/glob-0.7.14
new file mode 100644
index 000000000000..696ed598c945
--- /dev/null
+++ b/dev-haskell/glob-0.7.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/dlist-0.4:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6 >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 >=dev-haskell/test-framework-0.2 <dev-haskell/test-framework-1 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-1 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Globbing library
+EAPI=6
+HOMEPAGE=http://iki.fi/matti.niemenmaa/glob/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/dlist-0.4:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.7.14
+SRC_URI=mirror://hackage/packages/archive/Glob/0.7.14/Glob-0.7.14.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=27cf8cbcefe1047eceeb8765e914b60c
diff --git a/dev-haskell/glob-0.7.5 b/dev-haskell/glob-0.7.5
new file mode 100644
index 000000000000..12c074f02b7c
--- /dev/null
+++ b/dev-haskell/glob-0.7.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/dlist-0.4:=[profile?] <dev-haskell/dlist-0.8:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Globbing library
+EAPI=5
+HOMEPAGE=http://iki.fi/matti.niemenmaa/glob/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/dlist-0.4:=[profile?] <dev-haskell/dlist-0.8:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.5
+SRC_URI=mirror://hackage/packages/archive/Glob/0.7.5/Glob-0.7.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=736839357badb59d829394b572165912
diff --git a/dev-haskell/glob/Manifest b/dev-haskell/glob/Manifest
deleted file mode 100644
index fa1977abe083..000000000000
--- a/dev-haskell/glob/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST Glob-0.7.14.tar.gz 23928 BLAKE2B 0f5c58f55f182051326ac2e52b3332b9f6dd4a907cc179fd3d79f1e5973a99f038fe82c1c2d517dd281880657fe465544fe5275ffc864b67506318de01959ce0 SHA512 1ad470c90da94445bac959326327166cbaed2bd9abd6b861dfe1ff4849edc4cec00baa6d8d160f2513a2d0c036075c8f80ba795d70c85f2de447254b893dfb0e
-DIST Glob-0.7.5.tar.gz 23443 BLAKE2B 9664399f418ad2979d05053b09258b9c53a877274d806ef3efb8797452234663cad53448d5ef7b7b79cda6b52328e753f53a5ff2f2022516594b6d19729afbef SHA512 7397a6003b73fba31b1515ada667f2ff536cb1cc76d552e43167135877397dfc693a563abde11ca2912e0c005a99a37b45e564becadbd47d2c4e4f40ca4245b1
-EBUILD glob-0.7.14.ebuild 1205 BLAKE2B 5a57965b9159f5c7cd5118502864cf9ce27003f9fc1c7bfeb11f795cf7d1d8bef83b8ce0775149b1170eb6604bfda8915c730f8c930a3f5053c2eb907d90e17d SHA512 07defdcaae14ca57fb6fe18df3819be19a8ee88f68383723126e072b12bc7129c8905b680a52c29fe1508a904416add76ae7a35a199bb2df5414e4b2adc021cd
-EBUILD glob-0.7.5.ebuild 835 BLAKE2B c26a4fafbb526800cbb1cb6df71c83ef397c4896ef94799f35d38aceea7a4a813621b11d155a8353a9c831a20d42bca21b0de95e07396c3277a0e33370c6b6f7 SHA512 dfa4642abb5e7602240032761611c4ac3626d6600a1b432dd8ea432da0aba38a87b61b1a667a3a34819f213adaec322b8055253b2d377dc2a21251e65e8aed64
-MISC metadata.xml 352 BLAKE2B 7969510c26dccdf7f75f6fb5bb3c2adc54e5f673f3c36ef97b467cbab9659fa7a7eb01396fbdf37201fdacf699fcab9056e24a86918c16563f1b67cd7cf19b8f SHA512 9226b1c371c8eb0feddc1b4432d3398b06a4920a66575c95bc5f7d24d7f57d3019592e2f1f7335771f8a210fc9de7ff626039ed244174308b96b4457b15f8644
diff --git a/dev-haskell/glob/glob-0.7.14.ebuild b/dev-haskell/glob/glob-0.7.14.ebuild
deleted file mode 100644
index a469f0329db1..000000000000
--- a/dev-haskell/glob/glob-0.7.14.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="Glob"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Globbing library"
-HOMEPAGE="http://iki.fi/matti.niemenmaa/glob/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/dlist-0.4:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		>=dev-haskell/test-framework-0.2 <dev-haskell/test-framework-1
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-1
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-1 )
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/glob/glob-0.7.5.ebuild b/dev-haskell/glob/glob-0.7.5.ebuild
deleted file mode 100644
index 28597278a2c9..000000000000
--- a/dev-haskell/glob/glob-0.7.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Glob"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Globbing library"
-HOMEPAGE="http://iki.fi/matti.niemenmaa/glob/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/dlist-0.4:=[profile?] <dev-haskell/dlist-0.8:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cabal_chdeps \
-		'filepath     >= 1.1 && < 1.4' 'filepath     >= 1.1'
-}
diff --git a/dev-haskell/glob/metadata.xml b/dev-haskell/glob/metadata.xml
deleted file mode 100644
index 3497c902c48e..000000000000
--- a/dev-haskell/glob/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A library for globbing: matching patterns against file paths.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/gluraw-1.2.0.0 b/dev-haskell/gluraw-1.2.0.0
new file mode 100644
index 000000000000..8a3e6dcf055e
--- /dev/null
+++ b/dev-haskell/gluraw-1.2.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND==dev-haskell/openglraw-1.2*[profile?] >=dev-lang/ghc-6.8.2 virtual/glu >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A raw 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/openglraw-1.2*[profile?] >=dev-lang/ghc-6.8.2 virtual/glu
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/GLURaw/1.2.0.0/GLURaw-1.2.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=312bc408159bd48aa017b5b29baec332
diff --git a/dev-haskell/gluraw-1.3.0.0 b/dev-haskell/gluraw-1.3.0.0
new file mode 100644
index 000000000000..f48754b056cc
--- /dev/null
+++ b/dev-haskell/gluraw-1.3.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND==dev-haskell/openglraw-1.3*:=[profile?] >=dev-lang/ghc-6.10.4:= virtual/glu >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A raw 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/openglraw-1.3*:=[profile?] >=dev-lang/ghc-6.10.4:= virtual/glu
+SLOT=0/1.3.0.0
+SRC_URI=mirror://hackage/packages/archive/GLURaw/1.3.0.0/GLURaw-1.3.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c8886a3cfcdfcfb40ce5a731614a5945
diff --git a/dev-haskell/gluraw-1.4.0.1 b/dev-haskell/gluraw-1.4.0.1
new file mode 100644
index 000000000000..74f9061fc5b9
--- /dev/null
+++ b/dev-haskell/gluraw-1.4.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/openglraw-1.3.0.0:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/glu >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A raw 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/openglraw-1.3.0.0:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/glu
+SLOT=0/1.4.0.1
+SRC_URI=mirror://hackage/packages/archive/GLURaw/1.4.0.1/GLURaw-1.4.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2004bdb51d8c7f7348cca7dd7c5aa653
diff --git a/dev-haskell/gluraw-1.5.0.1 b/dev-haskell/gluraw-1.5.0.1
new file mode 100644
index 000000000000..54bed5dd5290
--- /dev/null
+++ b/dev-haskell/gluraw-1.5.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/openglraw-2.4:=[profile?] <dev-haskell/openglraw-2.6:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/glu >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A raw 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/openglraw-2.4:=[profile?] <dev-haskell/openglraw-2.6:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/glu
+SLOT=0/1.5.0.1
+SRC_URI=mirror://hackage/packages/archive/GLURaw/1.5.0.1/GLURaw-1.5.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ef6d519faf25c540bdc1863e3bbaca68
diff --git a/dev-haskell/gluraw-2.0.0.3 b/dev-haskell/gluraw-2.0.0.3
new file mode 100644
index 000000000000..16b72a4e669c
--- /dev/null
+++ b/dev-haskell/gluraw-2.0.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/openglraw-3.0:=[profile?] <dev-haskell/openglraw-3.3:=[profile?] >=dev-lang/ghc-7.8.2:= virtual/glu >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A raw binding for the OpenGL graphics system
+EAPI=6
+HOMEPAGE=http://www.haskell.org/haskellwiki/Opengl
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/openglraw-3.0:=[profile?] <dev-haskell/openglraw-3.3:=[profile?] >=dev-lang/ghc-7.8.2:= virtual/glu
+SLOT=0/2.0.0.3
+SRC_URI=mirror://hackage/packages/archive/GLURaw/2.0.0.3/GLURaw-2.0.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=72e95e4955750b014d28a4fa2c63ca5e
diff --git a/dev-haskell/gluraw/Manifest b/dev-haskell/gluraw/Manifest
deleted file mode 100644
index 2204b3446d19..000000000000
--- a/dev-haskell/gluraw/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST GLURaw-1.2.0.0.tar.gz 7736 BLAKE2B e0e2acf008e733e805101216761c0bfd126ad9a412288247305aedf02d0c08a5584542e8c5908c65c023a791aae82cc1edda47f9f9681e9ad1cafee10da53be1 SHA512 a25cff8c6d5356b858dafadbe1cb024c1662358fa259bdaf5ddeacacae1684b4adb1e0c5bc3bf30d5d3333bb9672838b37394810e07c3201d32b24b86355786a
-DIST GLURaw-1.3.0.0.tar.gz 7779 BLAKE2B 7de3ec011ffaeb9cb098d0253452433c1b2c0214b6345116842a21723e9c59b1edf4d4dad1a62a075b105c2df2dcfba1bf19180a8b5c09d18e9d08b80e3be316 SHA512 a51f62ab3465913216c43686c2ceac16ab78e24fabe740afec4264afd5afbfc1fc45d535b08374d719ca38dad9bb12a7227a01b1cfaee044f549fd4f4f8900b6
-DIST GLURaw-1.4.0.1.tar.gz 8445 BLAKE2B fbfe156d291fa830c91672b2c8aaff4c60c04ff990af66991da1fd8845645dc876751648f15c81c2004176d839b75a9b595be9513eb3970aad1d4fd17b5400b4 SHA512 48eb52f7923148c014f89d07029cb7293b325f9bc0d3786c685f1de73a58553602d77edd8261da3d3bdc7090249d11234ef97e76ba436bcd9acc2a8cdec78bed
-DIST GLURaw-1.5.0.1.tar.gz 10121 BLAKE2B e21d22e49349becd367686684e87f915cf42a5afb50fd03a2b811ff1047f5bc60eb709b09fcd935497a7a0512bb219a646705011dc0046e132034f49344f9eeb SHA512 085e28e63a28a72e766ec1404d4cf4f3189251e5a159fc00f5d06916a6e38ef80cf9f319e06e3a751db2354042aca4e74e5a736bba966457edc0f24197c950ad
-DIST GLURaw-2.0.0.3.tar.gz 10515 BLAKE2B eab97d41f801c5607a25e42463accdc615c4c2d21126481f472ff0faa78341d04956834eb7c6fe738c6670a788d5c7b729a08e6de234a1497391be3b8520d0f1 SHA512 dccd459c9392b1608d91cb80904346472209cb5dc8f2afbbb1ad07e24ddc0c8affc2eda4bb9aec9b2bc0e94e4546685cb60239c5687c629a8184b91162b4cc56
-EBUILD gluraw-1.2.0.0.ebuild 678 BLAKE2B 61ec3e9d9d785f005945e491108259297d800d721e6cbe95ea42ad08b782dc9485e66b60dd2082e2087463d0c11f20c26b4bc26b04e9e1583aaf05091c7f8d1a SHA512 e3d3123737c16ebaa31b4c3430ef1b40d4da97a91995b49532063b0c521632693794b55760c3b4ad6a43c33532a3db272760d2f4104a9c2cf1c219bfe3521397
-EBUILD gluraw-1.3.0.0.ebuild 679 BLAKE2B 9703655dca311cc0e9a863c1ecf434e4ac2273179ee3ae49c5f39758573415d2235edc2f46da0b11f0f813306a3c3db678663e8ac2ebfc1fe10e1cf174e53bf0 SHA512 67723b54b6b61ecd193906b05af45df15abd28207bdb150d0c90335d2e1aa7d9be600158728503b671a5d95a76ff2205da52c2baac18209f9c2d40134e9f850c
-EBUILD gluraw-1.4.0.1.ebuild 819 BLAKE2B 99264067f4e322c76bcc1e78af781d634044d07099a5081a1d33ca225e8d9d9bb08b79af467247f0dda9cccbe7ec4617c412f0b83e3ad49f7e806dff1e2a9e96 SHA512 3f6da5cfd32a0aa6b13db7fc6a94734fcb9ce179200506010299b6081440f7817b454d9147e4aeb2278eb0f5a155f49f63f350364159ebb0a70e831fbae74e3b
-EBUILD gluraw-1.5.0.1.ebuild 945 BLAKE2B 7f92c9ee4ce970ce465ea6755197c44c043510a5ff8128c93eba98d36ac38fe65f9e57762fca526642284f838711c44eb1793e1bdff4e32c4ce714907634ea57 SHA512 4bc751ee1a09532cc796d488b98e482cca6170f6caf64cce55d2ee9b120cabced0d4cfa49577acb4da30a63c00f8fa3d5b93c07ab1e8b168e18717aecfbb4371
-EBUILD gluraw-2.0.0.3.ebuild 856 BLAKE2B 4fdd473e33d01a20324397736e53e9dc75a45971f83a01592e614c225f545b8754728fe4765661b1f96fdfd609810eea52591244ec53a8e4e0c369e9ef67aa24 SHA512 029bb92fd2f6810d829ad1e6ca1a35cd265aff1b49dc5c15c44164dc21601518c1ce20c80c61607323fd914fe04006a8f7d325b85d27317f9ece28b13d26ca74
-MISC metadata.xml 853 BLAKE2B 1b9efca7c94cce20ebe7b3d4d89e18f217a0df2e9cdca1e3664a0ca780c3593c9773e83b02d078356da4479ba90cfe3e12b19156aa52bfc5426639f2067e7636 SHA512 06bd1d8f74db0621fe7e96a29c59e2792896ac9b744e5631a7c37112c795b61d0b913d9f33eab5908f494513eb470d8e87dc56e5069289ef0ffcbc473cc5c204
diff --git a/dev-haskell/gluraw/gluraw-1.2.0.0.ebuild b/dev-haskell/gluraw/gluraw-1.2.0.0.ebuild
deleted file mode 100644
index f532a7caf17d..000000000000
--- a/dev-haskell/gluraw/gluraw-1.2.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="GLURaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/openglraw-1.2*[profile?]
-		>=dev-lang/ghc-6.8.2
-		virtual/glu"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/gluraw/gluraw-1.3.0.0.ebuild b/dev-haskell/gluraw/gluraw-1.3.0.0.ebuild
deleted file mode 100644
index a245254a95fd..000000000000
--- a/dev-haskell/gluraw/gluraw-1.3.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="GLURaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~sparc x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/openglraw-1.3*:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		virtual/glu"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/gluraw/gluraw-1.4.0.1.ebuild b/dev-haskell/gluraw/gluraw-1.4.0.1.ebuild
deleted file mode 100644
index e20de22f180a..000000000000
--- a/dev-haskell/gluraw/gluraw-1.4.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-#hackport: flags: -usenativewindowslibraries
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="GLURaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/openglraw-1.3.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	virtual/glu
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/gluraw/gluraw-1.5.0.1.ebuild b/dev-haskell/gluraw/gluraw-1.5.0.1.ebuild
deleted file mode 100644
index 6b591676bbcc..000000000000
--- a/dev-haskell/gluraw/gluraw-1.5.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -usenativewindowslibraries
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="GLURaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/openglraw-2.4:=[profile?] <dev-haskell/openglraw-2.6:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	virtual/glu
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/gluraw/gluraw-2.0.0.3.ebuild b/dev-haskell/gluraw/gluraw-2.0.0.3.ebuild
deleted file mode 100644
index 27066191ba53..000000000000
--- a/dev-haskell/gluraw/gluraw-2.0.0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -usenativewindowslibraries
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="GLURaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/openglraw-3.0:=[profile?] <dev-haskell/openglraw-3.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	virtual/glu
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/gluraw/metadata.xml b/dev-haskell/gluraw/metadata.xml
deleted file mode 100644
index b0f883df7ad3..000000000000
--- a/dev-haskell/gluraw/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		GLURaw is a raw Haskell binding for the GLU 1.3 OpenGL utility library. It is
-		basically a 1:1 mapping of GLU's C API, intended as a basis for a nicer
-		interface.
-		
-		OpenGL is the industry's most widely used and supported 2D and 3D graphics
-		application programming interface (API), incorporating a broad set of
-		rendering, texture mapping, special effects, and other powerful visualization
-		functions. For more information about OpenGL and its various extensions,
-		please see &lt;http://www.opengl.org/&gt;
-		and &lt;http://www.opengl.org/registry/&gt;.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/glut-2.1.1.2 b/dev-haskell/glut-2.1.1.2
new file mode 100644
index 000000000000..657d17edf1ec
--- /dev/null
+++ b/dev-haskell/glut-2.1.1.2
@@ -0,0 +1,13 @@
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=141406260536c97d481086c20c4a8689
diff --git a/dev-haskell/glut-2.3.1.0 b/dev-haskell/glut-2.3.1.0
new file mode 100644
index 000000000000..83336241065d
--- /dev/null
+++ b/dev-haskell/glut-2.3.1.0
@@ -0,0 +1,13 @@
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f21a2e673fe026b92ff59831580f5fe9
diff --git a/dev-haskell/glut-2.4.0.0 b/dev-haskell/glut-2.4.0.0
new file mode 100644
index 000000000000..72e2d4299c07
--- /dev/null
+++ b/dev-haskell/glut-2.4.0.0
@@ -0,0 +1,13 @@
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e6635793a062bd8c3ac0ae2b0bf11765
diff --git a/dev-haskell/glut-2.5.1.1 b/dev-haskell/glut-2.5.1.1
new file mode 100644
index 000000000000..3f1293a6e937
--- /dev/null
+++ b/dev-haskell/glut-2.5.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/opengl-2.8.0.0:=[profile?] >=dev-haskell/openglraw-1.3.0.0:=[profile?] >=dev-lang/ghc-7.4.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.0.0:=[profile?] >=dev-haskell/openglraw-1.3.0.0:=[profile?] >=dev-lang/ghc-7.4.1:= media-libs/freeglut
+SLOT=0/2.5.1.1
+SRC_URI=mirror://hackage/packages/archive/GLUT/2.5.1.1/GLUT-2.5.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=51477eec549960cbda67b0f537ba1044
diff --git a/dev-haskell/glut-2.7.0.1 b/dev-haskell/glut-2.7.0.1
new file mode 100644
index 000000000000..f9594b36ac59
--- /dev/null
+++ b/dev-haskell/glut-2.7.0.1
@@ -0,0 +1,13 @@
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=48893f9cbdfdf6343dccec6fbcf93ba8
diff --git a/dev-haskell/glut-2.7.0.11 b/dev-haskell/glut-2.7.0.11
new file mode 100644
index 000000000000..3faabfbc6b61
--- /dev/null
+++ b/dev-haskell/glut-2.7.0.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-3.1:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?] >=dev-lang/ghc-7.8.2:= examples? ( >=dev-haskell/openglraw-1.0:=[profile?] <dev-haskell/openglraw-3.3:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A binding for the OpenGL Utility Toolkit
+EAPI=6
+HOMEPAGE=http://www.haskell.org/haskellwiki/Opengl
+IUSE=examples doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-3.1:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?] >=dev-lang/ghc-7.8.2:= examples? ( >=dev-haskell/openglraw-1.0:=[profile?] <dev-haskell/openglraw-3.3:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] )
+SLOT=0/2.7.0.11
+SRC_URI=mirror://hackage/packages/archive/GLUT/2.7.0.11/GLUT-2.7.0.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4b3ee51f4a640384720390a1a1daf991
diff --git a/dev-haskell/glut/Manifest b/dev-haskell/glut/Manifest
deleted file mode 100644
index 2448d2fcea11..000000000000
--- a/dev-haskell/glut/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-DIST GLUT-2.1.1.2.tar.gz 121228 BLAKE2B 61916d96622d7b5f57ddafa36d165e486f6eb612c3e2b347ed3f05f6cd270e5a4e5952f0d0b668c8173c57f48aa92e6ab6cc566b795945bd773de1c0a92e686b SHA512 d47b116f3f5f942560b3435338cebf21e5beb109bccdf3fdf7b9c7de607064353b538389a04aa63bf0ae74854efa68d9917aa7827b4830555692499164c14b0e
-DIST GLUT-2.3.1.0.tar.gz 643641 BLAKE2B f1f562312d889d06a9ada7816da8dfe01d2ce2679a6cf127123c534ac1c33787bccd1a86243f94b448c4871d2d8e34386190972d05a5df16b75c842d2483eb59 SHA512 a77a12600d3b967f6987fb848ad2ef5c9e00fb1a1f758280f7d7a5d358fce1b6fd436937b8d2dd815de07167746acc2db9566e8fb11198806be38d2527a9d49b
-DIST GLUT-2.4.0.0.tar.gz 643788 BLAKE2B ad315fc9067444b351bb58df456cbe8381fefa1a132e1ca24ea94469121b2199188f73d1277f01c065b1eba0d42e6fb8da54716cba89480ccac86514ff6bfd2f SHA512 01232a2ee356eb429b2081204a5ff5afeb15d6b424d1e30b0d41567e8817712909ed4433cbf6f9cbade700fe3f81786a69615ff9429a76a1003e091160674872
-DIST GLUT-2.5.1.1.tar.gz 655292 BLAKE2B 49347d5ffdb887388cd862902bd548dfdb1a4a024d98f0a5de64cd2e6cb7cf7021956ee170439d6cea145c65a5f3ebf9f4e9f2b6e7e38f10be3cb92c276fc8f4 SHA512 79895fea8b49178a93f59efa094a9eca26d23c2bb4b07902d83c8403e8c45c3a10a1961177bfc272339be279d012a0e8ff273881bcc54128fc40ff11f5f8bdd9
-DIST GLUT-2.7.0.1.tar.gz 660437 BLAKE2B b09713b449e01ff3539d2e2ba3357c96c4bab2e38eaa9dbb9588685920f286df145eea9e4fad4b758be165a4bb8c4696fa9e58b998b2b96fc4357204059edaea SHA512 89c6811be19cc40d8ace3dd46d24d4994261fca186874a2752a8a7c3f7fd28fe4f91543b6c321bb5c59e4c1e302df842aa706b9993041ed5ded78f60c769bff2
-DIST GLUT-2.7.0.11.tar.gz 656855 BLAKE2B cb45b6207a2af626c251d8c3abe64fbf295db5f7c396cb99bedb6326ed9a16e416c5e8de1f402926edf0109f52e79be1a7c7087adb388f27e07394e53b6e95c3 SHA512 aa9977f2d2141dc4fbc38915ffe8bfd6cf5a5c93502d3b813a41195556ada91644774869a6daa33f44964c517370e006830578b9b1b5cb59b7b49abedb1dcc66
-EBUILD glut-2.1.1.2.ebuild 667 BLAKE2B 7b91b180fe459f96349f0ba16bc3f85f0233384a52fb1237634405227dbac3c808bdc3858f58078c1392ba57e9b32b0b06692d936061047860b8323a0a154329 SHA512 8a2dbf222f5d31c897bc072c6ef39c565d9e65c130509c82e09350febb7aae91f727b9afcd3f47430adb901080602ba2ffe991dc1b0bf0dd66f1a87c43213788
-EBUILD glut-2.3.1.0.ebuild 795 BLAKE2B 58fa532d614709c8525b0000fe76b7e10d589ff65099850efbf4e5184a40a209d5442c6ee57af73a43ab476b23a1a9c0042728c4b8d7bd101349e5584cd59e88 SHA512 2ea7bb35bbaeb97e3325de7038be551bd1d6c2305a9570971a8e6c8357b265f2ea235649f4833692859ae51f8d7a6db8e03d75872e0024ce0dac619f401dc99d
-EBUILD glut-2.4.0.0.ebuild 720 BLAKE2B 2092dc244dabf67061d2ff3d5d0d7a1a2524aaf3af48844784fb1a41184bef88522fe46f236166740db740a04480a4a5e693df775ad172cec3a57b42ab98e56d SHA512 7945339d77ecf2c01cdce4486789a32643ce83c45d58167688ff5f9ffb1e775657a0a7b5f66e2266fa047b7ea66e42649fc869147641acfcdfdea6fe5c6da100
-EBUILD glut-2.5.1.1.ebuild 856 BLAKE2B 6664fce5ea411cc0ff2bce8445344a7f144b04f2f1de9f9a473d5b903d6fe3136b2bf3a361efce038241d78d3bc51e26fcde656048255d76ce7d6746d8ae05f5 SHA512 d7d96632bedf5bc55c186b13aa3434e5f6e3c29898afc868bc56535d5ea83d8cebc78db54fe64fc9ff18f7a5f9eb6ac057e83bee1cb1a8528c87b4492a1eb4f6
-EBUILD glut-2.7.0.1.ebuild 1094 BLAKE2B 9350ce49bea61a46fba56fe8ad7cdd5162bab5795ae7b1844fe4e1da7824c4580ff618c757851d4da06672f8cf879e93b85c2d9362274c2584f64dc7f018f366 SHA512 11c183e4bb1665c82ff1102963487959f0e1d943b875417932be5b9095f5a7ed116937ed1ba6955b6456e805b191543b80b5e101074c757da2dc209dc5bbbb53
-EBUILD glut-2.7.0.11.ebuild 1152 BLAKE2B 8e5471803f486673835934326fcfe01c4571d0224283bda12feaeb8568cdc850af4cc6989ef57b3ef4e31c9449d73d27058cb98012e527ec56ba6efeac8070ed SHA512 3b36ae9bb764a3568eb8f5080c4bf1418d0b51b251789d4837104c2d2b73dc27be44eeadfe652f93fad08fcc252b74e559c1ab82ed41852ba53927d6fa1ce21a
-MISC metadata.xml 553 BLAKE2B 7250bf1b06b8856d775daddc98fe91d618ee5e2ba14dcdde71598a4fef338f5062caa2505ee6e419f7b71a44e44e9be8346c0e4dc7ba88c9c30438961dee9e45 SHA512 3ae07ac62ea4bc8f7e9050c7069acf902602ea863b52317ecc2a9435c4e7c7b501c598fc39ac723efdb91232f4d31c150d9f457c2b6ed54d81ec5bc730c7988d
diff --git a/dev-haskell/glut/glut-2.1.1.2.ebuild b/dev-haskell/glut/glut-2.1.1.2.ebuild
deleted file mode 100644
index df2278427c9c..000000000000
--- a/dev-haskell/glut/glut-2.1.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
-
-MY_PN="GLUT"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenGL Utility Toolkit"
-HOMEPAGE="http://www.haskell.org/HOpenGL/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.6.1
-		>=dev-haskell/opengl-2.2
-		virtual/opengl
-		media-libs/freeglut"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-S="${WORKDIR}/${MY_P}"
-
-# TODO: Install examples when the "examples" USE flag is set
diff --git a/dev-haskell/glut/glut-2.3.1.0.ebuild b/dev-haskell/glut/glut-2.3.1.0.ebuild
deleted file mode 100644
index 4ac57f4301b3..000000000000
--- a/dev-haskell/glut/glut-2.3.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="GLUT"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenGL Utility Toolkit"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-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"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/glut/glut-2.4.0.0.ebuild b/dev-haskell/glut/glut-2.4.0.0.ebuild
deleted file mode 100644
index 39f3b26a19ce..000000000000
--- a/dev-haskell/glut/glut-2.4.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="GLUT"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenGL Utility Toolkit"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/opengl-2.8*:=[profile?]
-		=dev-haskell/openglraw-1.3*:=[profile?]
-		>=dev-lang/ghc-6.12.1:=
-		media-libs/freeglut"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/glut/glut-2.5.1.1.ebuild b/dev-haskell/glut/glut-2.5.1.1.ebuild
deleted file mode 100644
index f2cfeeac8d1e..000000000000
--- a/dev-haskell/glut/glut-2.5.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-#hackport: flags: -usenativewindowslibraries
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="GLUT"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenGL Utility Toolkit"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/opengl-2.8.0.0:=[profile?]
-	>=dev-haskell/openglraw-1.3.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	media-libs/freeglut
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/glut/glut-2.7.0.1.ebuild b/dev-haskell/glut/glut-2.7.0.1.ebuild
deleted file mode 100644
index 02922c47c3f1..000000000000
--- a/dev-haskell/glut/glut-2.7.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -usenativewindowslibraries
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="GLUT"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenGL Utility Toolkit"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-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
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/glut/glut-2.7.0.11.ebuild b/dev-haskell/glut/glut-2.7.0.11.ebuild
deleted file mode 100644
index ac074ea0dfc2..000000000000
--- a/dev-haskell/glut/glut-2.7.0.11.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -usenativewindowslibraries,buildexamples:examples
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="GLUT"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenGL Utility Toolkit"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND=">=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-3.1:=[profile?]
-	>=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	examples? ( >=dev-haskell/openglraw-1.0:=[profile?] <dev-haskell/openglraw-3.3:=[profile?]
-			>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples buildexamples) \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/glut/metadata.xml b/dev-haskell/glut/metadata.xml
deleted file mode 100644
index 586b21373af3..000000000000
--- a/dev-haskell/glut/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A Haskell binding for the OpenGL Utility Toolkit, a window system independent
-		toolkit for writing OpenGL programs. For more information about the C library
-		on which this binding is based, please see:
-		&lt;http://www.opengl.org/resources/libraries/glut/&gt;.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/gnuidn-0.2.1 b/dev-haskell/gnuidn-0.2.1
new file mode 100644
index 000000000000..94af662058ca
--- /dev/null
+++ b/dev-haskell/gnuidn-0.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:= net-dns/libidn dev-haskell/c2hs >=dev-haskell/cabal-1.6.0.3 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Bindings for GNU IDN
+EAPI=5
+HOMEPAGE=https://john-millikin.com/software/haskell-gnuidn/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:= net-dns/libidn
+SLOT=0/0.2.1
+SRC_URI=mirror://hackage/packages/archive/gnuidn/0.2.1/gnuidn-0.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=796e88687b74e11bb21157c66689c030
diff --git a/dev-haskell/gnuidn-0.2.2 b/dev-haskell/gnuidn-0.2.2
new file mode 100644
index 000000000000..2db02c70e69b
--- /dev/null
+++ b/dev-haskell/gnuidn-0.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= net-dns/libidn dev-haskell/c2hs >=dev-haskell/cabal-1.8 virtual/pkgconfig test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5 >=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3 >=dev-haskell/quickcheck-2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Bindings for GNU IDN
+EAPI=5
+HOMEPAGE=https://john-millikin.com/software/haskell-gnuidn/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= net-dns/libidn
+SLOT=0/0.2.2
+SRC_URI=mirror://hackage/packages/archive/gnuidn/0.2.2/gnuidn-0.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2fba0c3555ca46ca40d5e4070c44cc26
diff --git a/dev-haskell/gnuidn/Manifest b/dev-haskell/gnuidn/Manifest
deleted file mode 100644
index 837b996a0f88..000000000000
--- a/dev-haskell/gnuidn/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gnuidn-0.2.1.tar.gz 16392 BLAKE2B cad4e9d5a03a90aa41a305e5f9424b7a2fc1a4bdaf19cb79ed7e4449f6bc999c851261b289094516e3d99455ae87f1b27a8bfbaaa46ff402f386f1c458ed1690 SHA512 f22ab90cf21b01c899ab61e231afefbb97f1f831a0dd8c32c405e381f3d3a01864c1208d0867d09e773e05d5a8a69d1f8303e35337ea51ce1277a47f9574e1ae
-DIST gnuidn-0.2.2.tar.gz 17534 BLAKE2B e6f152145bc7626dfa9757477970d6cd6066d47350d7ccb25c99ecc8b33406c54634cbf6829ab08c5d8fc7987277e110429899436c7b99d71aafef0ac496dbb7 SHA512 4ac894ba4cc4fb9fd90ccea55fda342cd0dadc863a091d31287b19117ec1e545a23b7fb69db02bbb8ee9eb84856acb51f3ab0d7778f4ca3da290dfcbc7ef27ac
-EBUILD gnuidn-0.2.1.ebuild 630 BLAKE2B 4197ad130c03180da6482a8c8c6de7ebbc4badcd861d72ce98799ef80786c4e53ae4b3c65278eee26f076f9d2ebabaec4b86099c18c1bcba9df62b44ca1aa965 SHA512 cf4aecc43acb28a51259f2fd4cdd355bd00805454961d9f3146808fbce1e66d346cb2b04b210fa7db4c5bff4f2c03a9171c9b30827aa17d3463f0ec3061dd00f
-EBUILD gnuidn-0.2.2.ebuild 798 BLAKE2B f5c3bf674e194ecde326d4479c3560fdcea1b46c2ab687def3b628c7a31860c16ff22eee17d9c63d6787ecbf36ed4ed0a4774f749699778fa8675c2598f3c93f SHA512 3f50b0b819da0369fdaa182f613e7cb71bdc164b905b09fc508dc48e5c8937a90bb8b549f80a6e24871da4300bd90812f2d1aed3818724fdc15e3623bcc577f2
-MISC metadata.xml 311 BLAKE2B 942486c345c7aea099c48d651929a982e90b4df3498d70b4a711e014f556981784a96e8daa84391a870ae1adc3d8866c881cc188b9e5227a3eebe585f561d25d SHA512 a28d19884005a4438b07de1d14a1e5eca59c76c9242d9cf6f8a2b16b19e74cc2a8fdda2b4a6683c8000915e757d11b2e630b2978118b06275709b481eb992f16
diff --git a/dev-haskell/gnuidn/gnuidn-0.2.1.ebuild b/dev-haskell/gnuidn/gnuidn-0.2.1.ebuild
deleted file mode 100644
index 99f03e40841c..000000000000
--- a/dev-haskell/gnuidn/gnuidn-0.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings for GNU IDN"
-HOMEPAGE="https://john-millikin.com/software/haskell-gnuidn/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	net-dns/libidn
-"
-DEPEND="${RDEPEND}
-	dev-haskell/c2hs
-	>=dev-haskell/cabal-1.6.0.3
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/gnuidn/gnuidn-0.2.2.ebuild b/dev-haskell/gnuidn/gnuidn-0.2.2.ebuild
deleted file mode 100644
index 6d0b7c590217..000000000000
--- a/dev-haskell/gnuidn/gnuidn-0.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings for GNU IDN"
-HOMEPAGE="https://john-millikin.com/software/haskell-gnuidn/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	net-dns/libidn
-"
-DEPEND="${RDEPEND}
-	dev-haskell/c2hs
-	>=dev-haskell/cabal-1.8
-	virtual/pkgconfig
-	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3
-		>=dev-haskell/quickcheck-2.4 )
-"
diff --git a/dev-haskell/gnuidn/metadata.xml b/dev-haskell/gnuidn/metadata.xml
deleted file mode 100644
index 2cb65de0d577..000000000000
--- a/dev-haskell/gnuidn/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Bindings for GNU IDN
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/gnutls-0.2 b/dev-haskell/gnutls-0.2
new file mode 100644
index 000000000000..90d6423b08d5
--- /dev/null
+++ b/dev-haskell/gnutls-0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= net-libs/gnutls:= >=dev-haskell/cabal-1.6 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Bindings for GNU libgnutls
+EAPI=5
+HOMEPAGE=https://john-millikin.com/software/haskell-gnutls/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= net-libs/gnutls:=
+SLOT=0/0.2
+SRC_URI=mirror://hackage/packages/archive/gnutls/0.2/gnutls-0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0acd6e7700d8fb8085e730d7024a8a49
diff --git a/dev-haskell/gnutls/Manifest b/dev-haskell/gnutls/Manifest
deleted file mode 100644
index a5da1e90791a..000000000000
--- a/dev-haskell/gnutls/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnutls-0.2.tar.gz 17272 BLAKE2B 2412f9a5f7a74054317f6f4c54c5813a897976da2e48a534a5a12557f04766dad680638e6f61071e9721d84ec1a4ff02b72dbf531ed392b1be6c0b5280919092 SHA512 9b5e3083fae30e4ac8584c825ed1f1c07b24136ca6d30c627f17d1c7793a515a091919784791b3a5bcd05038d8d43419802e036cefe8525efac9ee3f9ebf9e8b
-EBUILD gnutls-0.2.ebuild 712 BLAKE2B 98452b2693782d56db49e35f6493c4e53557b05001af67c932fc99be7a8fc8df34cf19c1eaaf7796a2a1ab70db5cdc0300816bdb7e4d395e7ddbf14a0102ccd1 SHA512 c9ba9e3df364f50eebbe81764792b8692d7a8eec9ca3843b2f2d3eb13d93c9a95c8b17f6834914b44e71f0fdeacd2aaf0b4f26354be17619fdf691f5adfc2ecf
-MISC metadata.xml 545 BLAKE2B ffac5cf312728e343b1f48d3be0af9bbb6c6737b3c0f82cc752a78b8f22822c1d58bfc28ee3a186d3de51d0af51ddf51ca053b6e0c7eec1e328cbd681b60cf85 SHA512 42bd7ea30a8ad09a9d9b4212430808823dfb4470537bcfb7dc1b63d32008e214ef06ac400485f4268028b3e6bb9b3b8252e073ba13b30294f81d86d721eac692
diff --git a/dev-haskell/gnutls/gnutls-0.2.ebuild b/dev-haskell/gnutls/gnutls-0.2.ebuild
deleted file mode 100644
index 6944db190fc8..000000000000
--- a/dev-haskell/gnutls/gnutls-0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings for GNU libgnutls"
-HOMEPAGE="https://john-millikin.com/software/haskell-gnutls/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	net-libs/gnutls:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/gnutls/metadata.xml b/dev-haskell/gnutls/metadata.xml
deleted file mode 100644
index 85d7c5520de5..000000000000
--- a/dev-haskell/gnutls/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		You almost certainly don't want to depend on this release.
-		
-		This is a pre-alpha, almost useless release; its only purpose is to enable
-		TLS support in some of my other libraries. More complete bindings for GNU TLS
-		will be released at a later date.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/graphviz-2999.18.0.2-r1 b/dev-haskell/graphviz-2999.18.0.2-r1
new file mode 100644
index 000000000000..45bf8867ccc1
--- /dev/null
+++ b/dev-haskell/graphviz-2999.18.0.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/colour-2.3:=[profile?] <dev-haskell/colour-2.4:=[profile?] >=dev-haskell/dlist-0.5:=[profile?] <dev-haskell/dlist-0.8:=[profile?] >=dev-haskell/fgl-5.4:=[profile?] <dev-haskell/fgl-5.6:=[profile?] >=dev-haskell/polyparse-1.9:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/wl-pprint-text-1.1.0.0:=[profile?] <dev-haskell/wl-pprint-text-1.2.0.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.14 test? ( >=dev-haskell/fgl-arbitrary-0.2 <dev-haskell/fgl-arbitrary-0.3 >=dev-haskell/quickcheck-2.3 <dev-haskell/quickcheck-2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Bindings to Graphviz for graph visualisation
+EAPI=5
+HOMEPAGE=http://projects.haskell.org/graphviz/
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/colour-2.3:=[profile?] <dev-haskell/colour-2.4:=[profile?] >=dev-haskell/dlist-0.5:=[profile?] <dev-haskell/dlist-0.8:=[profile?] >=dev-haskell/fgl-5.4:=[profile?] <dev-haskell/fgl-5.6:=[profile?] >=dev-haskell/polyparse-1.9:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/wl-pprint-text-1.1.0.0:=[profile?] <dev-haskell/wl-pprint-text-1.2.0.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/2999.18.0.2
+SRC_URI=mirror://hackage/packages/archive/graphviz/2999.18.0.2/graphviz-2999.18.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6aff9c67ba43d9c1c9a74d3f7b6bcdb8
diff --git a/dev-haskell/graphviz-2999.18.1.2 b/dev-haskell/graphviz-2999.18.1.2
new file mode 100644
index 000000000000..5b64d8b56519
--- /dev/null
+++ b/dev-haskell/graphviz-2999.18.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/colour-2.3:=[profile?] <dev-haskell/colour-2.4:=[profile?] >=dev-haskell/dlist-0.5:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/fgl-5.4:=[profile?] <dev-haskell/fgl-5.6:=[profile?] >=dev-haskell/polyparse-1.9:=[profile?] <dev-haskell/polyparse-1.13:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/wl-pprint-text-1.1.0.0:=[profile?] <dev-haskell/wl-pprint-text-1.2.0.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.14 test? ( >=dev-haskell/fgl-arbitrary-0.2 <dev-haskell/fgl-arbitrary-0.3 >=dev-haskell/quickcheck-2.3 <dev-haskell/quickcheck-2.10 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Bindings to Graphviz for graph visualisation
+EAPI=6
+HOMEPAGE=http://projects.haskell.org/graphviz/
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/colour-2.3:=[profile?] <dev-haskell/colour-2.4:=[profile?] >=dev-haskell/dlist-0.5:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/fgl-5.4:=[profile?] <dev-haskell/fgl-5.6:=[profile?] >=dev-haskell/polyparse-1.9:=[profile?] <dev-haskell/polyparse-1.13:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/wl-pprint-text-1.1.0.0:=[profile?] <dev-haskell/wl-pprint-text-1.2.0.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2999.18.1.2
+SRC_URI=mirror://hackage/packages/archive/graphviz/2999.18.1.2/graphviz-2999.18.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=309544dfc65fa3caf9740a47be2aa7c7
diff --git a/dev-haskell/graphviz/Manifest b/dev-haskell/graphviz/Manifest
deleted file mode 100644
index 0862905ecc5c..000000000000
--- a/dev-haskell/graphviz/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST graphviz-2999.18.0.2.tar.gz 223908 BLAKE2B 2f425cad55622a519ae6d6641bda6340c0dca63ea800fdd77a2c66bc4f4ad06595499089c3a7857cdc02be1f031bd91b94a9eb025e206990942ded6ee22745a4 SHA512 8b27a81af2d31780801534f785bfda1dfbd127e176fa2c4bada2b33a7c80166fbb0efa67706296201bb19d201b8e2ac56453be0d8fcb488b93feb95d2acd8a09
-DIST graphviz-2999.18.1.2.tar.gz 222546 BLAKE2B 43acbf090a0396041398e54461627339b914c590fcb10421ac3299d68805b4aaf2637a65987d6c9a1e45cc96e2e536ecf11eb88ac6a62fe92a56c1fd503e4bae SHA512 1e0bc5b72b934febb923c13052f83db12270954e37483f46c64db8a23eb7ea3894b72c8e2cb303cde6bec30f75a28897c53d81e92fe9489ec21a4589e648dd3f
-EBUILD graphviz-2999.18.0.2-r1.ebuild 1464 BLAKE2B 8aebdaae26fc398fe7b07e46ea3e19382d9c78933391527458e50be136076033d82d29dc3e18fcf030c61f872a63ba22dc4c05832b03bb0a074a41165179e3f1 SHA512 3867142bbdcbd996b1229896c702adbb34f8701092d630ce80421f1af8f3d0c85fad029aedf90c380b057c99f474cabff28f3ac2d5ca0a1f614eb0ab1d30a117
-EBUILD graphviz-2999.18.1.2.ebuild 1391 BLAKE2B 99ef760ce058254be811e6dddbba4a4f565fc2165ff833192917132e4fb6867aa3bef61a219b94de5da3259729fc545e3dfb0ccb5b482647abaadbb7942b311c SHA512 43d0d81c76c4f21082c5013d02fee5dc98b42e2aa3a5ee7bb215fe3523170a3b52c1d61a183e898b21efa98e5facafc43c75f80cfab1b80f4e2ff4c1348f3b10
-MISC metadata.xml 1323 BLAKE2B 1054a4262b89ba33309d2c0c2d499008bc2965266055b431ab552776a67e390ef8c83eb5485ecfdd0f878c6643ba79f1592c8d18bca6fdb132c2d52f39adc2be SHA512 a87c0ffc1693ecd616f5a97d673ac93830543757edbcf6a59f6343bed2910218175fecddbb1e81a5d97464a0d9a72a4fdef7d29d16625aa9a3eecd1cfb86c9ad
diff --git a/dev-haskell/graphviz/graphviz-2999.18.0.2-r1.ebuild b/dev-haskell/graphviz/graphviz-2999.18.0.2-r1.ebuild
deleted file mode 100644
index 95dd18fe4797..000000000000
--- a/dev-haskell/graphviz/graphviz-2999.18.0.2-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -test-parsing
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to Graphviz for graph visualisation"
-HOMEPAGE="http://projects.haskell.org/graphviz/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RESTRICT=test # too slow
-
-RDEPEND=">=dev-haskell/colour-2.3:=[profile?] <dev-haskell/colour-2.4:=[profile?]
-	>=dev-haskell/dlist-0.5:=[profile?] <dev-haskell/dlist-0.8:=[profile?]
-	>=dev-haskell/fgl-5.4:=[profile?] <dev-haskell/fgl-5.6:=[profile?]
-	>=dev-haskell/polyparse-1.9:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/wl-pprint-text-1.1.0.0:=[profile?] <dev-haskell/wl-pprint-text-1.2.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.14
-	test? ( >=dev-haskell/fgl-arbitrary-0.2 <dev-haskell/fgl-arbitrary-0.3
-		>=dev-haskell/quickcheck-2.3 <dev-haskell/quickcheck-2.9 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'polyparse >=1.9 && <1.12' 'polyparse >=1.9'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-test-parsing
-}
diff --git a/dev-haskell/graphviz/graphviz-2999.18.1.2.ebuild b/dev-haskell/graphviz/graphviz-2999.18.1.2.ebuild
deleted file mode 100644
index 13485cc9e6e6..000000000000
--- a/dev-haskell/graphviz/graphviz-2999.18.1.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -test-parsing
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to Graphviz for graph visualisation"
-HOMEPAGE="http://projects.haskell.org/graphviz/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/colour-2.3:=[profile?] <dev-haskell/colour-2.4:=[profile?]
-	>=dev-haskell/dlist-0.5:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
-	>=dev-haskell/fgl-5.4:=[profile?] <dev-haskell/fgl-5.6:=[profile?]
-	>=dev-haskell/polyparse-1.9:=[profile?] <dev-haskell/polyparse-1.13:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/wl-pprint-text-1.1.0.0:=[profile?] <dev-haskell/wl-pprint-text-1.2.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.14
-	test? ( >=dev-haskell/fgl-arbitrary-0.2 <dev-haskell/fgl-arbitrary-0.3
-		>=dev-haskell/quickcheck-2.3 <dev-haskell/quickcheck-2.10 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-test-parsing
-}
diff --git a/dev-haskell/graphviz/metadata.xml b/dev-haskell/graphviz/metadata.xml
deleted file mode 100644
index 01b1d2a5ff68..000000000000
--- a/dev-haskell/graphviz/metadata.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library provides bindings for the Dot language used by the
-		Graphviz (&lt;http://graphviz.org/&gt;) suite of programs for visualising
-		graphs, as well as functions to call those programs.
-		
-		Main features of the graphviz library include:
-		
-		* Almost complete coverage of all Graphviz attributes and syntax.
-		
-		* Support for specifying clusters.
-		
-		* The ability to use a custom node type.
-		
-		* Functions for running a Graphviz layout tool with all specified
-		output types.
-		
-		* The ability to not only generate but also parse Dot code with two
-		options: strict and liberal (in terms of ordering of statements).
-		
-		* Functions to convert FGL graphs and other graph-like data structures
-		to Dot code - including support to group them into clusters - with a
-		high degree of customisation by specifying which attributes to use
-		and limited support for the inverse operation.
-		
-		* Round-trip support for passing an FGL graph through Graphviz to
-		augment node and edge labels with positional information, etc.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/groupoids-3.0.1.1 b/dev-haskell/groupoids-3.0.1.1
new file mode 100644
index 000000000000..1a0027d8e72e
--- /dev/null
+++ b/dev-haskell/groupoids-3.0.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/semigroupoids-3:=[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=Haskell 98 Groupoids
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/groupoids/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/semigroupoids-3:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/3.0.1.1
+SRC_URI=mirror://hackage/packages/archive/groupoids/3.0.1.1/groupoids-3.0.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5ebb22d0e5de68197ae2fe2c624247f5
diff --git a/dev-haskell/groupoids-4.0 b/dev-haskell/groupoids-4.0
new file mode 100644
index 000000000000..7e6bdf94d9fc
--- /dev/null
+++ b/dev-haskell/groupoids-4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/semigroupoids-4.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3
+DESCRIPTION=This package has been absorbed into semigroupoids 4.0
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/groupoids/
+IUSE=profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/semigroupoids-4.0:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/4.0
+SRC_URI=mirror://hackage/packages/archive/groupoids/4.0/groupoids-4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=214b9a7ff185aed7b77570801b998722
diff --git a/dev-haskell/groupoids/Manifest b/dev-haskell/groupoids/Manifest
deleted file mode 100644
index 1481f1333224..000000000000
--- a/dev-haskell/groupoids/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST groupoids-3.0.1.1.tar.gz 2935 BLAKE2B ce54406ce4e8afc37f1f66605dd2fbddc0edbb9a4e95fb13850c4c58c8f91cacfa3a415621fe74239039dc5fd2928ca24b8ecc2d07090b86fd4f92a15af4eed1 SHA512 ebb8976a43f1486871a5ebcb5c3abef85bf95725e9f75e12396feadd8f9a883432f66bc65da5efe18b2455d8a6386e2b7e262f6c33467b0d22e2667312911e82
-DIST groupoids-4.0.tar.gz 2414 BLAKE2B 0576f3c2eb9b5a097805c6db25889a264205029ed67cf9de8769305e4f89b6880ddd1073ba6126eb5340366762e6820d7e759a21be76c34d74db0abab378a266 SHA512 d0aacc582a1d03ab42ce900992e9f9c3cec47da653c5a472934361c5656cbad6b81b18065cf3968ccc6c4d8f239329f7f0213745d2b0d78e2c74ad3d59bec289
-EBUILD groupoids-3.0.1.1.ebuild 572 BLAKE2B d81d8b011a3818b63517de8be68e43b91d5513863f82aa96603732d65fc5c0a9af62598fb198ed7bf66ffbcbbfc36febcd409557a90f97f6429b3cc8796086cc SHA512 6627cc48f28bfee6e1f2167fd21e27659790c6df1a98ee5b0733d20c02e76d6c35206abdb1d779beef11efda32f4757b9dc3bd82fa4afa70f23dbf4ad4c4d9ec
-EBUILD groupoids-4.0.ebuild 587 BLAKE2B 48eab965f0fc62b69aea83c1766940d70d034065e5c7fb2fcb31b651404b6dfb9b74c18cc35a8c54fad8d75696accfd5689bbe7098299e7c4cfd75e2e3bc9694 SHA512 54e471c5ce5fc64a1742eb62ab7076f4aff50d7c2737594223e63dd5f601201d052d241534a43e621a50ad3edfaa13c8b005cdc5c3516fddd1fffdb5bb51ffa6
-MISC metadata.xml 392 BLAKE2B 6666f18e2d5a9b6cc80571fb07a4ff35ab7cd1057a8c43444c95fcf722a5f7958a916f0736c30ec515b0b9c8da2bb36fa42749c501a86255673fe230983fcd83 SHA512 eef4fbf0ee9a8116ab157bd2d6b87bafb20c4bdcefe00642d5b5141bf4ea39d5307afe308afad7e6f3613aa87d0fcf1b8a85dfc2dee61b4964440a9a45da36cb
diff --git a/dev-haskell/groupoids/groupoids-3.0.1.1.ebuild b/dev-haskell/groupoids/groupoids-3.0.1.1.ebuild
deleted file mode 100644
index 2fe310bb93c2..000000000000
--- a/dev-haskell/groupoids/groupoids-3.0.1.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 Groupoids"
-HOMEPAGE="https://github.com/ekmett/groupoids/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/semigroupoids-3:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/groupoids/groupoids-4.0.ebuild b/dev-haskell/groupoids/groupoids-4.0.ebuild
deleted file mode 100644
index 76cca9609dc8..000000000000
--- a/dev-haskell/groupoids/groupoids-4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="This package has been absorbed into semigroupoids 4.0"
-HOMEPAGE="https://github.com/ekmett/groupoids/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/semigroupoids-4.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/groupoids/metadata.xml b/dev-haskell/groupoids/metadata.xml
deleted file mode 100644
index 997de60dc21d..000000000000
--- a/dev-haskell/groupoids/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haskell 98 Groupoids
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/groupoids</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/gsasl-0.3.6 b/dev-haskell/gsasl-0.3.6
new file mode 100644
index 000000000000..799be2e3f43a
--- /dev/null
+++ b/dev-haskell/gsasl-0.3.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/gsasl >=dev-haskell/cabal-1.6 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Bindings for GNU libgsasl
+EAPI=5
+HOMEPAGE=https://john-millikin.com/software/haskell-gsasl/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/gsasl
+SLOT=0/0.3.6
+SRC_URI=mirror://hackage/packages/archive/gsasl/0.3.6/gsasl-0.3.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=62b570c5f8cd4781f9c2714b81081038
diff --git a/dev-haskell/gsasl/Manifest b/dev-haskell/gsasl/Manifest
deleted file mode 100644
index c89722604bbc..000000000000
--- a/dev-haskell/gsasl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gsasl-0.3.6.tar.gz 20170 BLAKE2B b9b4e18a3e19ebccec6889b1767fd415920b23c083fc96c835aa1d3a9e0598c295f794ca897dd97f19a02bfe7d4c1ebe6986f1a27805424d4668d29a1b1d3b2d SHA512 657b3154d32d5c40eca79fa8cc0fd7f2dfce2d5d934f0388e3a16db15d513b18f5a25479b9f71ee164f999de9748f83e63f0334f43ef31def944c987e7186122
-EBUILD gsasl-0.3.6.ebuild 626 BLAKE2B fb0229d1b840a781f0962f9162136211a654e193934d75f035716b7de7f3c69210ef86674ba4724b89072408b9dc87bcbaa330bb1d88a4519e9052a070d7fe21 SHA512 64590162926ae00e45ac809a2152a3c7452bf60ede839d1baacfc4d0653e12f9825ef7a44eb57244a8c758e9b3e997d6234c4a860f28805d666233d8d933c0e4
-MISC metadata.xml 316 BLAKE2B 36377330442664a36484a3fb3b0b0ff400eac8d019dfba6dee9d85288c803cfd2d0d16fe41dc0feb396558d4fd6d370afd55385862aff168338bd5ffb4fd7979 SHA512 86dfed4b867f02af23b5012becf9ffa3eafb7e31e620fff9d8835e4fc3312db8e90076bf8d68ab64cee7e25a96b25f0c3814078f7740fca451bc327e4d1bc7c2
diff --git a/dev-haskell/gsasl/gsasl-0.3.6.ebuild b/dev-haskell/gsasl/gsasl-0.3.6.ebuild
deleted file mode 100644
index 4cc146da77a6..000000000000
--- a/dev-haskell/gsasl/gsasl-0.3.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings for GNU libgsasl"
-HOMEPAGE="https://john-millikin.com/software/haskell-gsasl/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	virtual/gsasl
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/gsasl/metadata.xml b/dev-haskell/gsasl/metadata.xml
deleted file mode 100644
index adae1a7f2f4e..000000000000
--- a/dev-haskell/gsasl/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Bindings for GNU libgsasl
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/gtk-0.12.5.7.2 b/dev-haskell/gtk-0.12.5.7.2
new file mode 100644
index 000000000000..177eafef1b4e
--- /dev/null
+++ b/dev-haskell/gtk-0.12.5.7.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=fmode-binary? ( >=dev-haskell/glib-0.12.5.4:0=[profile?] <dev-haskell/glib-0.13:0=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.12.5.3:0=[profile?] <dev-haskell/pango-0.13:0=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:2 ) gio? ( >=dev-haskell/cairo-0.12.5.3:0=[profile?] <dev-haskell/cairo-0.13:0=[profile?] >=dev-haskell/gio-0.12.5:0=[profile?] <dev-haskell/gio-0.13:0=[profile?] >=dev-haskell/glib-0.12.5.4:0=[profile?] <dev-haskell/glib-0.13:0=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.12.5.3:0=[profile?] <dev-haskell/pango-0.13:0=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:2 ) !gio? ( fmode-binary? ( >=dev-haskell/cairo-0.12.5.3:0=[profile?] <dev-haskell/cairo-0.13:0=[profile?] ) !fmode-binary? ( >=dev-haskell/cairo-0.12.5.3:0=[profile?] <dev-haskell/cairo-0.13:0=[profile?] >=dev-haskell/glib-0.12.5.4:0=[profile?] <dev-haskell/glib-0.13:0=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.12.5.3:0=[profile?] <dev-haskell/pango-0.13:0=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:2 ) ) >=dev-haskell/cabal-1.8 >=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0= virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binding to the Gtk+ graphical user interface library
+EAPI=5
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=+fmode-binary +gio doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=fmode-binary? ( >=dev-haskell/glib-0.12.5.4:0=[profile?] <dev-haskell/glib-0.13:0=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.12.5.3:0=[profile?] <dev-haskell/pango-0.13:0=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:2 ) gio? ( >=dev-haskell/cairo-0.12.5.3:0=[profile?] <dev-haskell/cairo-0.13:0=[profile?] >=dev-haskell/gio-0.12.5:0=[profile?] <dev-haskell/gio-0.13:0=[profile?] >=dev-haskell/glib-0.12.5.4:0=[profile?] <dev-haskell/glib-0.13:0=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.12.5.3:0=[profile?] <dev-haskell/pango-0.13:0=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:2 ) !gio? ( fmode-binary? ( >=dev-haskell/cairo-0.12.5.3:0=[profile?] <dev-haskell/cairo-0.13:0=[profile?] ) !fmode-binary? ( >=dev-haskell/cairo-0.12.5.3:0=[profile?] <dev-haskell/cairo-0.13:0=[profile?] >=dev-haskell/glib-0.12.5.4:0=[profile?] <dev-haskell/glib-0.13:0=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.12.5.3:0=[profile?] <dev-haskell/pango-0.13:0=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:2 ) )
+SLOT=2/0.12.5.7.2
+SRC_URI=mirror://hackage/packages/archive/gtk/0.12.5.7/gtk-0.12.5.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0590149a12afea198f6abec35b80534a
diff --git a/dev-haskell/gtk-0.13.9 b/dev-haskell/gtk-0.13.9
new file mode 100644
index 000000000000..e1c253bb731d
--- /dev/null
+++ b/dev-haskell/gtk-0.13.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:2 gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] ) >=dev-haskell/cabal-1.18 dev-haskell/gtk2hs-buildtools virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binding to the Gtk+ graphical user interface library
+EAPI=5
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=+deprecated +fmode-binary +gio doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:2 gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
+SLOT=2/0.13.9
+SRC_URI=mirror://hackage/packages/archive/gtk/0.13.9/gtk-0.13.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=11f9622de3a38e8c857083927165887f
diff --git a/dev-haskell/gtk-0.14.6 b/dev-haskell/gtk-0.14.6
new file mode 100644
index 000000000000..d616d625c77d
--- /dev/null
+++ b/dev-haskell/gtk-0.14.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:2 gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] ) >=dev-haskell/cabal-1.24 dev-haskell/gtk2hs-buildtools virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binding to the Gtk+ graphical user interface library
+EAPI=6
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=+deprecated +fmode-binary +gio doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:2 gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
+SLOT=2/0.14.6
+SRC_URI=mirror://hackage/packages/archive/gtk/0.14.6/gtk-0.14.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c35dd482a20ed8a0693084c5a5914042
diff --git a/dev-haskell/gtk/Manifest b/dev-haskell/gtk/Manifest
deleted file mode 100644
index 57387d9a1482..000000000000
--- a/dev-haskell/gtk/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST gtk-0.12.5.7.tar.gz 671695 BLAKE2B fb76cd0adabfdbd2ba8ba67a9b272d1feb13321bd9bbd2bfd0305899c90152df02864c57896d7b923b55d3c12a2375d33112526aed2de996621961c454392510 SHA512 ec8bb9a97f329a6be314d05481027bfe38317d3c16b48209d71a56b82dcf797cab1b1c94726a66d66677858523306ff59ab225b09d36f32b678a8b11a9ad165c
-DIST gtk-0.13.9.tar.gz 684971 BLAKE2B fafbdab72b0b2d3a8d3e4ed54bb6cac2ca0140fc20332b7c20e008943a095a17dd1fe705842fc8099c75840cd4f527abddd3eb2a302a92d9faaf1239e1f15f16 SHA512 11ef461382b67da40d9dffda8f4cbfe086ef937affedf1ac154cb2ca306b22f03f1b00512b7ef5de49d71041b0ee2cc0ddb6761ad51524b1fbbbf740653f12a0
-DIST gtk-0.14.6.tar.gz 679274 BLAKE2B 4554cfd990abb8ad189b11baf6f38525e72c1989f762f091a7e7fcde159d5516ad9fee71bdb6e7983b1b4293280f59e6a4db34fb4944b14e209e2660fbf95334 SHA512 f6f12fb0b07129b313858134d7dd1844a75f1ceaae27b14172891c281949822c222841665cdea62e3bb27c7b47e7fd3e0370721ebc520a0335b512ddf66f9428
-EBUILD gtk-0.12.5.7.2.ebuild 2161 BLAKE2B ee07b437e8f8333fb755d714d78259b433c7b2cc74ef45e8f0bf9ebe3e287f31e6af7514369849876b6a801aa5e3f2e03cf3e9b1f327b35fff3c081b9be60e9f SHA512 b697f92290431dce438a559a564d28b751a88342da641fbff45c12c2113fd6fcb8ae04212f4fc62c8036893d35562a554980d964f35c017da02b37a00bcc4815
-EBUILD gtk-0.13.9.ebuild 1367 BLAKE2B dea5821a851b196e0cd42f67de5a52b2f98b7043e54f1f8a2a94d6a2b0a73b6df7bbe64fb6d36ef111ff3eed5177b7366b92c042bf2b72769a7498e41618fb28 SHA512 04b3da416ad217e93466c3028b9d23eaae0eb1dbe807642daa7d012f3cad22f638080a07bfe44bbb924aadc736a333b962b0ac61290ff39a89c49eb8d3172269
-EBUILD gtk-0.14.6.ebuild 1365 BLAKE2B 97351a59878baac769a545985841107c2b4a44d9fc6a17fe68373f027a5fca3adaef59871b4fdf3bf9580506137af2fa6ce2efc0119580f78ce584fb629db285 SHA512 35b8c5f1436c81cb08d6cdb3e4bc3749aa11418683c9d3a65376b241022f47f0a1b6039b456cff4f65bd0e3384172fcb0f6e4d1a4bb1012f7ff4fcb3b56e7c01
-MISC metadata.xml 783 BLAKE2B 03cf02ef8216abd88b601f79acf0301d104c8c788c63138378cf7cd19a5adcd6a50a4d9dcd2ea95032acd9466a7be7e81123a35c60dcd5e0b5a41457f18801f6 SHA512 9da50d73780cdfb09196111d6abc5ad9b58ac08a7e2a0ace9b55626209512b4df2812b8de969c4d3b16b4d00b82f1be5c0bf1152050d77285a2dbda09e0240b1
diff --git a/dev-haskell/gtk/gtk-0.12.5.7.2.ebuild b/dev-haskell/gtk/gtk-0.12.5.7.2.ebuild
deleted file mode 100644
index 99600099e270..000000000000
--- a/dev-haskell/gtk/gtk-0.12.5.7.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-GTK_MAJ_VER="2"
-
-MY_PV="${PV%.*}"
-MY_P="${PN}-${MY_PV}"
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Gtk+ graphical user interface library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${MY_PV}/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2.1"
-SLOT="${GTK_MAJ_VER}/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="+fmode-binary +gio"
-
-RDEPEND="fmode-binary? ( >=dev-haskell/glib-0.12.5.4:0=[profile?] <dev-haskell/glib-0.13:0=[profile?]
-			dev-haskell/mtl:=[profile?]
-			>=dev-haskell/pango-0.12.5.3:0=[profile?] <dev-haskell/pango-0.13:0=[profile?]
-			>=dev-lang/ghc-7.4.1:=
-			dev-libs/glib:2
-			x11-libs/gtk+:2 )
-	gio? ( >=dev-haskell/cairo-0.12.5.3:0=[profile?] <dev-haskell/cairo-0.13:0=[profile?]
-			>=dev-haskell/gio-0.12.5:0=[profile?] <dev-haskell/gio-0.13:0=[profile?]
-			>=dev-haskell/glib-0.12.5.4:0=[profile?] <dev-haskell/glib-0.13:0=[profile?]
-			dev-haskell/mtl:=[profile?]
-			>=dev-haskell/pango-0.12.5.3:0=[profile?] <dev-haskell/pango-0.13:0=[profile?]
-			>=dev-lang/ghc-7.4.1:=
-			dev-libs/glib:2
-			x11-libs/gtk+:2 )
-	!gio? ( fmode-binary? ( >=dev-haskell/cairo-0.12.5.3:0=[profile?] <dev-haskell/cairo-0.13:0=[profile?] )
-			!fmode-binary? ( >=dev-haskell/cairo-0.12.5.3:0=[profile?] <dev-haskell/cairo-0.13:0=[profile?]
-								>=dev-haskell/glib-0.12.5.4:0=[profile?] <dev-haskell/glib-0.13:0=[profile?]
-								dev-haskell/mtl:=[profile?]
-								>=dev-haskell/pango-0.12.5.3:0=[profile?] <dev-haskell/pango-0.13:0=[profile?]
-								>=dev-lang/ghc-7.4.1:=
-								dev-libs/glib:2
-								x11-libs/gtk+:2 ) )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	>=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0=
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Upstream has this enabled, so we might as well force it enabled to be sure.
-	cabal_src_configure \
-		--flags=deprecated \
-		$(cabal_flag fmode-binary fmode-binary) \
-		$(cabal_flag gio have-giob)
-}
diff --git a/dev-haskell/gtk/gtk-0.13.9.ebuild b/dev-haskell/gtk/gtk-0.13.9.ebuild
deleted file mode 100644
index eaff25f9e7dc..000000000000
--- a/dev-haskell/gtk/gtk-0.13.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: have-gio:gio,-have-quartz-gtk
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Gtk+ graphical user interface library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="2/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+deprecated +fmode-binary +gio"
-
-RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
-	>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?]
-	>=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-	dev-haskell/gtk2hs-buildtools
-	virtual/pkgconfig
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag deprecated deprecated) \
-		$(cabal_flag fmode-binary fmode-binary) \
-		$(cabal_flag gio have-gio) \
-		--flag=-have-quartz-gtk
-}
diff --git a/dev-haskell/gtk/gtk-0.14.6.ebuild b/dev-haskell/gtk/gtk-0.14.6.ebuild
deleted file mode 100644
index f13ea2070da2..000000000000
--- a/dev-haskell/gtk/gtk-0.14.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: have-gio:gio,-have-quartz-gtk
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Gtk+ graphical user interface library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="2/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+deprecated +fmode-binary +gio"
-
-RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
-	>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?]
-	>=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24
-	dev-haskell/gtk2hs-buildtools
-	virtual/pkgconfig
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag deprecated deprecated) \
-		$(cabal_flag fmode-binary fmode-binary) \
-		$(cabal_flag gio have-gio) \
-		--flag=-have-quartz-gtk
-}
diff --git a/dev-haskell/gtk/metadata.xml b/dev-haskell/gtk/metadata.xml
deleted file mode 100644
index 6adfdd23634a..000000000000
--- a/dev-haskell/gtk/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This is the core library of the Gtk2Hs suite of libraries for Haskell
-		based on Gtk+. Gtk+ is an extensive and mature multi-platform toolkit
-		for creating graphical user interfaces.
-	</longdescription>
-	<use>
-		<flag name="deprecated">Include definitions in this library that are considered obsolete.</flag>
-		<flag name="gio">Depend on GIO package, thereby enabling certain features.</flag>
-		<flag name="fmode-binary">Set the default file translation mode for file I/O operations to _O_BINARY.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/gtk2hs-buildtools-0.12.5.1-r1 b/dev-haskell/gtk2hs-buildtools-0.12.5.1-r1
new file mode 100644
index 000000000000..a09011b95986
--- /dev/null
+++ b/dev-haskell/gtk2hs-buildtools-0.12.5.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/alex >=dev-haskell/cabal-1.8 dev-haskell/happy dev-haskell/hashtables dev-haskell/random >=dev-lang/ghc-6.10.4
+DESCRIPTION=Tools to build the Gtk2Hs suite of User Interface libraries
+EAPI=5
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=+closuresignals
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
+LICENSE=GPL-2
+SLOT=0/0.12.5.1
+SRC_URI=mirror://hackage/packages/archive/gtk2hs-buildtools/0.12.5.1/gtk2hs-buildtools-0.12.5.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3978c083bfdb2bd2b61f13ca45c0f1e1
diff --git a/dev-haskell/gtk2hs-buildtools-0.13.0.4-r3 b/dev-haskell/gtk2hs-buildtools-0.13.0.4-r3
new file mode 100644
index 000000000000..5ef2e44c2ab8
--- /dev/null
+++ b/dev-haskell/gtk2hs-buildtools-0.13.0.4-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/random:= dev-haskell/hashtables:= >=dev-lang/ghc-7.4.1:= dev-haskell/alex >=dev-haskell/cabal-1.8 dev-haskell/happy
+DESCRIPTION=Tools to build the Gtk2Hs suite of User Interface libraries
+EAPI=5
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=+closuresignals
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/random:= dev-haskell/hashtables:= >=dev-lang/ghc-7.4.1:=
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/gtk2hs-buildtools/0.13.0.4/gtk2hs-buildtools-0.13.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ff6c37131ed8d84f19cb349059cf25ee
diff --git a/dev-haskell/gtk2hs-buildtools-0.13.2.2 b/dev-haskell/gtk2hs-buildtools-0.13.2.2
new file mode 100644
index 000000000000..91fcf1c0b2aa
--- /dev/null
+++ b/dev-haskell/gtk2hs-buildtools-0.13.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cabal-1.24.0.0:=[profile?] <dev-haskell/cabal-1.25:=[profile?] dev-haskell/hashtables:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.8.2:= dev-haskell/alex >=dev-haskell/cabal-1.18.1.3 dev-haskell/happy
+DESCRIPTION=Tools to build the Gtk2Hs suite of User Interface libraries
+EAPI=6
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=+closuresignals profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-haskell/cabal-1.24.0.0:=[profile?] <dev-haskell/cabal-1.25:=[profile?] dev-haskell/hashtables:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.13.2.2
+SRC_URI=mirror://hackage/packages/archive/gtk2hs-buildtools/0.13.2.2/gtk2hs-buildtools-0.13.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a8ea2e8bb916e799afbb5b5e5d77fc1b
diff --git a/dev-haskell/gtk2hs-buildtools/Manifest b/dev-haskell/gtk2hs-buildtools/Manifest
deleted file mode 100644
index acca7f96aa98..000000000000
--- a/dev-haskell/gtk2hs-buildtools/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX gtk2hs-buildtools-0.13.0.4-alex-3.1.6.patch 282 BLAKE2B a7e9f917a5a3420f99c36fede670d1c620f798d8f490be697c0ed2e76973766d8fc09236b24250b7fe6ca725b90cc22a05d8711a16161ff0def2fb87f5ffbf0a SHA512 7f151b2c3f765f4362485b476c79660ffac51c06a0ef97c1afe37270fde6e665d8a7d57808ade533279a51c4e8730c1f8b1311a7f124c03a282cebb4d49770c9
-AUX gtk2hs-buildtools-0.13.0.4-ia64.patch 1689 BLAKE2B 5c935b8c635502dc751fdb92790afe6129bbb1a70985d5a97873f53f8347006f9135a3f8018b6127d83a5e9722d8d117e8b37b805c54821ce1d4667217110c61 SHA512 9d42873e69369af9a8dd5ca517ad967e3b1e6df2b529c24054d6ab9c379f7fcf88bd1f8da432e9a93e9eae0c5c59288ec0cc36283f743b41dd90a05d7a48578d
-AUX gtk2hs-buildtools-0.13.1.0-ia64.patch 1864 BLAKE2B 3c0ba7b61e0294d4922ccd6768592fb754dfaca384d6acb642f1c27f7055239dcc5ab3c0327a8f774ecd0cb3da26c3c3d95ac8b6e640641ff94625671705a5a4 SHA512 75b4db420e37838c31db7dcaf9ba6c6ad48fe47407822d7bdc975a3e03dad8f1f7ab3a3f425c1665c8434c8137dfb86f2414a036d455379448fa4251cec8d402
-DIST gtk2hs-buildtools-0.12.5.1.tar.gz 169038 BLAKE2B 5cfb74ddafa9137a5893edab4273ce446d1905ac96524320941bc4ae2addc1e7e225caff38634760ca17052d3b6f4bafee0933ee4ccaf73eab0e837903e3c419 SHA512 ec25d74209c79414b66cf15e7b041be39f2179d37a4ecc5a2859022db2245ebf7258d13e130d9b8eae53a35575fc200c7ab0bbc4e99571bc2e7b410a9d268c56
-DIST gtk2hs-buildtools-0.13.0.4.tar.gz 169272 BLAKE2B 25d32aae481560dfd74b7484e2533a88fef84c7c12aae0154f9e3eb80b8efbc872b35290f852c440f17a6c104fc0e50e27698bbab9c3247255ea0185e741bfe8 SHA512 ac5eba81fbeb0387a6294868259e2122b1b90aa76d5c7c9062df6796ec697cca87b73789275deaa1374fa34985b67e5b342b4cd3284393fa17f7c13543657299
-DIST gtk2hs-buildtools-0.13.2.2.tar.gz 178124 BLAKE2B b1fdaecc2260f53407a9d7bf6d5307db06a02cc0ebb0aeceafd30ba88cde60c7aeb7f169c653c7dbc191c46cb0369f8746d09a88824389003dcc51bc3ce4acad SHA512 4d5dac91529fa8856f1e3369ed97d688e7423767a2db5387f092ebc65f624d4689ead154a7036177a1de8978726901196b8161c846f5afd134ffda1e29517b06
-EBUILD gtk2hs-buildtools-0.12.5.1-r1.ebuild 757 BLAKE2B ed65b947c6c73856b980f695ec727ec64e67fe2cb38d381753858ef51a2ebf3e86214e596aa470a8b1bfa9fcb270b094b0febc4d04c60699944ef4c24c349d46 SHA512 0cbaafa9aa9e292559aa5099cfaa427c33d96ac8e824e6064a24c681550ea72e4bff23464049298dd98159212eee7ab0a87670998a20688e9c47500b70c8d300
-EBUILD gtk2hs-buildtools-0.13.0.4-r3.ebuild 859 BLAKE2B 0e2be10327e6637f5a188e3be1f1d8a35b7de1a9e327cd894d40a0c3b44f7f81a606b0122add6a0d9b7ee0009a8f5015a221ff933a20d48f5693ada9315449aa SHA512 6df76d9d797d45f76c88d4ab8c02da77dc8569e240bbee529d8602409d9bfe835310f06a8a28e212b42b8be3a787e5980a0bbe1333c577d38260f238936c5c4b
-EBUILD gtk2hs-buildtools-0.13.2.2.ebuild 974 BLAKE2B 92680fa2db97a011fbf378bb8dcc35a7321199855765731358e2cf2633b1eb56ce29ca5f254e6f64f00cfd81044c480e9ff9087aa4be382267a0cb9a015216db SHA512 49a9928b52c3b0d6e9c6f6755e77eb3376ee7905d5b8b04eec2cc0c6933cf2c8b351a86be2fb1947b2f192ad6cd66edfb2af5e995a5b7960ee2ce72202c660df
-MISC metadata.xml 838 BLAKE2B d807057f72ce471a31e5eda4e4c26d8c2e7a6e5c6a932dc577c293d5f52704ce64b055a2dc194fbce71d8028ee7d5dca05f863fa2519fc841f585400d05849de SHA512 81b67b9c4d461b291561a2ee3873c80c257fc0e3e8641724381567d378aafae21f8056b60b00d432a0db60f5795d6b7a78a74cce9e10722b809f46c6701e7feb
diff --git a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.0.4-alex-3.1.6.patch b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.0.4-alex-3.1.6.patch
deleted file mode 100644
index a772e67c687e..000000000000
--- a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.0.4-alex-3.1.6.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/c2hs/c/CLexer.x b/c2hs/c/CLexer.x
-index 77702ed..1cd2483 100644
---- a/c2hs/c/CLexer.x
-+++ b/c2hs/c/CLexer.x
-@@ -68,3 +68,3 @@ module CLexer (lexC, parseError) where
- 
--import Data.Char      (isDigit)
-+import Data.Char      (ord, isDigit)
- import Data.Word      (Word8)
diff --git a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.0.4-ia64.patch b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.0.4-ia64.patch
deleted file mode 100644
index 3caf5f769cab..000000000000
--- a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.0.4-ia64.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-ia64 is is a special showflake.
-
-Technically does nothing bad,
-but it alone uses '__builtin_offsetof (struct sigcontext'
-in system headers. c2hs does not handle that.
-
-https://bugs.gentoo.org/498638
-diff --git a/c2hs/c/C.hs b/c2hs/c/C.hs
-index f79b6d9..aa1b5e4 100644
---- a/c2hs/c/C.hs
-+++ b/c2hs/c/C.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE CPP, PatternGuards #-}
- --  C->Haskell Compiler: interface to C processing routines
-@@ -94,2 +95,20 @@ isuffix  = ".i"
- 
-+-- This stanza workarounds very specific limitation
-+-- of c2hs of not being able to expang __builtin_offsetof
-+-- used by all glib/gtk headers at least on ia64.
-+raw_mangle :: String -> String
-+raw_mangle s = case s of
-+    [] -> []
-+#ifdef ia64_HOST_ARCH
-+    _ | Just (h, rest) <- chop_head "__builtin_offsetof (struct sigcontext, sc_gr[0])"
-+                                    "200" -- ia64/linux/glibc, sigh
-+        -> h ++ raw_mangle rest
-+#endif /* ia64_HOST_ARCH */
-+    (h:t) -> h : raw_mangle t
-+  where chop_head prefix new_prefix =
-+            case splitAt p_len s of
-+                (h, t) | h == prefix -> Just (new_prefix, t)
-+                _                    -> Nothing
-+              where p_len = length prefix
-+
- -- given a file name (with suffix), parse that file as a C header and do the
-@@ -106,3 +124,3 @@ loadAttrC fname  = do
- 		     traceInfoRead fname
--		     contents <- readFileCIO fname
-+		     contents <- raw_mangle `fmap` readFileCIO fname
- 
-@@ -126,4 +144,4 @@ loadAttrC fname  = do
- 			 errmsgs <- showErrors
--			 fatal ("C header contains \
--				\errors:\n\n" ++ errmsgs)   -- fatal error
-+			 fatal ("C header contains " ++
-+				"errors:\n\n" ++ errmsgs)   -- fatal error
- 		       else do
diff --git a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.1.0-ia64.patch b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.1.0-ia64.patch
deleted file mode 100644
index ae5edd1a471f..000000000000
--- a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.1.0-ia64.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-ia64 is is a special showflake.
-
-Technically does nothing bad,
-but it alone uses '__builtin_offsetof (struct sigcontext'
-in system headers. c2hs does not handle that.
-
-https://bugs.gentoo.org/498638
-diff --git a/c2hs/c/C.hs b/c2hs/c/C.hs
-index f79b6d9..aa1b5e4 100644
---- a/c2hs/c/C.hs
-+++ b/c2hs/c/C.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE CPP, PatternGuards #-}
- --  C->Haskell Compiler: interface to C processing routines
-@@ -94,2 +95,20 @@ isuffix  = ".i"
- 
-+-- This stanza workarounds very specific limitation
-+-- of c2hs of not being able to expang __builtin_offsetof
-+-- used by all glib/gtk headers at least on ia64.
-+raw_mangle :: String -> String
-+raw_mangle s = case s of
-+    [] -> []
-+#ifdef ia64_HOST_ARCH
-+    _ | Just (h, rest) <- chop_head "__builtin_offsetof (struct sigcontext, sc_gr[0])"
-+                                    "200" -- ia64/linux/glibc, sigh
-+        -> h ++ raw_mangle rest
-+#endif /* ia64_HOST_ARCH */
-+    (h:t) -> h : raw_mangle t
-+  where chop_head prefix new_prefix =
-+            case splitAt p_len s of
-+                (h, t) | h == prefix -> Just (new_prefix, t)
-+                _                    -> Nothing
-+              where p_len = length prefix
-+
- -- given a file name (with suffix), parse that file as a C header and do the
-@@ -106,3 +124,3 @@ loadAttrC fname  = do
-                      traceInfoRead fname
--                     contents <- readFileCIO fname
-+                     contents <- raw_mangle `fmap` readFileCIO fname
- 
-@@ -126,4 +144,4 @@ loadAttrC fname  = do
-                          errmsgs <- showErrors
--                         fatal ("C header contains \
--                                \errors:\n\n" ++ errmsgs)   -- fatal error
-+                         fatal ("C header contains " ++
-+                                "errors:\n\n" ++ errmsgs)   -- fatal error
-                        else do
diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.5.1-r1.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.5.1-r1.ebuild
deleted file mode 100644
index f30199e6d8a5..000000000000
--- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.5.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="Tools to build the Gtk2Hs suite of User Interface libraries"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="+closuresignals"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.8
-	dev-haskell/happy
-	dev-haskell/hashtables
-	dev-haskell/random
-	>=dev-lang/ghc-6.10.4
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag closuresignals closuresignals)
-}
diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.0.4-r3.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.0.4-r3.ebuild
deleted file mode 100644
index 2966829c08e9..000000000000
--- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.0.4-r3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="Tools to build the Gtk2Hs suite of User Interface libraries"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+closuresignals"
-
-RDEPEND="dev-haskell/random:=
-	dev-haskell/hashtables:=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.8
-	dev-haskell/happy
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ia64.patch
-	epatch "${FILESDIR}"/${P}-alex-3.1.6.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag closuresignals closuresignals)
-}
diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.2.2.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.2.2.ebuild
deleted file mode 100644
index f3ead4fd56ce..000000000000
--- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.2.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile" # duplicate symbols: haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Tools to build the Gtk2Hs suite of User Interface libraries"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+closuresignals"
-
-RDEPEND=">=dev-haskell/cabal-1.24.0.0:=[profile?] <dev-haskell/cabal-1.25:=[profile?]
-	dev-haskell/hashtables:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.18.1.3
-	dev-haskell/happy
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.13.1.0-ia64.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag closuresignals closuresignals)
-}
diff --git a/dev-haskell/gtk2hs-buildtools/metadata.xml b/dev-haskell/gtk2hs-buildtools/metadata.xml
deleted file mode 100644
index af96940296fd..000000000000
--- a/dev-haskell/gtk2hs-buildtools/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides a set of helper programs necessary to
-		build the Gtk2Hs suite of libraries. These tools include
-		a modified c2hs binding tool that is used to generate
-		FFI declarations, a tool to build a type hierarchy that
-		mirrors the C type hierarchy of GObjects found in glib,
-		and a generator for signal declarations that are used
-		to call back from C to Haskell. These tools are not needed
-		to actually run Gtk2Hs programs.
-	</longdescription>
-	<use>
-		<flag name="closuresignals">Use the the GClosure-based signals
-		implementation.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/gtk3-0.13.7 b/dev-haskell/gtk3-0.13.7
new file mode 100644
index 000000000000..b03caddc35e8
--- /dev/null
+++ b/dev-haskell/gtk3-0.13.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:3 gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] ) >=dev-haskell/gtk2hs-buildtools-0.13.0.3:0= virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binding to the Gtk+ graphical user interface library
+EAPI=5
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=examples +fmode-binary +gio doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:3 gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
+SLOT=0/0.13.7
+SRC_URI=mirror://hackage/packages/archive/gtk3/0.13.7/gtk3-0.13.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4fd5e610bbe5969383f657b5321bfbf0
diff --git a/dev-haskell/gtk3-0.14.6 b/dev-haskell/gtk3-0.14.6
new file mode 100644
index 000000000000..ec559c54de1c
--- /dev/null
+++ b/dev-haskell/gtk3-0.14.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:3 gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] ) >=dev-haskell/cabal-1.24 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binding to the Gtk+ 3 graphical user interface library
+EAPI=6
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=+fmode-binary +gio doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:3 gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
+SLOT=0/0.14.6
+SRC_URI=mirror://hackage/packages/archive/gtk3/0.14.6/gtk3-0.14.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c10a3b9f067ad3edc1f6ef45e2ff3564
diff --git a/dev-haskell/gtk3/Manifest b/dev-haskell/gtk3/Manifest
deleted file mode 100644
index d0a8f8eede9d..000000000000
--- a/dev-haskell/gtk3/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gtk3-0.13.7.tar.gz 673031 BLAKE2B 4a99b1c430cad1d940b9c30cbf4ab2bcddf64d2bdcc645b2ad37c86069a4817c677ccc3552007c9aeb41755125650cea19c70786dd4a64d348bf483bd08a3073 SHA512 c350ae55a7044684e6f2d94592decfcd01d3e96900a468cd417bad52713502c89c328f96cd4ff29647169a76287b8dada9654d46c4dc884c0dab0590ad57762e
-DIST gtk3-0.14.6.tar.gz 675439 BLAKE2B 7b5699db78f68e763ba972c2a82aa4044d2b97e60137443732b199afb2b611758130b9dcc8240da7492d0853c8bbdc88aa9e18884798eb1c33d7f6af7fbd9409 SHA512 d03930164fa117ebd6bcc79b79a9cfc0449c5ed0b3de6999f26ad63673a67a146f989245efa68b4e1484091689b350a5df95ed49bbbe9d4a30fbe418cbb37209
-EBUILD gtk3-0.13.7.ebuild 1708 BLAKE2B 0843d630a15d1c3d637eac8c5ce757b7f811c9d3d7d1e93eef3ca68f2eba7472d2ec4c58003af722b1587349536d01c1799eeb8d1650bf140a046dcea21415ba SHA512 edcc1c76430601dd56f4be8fceb2ddbfb27ccdf1fcf9162c2809d05cfa42a3524cc25e2cb10c877e284bfd4d0d51266b2c611803bb992ebceeb8899ff84a977a
-EBUILD gtk3-0.14.6.ebuild 1260 BLAKE2B 49d3f506a3c0662835abe71c81dd39baa1901eb22daa4edfbedcc32105bfd15180f89c1ca440e65aa62c188a93c4cda72c53bfe1668b49568e7576379f691a44 SHA512 4ac7c9ff2b2dcc8330295c6fcc77788b71a5f3f2b0d55c95bf61b2075bbfe60e8ae4e36110a7cd5261a3a52ddca6019e26730e2d895e17ee1adc490313a0efe2
-MISC metadata.xml 684 BLAKE2B 73d54f823aeec358194a2890de13039ae184f4eb480ffa2b2c48891348b293330cad0e54bdc2ae4f1631017e5cddb4e7cce200c5835938b8cfaeb6aaf05891d6 SHA512 ea4adf337f95bf29283b9bf86c871e34f48e955fab90cafef7a8fa0804e4cdead514b54a7f3f0f6d8c10384d30285309545962fc059d78b36b357a985105c0fa
diff --git a/dev-haskell/gtk3/gtk3-0.13.7.ebuild b/dev-haskell/gtk3/gtk3-0.13.7.ebuild
deleted file mode 100644
index 81f613f18672..000000000000
--- a/dev-haskell/gtk3/gtk3-0.13.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-#nocabaldep is for the fancy cabal-detection feature at build-time
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Gtk+ graphical user interface library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="examples +fmode-binary +gio"
-
-RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
-	>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?]
-	>=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/glib:2
-	x11-libs/gtk+:3
-	gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/gtk2hs-buildtools-0.13.0.3:0=
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# workaround for module order
-	cabal_chdeps \
-		'other-modules:' 'exposed-modules:'
-	# fix build with gcc 5.1.0 and later https://github.com/gtk2hs/gtk2hs/issues/104
-	sed -e 's@gccProg, "--cppopts=-E"@gccProg, "--cppopts=-E", "--cppopts=-P"@' \
-		-i Gtk2HsSetup.hs || die
-}
-
-src_configure() {
-	cabal_src_configure \
-		$(cabal_flag examples build-demos) \
-		$(cabal_flag fmode-binary fmode-binary) \
-		$(cabal_flag gio have-gio) \
-		--flags=-have-quartz-gtk
-}
diff --git a/dev-haskell/gtk3/gtk3-0.14.6.ebuild b/dev-haskell/gtk3/gtk3-0.14.6.ebuild
deleted file mode 100644
index febcd4216f7d..000000000000
--- a/dev-haskell/gtk3/gtk3-0.14.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: have-gio:gio,build-demos:examples
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Gtk+ 3 graphical user interface library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+fmode-binary +gio"
-
-RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
-	>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?]
-	>=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/glib:2
-	x11-libs/gtk+:3
-	gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24
-	virtual/pkgconfig
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag fmode-binary fmode-binary) \
-		$(cabal_flag gio have-gio)
-}
diff --git a/dev-haskell/gtk3/metadata.xml b/dev-haskell/gtk3/metadata.xml
deleted file mode 100644
index 28e651a53516..000000000000
--- a/dev-haskell/gtk3/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This is the core library of the Gtk2Hs suite of libraries for Haskell
-		based on Gtk+. Gtk+ is an extensive and mature multi-platform toolkit
-		for creating graphical user interfaces.
-	</longdescription>
-	<use>
-		<flag name="gio">Depend on GIO package, thereby enabling certain features.</flag>
-		<flag name="fmode-binary">Set the default file translation mode for file I/O operations to _O_BINARY.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/hackage-security-0.5.2.2 b/dev-haskell/hackage-security-0.5.2.2
new file mode 100644
index 000000000000..dca4282c8e39
--- /dev/null
+++ b/dev-haskell/hackage-security-0.5.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-1.26:=[profile?] >=dev-haskell/cryptohash-sha256-0.11:=[profile?] <dev-haskell/cryptohash-sha256-0.12:=[profile?] >=dev-haskell/ed25519-0.0:=[profile?] <dev-haskell/ed25519-0.1:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/old-locale-1.0:=[profile?] use-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?] ) !use-network-uri? ( >=dev-haskell/network-2.5:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck dev-haskell/temporary !use-network-uri? ( dev-haskell/network-uri ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Hackage security library
+EAPI=6
+HOMEPAGE=https://github.com/well-typed/hackage-security
+IUSE=+use-network-uri doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-1.26:=[profile?] >=dev-haskell/cryptohash-sha256-0.11:=[profile?] <dev-haskell/cryptohash-sha256-0.12:=[profile?] >=dev-haskell/ed25519-0.0:=[profile?] <dev-haskell/ed25519-0.1:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/old-locale-1.0:=[profile?] use-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?] ) !use-network-uri? ( >=dev-haskell/network-2.5:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/0.5.2.2
+SRC_URI=mirror://hackage/packages/archive/hackage-security/0.5.2.2/hackage-security-0.5.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ac8502918debb4b2713887733b94cb5f
diff --git a/dev-haskell/hackage-security/Manifest b/dev-haskell/hackage-security/Manifest
deleted file mode 100644
index 5dc442226a00..000000000000
--- a/dev-haskell/hackage-security/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hackage-security-0.5.2.2.tar.gz 83131 BLAKE2B 4ce0ff3d4ee2647ac5311996756ce43aa91ee7989ef6a46ea94679890900811c770e5ce91acc0e39fe0e42767cdd6d21bb11bee7d385c9e3a30c642b9471f423 SHA512 5adab3c46d7aada8668128ad8c9389ca65489eec776f8571b8ee5834d74b961f19b558cb6642cbb1891ee381b2d4f2019dddf29bad13607fe23bef49a3d6f535
-EBUILD hackage-security-0.5.2.2.ebuild 2038 BLAKE2B 294b63a27ee629b40cfb90336a0a2b6998f7a1c1912c9b666dc2c839b0cef1fd4bb21d97b842ccba3324a0b8a4526d1a1f2c2b7abbef9cd8a1081d8f97b51117 SHA512 9fe48f4bd94367d286ec50d4b71a9fa97e6ce5a4f68026e92cb629b824bf64ccb674d8cdec99433d21d70aa1e284e2c85ab63f22489b783ae515bba682b0f342
-MISC metadata.xml 1351 BLAKE2B c2977bbb8e8b408a51025c61970fe9881207ca2c91e5b7c7778a6c46caa15314c3536b2c720370c7739d37ca38c3f1693bd4c6ad024a5eaede982cd5940e0c07 SHA512 bc2b65083d43a010a500ee5d47300703dec5a0b1bd4490ad8a64a35063e15bf198124aa049eb895c3c42dfd021720d32b7c73eddbbabb105d5e851b24e78cf46
diff --git a/dev-haskell/hackage-security/hackage-security-0.5.2.2.ebuild b/dev-haskell/hackage-security/hackage-security-0.5.2.2.ebuild
deleted file mode 100644
index 7690bc1904e0..000000000000
--- a/dev-haskell/hackage-security/hackage-security-0.5.2.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hackage security library"
-HOMEPAGE="https://github.com/well-typed/hackage-security"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+use-network-uri"
-
-RDEPEND=">=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
-	>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-1.26:=[profile?]
-	>=dev-haskell/cryptohash-sha256-0.11:=[profile?] <dev-haskell/cryptohash-sha256-0.12:=[profile?]
-	>=dev-haskell/ed25519-0.0:=[profile?] <dev-haskell/ed25519-0.1:=[profile?]
-	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-	>=dev-haskell/old-locale-1.0:=[profile?]
-	use-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?] )
-	!use-network-uri? ( >=dev-haskell/network-2.5:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck
-		dev-haskell/temporary
-		!use-network-uri? ( dev-haskell/network-uri ) )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'directory         >= 1.1.0.2 && < 1.3' 'directory         >= 1.1.0.2'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag use-network-uri use-network-uri)
-}
diff --git a/dev-haskell/hackage-security/metadata.xml b/dev-haskell/hackage-security/metadata.xml
deleted file mode 100644
index a3594f6cd4ae..000000000000
--- a/dev-haskell/hackage-security/metadata.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="use-network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
-	<longdescription>
-		The hackage security library provides both server and
-		client utilities for securing the Hackage package server
-		(&lt;http://hackage.haskell.org/&gt;).  It is based on The Update
-		Framework (&lt;http://theupdateframework.com/&gt;), a set of
-		recommendations developed by security researchers at
-		various universities in the US as well as developers on the
-		Tor project (&lt;https://www.torproject.org/&gt;).
-		
-		The current implementation supports only index signing,
-		thereby enabling untrusted mirrors. It does not yet provide
-		facilities for author package signing.
-		
-		The library has two main entry points:
-		"Hackage.Security.Client" is the main entry point for
-		clients (the typical example being @cabal@), and
-		"Hackage.Security.Server" is the main entry point for
-		servers (the typical example being @hackage-server@).
-		
-		This is a beta release.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">well-typed/hackage-security</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/haddock-2.14.3.0.7.8.3 b/dev-haskell/haddock-2.14.3.0.7.8.3
new file mode 100644
index 000000000000..8374b6ae6b21
--- /dev/null
+++ b/dev-haskell/haddock-2.14.3.0.7.8.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/ghc-paths:=[profile?] >=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-7.8.3:= <dev-lang/ghc-7.9:= hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A documentation-generation tool for Haskell libraries
+EAPI=5
+HOMEPAGE=http://www.haskell.org/haddock/
+IUSE=doc hscolour profile test
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=dev-haskell/ghc-paths:=[profile?] >=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-7.8.3:= <dev-lang/ghc-7.9:=
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cf74d6f3fd1a1a6c39ba71eb99e5b6c7
diff --git a/dev-haskell/haddock-2.16.1 b/dev-haskell/haddock-2.16.1
new file mode 100644
index 000000000000..1fcd762adf7f
--- /dev/null
+++ b/dev-haskell/haddock-2.16.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/cabal-1.10 >=dev-lang/ghc-7.4.1 ~dev-haskell/haddock-api-2.16.1
+DESCRIPTION=A documentation-generation tool for Haskell libraries
+EAPI=5
+HOMEPAGE=http://www.haskell.org/haddock/
+IUSE=test
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/haddock/2.16.1/haddock-2.16.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=414e783393f9bd2296e401f8398a93b9
diff --git a/dev-haskell/haddock-2.17.2 b/dev-haskell/haddock-2.17.2
new file mode 100644
index 000000000000..e2acf3d58500
--- /dev/null
+++ b/dev-haskell/haddock-2.17.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/haddock-api-2.17:= <dev-haskell/haddock-api-2.18:= >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10
+DESCRIPTION=A documentation-generation tool for Haskell libraries
+EAPI=6
+HOMEPAGE=http://www.haskell.org/haddock/
+IUSE=test
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/haddock-api-2.17:= <dev-haskell/haddock-api-2.18:= >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/haddock/2.17.2/haddock-2.17.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cabccd96ed6c47f02d04495b0e4c8bfd
diff --git a/dev-haskell/haddock-api-2.16.1 b/dev-haskell/haddock-api-2.16.1
new file mode 100644
index 000000000000..95b943239359
--- /dev/null
+++ b/dev-haskell/haddock-api-2.16.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cabal-1.10:=[profile?] dev-haskell/ghc-paths:=[profile?] >=dev-haskell/haddock-library-1.2:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?] >=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-7.10:= <dev-lang/ghc-7.12:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A documentation-generation tool for Haskell libraries
+EAPI=5
+HOMEPAGE=http://www.haskell.org/haddock/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cabal-1.10:=[profile?] dev-haskell/ghc-paths:=[profile?] >=dev-haskell/haddock-library-1.2:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?] >=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-7.10:= <dev-lang/ghc-7.12:=
+SLOT=0/2.16.1
+SRC_URI=mirror://hackage/packages/archive/haddock-api/2.16.1/haddock-api-2.16.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d41b98bb7c4ee6ec12037c033f84013c
diff --git a/dev-haskell/haddock-api-2.17.3 b/dev-haskell/haddock-api-2.17.3
new file mode 100644
index 000000000000..ddec99541938
--- /dev/null
+++ b/dev-haskell/haddock-api-2.17.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cabal-1.10:=[profile?] dev-haskell/ghc-paths:=[profile?] >=dev-haskell/haddock-library-1.4:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-8.0:= <dev-lang/ghc-8.2:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/hspec >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A documentation-generation tool for Haskell libraries
+EAPI=6
+HOMEPAGE=http://www.haskell.org/haddock/
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cabal-1.10:=[profile?] dev-haskell/ghc-paths:=[profile?] >=dev-haskell/haddock-library-1.4:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-8.0:= <dev-lang/ghc-8.2:=
+SLOT=0/2.17.3
+SRC_URI=mirror://hackage/packages/archive/haddock-api/2.17.3/haddock-api-2.17.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=26f1742ba3a1dd483d46fa43684858a9
diff --git a/dev-haskell/haddock-api/Manifest b/dev-haskell/haddock-api/Manifest
deleted file mode 100644
index e81e925f92a4..000000000000
--- a/dev-haskell/haddock-api/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX haddock-api-2.17.3-ghc-8.0.2_rc1.patch 747 BLAKE2B 743b22c933a793ed5006664ff78b7b1691e8ea745f8dedf080a426c2daaadc69d4e7dced80e9872c7e6a65c56cf2946cf24f75219b2e9b8dc361598c8f27fed8 SHA512 813823790fceb96c8b314835896dac165bd4e91f888090c65cbe91dc2ac026e2d0bd79acb40974154252ea106a7dcf56d80da6af4dd67db59f8004166f29bf08
-DIST haddock-api-2.16.1.tar.gz 125372 BLAKE2B dbc0678cd38bad8549375468ddda27061e17cb74927e1a1c3c286cb25e8cd098a8f17333d199897bcd7ee56553b4d68b206a6935c44b0a5056810921fc6a3b45 SHA512 01450602d238651a8711141d51f5246536a96b69efee29942296fdfc249929f5f33df24ee676b56d0ba82269cb6557dd3a4e8fabbd1b809e506867b5f285bb17
-DIST haddock-api-2.17.3.tar.gz 145142 BLAKE2B 1ca87c180baed23ec5df5d5cbfedc7e3823c344655b2d13f2bcbce0c774874223269b06a88f45365511f6789f8068086c04460faaf4eec7354a20bc18680ce26 SHA512 00057618d970fc7786913eec0b408baabbf1aff4b705c105f6d6347ae9c46af1b2ea7bed420edfaec38c835dee08593c9ae53ab9a30153239e687de6f5301840
-EBUILD haddock-api-2.16.1.ebuild 842 BLAKE2B 3be75a37482b165f76d14336ba610b0b3f0e07b86ff0a2d8ad270d9b49ef566439a93d98a982a9fd4774706c82461804a67149980fb369e00553d77ebeb0c5fc SHA512 59b2ca5328a6e0a5b6ddaed94e01c4e1f7c44bf530f967c4cdaabae0e6bc4c6247c102fe6e563d0fbf5464702a40bbd2ef25901266b9c3adf0fd71bda98a6b68
-EBUILD haddock-api-2.17.3.ebuild 1055 BLAKE2B d8e574fd79565019e2345118bc86d0f4bb1ff650c8e2d5d5a093f2c7752982932eb8a49ffb1a99ab56e70dc46c83497b66d41f89362d1b71609d7836aa1063c7 SHA512 1b668c9b88ed2dd25b7c0ce519b2c6093166d91ccf59042cc2e536a357b8e158f44ceba13a69e0a97cecead739a3555327144dd606e026c4ef89e245f4eea91d
-MISC metadata.xml 357 BLAKE2B 808036b0cf5b428f9488a39d294aec21cd83215e5224007492c96b6b49a296c5a350a1ba1fbc75e3ffdc33456a02f4669e45d3e740da8324ea9f635cbcd8a2c9 SHA512 0f4a0bb813ebec80793d97d4ab2df397fba47ffdfb19afc8de5262cd3cd627172a982afd9fd36ce25051285f3b33cc3ba70ede63de59ac7be7ff72d237b85db2
diff --git a/dev-haskell/haddock-api/files/haddock-api-2.17.3-ghc-8.0.2_rc1.patch b/dev-haskell/haddock-api/files/haddock-api-2.17.3-ghc-8.0.2_rc1.patch
deleted file mode 100644
index 6aafc8f37522..000000000000
--- a/dev-haskell/haddock-api/files/haddock-api-2.17.3-ghc-8.0.2_rc1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/Haddock/Types.hs b/src/Haddock/Types.hs
-index eacf447..458d15f 100644
---- a/src/Haddock/Types.hs
-+++ b/src/Haddock/Types.hs
-@@ -1,2 +1,2 @@
--{-# LANGUAGE DeriveDataTypeable, DeriveFunctor, DeriveFoldable, DeriveTraversable, StandaloneDeriving, TypeFamilies, RecordWildCards #-}
-+{-# LANGUAGE DeriveDataTypeable, DeriveFunctor, DeriveFoldable, DeriveTraversable, StandaloneDeriving, TypeFamilies, RecordWildCards, CPP #-}
- {-# OPTIONS_GHC -fno-warn-orphans #-}
-@@ -450,2 +450,3 @@ instance (NFData a, NFData mod)
- 
-+#if !MIN_VERSION_GLASGOW_HASKELL(8,0,1,1)
- instance NFData Name where rnf x = seq x ()
-@@ -453,2 +454,3 @@ instance NFData OccName where rnf x = seq x ()
- instance NFData ModuleName where rnf x = seq x ()
-+#endif
- 
diff --git a/dev-haskell/haddock-api/haddock-api-2.16.1.ebuild b/dev-haskell/haddock-api/haddock-api-2.16.1.ebuild
deleted file mode 100644
index d9c6ab96ec99..000000000000
--- a/dev-haskell/haddock-api/haddock-api-2.16.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="http://www.haskell.org/haddock/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cabal-1.10:=[profile?]
-	dev-haskell/ghc-paths:=[profile?]
-	>=dev-haskell/haddock-library-1.2:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?]
-	>=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
-	>=dev-lang/ghc-7.10:= <dev-lang/ghc-7.12:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/haddock-api/haddock-api-2.17.3.ebuild b/dev-haskell/haddock-api/haddock-api-2.17.3.ebuild
deleted file mode 100644
index dc5b5731e12d..000000000000
--- a/dev-haskell/haddock-api/haddock-api-2.17.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="http://www.haskell.org/haddock/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.0.1
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cabal-1.10:=[profile?]
-	dev-haskell/ghc-paths:=[profile?]
-	>=dev-haskell/haddock-library-1.4:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
-	>=dev-lang/ghc-8.0:= <dev-lang/ghc-8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-haskell/hspec
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-8.0.2_rc1.patch)
diff --git a/dev-haskell/haddock-api/metadata.xml b/dev-haskell/haddock-api/metadata.xml
deleted file mode 100644
index 5b91128aaa05..000000000000
--- a/dev-haskell/haddock-api/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haddock is a documentation-generation tool for Haskell
-		libraries
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/haddock-library-1.1.1 b/dev-haskell/haddock-library-1.1.1
new file mode 100644
index 000000000000..9aa736d5517b
--- /dev/null
+++ b/dev-haskell/haddock-library-1.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/base-compat dev-haskell/hspec >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Library exposing some functionality of Haddock
+EAPI=5
+HOMEPAGE=http://www.haskell.org/haddock/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.1
+SRC_URI=mirror://hackage/packages/archive/haddock-library/1.1.1/haddock-library-1.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0a0505544d81b26fad89138ba18194d9
diff --git a/dev-haskell/haddock-library-1.2.1 b/dev-haskell/haddock-library-1.2.1
new file mode 100644
index 000000000000..cda08879017b
--- /dev/null
+++ b/dev-haskell/haddock-library-1.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/base-compat dev-haskell/hspec >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Library exposing some functionality of Haddock
+EAPI=5
+HOMEPAGE=http://www.haskell.org/haddock/
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/1.2.1
+SRC_URI=mirror://hackage/packages/archive/haddock-library/1.2.1/haddock-library-1.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=21aa80163d0b4a01255f877dbd174236
diff --git a/dev-haskell/haddock-library-1.4.2 b/dev-haskell/haddock-library-1.4.2
new file mode 100644
index 000000000000..84b16ec9e666
--- /dev/null
+++ b/dev-haskell/haddock-library-1.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/base-compat dev-haskell/hspec >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Library exposing some functionality of Haddock
+EAPI=6
+HOMEPAGE=http://www.haskell.org/haddock/
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.4.2
+SRC_URI=mirror://hackage/packages/archive/haddock-library/1.4.2/haddock-library-1.4.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=24ad96e4c8105bc0c07d49c84bd282b1
diff --git a/dev-haskell/haddock-library/Manifest b/dev-haskell/haddock-library/Manifest
deleted file mode 100644
index ff712918c927..000000000000
--- a/dev-haskell/haddock-library/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST haddock-library-1.1.1.tar.gz 35641 BLAKE2B 1754ce1088c34629f8523a80c9ee142471b8e7f53f5a77e89265211588cc80719e7fec49e35142b8288b4632a0548def65f9f2966d6838d79e75ec1574588336 SHA512 5f1a592af66a054482fc06ca8d974db0ebd4e42b383ec6b3fd7d44d155bd89c567013af1266e697b76a96b4d39486bc22eac7eb4b1d6842ec0f842533ac8dffb
-DIST haddock-library-1.2.1.tar.gz 38606 BLAKE2B 1896a098a4858796feb9ded26914a7cfc9f6478f3993485a9c61be1a3b1aee1e32accafadaa5b1e030d17f78555b1f4c731b76c09bb83c7a7cb8132c8e25e792 SHA512 7ac9dfc648e6e59e1dbaafc7fdf26acb378997506c353dedadf89a729223cdb518edd59642e81758fd898cda163258e5e4150fc84369c3e011e59acd827a037a
-DIST haddock-library-1.4.2.tar.gz 38701 BLAKE2B 56c0f1c46100fcf8afa88ce8c44f989da9561109bf74473d5ef65962cc057cf7a54f87786171ad2f57895000e610663f1b2711f231adc7d85442e9028bd9729b SHA512 0ea02f4ac898e6d4349f3c8d3997d66c35866350bfd661b6030a0b59c609eaae3647c8898bb5142afb0235b2eb785059356f6eb2031e6e93615d1d4e3c4cce82
-EBUILD haddock-library-1.1.1.ebuild 671 BLAKE2B 042c08772c672a08a2dd243e6f32827701fb6f01bab78527828364aed34f47252afadf4a9f8f925eff2d0dbbf430a2ec42284f2d31e1c57574ab7147ebc1d3fb SHA512 feb5d49af81f4671d6e03bf7d1c096d43542070457c9284ee676e9848705803efbbe626fa9b468cb7c5d5320104cc513d78fe4ce3519d5145a65a9bc648f9321
-EBUILD haddock-library-1.2.1.ebuild 793 BLAKE2B 833488c47de9d560f699dcd21addfd93b79b36a771341f9eb647cdc56e31a1694a60db236d0a0e51497de8eaecc64dd85bb4c1cedd4df04a9eef3486d579e04a SHA512 d2740a780a1ad84b3a177fe4d719c16cab2a0cb138e5630b288bad6734d441c43b0e1a33d53f3b51bb732a5f93d922d038b33a104fb55cbc24ff9c48d7e08052
-EBUILD haddock-library-1.4.2.ebuild 808 BLAKE2B 41e0f43161fb0adf355364c6efa155e80847704ab9e4d14e8206b3d3a088a6e88e962bcd6ccad1bd851fab7e4afa4341a2030792538013b99a0e21a4429f4514 SHA512 ea76a49732ed5f07960ebfa59e6d2dfbcba34880638966eadbca411b992660b2db1d7ca7a55884a8c5216ca1c8415def31a1423b79230e5b4693a011fd128702
-MISC metadata.xml 649 BLAKE2B 3009fffda0bdf4a08fb7014a168578c8054cd7e701ca254b12debebf6aadf7a36d968d3d39a555767aef11646e2cc71707ab40f5ad77bc85923bdac3a3ac45a3 SHA512 316469b542dcc67cbf2c6f28a2cb7c3321fc13654349c59631c185ceeb2bc55b78d23b2bbb224ab7b19b1aa0d2d8237fb9ec98693e4420fe8e1556e5acd370cc
diff --git a/dev-haskell/haddock-library/haddock-library-1.1.1.ebuild b/dev-haskell/haddock-library/haddock-library-1.1.1.ebuild
deleted file mode 100644
index 5ce55c6f922e..000000000000
--- a/dev-haskell/haddock-library/haddock-library-1.1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Library exposing some functionality of Haddock"
-HOMEPAGE="http://www.haskell.org/haddock/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/base-compat
-		dev-haskell/hspec
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
-"
diff --git a/dev-haskell/haddock-library/haddock-library-1.2.1.ebuild b/dev-haskell/haddock-library/haddock-library-1.2.1.ebuild
deleted file mode 100644
index f5ca262a3d8a..000000000000
--- a/dev-haskell/haddock-library/haddock-library-1.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Library exposing some functionality of Haddock"
-HOMEPAGE="http://www.haskell.org/haddock/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # on ghc-7.6 Prelude collides with base-compat
-
-RDEPEND="dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/base-compat
-		dev-haskell/hspec
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
-"
diff --git a/dev-haskell/haddock-library/haddock-library-1.4.2.ebuild b/dev-haskell/haddock-library/haddock-library-1.4.2.ebuild
deleted file mode 100644
index 2d7ee89fd817..000000000000
--- a/dev-haskell/haddock-library/haddock-library-1.4.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Library exposing some functionality of Haddock"
-HOMEPAGE="http://www.haskell.org/haddock/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.0.1, might not be required but needs porting revdeps
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/base-compat
-		dev-haskell/hspec
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
-"
diff --git a/dev-haskell/haddock-library/metadata.xml b/dev-haskell/haddock-library/metadata.xml
deleted file mode 100644
index 5187ff9bad5a..000000000000
--- a/dev-haskell/haddock-library/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haddock is a documentation-generation tool for Haskell
-		libraries. These modules expose some functionality of it
-		without pulling in the GHC dependency. Please note that the
-		API is likely to change so specify upper bounds in your
-		project if you can't release often. For interacting with Haddock
-		itself, see the <pkg>dev-haskell/haddock</pkg> package.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
deleted file mode 100644
index 1329d6174cf1..000000000000
--- a/dev-haskell/haddock/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST haddock-2.14.3.0.7.8.3.tar.gz 230282 BLAKE2B cb5336c72e0fa3036bf7ceaa202ff35e1d104fcb05c4317f16e78c0517b27529c1fab28e2ee4f2e14cbf2db592ff88a6b01d1840193c9a69233230fec1ffc423 SHA512 62ae4a29c877c3b9742828fcda2f1f045357f41b4a2c495a4791a42d412d41b3d206cdcb73e2d1bd4e95c40371dae865f4eaa37031cda6c1bada5dfed963c2be
-DIST haddock-2.16.1.tar.gz 216323 BLAKE2B feddc77d8072dfafb4b06486f57db89a0136ed53644efb0336a26e6c3f31789cf57e302e7bbfbfb9af036a00cbf801c47398347bd664333f0a35debdf794ada3 SHA512 709af410f8746819c8c067f3549d79ba0ecaa312fb6b19acf670a9a3e4c94e94b8e546493e08293eceeb488bc0891a8ebe033a58411c4af935b445cd7f3014b8
-DIST haddock-2.17.2.tar.gz 245690 BLAKE2B dc6f646a5972add1a5ac0e2a2a4119df5f8f0604984f0fa3f828e72bca96f8ec98b09ce65de6bb94a2714c64680a79ae3dd49f60a27cbf5483cb71f239180c87 SHA512 f8f06abd3b231fae36b900d54a70107dcd6718bab7726ad7bd8392c9053700b96672cf9efa0854033a5c1473dcdf00c390f253bc244ff5f4d25e70dd76c8ea1d
-EBUILD haddock-2.14.3.0.7.8.3.ebuild 2065 BLAKE2B f995f3476f85cb82a4fa586719cd5825650f5013255a0b8bbebd1dcb7be78be44bb9b9560bb94dba6dffa7540192b01220b93a351eaf4c1adb789653d35ff529 SHA512 8af0445f0cab0b1631a044de38f3ecfc94bcb920666a02fe5d0ff15753306d7bbb9a94748bc42d68ad68023cc55461c5c99af220f652f468533ac151d42a58ae
-EBUILD haddock-2.16.1.ebuild 1924 BLAKE2B e7acb4e9b47c99f0fd55a579c6a32fffa8341ae273a8b1b5a046b95a5aaa884bd9224b44f0b1d02da531645650417ad2682d39c085d4d701f6c3cdf9dd178dae SHA512 2950f44d9907e2c5213e35854a0c17a6853d8102ef766ddd87bdbaecc85f1bded8d30a2c371b7338877eacaa932ec55c15dcef2f61635e6cb3555a605bee54de
-EBUILD haddock-2.17.2.ebuild 807 BLAKE2B 8abb2d56eb1f15b4475a001fd213e149ba22ae13ace7c023484ab7f8b547d0d4d02710a28a129910d8b01e8ff57097fe86fc8927823a46d737ee8a759e1c7621 SHA512 25111b0a91da762f6f81f6c4a81d9296382e71d18265af5ac710249e419bfd876378c4d41f12c99327979430bcf398196cd48eca4981413c8d58f60536985b97
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/haddock/haddock-2.14.3.0.7.8.3.ebuild b/dev-haskell/haddock/haddock-2.14.3.0.7.8.3.ebuild
deleted file mode 100644
index c7189720b62b..000000000000
--- a/dev-haskell/haddock/haddock-2.14.3.0.7.8.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal pax-utils
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="http://www.haskell.org/haddock/"
-#SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-SRC_URI="http://code.haskell.org/~slyfox/snapshots/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RESTRICT=test # many test depends are not keyworded yet
-
-RDEPEND="dev-haskell/ghc-paths:=[profile?]
-	>=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
-	>=dev-lang/ghc-7.8.3:= <dev-lang/ghc-7.9:=
-"
-DEPEND="${RDEPEND}
-"
-
-src_prepare() {
-	if [[ ! -e "${S}/html" ]]; then
-		ln -s resources/html "${S}/html" || die "Could not create symbolic link ${S}/html"
-	fi
-}
-
-src_configure() {
-	# create a fake haddock executable. it'll set the right version to cabal
-	# configure, but will eventually get overwritten in src_compile by
-	# the real executable.
-	local exe="${S}/dist/build/haddock/haddock"
-	mkdir -p $(dirname "${exe}")
-	echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}"
-	chmod +x "${exe}"
-
-	# we use 'nocabaldep' to use ghc's bundled Cabal
-	# as external one is likely to break our haddock
-	# (known to work on 1.16.0 and breaks on 1.16.0.1!)
-	haskell-cabal_src_configure \
-		--ghc-options=-rtsopts \
-		--with-haddock="${exe}" \
-		--constraint="Cabal == $(cabal-version)"
-}
-
-src_compile() {
-	# when building the (recursive..) haddock docs, change the datadir to the
-	# current directory, as we're using haddock inplace even if it's built to be
-	# installed into the system first.
-	haddock_datadir="${S}" haskell-cabal_src_compile
-}
-
-src_install() {
-	cabal_src_install
-	# haddock uses GHC-api to process TH source.
-	# TH requires GHCi which needs mmap('rwx') (bug #299709)
-	pax-mark -m "${D}/usr/bin/${PN}"
-}
diff --git a/dev-haskell/haddock/haddock-2.16.1.ebuild b/dev-haskell/haddock/haddock-2.16.1.ebuild
deleted file mode 100644
index 71a09ba5b39c..000000000000
--- a/dev-haskell/haddock/haddock-2.16.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin test-suite"
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal pax-utils
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="http://www.haskell.org/haddock/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # tests are outdated
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	>=dev-lang/ghc-7.4.1
-	~dev-haskell/haddock-api-2.16.1
-"
-
-src_prepare() {
-	if [[ ! -e "${S}/html" ]]; then
-		ln -s resources/html "${S}/html" || die "Could not create symbolic link ${S}/html"
-	fi
-}
-
-src_configure() {
-	# create a fake haddock executable. it'll set the right version to cabal
-	# configure, but will eventually get overwritten in src_compile by
-	# the real executable.
-	local exe="${S}/dist/build/haddock/haddock"
-	mkdir -p $(dirname "${exe}")
-	echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}"
-	chmod +x "${exe}"
-
-	# we use 'nocabaldep' to use ghc's bundled Cabal
-	# as external one is likely to break our haddock
-	# (known to work on 1.16.0 and breaks on 1.16.0.1!)
-	haskell-cabal_src_configure \
-		--flags=-in-ghc-tree \
-		--ghc-options=-rtsopts \
-		--with-haddock="${exe}" \
-		--constraint="Cabal == $(cabal-version)"
-
-}
-
-src_compile() {
-	# when building the (recursive..) haddock docs, change the datadir to the
-	# current directory, as we're using haddock inplace even if it's built to be
-	# installed into the system first.
-	haddock_datadir="${S}" haskell-cabal_src_compile
-	pax-mark -m "${S}/dist/build/haddock"
-}
-
-src_install() {
-	cabal_src_install
-	# haddock uses GHC-api to process TH source.
-	# TH requires GHCi which needs mmap('rwx') (bug #299709)
-	pax-mark -m "${D}/usr/bin/${PN}"
-}
diff --git a/dev-haskell/haddock/haddock-2.17.2.ebuild b/dev-haskell/haddock/haddock-2.17.2.ebuild
deleted file mode 100644
index 880b8ea5705f..000000000000
--- a/dev-haskell/haddock/haddock-2.17.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -in-ghc-tree
-
-CABAL_FEATURES="bin test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="http://www.haskell.org/haddock/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-#keep in sync with ghc-8.0.1
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # there is no haddock-test on hackage yet
-
-RDEPEND=">=dev-haskell/haddock-api-2.17:= <dev-haskell/haddock-api-2.18:=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-in-ghc-tree
-}
diff --git a/dev-haskell/haddock/metadata.xml b/dev-haskell/haddock/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/haddock/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/half-0.2.2.3 b/dev-haskell/half-0.2.2.3
new file mode 100644
index 000000000000..98a4ae7e799d
--- /dev/null
+++ b/dev-haskell/half-0.2.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Half-precision floating-point
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/half
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.2.3
+SRC_URI=mirror://hackage/packages/archive/half/0.2.2.3/half-0.2.2.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d87c2ccab1b95c320072d58bd0fb5ec5
diff --git a/dev-haskell/half/Manifest b/dev-haskell/half/Manifest
deleted file mode 100644
index 1cebde470bad..000000000000
--- a/dev-haskell/half/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST half-0.2.2.3.tar.gz 6050 BLAKE2B 79ff80c1935814e73384b18754b3f74341c59ef55fddc40f002e1ce1a0780f45cdcb9c50726461da105508176b591f75fda955edb86091d186947d6da187b5ef SHA512 1b341670d0aa8513bef63a9522884d7c4b71cf9af6420bc67f8aab34c906a96c0288d900106878f5de9902b259f35501d09ba0b9ad82e5a759405e615572d17e
-EBUILD half-0.2.2.3.ebuild 538 BLAKE2B a9ddbf873cd80a92ff04d297120a7a25a1348d08dedc4a38c753580a27464a9d8a0bb5860292e1067f0420ca74c67e7864430c810b15321e9db9d19cdaed7f29 SHA512 2cec554e0c6ad4c5e7d61b293af93777c0ae56748f20b4fe4c76b478081951b2099ccb61646e77673b3ea7b4d47fdd405a4a001a9b3d57f5e316fe30a0f197d6
-MISC metadata.xml 396 BLAKE2B 5d7e4ec53b49d69d98387cf2746b5c5409961216147c58dd02d16e18c1b5d2485f3f24734ce7602194655052b1fdc0d4534dce480aaddbf95f87309e1ebe3366 SHA512 4242e5d65bea90e4d54e5e721cbf857068a6d6635eba7f6eedc6fc4797123b448bd963c1e6c2df9c5926007757a868fd04f46604cd99efe78243b3f608c98d3e
diff --git a/dev-haskell/half/half-0.2.2.3.ebuild b/dev-haskell/half/half-0.2.2.3.ebuild
deleted file mode 100644
index 6761953a7516..000000000000
--- a/dev-haskell/half/half-0.2.2.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Half-precision floating-point"
-HOMEPAGE="https://github.com/ekmett/half"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/half/metadata.xml b/dev-haskell/half/metadata.xml
deleted file mode 100644
index ceefd43cdeb4..000000000000
--- a/dev-haskell/half/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Half-precision floating-point
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/half</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hamlet-1.1.9.2 b/dev-haskell/hamlet-1.1.9.2
new file mode 100644
index 000000000000..2b2702630588
--- /dev/null
+++ b/dev-haskell/hamlet-1.1.9.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/failure-0.1:=[profile?] <dev-haskell/failure-0.3:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/shakespeare-1.2.0.4:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haml-like template files that are compile-time checked
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/failure-0.1:=[profile?] <dev-haskell/failure-0.3:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/shakespeare-1.2.0.4:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/1.1.9.2
+SRC_URI=mirror://hackage/packages/archive/hamlet/1.1.9.2/hamlet-1.1.9.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=58aed623929ee362857dfcdb46ed31b9
diff --git a/dev-haskell/hamlet-1.2.0 b/dev-haskell/hamlet-1.2.0
new file mode 100644
index 000000000000..a4aa8d755cd0
--- /dev/null
+++ b/dev-haskell/hamlet-1.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8
+DESCRIPTION=Haml-like template files that are compile-time checked (deprecated)
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
+IUSE=profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.2.0
+SRC_URI=mirror://hackage/packages/archive/hamlet/1.2.0/hamlet-1.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=da6e3bbab8120f89f6e5cdefaff8e4a2
diff --git a/dev-haskell/hamlet/Manifest b/dev-haskell/hamlet/Manifest
deleted file mode 100644
index 2cc7c0222c93..000000000000
--- a/dev-haskell/hamlet/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST hamlet-1.1.9.2.tar.gz 23693 BLAKE2B 7343710f65b9e34f770b8131691ef2f07b8cad7ac6a6e66454c443c077d8d5adad6bfb50231e2d4c0448162996c1737d5d3a34e6fe5a603fb05803921f684829 SHA512 e995a92856b0a7dde7bb36439d3922cb560efbcf35d08c20041d6236583e71dd09bc2983c038ad500492f89bbf091bb9ac6e7066afcd309e7aefcbfb963d8658
-DIST hamlet-1.2.0.tar.gz 1636 BLAKE2B 21b9b161238d715f5ec2c4e97ba05b87c73276f5acfea11c2bf04eb64c4bf24902def08be45ee4199e7489798e2d6df87aebf934c9a771f070078272d99a9cff SHA512 8bc20f0ddc64b6943f0e85cd7f6babf5bbd6121bf50d420824320241b6ea270876fb58e39e3275d8476b959a815e6a6fee711e3376c18e88f25cccfeb059f99a
-EBUILD hamlet-1.1.9.2.ebuild 1188 BLAKE2B d5dfffd0408365ef0f4a6d0ddb12e3e4719b3581048f0fb7e48094a61ac06bb0a9c92aa7568a6eab2a8b069a73a8177441a8fa2568b454d1619cc72a00f27e24 SHA512 385f427e91823259532c727fc2f2126ea128bd3f4b840d6ca85269bc5d74059caf4ebd179c6960f7a5588fb51febd98a8be336f4de7d0b799e26f918f9ef7aa3
-EBUILD hamlet-1.2.0.ebuild 612 BLAKE2B 8af064a22f58116bbed8a516f0e99ccfec7b15bfc29de91961c37783ee7ab6ecff3afc832c315b5d0aed143edcbea9f0cdfde87da6163a2f07dc43facfb65dc5 SHA512 3fe0b276cb6af5eb9b047c0925766e776fb69da36730f08c229e1dca68c736caa4f719b38f9893e00cc30628bd23a37bd51ea760ae555e65d37abe3b7e0ec1b4
-MISC metadata.xml 1210 BLAKE2B 8e5382425f1a7c674db2655ae33d8f9ca24708ff869da8da4371bae3bb4095934dc3796405fd5168e199f2cd9e910ac60a64cb003004ea7a549fc260f290256c SHA512 60ad8abe20655a18d186db1f14b9e0e105f23e2aad34a1d6978a1b2b3e2c95ac223d428f098ecc8000dea04fca19998da59f0254238807ccdee79c987e034fa6
diff --git a/dev-haskell/hamlet/hamlet-1.1.9.2.ebuild b/dev-haskell/hamlet/hamlet-1.1.9.2.ebuild
deleted file mode 100644
index 11de69324607..000000000000
--- a/dev-haskell/hamlet/hamlet-1.1.9.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haml-like template files that are compile-time checked"
-HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/failure-0.1:=[profile?] <dev-haskell/failure-0.3:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-haskell/shakespeare-1.2.0.4:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?]
-	>=dev-haskell/system-fileio-0.3:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/hamlet/hamlet-1.2.0.ebuild b/dev-haskell/hamlet/hamlet-1.2.0.ebuild
deleted file mode 100644
index e1990b253592..000000000000
--- a/dev-haskell/hamlet/hamlet-1.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Haml-like template files that are compile-time checked (deprecated)"
-HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/hamlet/metadata.xml b/dev-haskell/hamlet/metadata.xml
deleted file mode 100644
index c842c33be2f7..000000000000
--- a/dev-haskell/hamlet/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Hamlet gives you a type-safe tool for generating HTML code. It works via Quasi-Quoting, and generating extremely efficient output code. The syntax is white-space sensitive, and it helps you avoid cross-site scripting issues and 404 errors. Please see the documentation at &lt;http://docs.yesodweb.com/book/hamlet/&gt; for more details.
-		
-		Here is a quick overview of hamlet html. Due to haddock escaping issues, we can't properly show variable insertion, but we are still going to show some conditionals. Please see &lt;http://www.yesodweb.com/book/templates&gt; for a thorough description
-		
-		&gt; !!!
-		&gt; &lt;html&gt;
-		&gt;     &lt;head&gt;
-		&gt;         &lt;title&gt;Hamlet Demo
-		&gt;     &lt;body&gt;
-		&gt;         &lt;h1&gt;Information on John Doe
-		&gt;         &lt;h2&gt;
-		&gt;             $if isMarried person
-		&gt;                 Married
-		&gt;             $else
-		&gt;                 Not married
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/happstack-server-7.1.7.1 b/dev-haskell/happstack-server-7.1.7.1
new file mode 100644
index 000000000000..cfcd427f44d8
--- /dev/null
+++ b/dev-haskell/happstack-server-7.1.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND==dev-haskell/base64-bytestring-1.0*:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[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/mtl-2:=[profile?] <dev-haskell/mtl-2.2:=[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-0.12:=[profile?] >=dev-haskell/threads-0.5:=[profile?] dev-haskell/time-compat:=[profile?] >=dev-haskell/transformers-0.1.3:=[profile?] <dev-haskell/transformers-0.4:=[profile?] =dev-haskell/transformers-base-0.4*:=[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-6.12.1:= >=dev-haskell/network-2.2.3:=[profile?] >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Web related tools and services
+EAPI=5
+HOMEPAGE=http://happstack.com
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND==dev-haskell/base64-bytestring-1.0*:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[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/mtl-2:=[profile?] <dev-haskell/mtl-2.2:=[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-0.12:=[profile?] >=dev-haskell/threads-0.5:=[profile?] dev-haskell/time-compat:=[profile?] >=dev-haskell/transformers-0.1.3:=[profile?] <dev-haskell/transformers-0.4:=[profile?] =dev-haskell/transformers-base-0.4*:=[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-6.12.1:= >=dev-haskell/network-2.2.3:=[profile?]
+SLOT=0/7.1.7.1
+SRC_URI=mirror://hackage/packages/archive/happstack-server/7.1.7.1/happstack-server-7.1.7.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=229344d8845c8701d5ca813e06e43fd7
diff --git a/dev-haskell/happstack-server-7.3.9 b/dev-haskell/happstack-server-7.3.9
new file mode 100644
index 000000000000..5ab5b9105f09
--- /dev/null
+++ b/dev-haskell/happstack-server-7.3.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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?] ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Web related tools and services
+EAPI=5
+HOMEPAGE=http://happstack.com
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=afcf0b85acac9deaa6fa068b2d17eacf
diff --git a/dev-haskell/happstack-server-7.4.5 b/dev-haskell/happstack-server-7.4.5
new file mode 100644
index 000000000000..cf342adb2551
--- /dev/null
+++ b/dev-haskell/happstack-server-7.4.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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?] ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Web related tools and services
+EAPI=5
+HOMEPAGE=http://happstack.com
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b8e35d8f49c30e8dbf289e69261de2a2
diff --git a/dev-haskell/happstack-server-7.4.6.1 b/dev-haskell/happstack-server-7.4.6.1
new file mode 100644
index 000000000000..1b3b68a18cae
--- /dev/null
+++ b/dev-haskell/happstack-server-7.4.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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?] ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Web related tools and services
+EAPI=5
+HOMEPAGE=http://happstack.com
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7f210ab5a58ee507b3d560c0e7afbb81
diff --git a/dev-haskell/happstack-server-7.4.6.2 b/dev-haskell/happstack-server-7.4.6.2
new file mode 100644
index 000000000000..f39ca49dc945
--- /dev/null
+++ b/dev-haskell/happstack-server-7.4.6.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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?] ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Web related tools and services
+EAPI=6
+HOMEPAGE=http://happstack.com
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=027491c7fe9e030fc8a1727bf2e3c8b5
diff --git a/dev-haskell/happstack-server/Manifest b/dev-haskell/happstack-server/Manifest
deleted file mode 100644
index 93a716f8ea88..000000000000
--- a/dev-haskell/happstack-server/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST happstack-server-7.1.7.1.tar.gz 78293 BLAKE2B d75dbc1d81c9b496671ffaba6d652aae2fb36801efeafe5a831a02b4feedbad4002b42eea53ad94ccf9e2861bb0772b8ccc8b1c3c9e582b3dd048ddd30e5b455 SHA512 d43c22421e3468fc5fd9e943088db9df3ca394dd964aaa1b9caba998a1e94923956912cdf46fd17cc99969f03097d24b5426f83dbec58585b366478ff46dd5b4
-DIST happstack-server-7.3.9.tar.gz 79473 BLAKE2B d32a9882b8570b8871cd2b3e00605776c747f498be1eaa3a561a1df8b0294a807691e0e33ef50e4a32c49fd4c4a10612fb62a39692d3d4cd9942d251853302a5 SHA512 3bbfa96e17d5e452604c81f1322a3dbec9a44eae76c448e6a79843c05a079c5d081d58a7d126d8bd2957d774899b6678eeadc17fa161f58046296299b1a1c7a2
-DIST happstack-server-7.4.5.tar.gz 79941 BLAKE2B 8b02cf9af538c45782d36e098b2f235ae4763f7206ff644e8b21aaae821480083706904754268d5288e370a8df5f9fcbaab2080515684e782170d28ba8d58ad6 SHA512 52aa4261abe1cea3211add541b6831e0d586dcfc1e24d6d22ac7b69c10fd26ddaa93b2582ee586d9bb8dbef88b7f2e135f874a5ac65d0085d406fa6fa7a6b618
-DIST happstack-server-7.4.6.1.tar.gz 81027 BLAKE2B 618b3b146740efac35d63a1bbf6b8ea176ca8b945ed1693b9b5022f727635aea5442eac4201bb44ace3ac6a91281c73c881140f54ca063a2f7bfb97800fb5cae SHA512 499975de4919b38301ad065e260d22edb8aca116252a9004a631ec122efaf92b779ebfb7a6480aabad23ba0602e723f3ef78247a274489b073525831d8b72593
-DIST happstack-server-7.4.6.2.tar.gz 81122 BLAKE2B ad0b0f4bd9308782dfc0dd91d329e331055f6610ac0c225794d6580d05eb44742a289add593ffec9487bf4220f861e515a6a2307915c5ce4d5a61df743dbf6e2 SHA512 6fb34bbb3a03e985d53a253db523c01f2f2f1e319e8528f9ab8cd4c9ffeeaeca4d3768f154c9eb12419b87bfd9007ee38ae195a8c265867b1526da3e353722b2
-EBUILD happstack-server-7.1.7.1.ebuild 1759 BLAKE2B 5795c6fa50ab613203ba790f89646c5b0d9efcf5d6aef8876018e50ae6beb4359f7f4a2d73e6ec3f3272cb1982eb15991bae39828bea874f517377b0b9b879cb SHA512 217036512d36100b4a3ffcacd15deff3b79d95fed29213e1a405e926aa9d929e353d54c34c9af0d95850f3c8f47821bd92a1618f799336adb9feaa7b250452ba
-EBUILD happstack-server-7.3.9.ebuild 2150 BLAKE2B 25f0a578cb075f1b0b157649754af467a36e8a62ab31459e910e093964ccc83d2ed12d2a96809ce38aecc2ab732e85fed97b15e49faf122e69e2f9e60bbaeb2e SHA512 fa4e17aea45127b1d6da8b02975c70e1263172e8ed3584edc41c9de6a042934171e3dade12b43596135bcad223fbd2a2954fb3dfb86bbc7ec5a7a8a1579dcfd6
-EBUILD happstack-server-7.4.5.ebuild 2322 BLAKE2B 7ed3b615689cddb54c8e1f2cfcb239d44e3d91b9bb2f84aca1f1581137ba559f9387616051798a937eebd364fea8e458e5157ec9d01d2968d30717332ed3c22c SHA512 68f91ad2084878351ef7f766e5df25abbfec2214c891918f5dfd836a098a1e2b7b3dfefa3eb78d6a1ea5f26e5ff9c843c9ea95bd552db11b3af61bd0cb9a2922
-EBUILD happstack-server-7.4.6.1.ebuild 2322 BLAKE2B 920fbe4997e21fdbd1ed6765107ba7b6fc31a9e2ca9c72638bb3eb1841862bdcabc409135859d95b73f58075ffdddfb9315511bc15802ba572b799a0ff2c0860 SHA512 d0f07ccb77c1c0de4c839197ca9373f16b0eceb69e86061b17e8fb73b18354f69ebdf02da8d5208c77c9cd995f5ed37232244bf7159035db8bb79c567e318ffe
-EBUILD happstack-server-7.4.6.2.ebuild 2320 BLAKE2B 32975dba8cd87cf42fb3e6f49002514ce20ef69c5f4cc82e5461c403c7010a29c32f16d54936790656aaa0f1f2c8532c9a294b5108bfa79ead943250fab32fa5 SHA512 d4c79a31110dacecfb907c78f43b0bdbf4a97b854c86e0ef0c1b67b517ba0f78e268659fab1fc1f32cd86e96a2fc90e1cdea6534cd284c4d4e9145f7bf43a799
-MISC metadata.xml 783 BLAKE2B a8cb314ab77fb26778bbb6a24d97149a0c2c84db347464ece52cb73ca04d0a93789434c651f3c8b341b22eb28131d2df1d7b1eb38c8438dcfb14aa4098c3fab4 SHA512 143724d18525c0f3ce372eb2de985114782e74dda15a976f656ef7d36abfafb318cbccfedd7d93bc45523c17cf9e081279faae4077f31a2054e8688025ce3109
diff --git a/dev-haskell/happstack-server/happstack-server-7.1.7.1.ebuild b/dev-haskell/happstack-server/happstack-server-7.1.7.1.ebuild
deleted file mode 100644
index 99b970d30f58..000000000000
--- a/dev-haskell/happstack-server/happstack-server-7.1.7.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Web related tools and services"
-HOMEPAGE="http://happstack.com"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-#hackport: ignore-flag network_2_2_3 ; flag for old network compatibility
-#hackport: ignore-flag template_haskell: non GHC compiler
-IUSE=""
-
-RDEPEND="=dev-haskell/base64-bytestring-1.0*:=[profile?]
-		>=dev-haskell/blaze-html-0.5:=[profile?]
-		<dev-haskell/blaze-html-0.7:=[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/mtl-2:=[profile?]
-		<dev-haskell/mtl-2.2:=[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-0.12:=[profile?]
-		>=dev-haskell/threads-0.5:=[profile?]
-		dev-haskell/time-compat:=[profile?]
-		>=dev-haskell/transformers-0.1.3:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		=dev-haskell/transformers-base-0.4*:=[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-6.12.1:=
-		>=dev-haskell/network-2.2.3:=[profile?]
-		"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/hunit
-		)"
diff --git a/dev-haskell/happstack-server/happstack-server-7.3.9.ebuild b/dev-haskell/happstack-server/happstack-server-7.3.9.ebuild
deleted file mode 100644
index 004b8b1f45df..000000000000
--- a/dev-haskell/happstack-server/happstack-server-7.3.9.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: +network_2_2_3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Web related tools and services"
-HOMEPAGE="http://happstack.com"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri +template_haskell"
-
-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?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri) \
-		--flag=network_2_2_3 \
-		$(cabal_flag template_haskell template_haskell)
-}
diff --git a/dev-haskell/happstack-server/happstack-server-7.4.5.ebuild b/dev-haskell/happstack-server/happstack-server-7.4.5.ebuild
deleted file mode 100644
index 8a1a3a96308b..000000000000
--- a/dev-haskell/happstack-server/happstack-server-7.4.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +network_2_2_3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Web related tools and services"
-HOMEPAGE="http://happstack.com"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri +template_haskell"
-
-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?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri) \
-		--flag=network_2_2_3 \
-		$(cabal_flag template_haskell template_haskell)
-}
diff --git a/dev-haskell/happstack-server/happstack-server-7.4.6.1.ebuild b/dev-haskell/happstack-server/happstack-server-7.4.6.1.ebuild
deleted file mode 100644
index a3a3ca292e73..000000000000
--- a/dev-haskell/happstack-server/happstack-server-7.4.6.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: +network_2_2_3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Web related tools and services"
-HOMEPAGE="http://happstack.com"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri +template_haskell"
-
-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?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri) \
-		--flag=network_2_2_3 \
-		$(cabal_flag template_haskell template_haskell)
-}
diff --git a/dev-haskell/happstack-server/happstack-server-7.4.6.2.ebuild b/dev-haskell/happstack-server/happstack-server-7.4.6.2.ebuild
deleted file mode 100644
index 40b969bb48e2..000000000000
--- a/dev-haskell/happstack-server/happstack-server-7.4.6.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: +network_2_2_3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Web related tools and services"
-HOMEPAGE="http://happstack.com"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri +template_haskell"
-
-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?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri) \
-		--flag=network_2_2_3 \
-		$(cabal_flag template_haskell template_haskell)
-}
diff --git a/dev-haskell/happstack-server/metadata.xml b/dev-haskell/happstack-server/metadata.xml
deleted file mode 100644
index 8a3c718999b7..000000000000
--- a/dev-haskell/happstack-server/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Happstack Server provides an HTTP server and a rich set of functions for routing requests, handling query parameters, generating responses, working with cookies, serving files, and more. For in-depth documentation see the Happstack Crash Course &lt;http://happstack.com/docs/crashcourse/index.html&gt;
-	</longdescription>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package</flag>
-		<flag name="template_haskell">Description: Template Haskell is available on this system</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/happy-1.19.4 b/dev-haskell/happy-1.19.4
new file mode 100644
index 000000000000..b066aadb9477
--- /dev/null
+++ b/dev-haskell/happy-1.19.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/cabal-1.8 >=dev-haskell/mtl-1.0 >=dev-lang/ghc-6.10.4 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Happy is a parser generator for Haskell
+EAPI=5
+HOMEPAGE=http://www.haskell.org/happy/
+IUSE=doc test
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/happy/1.19.4/happy-1.19.4.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=86bb9dc978554407b52b3696d91292c8
diff --git a/dev-haskell/happy-1.19.5 b/dev-haskell/happy-1.19.5
new file mode 100644
index 000000000000..f459ce8276ec
--- /dev/null
+++ b/dev-haskell/happy-1.19.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/cabal-1.8 >=dev-haskell/mtl-1.0 >=dev-lang/ghc-6.10.4 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Happy is a parser generator for Haskell
+EAPI=5
+HOMEPAGE=http://www.haskell.org/happy/
+IUSE=doc test
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/happy/1.19.5/happy-1.19.5.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=637f2371c28482a1c2d55ab243891a7d
diff --git a/dev-haskell/happy/Manifest b/dev-haskell/happy/Manifest
deleted file mode 100644
index 45c59a73de2a..000000000000
--- a/dev-haskell/happy/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX happy-1.19.5-ghc-7.10.2.patch 940 BLAKE2B c3c87413be01ad73b33ee7cda3e95063c94dd901045491b3ec6a7b78a05447cc7f917c76c9f8497fa7887ec0315893566af3d0d13a0c6a5fff194b917695da65 SHA512 8866180fc18c7390132cef311b40b890f2d768296302f3a85cba2fcfc6abb523de6280dd6046da3fbc45915a7d866df5ec6725fe229c168482854d00cbe66d65
-DIST happy-1.19.4.tar.gz 160497 BLAKE2B a8a271ea69100d24b9a293d53e2a3262ad34c26cc9b511648cf64df719c49936b5badc6651191ca52b48ed96660335e86e706763e186f5275de1b58ae528631c SHA512 d49893098f9982321fc03dad464bf787873a1a82167165d53f617ba04923c7e5d8f177def7fa045a5669d1c7f886a88087ba8f668ef1900a71498b5800cc4b1a
-DIST happy-1.19.5.tar.gz 159280 BLAKE2B 5cfbddd981d689cfd076367e49f5b9fcfa38eca071a3d1d347a2074eb9c56436f6c7169d524b6628228472ee31ae1ccce3b5e1bcd0ae2b70d31283e3b4e33ee8 SHA512 7b43ef5236bdfba82bbddedb7edc7a8094990a389c0d3f5f848cb6208c3577e7b394cb290e51a2b2eebca25c97978a85ee932e74bbf6a792e261e5b5bff25a2b
-EBUILD happy-1.19.4.ebuild 1401 BLAKE2B c4ccf7a7e454cfd189ac431d2894232580ade8d0cf78386b1abc60d9b856eddbdda6ad0cc048356a27e6e491db24aebfccf75524ef399084abebaddefd8e621b SHA512 a904577fb3a6a8fa989cba8366f6785be84be9df612bb659ad95d45e125b03fe0e3d0f2af930257a8dcee91864fed7b2a62060b1c79476e9a79f725085905be9
-EBUILD happy-1.19.5.ebuild 1564 BLAKE2B a35d8f94b47e326768bef76cf1be980c05f3a3c2451ebd4e6ef235b55491864b8c5e119871ad6a8ce98da31f99392d92990e06dcc04647cb452f904cd7564fdf SHA512 d03e33ce278eb9da0457d7ec53ebc223ed2e1746c4461fe9f8c3db7b03fe3e7196450759b00cb874a7281083917d2fd684bf9688656358efd24c2845b425a727
-MISC metadata.xml 330 BLAKE2B 12dc311da8b192ead3d26e96a70e56d8aaed9ca86162993d1277f5738c0929cd058cde3a47e72ea0e0bbf268bf404b88cf602738f8dd34f0bb95fbd66afdeb78 SHA512 505782103d2814ce34e9e6e7ad91cd466c3f6593e636f9e38eb70e5c89892c2231e24feb310ebd4a33af0d15cc0cc58bd083da6573f65a1604fdbc3dd9380889
diff --git a/dev-haskell/happy/files/happy-1.19.5-ghc-7.10.2.patch b/dev-haskell/happy/files/happy-1.19.5-ghc-7.10.2.patch
deleted file mode 100644
index dee216b029fb..000000000000
--- a/dev-haskell/happy/files/happy-1.19.5-ghc-7.10.2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-I'm not sure if it's a ghc feature or a bug.
-Should happy emable that extension for -g option?
-
-The build error is Kind mismatch:
-
-  monad002.g.hs:296:26:
-    Couldn't match kind ‘*’ with ‘#’
-    When matching types
-      t0 :: *
-      Happy_GHC_Exts.Int# :: #
-    Relevant bindings include
-      cont :: t0 -> [Char] -> Int -> ParseResult a
-        (bound at monad002.g.hs:293:13)
-    In the first argument of ‘cont’, namely ‘8#’
-    In the expression: cont 8#
-    In a case alternative: TokenLet -> cont 8#
-
-Slightly related bug: https://ghc.haskell.org/trac/ghc/ticket/8739
-
-diff --git a/tests/monad002.ly b/tests/monad002.ly
-index 35cc5b0..4c526ca 100644
---- a/tests/monad002.ly
-+++ b/tests/monad002.ly
-@@ -5,2 +5,3 @@ Test for monadic Happy Parsers, Simon Marlow 1996.
- > {-# OPTIONS_GHC -fglasgow-exts #-}
-+> {-# LANGUAGE MonoLocalBinds #-}
- > -- -fglasgow-exts required because P is a type synonym, and Happy uses it
diff --git a/dev-haskell/happy/happy-1.19.4.ebuild b/dev-haskell/happy/happy-1.19.4.ebuild
deleted file mode 100644
index 8961425f8b2e..000000000000
--- a/dev-haskell/happy/happy-1.19.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit eutils haskell-cabal autotools
-
-DESCRIPTION="Happy is a parser generator for Haskell"
-HOMEPAGE="http://www.haskell.org/happy/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	>=dev-haskell/mtl-1.0
-	>=dev-lang/ghc-6.10.4
-	doc? ( ~app-text/docbook-xml-dtd-4.2
-			app-text/docbook-xsl-stylesheets )
-"
-
-src_prepare() {
-	for f in AttrGrammarParser Parser; do
-		# drop broken autogenerated
-		mv "dist/build/happy/happy-tmp/$f.hs" src/ || die
-		# drop depend on itself, otherwise cabal tries to regenerate it
-		rm "src/$f.ly" || die
-	done
-	use doc && cd doc && eautoconf
-}
-
-src_configure() {
-	# '--with-happy=false' allows detecting circular
-	# depends even when 'happy' is installed in system
-	haskell-cabal_src_configure --with-happy=false
-
-	if use doc; then
-		# does not like out-of-source builds
-		cd doc || die
-		econf
-	fi
-}
-
-src_compile() {
-	haskell-cabal_src_compile
-
-	if use doc; then
-		emake -C doc -j1
-	fi
-}
-
-src_install() {
-	haskell-cabal_src_install
-	if use doc; then
-		cd doc || die
-		dohtml -r happy/*
-		doman "${S}/doc/happy.1"
-	fi
-}
diff --git a/dev-haskell/happy/happy-1.19.5.ebuild b/dev-haskell/happy/happy-1.19.5.ebuild
deleted file mode 100644
index 5ba52024b7dc..000000000000
--- a/dev-haskell/happy/happy-1.19.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit eutils haskell-cabal autotools
-
-DESCRIPTION="Happy is a parser generator for Haskell"
-HOMEPAGE="http://www.haskell.org/happy/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	>=dev-haskell/mtl-1.0
-	>=dev-lang/ghc-6.10.4
-	doc? ( ~app-text/docbook-xml-dtd-4.2
-			app-text/docbook-xsl-stylesheets )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.19.5-ghc-7.10.2.patch
-
-	for f in AttrGrammarParser Parser; do
-		# drop broken autogenerated
-		mv "dist/build/happy/happy-tmp/$f.hs" src/ || die
-		# drop depend on itself, otherwise cabal tries to regenerate it
-		rm "src/$f.ly" || die
-	done
-	use doc && cd doc && eautoconf
-}
-
-src_configure() {
-	# '--with-happy=false' allows detecting circular
-	# depends even when 'happy' is installed in system
-	haskell-cabal_src_configure --with-happy=false
-
-	if use doc; then
-		# does not like out-of-source builds
-		cd doc || die
-		econf
-	fi
-}
-
-src_compile() {
-	haskell-cabal_src_compile
-
-	if use doc; then
-		emake -C doc -j1
-	fi
-}
-
-src_test() {
-	# workaround https://github.com/haskell/cabal/issues/2398
-	emake -k -C tests all || die
-}
-
-src_install() {
-	haskell-cabal_src_install
-	if use doc; then
-		cd doc || die
-		dohtml -r happy/*
-		doman "${S}/doc/happy.1"
-	fi
-}
diff --git a/dev-haskell/happy/metadata.xml b/dev-haskell/happy/metadata.xml
deleted file mode 100644
index 74ae0f3e98e6..000000000000
--- a/dev-haskell/happy/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Happy is a parser generator for Haskell
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/harp-0.4.1 b/dev-haskell/harp-0.4.1
new file mode 100644
index 000000000000..6fd131be30e1
--- /dev/null
+++ b/dev-haskell/harp-0.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= dev-haskell/cabal doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HaRP allows pattern-matching with regular expressions
+EAPI=5
+HOMEPAGE=https://github.com/seereason/harp
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.1
+SRC_URI=mirror://hackage/packages/archive/harp/0.4.1/harp-0.4.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e8bb434d683e5f080687a044e714d98a
diff --git a/dev-haskell/harp-0.4.2 b/dev-haskell/harp-0.4.2
new file mode 100644
index 000000000000..431ba769f2d2
--- /dev/null
+++ b/dev-haskell/harp-0.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HaRP allows pattern-matching with regular expressions
+EAPI=6
+HOMEPAGE=https://github.com/seereason/harp
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.2
+SRC_URI=mirror://hackage/packages/archive/harp/0.4.2/harp-0.4.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7d5d75d8a7b0b3bdac9fc952d324bd66
diff --git a/dev-haskell/harp/Manifest b/dev-haskell/harp/Manifest
deleted file mode 100644
index 6f6890f42b79..000000000000
--- a/dev-haskell/harp/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST harp-0.4.1.tar.gz 2831 BLAKE2B 1f160a15ef8c94d01d77ec9d571d649f3acfd123c1375a2678259b5ffd74b69aa3839acae0b0ae1697cf03fa310d74137fb8bf51a2fb641f823960eaa5775895 SHA512 f0e185df070301aa57ed3f2be1d9eaad65920de36404b4db81172565e87ddf152714e24fa57ad7d8519e464d8e6287d3a0b23c9242d759f4538033f239f061a9
-DIST harp-0.4.2.tar.gz 2900 BLAKE2B e849a5efc3e9e7274e3890e2e5cce5266e6cf3e1acfe023619696754a3c108263c59a4ec5f1069b9459e0348e0bdd02fa6b9f3120bbc8a65b11b340b81004a42 SHA512 2af06f0ccc138ba781edce6040fd4a88cace808990dc01cce4832414e2b4e29930c3493b320bd5d9a150823a9dcdce3a74bda82a078ded8afcce76edbdac1c13
-EBUILD harp-0.4.1.ebuild 571 BLAKE2B a260d339b20af603174d300001bf7cadaba0882a0d924306485a28339a9294921cc8c7704b7bf8b398b4e06a078da497a702bab4d117e38fd18763516b5d2544 SHA512 8f3b9de3a1388ccafffd0d266601362c1c1ac10733c867fbb758465d5b3f7d282a68c30f4472c18d14c9bbb3af5882d7f483f93a1ed597ce67a7397e279df96c
-EBUILD harp-0.4.2.ebuild 575 BLAKE2B 39183a61d9fe235c1875d2cfe9f887f87c26e8ec636d0185548067909d3b0fb61c385f6413cda9757cbfb36b2c73a5de9fc6a60cdc50232969683bfca860d481 SHA512 6747713a919cdce9a4b1039c2f423c54c7c09b634de4d00f8f0b1ecb629040eafa900f806acf30698a86dcd2e5238caea51cff4bbff888e2386d6ac1c2e2dfce
-MISC metadata.xml 791 BLAKE2B 222b9485281e5bbf2ebfa972f8b71c2e46b9aa269605d7d909645507debf6d633cafba0cb52723b14a3411e0e9b78a4c7d8f0f6b70681385b5a95a887e9b7198 SHA512 acb1e367a23883961e8c1a05d6903c8caafd3aa15cb33629325e5f07cd0a26f0655c112c4fe057a9fa9caee7f7f2b39c21d14331236166d20777e7dec440c6c6
diff --git a/dev-haskell/harp/harp-0.4.1.ebuild b/dev-haskell/harp/harp-0.4.1.ebuild
deleted file mode 100644
index 2850959f149d..000000000000
--- a/dev-haskell/harp/harp-0.4.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HaRP allows pattern-matching with regular expressions"
-HOMEPAGE="https://github.com/seereason/harp"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/cabal
-"
diff --git a/dev-haskell/harp/harp-0.4.2.ebuild b/dev-haskell/harp/harp-0.4.2.ebuild
deleted file mode 100644
index d150d596b33f..000000000000
--- a/dev-haskell/harp/harp-0.4.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HaRP allows pattern-matching with regular expressions"
-HOMEPAGE="https://github.com/seereason/harp"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/harp/metadata.xml b/dev-haskell/harp/metadata.xml
deleted file mode 100644
index 54b09a2c0d8b..000000000000
--- a/dev-haskell/harp/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription lang="en">
-	HaRP, or Haskell Regular Patterns, is a Haskell extension that extends the
-	normal pattern matching facility with the power of regular expressions. This
-	expressive power is highly useful in a wide range of areas, including text
-	parsing and XML processing. Regular expression patterns in HaRP work over
-	ordinary Haskell lists ([]) of arbitrary type. HaRP is implemented as a
-	pre-processor to ordinary Haskell.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">seereason/harp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hashable-1.2.1.0 b/dev-haskell/hashable-1.2.1.0
new file mode 100644
index 000000000000..82f6c1e7587e
--- /dev/null
+++ b/dev-haskell/hashable-1.2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/text-0.11.0.5:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2.4.0.1 >=dev-haskell/random-1.0 <dev-haskell/random-1.1 >=dev-haskell/test-framework-0.3.3 dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A class for types that can be converted to a hash value
+EAPI=5
+HOMEPAGE=https://github.com/tibbe/hashable
+IUSE=+cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 doc hscolour profile test
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-0.11.0.5:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.2.1.0
+SRC_URI=mirror://hackage/packages/archive/hashable/1.2.1.0/hashable-1.2.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cc0475f2990ec6e011843dc451be2e4a
diff --git a/dev-haskell/hashable-1.2.4.0 b/dev-haskell/hashable-1.2.4.0
new file mode 100644
index 000000000000..f38c8da29087
--- /dev/null
+++ b/dev-haskell/hashable-1.2.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-0.11.0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2.4.0.1 >=dev-haskell/random-1.0 <dev-haskell/random-1.2 >=dev-haskell/test-framework-0.3.3 dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A class for types that can be converted to a hash value
+EAPI=5
+HOMEPAGE=https://github.com/tibbe/hashable
+IUSE=+cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 doc hscolour profile test
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-0.11.0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.4.0
+SRC_URI=mirror://hackage/packages/archive/hashable/1.2.4.0/hashable-1.2.4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=56c06c94ce139227dfbc9272a2015551
diff --git a/dev-haskell/hashable-time-0.2 b/dev-haskell/hashable-time-0.2
new file mode 100644
index 000000000000..9e796d5bf6b0
--- /dev/null
+++ b/dev-haskell/hashable-time-0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/hashable-1.2.3.3:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Hashable instances for Data.Time
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/hashable-time
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.2.3.3:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.2
+SRC_URI=mirror://hackage/packages/archive/hashable-time/0.2/hashable-time-0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b68eff61e813270c29c25b4cbc9dbfd3
diff --git a/dev-haskell/hashable-time/Manifest b/dev-haskell/hashable-time/Manifest
deleted file mode 100644
index c9af04140dbf..000000000000
--- a/dev-haskell/hashable-time/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hashable-time-0.2.tar.gz 2111 BLAKE2B cf4dec1e99e2d76a2137b121cfdc109cb527d7733f893b5d74530bfac8708aa1246168c6439b2da157e15384fdce26f203070fe3151b5bb65676c1a08604a3be SHA512 0a05707019f2cc19c26a4dac955c5f31f334589074b7ecff15ae60654dea1376205b897d674fa4b1369dec62ca4f93a061250baabccf30f877ea984495df1211
-EBUILD hashable-time-0.2.ebuild 815 BLAKE2B a5bccf9cbb1386e3520f9968574ead63b51bd3bb541638d668ed03e2ff993c24f4533e515e6a5468a413cc6fde936d68becbd1d3f2fa235c679ef058a45bafba SHA512 8c3e69d4c708faa12de583fd4249f06ff6339a3627d262a2acc85a60073a598b84c71ba3fa488b3c1076e66f6618156bcc15ea334c5d14aa22be3f922f3aac6d
-MISC metadata.xml 332 BLAKE2B 037093d6fb99f66788bf24fc26ec14eddea9e7451975a90bfe3ac662d3de01fe4a2e253a3651485e103709104358237f03cccc91d582229847fb58c537cec4bc SHA512 84562d5e5861a05e4920fdab8511b6d0be31ff1415daf7233141d961812c9e919f2a1ea51ccbd2f68a8cddfdcd74008c427a44460fddbb957c5165af3134bc46
diff --git a/dev-haskell/hashable-time/hashable-time-0.2.ebuild b/dev-haskell/hashable-time/hashable-time-0.2.ebuild
deleted file mode 100644
index 0d9bfe5e5d67..000000000000
--- a/dev-haskell/hashable-time/hashable-time-0.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Hashable instances for Data.Time"
-HOMEPAGE="http://hackage.haskell.org/package/hashable-time"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.2.3.3:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >=4.7 && <4.9' 'base >=4.7' \
-		'hashable >=1.2.3.3 && <=1.3' 'hashable >=1.2.3.3'
-}
diff --git a/dev-haskell/hashable-time/metadata.xml b/dev-haskell/hashable-time/metadata.xml
deleted file mode 100644
index 7d4c05083bbc..000000000000
--- a/dev-haskell/hashable-time/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Hashable instances for types in Data.Time
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hashable/Manifest b/dev-haskell/hashable/Manifest
deleted file mode 100644
index e9c6674b1872..000000000000
--- a/dev-haskell/hashable/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST hashable-1.2.1.0.tar.gz 22389 BLAKE2B 62b883954ad22e25ace7b267e79e2a62be35671dc14d04c9ad12675d9a350b829088bb3c79b254cbd4783953ff46543f68d71e002b96cb1ba272ec808b17eaaa SHA512 343f6b9eb40d089f0f2187427af7d7b5dbe15884649ddc8e0b140db129f21fc44f6bf41a262a3b2a0c74d967be6f603799472802d835e48a442f836dd8142607
-DIST hashable-1.2.4.0.tar.gz 24491 BLAKE2B c5d3fb061a2e4fbb7c85f00c24818e708d8511c547588eea024240611d427f982633cacecd35d9a8f4306377ef0b5f75889271cd6bbeabfd0d1f837cb3b4b8db SHA512 992027ce617e347414e328e05afe69b8621fb1af21fef58836761d2002a1f9f7f97c981ff3c4fe8699a1da124771df575717ed4e3fd0bbe5c62d81be1322dbf6
-EBUILD hashable-1.2.1.0.ebuild 1153 BLAKE2B 1d11b8d60aecf111b015fae950f427d10f49c5e846baf7d46cb1856072ca0a73843feea0777b28b1a8aa3ff321b9e46d437ab37993daeb14c8b7176c26435870 SHA512 4f3f50820b1f6bace2c00e016f51585b581ed7f19943e0e8c736ac0aab5429cb11b221d325b302a9bf4828c38a4ee36080d31c99c42e60c66c1fcc303bc0df00
-EBUILD hashable-1.2.4.0.ebuild 1140 BLAKE2B 831b6a786a9d0e8f5914fd4669a9bd8b28c7f113a128d1e802662a187dff72b35a27cdcf8dd5448878ed113dd36c282ee6bb36eefe43d96b96fe115c3a333416 SHA512 8c07cd754ce0034ea1e939944d095744f6bcf7280efe1983a244e327aa71cf7a60d03f320a45b720278cab51463a6ee28f2e61c6330428dd78bd60569680cea0
-MISC metadata.xml 619 BLAKE2B 0c13ff65442edc8bf2e0234b9eb861f11ed9e678062aa2823ee52c9f6be5e0ae671efef678af09481e3fceb07107b4d8c366f1e7f4d5ec873dbad5a03a5bda86 SHA512 d87a8b83ce7d1ffe5024aef8d884b8c6dcd1a01b8c8ae255ddc42848a6f37130853b13bd9a21d8dce2352c6fbf4406fc8286ebaa25d9986764fc668ddb7be050
diff --git a/dev-haskell/hashable/hashable-1.2.1.0.ebuild b/dev-haskell/hashable/hashable-1.2.1.0.ebuild
deleted file mode 100644
index ff0b81bf60b8..000000000000
--- a/dev-haskell/hashable/hashable-1.2.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A class for types that can be converted to a hash value"
-HOMEPAGE="https://github.com/tibbe/hashable"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="+cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
-
-RDEPEND=">=dev-haskell/text-0.11.0.5:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.4.0.1
-		>=dev-haskell/random-1.0 <dev-haskell/random-1.1
-		>=dev-haskell/test-framework-0.3.3
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
-
-src_prepare() {
-	# a workaround for <cabal-1.18 #498480
-	hsc2hs tests/Regress/Mmap.{hsc,hs} || die
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag cpu_flags_x86_sse2 sse2) \
-		$(cabal_flag cpu_flags_x86_sse4_1 sse41)
-}
diff --git a/dev-haskell/hashable/hashable-1.2.4.0.ebuild b/dev-haskell/hashable/hashable-1.2.4.0.ebuild
deleted file mode 100644
index f2a3ae5e0d11..000000000000
--- a/dev-haskell/hashable/hashable-1.2.4.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: sse41:cpu_flags_x86_sse4_1,sse2:cpu_flags_x86_sse2,integer-gmp:gmp
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A class for types that can be converted to a hash value"
-HOMEPAGE="https://github.com/tibbe/hashable"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
-
-RDEPEND=">=dev-haskell/text-0.11.0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.4.0.1
-		>=dev-haskell/random-1.0 <dev-haskell/random-1.2
-		>=dev-haskell/test-framework-0.3.3
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag cpu_flags_x86_sse2 sse2) \
-		$(cabal_flag cpu_flags_x86_sse4_1 sse41)
-}
diff --git a/dev-haskell/hashable/metadata.xml b/dev-haskell/hashable/metadata.xml
deleted file mode 100644
index fbc05adb87d3..000000000000
--- a/dev-haskell/hashable/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package defines a class, 'Hashable', for types that
-		can be converted to a hash value.  This class
-		exists for the benefit of hashing-based data
-		structures.  The package provides instances for
-		basic types and a way to combine hash values.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">tibbe/hashable</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hashed-storage-0.5.11 b/dev-haskell/hashed-storage-0.5.11
new file mode 100644
index 000000000000..51cb1897e3af
--- /dev/null
+++ b/dev-haskell/hashed-storage-0.5.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=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?] ) >=dev-haskell/cabal-1.6 test? ( dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.3:2=[profile?] dev-haskell/test-framework:=[profile?] dev-haskell/test-framework-hunit:=[profile?] dev-haskell/test-framework-quickcheck2:=[profile?] dev-haskell/zip-archive:=[profile?] ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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 ~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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=eec054c5c2f10e3facf60bba2eeab2b7
diff --git a/dev-haskell/hashed-storage/Manifest b/dev-haskell/hashed-storage/Manifest
deleted file mode 100644
index 3fc7ef43ec70..000000000000
--- a/dev-haskell/hashed-storage/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX hashed-storage-0.5.11-QC-2.8.2.patch 657 BLAKE2B 1833133a0a6fb4b360e2d5b3db20ecdcb09fe5f8fba36f06f8ac7c792a834d597b8766504a3d25d17bca82092565fe3de7d85a3e69ade5f2e0d352c9fba36ca4 SHA512 2a563cbe79d1c83879786fb642a6b2656b2de2a397e5e60d20d5e6fb14b0285611885500dd2d49b96bfd7d12f38864fe2b42c26488cfe06602fda11eb709f6f9
-AUX hashed-storage-0.5.11-ghc-7.10.patch 321 BLAKE2B 354ac2d1ecb01eab3c2cdd007d4759ccce0226d7b951bb8c990f7fb298d0b5ae31377a8458bd481823d051844116e74ea310a3bf6878061a44ee82e5dad13f1e SHA512 94c405cf1c000f77922832c8b96fb14f8c3dbe410fee4e26d84f7d7183c92f3863fb64773e391cfe730deea6b866625060827b7e86dd6b0ce06cc4c09fb798f2
-DIST hashed-storage-0.5.11.tar.gz 57315 BLAKE2B a97a706446117dc049810b054cad25e62b75be905a0379ef935deb2c1fee6c2de0dece3bf74917bf7bb781f6a90a989ed8b164b3d871768c6c4e9182ffdbf488 SHA512 11bfc05ecb2de5adc5a46116d15d969207a310583e7183e2a21ef767a23eabc55622c84ef351ace81a29800a544358c604b4a255800a713af01266331bf321ba
-EBUILD hashed-storage-0.5.11.ebuild 1503 BLAKE2B 1879d69ad95602b5dfe4d054ee3936cd7f1522596891a263f6a9f74e06095a0665bc7d24e2077e830d706c74b0d1c3c34ce9ccabf03ed94751d08668fdc57920 SHA512 ad87a3db94b4e9d35083fffd10f15c4dc8b16c7a4588e5c7722e3ea0d742e357c10bfd34a3f1172235b622b107b249da8a1dfe5fe47d23d93c23d36c203e2e4d
-MISC metadata.xml 828 BLAKE2B 533f7903dbedce03eb8a87c0c9cf2fa6303a8d4f35e4e6d24f7f76b365ee2f87536185673c225d489bb868501e3baf175b52273adc549313f8e0ade62ec52f09 SHA512 772db545db082c105a75a491cc735c9f5fff87816f48c6b9433926a8b23431e2dfc8cf2e99c27ce4989e0b7da505a2281a8bc34f519623ab6e15f3636348bd0e
diff --git a/dev-haskell/hashed-storage/files/hashed-storage-0.5.11-QC-2.8.2.patch b/dev-haskell/hashed-storage/files/hashed-storage-0.5.11-QC-2.8.2.patch
deleted file mode 100644
index 1a001e73f537..000000000000
--- a/dev-haskell/hashed-storage/files/hashed-storage-0.5.11-QC-2.8.2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Storage/Hashed/Test.hs b/Storage/Hashed/Test.hs
-index d3cab6f..7f8291e 100644
---- a/Storage/Hashed/Test.hs
-+++ b/Storage/Hashed/Test.hs
-@@ -1,2 +1,2 @@
--{-# LANGUAGE ScopedTypeVariables, FlexibleInstances #-}
-+{-# LANGUAGE ScopedTypeVariables, FlexibleInstances, CPP #-}
- module Storage.Hashed.Test( tests ) where
-@@ -464,2 +464,3 @@ posix = [ testCase "getFileStatus" $ check_stat Posix.getFileStatus
- 
-+#if ! MIN_VERSION_QuickCheck(2,8,2)
- instance (Arbitrary a, Ord a) => Arbitrary (S.Set a)
-@@ -469,2 +470,3 @@ instance (Arbitrary k, Arbitrary v, Ord k) => Arbitrary (M.Map k v)
-     where arbitrary = M.fromList `fmap` arbitrary
-+#endif
- 
diff --git a/dev-haskell/hashed-storage/files/hashed-storage-0.5.11-ghc-7.10.patch b/dev-haskell/hashed-storage/files/hashed-storage-0.5.11-ghc-7.10.patch
deleted file mode 100644
index f071cab314fb..000000000000
--- a/dev-haskell/hashed-storage/files/hashed-storage-0.5.11-ghc-7.10.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --git a/Storage/Hashed/Monad.hs b/Storage/Hashed/Monad.hs
-index 67287b4..bf8ad38 100644
---- a/Storage/Hashed/Monad.hs
-+++ b/Storage/Hashed/Monad.hs
-@@ -1,2 +1,3 @@
- {-# LANGUAGE ScopedTypeVariables, BangPatterns, TypeSynonymInstances, UndecidableInstances, FlexibleInstances #-}
-+{-# LANGUAGE FlexibleContexts #-}
- 
diff --git a/dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild b/dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild
deleted file mode 100644
index 880b1a53be72..000000000000
--- a/dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Hashed file storage support code"
-HOMEPAGE="http://hackage.haskell.org/package/hashed-storage"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE="diff hpc test"
-
-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?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-	test? ( dev-haskell/hunit:=[profile?]
-		>=dev-haskell/quickcheck-2.3:2=[profile?]
-		dev-haskell/test-framework:=[profile?]
-		dev-haskell/test-framework-hunit:=[profile?]
-		dev-haskell/test-framework-quickcheck2:=[profile?]
-		dev-haskell/zip-archive:=[profile?] )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-	epatch "${FILESDIR}"/${P}-QC-2.8.2.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag diff diff) \
-		$(cabal_flag hpc hpc) \
-		$(cabal_flag test test)
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	use test && rm "${ED}/usr/bin/hashed-storage-test"
-}
diff --git a/dev-haskell/hashed-storage/metadata.xml b/dev-haskell/hashed-storage/metadata.xml
deleted file mode 100644
index af6dbebb7a30..000000000000
--- a/dev-haskell/hashed-storage/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Support code for reading and manipulating hashed file storage
-		(where each file and directory is associated with a
-		cryptographic hash, for corruption-resistant storage and fast
-		comparisons).
-		
-		The supported storage formats include darcs hashed pristine, a
-		plain filesystem tree and an indexed plain tree (where the index
-		maintains hashes of the plain files and directories).
-	</longdescription>
-	<use>
-		<flag name="diff">Provide the Storage.Hashed.Diff module.</flag>
-		<flag name="hpc">Compile with the profiling ghc flag -fhpc.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/hashtables-1.1.2.1 b/dev-haskell/hashtables-1.1.2.1
new file mode 100644
index 000000000000..3ac8c0044ef5
--- /dev/null
+++ b/dev-haskell/hashtables-1.1.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Mutable hash tables in the ST monad
+EAPI=5
+HOMEPAGE=https://github.com/gregorycollins/hashtables
+IUSE=bounds-checking portable cpu_flags_x86_sse4_1 +unsafe-tricks doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+SLOT=0/1.1.2.1
+SRC_URI=mirror://hackage/packages/archive/hashtables/1.1.2.1/hashtables-1.1.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=79eb12fac23c4e83ec3c455a95d94836
diff --git a/dev-haskell/hashtables-1.2.1.0 b/dev-haskell/hashtables-1.2.1.0
new file mode 100644
index 000000000000..3e7142417569
--- /dev/null
+++ b/dev-haskell/hashtables-1.2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Mutable hash tables in the ST monad
+EAPI=5
+HOMEPAGE=https://github.com/gregorycollins/hashtables
+IUSE=bounds-checking cpu_flags_x86_sse4_2 portable +unsafe-tricks doc hscolour profile
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+SLOT=0/1.2.1.0
+SRC_URI=mirror://hackage/packages/archive/hashtables/1.2.1.0/hashtables-1.2.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3587981bd71d569a1982270728c173a9
diff --git a/dev-haskell/hashtables/Manifest b/dev-haskell/hashtables/Manifest
deleted file mode 100644
index 075465897d91..000000000000
--- a/dev-haskell/hashtables/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST hashtables-1.1.2.1.tar.gz 48553 BLAKE2B eff3d256a6e0bbf3ac31e6d26c43efce9bc06ba09d14b22a6a5bd1d0ea17b81912590739376a6912990501d33598e39e4f92818dceb8c89a8e57853dffbc4373 SHA512 87739d4021b705e40982e66925400eea38efd2f2a11dc46626f33d2a9c9287a5a323d93c82d6e8415aef0434350256fda80819a4bbb58ff2afee74ed755c266a
-DIST hashtables-1.2.1.0.tar.gz 53706 BLAKE2B 5bc1d17fdf80f561fa7d6e9a9010025098579694356484bdaf41ebf6e5e2a03dd6983cb653eef553fb41be99aaa3ce11b2004efe62a585b0ec34f7c4fa12cefe SHA512 2c6cd17434402ff963a1b3357e58dfab3d4b60f5a2848b5433dcbbc1705d24707eacfc36af5dfb461ab03ce678c0736f3277292677e8ab297b306bd14e797e64
-EBUILD hashtables-1.1.2.1.ebuild 1054 BLAKE2B 83ff3b4f17499c59b477e7c939d411e1c8d00a7887453672b6345809b716a5674c369eeed4e29cdda599e3e8853ccf7e4527def3b92b2c59d5a13bd85eb99d05 SHA512 04d535bb5650c804188b04f54828fa01bbcac42d5eab49ac1f32e36f8479be018546a415d1c289cb51858f42c0818be71a01396dad2fb16579c76f5646ce339b
-EBUILD hashtables-1.2.1.0.ebuild 1103 BLAKE2B ea5c6826e271c0e4bf22e89fe08d902d0e87be8d8cbc4796c396986adc50bcd03529c2fca333f64f341f803ca803930fe57c121785fb66439fab3aa24d225a40 SHA512 5e92d70af6adcf221f166e4644ea54287494e882b2699aacc297b835f880a3faf22a52b21285fb61ed4a99e7390ea2e64678e19bf5a19cecddf12f8976bbad7f
-MISC metadata.xml 4879 BLAKE2B 598ddf899f47f5ad42df5aaa560fa82be7abdc74addb41ccb98593b78a079ec4d4c99df0bf92f43bb550f993276948514f0ff0eaae01b299751a87662cf754d8 SHA512 1e2c0ad46c2da83689d968382e45a4b0d600dffbd73c1e817e95eb6bcedf4c8a352343753163fe83692a5b96afa00eac94e4d80819a2e6b04613363b0289ef9b
diff --git a/dev-haskell/hashtables/hashtables-1.1.2.1.ebuild b/dev-haskell/hashtables/hashtables-1.1.2.1.ebuild
deleted file mode 100644
index b033729e272c..000000000000
--- a/dev-haskell/hashtables/hashtables-1.1.2.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Mutable hash tables in the ST monad"
-HOMEPAGE="https://github.com/gregorycollins/hashtables"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="bounds-checking portable cpu_flags_x86_sse4_1 +unsafe-tricks"
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bounds-checking bounds-checking) \
-		$(cabal_flag portable portable) \
-		$(cabal_flag cpu_flags_x86_sse4_1 sse41) \
-		$(cabal_flag unsafe-tricks unsafe-tricks)
-}
diff --git a/dev-haskell/hashtables/hashtables-1.2.1.0.ebuild b/dev-haskell/hashtables/hashtables-1.2.1.0.ebuild
deleted file mode 100644
index 9001909211fc..000000000000
--- a/dev-haskell/hashtables/hashtables-1.2.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: sse42:cpu_flags_x86_sse4_2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Mutable hash tables in the ST monad"
-HOMEPAGE="https://github.com/gregorycollins/hashtables"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bounds-checking cpu_flags_x86_sse4_2 portable +unsafe-tricks"
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bounds-checking bounds-checking) \
-		$(cabal_flag portable portable) \
-		$(cabal_flag cpu_flags_x86_sse4_2 sse42) \
-		$(cabal_flag unsafe-tricks unsafe-tricks)
-}
diff --git a/dev-haskell/hashtables/metadata.xml b/dev-haskell/hashtables/metadata.xml
deleted file mode 100644
index 7443663f12a1..000000000000
--- a/dev-haskell/hashtables/metadata.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-	</maintainer>
-	<longdescription>
-		This package provides a couple of different implementations of mutable hash
-		tables in the ST monad, as well as a typeclass abstracting their common
-		operations, and a set of wrappers to use the hash tables in the IO monad.
-		
-		/QUICK START/: documentation for the hash table operations is provided in the
-		"Data.HashTable.Class" module, and the IO wrappers (which most users will
-		probably prefer) are located in the "Data.HashTable.IO" module.
-		
-		This package currently contains three hash table implementations:
-		
-		1. "Data.HashTable.ST.Basic" contains a basic open-addressing hash table
-		using linear probing as the collision strategy. On a pure speed basis it
-		should currently be the fastest available Haskell hash table
-		implementation for lookups, although it has a higher memory overhead
-		than the other tables and can suffer from long delays when the table is
-		resized because all of the elements in the table need to be rehashed.
-		
-		2. "Data.HashTable.ST.Cuckoo" contains an implementation of \"cuckoo
-		hashing\" as introduced by Pagh and Rodler in 2001 (see
-		&lt;https://en.wikipedia.org/wiki/Cuckoo_hashing&gt;). Cuckoo hashing has
-		worst-case /O(1)/ lookups and can reach a high \"load factor\", in which
-		the table can perform acceptably well even when more than 90% full.
-		Randomized testing shows this implementation of cuckoo hashing to be
-		slightly faster on insert and slightly slower on lookup than
-		"Data.Hashtable.ST.Basic", while being more space efficient by about a
-		half-word per key-value mapping. Cuckoo hashing, like the basic hash
-		table implementation using linear probing, can suffer from long delays
-		when the table is resized.
-		
-		3. "Data.HashTable.ST.Linear" contains a linear hash table (see
-		&lt;https://en.wikipedia.org/wiki/Linear_hashing&gt;), which trades some insert
-		and lookup performance for higher space efficiency and much shorter
-		delays when expanding the table. In most cases, benchmarks show this
-		table to be currently slightly faster than @Data.HashTable@ from the
-		Haskell base library.
-		
-		It is recommended to create a concrete type alias in your code when using this
-		package, i.e.:
-		
-		&gt; import qualified Data.HashTable.IO as H
-		&gt;
-		&gt; type HashTable k v = H.BasicHashTable k v
-		&gt;
-		&gt; foo :: IO (HashTable Int Int)
-		&gt; foo = do
-		&gt;	 ht &lt;- H.new
-		&gt;	 H.insert ht 1 1
-		&gt;	 return ht
-		
-		Firstly, this makes it easy to switch to a different hash table implementation,
-		and secondly, using a concrete type rather than leaving your functions abstract
-		in the HashTable class should allow GHC to optimize away the typeclass
-		dictionaries.
-		
-		This package accepts a couple of different cabal flags:
-		
-		* @unsafe-tricks@, default /ON/. If this flag is enabled, we use some
-		unsafe GHC-specific tricks to save indirections (namely @unsafeCoerce#@
-		and @reallyUnsafePtrEquality#@. These techniques rely on assumptions
-		about the behaviour of the GHC runtime system and, although they've been
-		tested and should be safe under normal conditions, are slightly
-		dangerous. Caveat emptor. In particular, these techniques are
-		incompatible with HPC code coverage reports.
-		
-		* @sse41@, default /OFF/. If this flag is enabled, we use some SSE 4.1
-		instructions (see &lt;https://en.wikipedia.org/wiki/SSE4&gt;, first available on
-		Intel Core 2 processors) to speed up cache-line searches for cuckoo
-		hashing.
-		
-		* @bounds-checking@, default /OFF/. If this flag is enabled, array accesses
-		are bounds-checked.
-		
-		* @debug@, default /OFF/. If turned on, we'll rudely spew debug output to
-		stdout.
-		
-		* @portable@, default /OFF/. If this flag is enabled, we use only pure
-		Haskell code and try not to use unportable GHC extensions. Turning this
-		flag on forces @unsafe-tricks@ and @sse41@ /OFF/.
-		
-		This package has been tested with GHC 7.0.3, on:
-		
-		* a MacBook Pro running Snow Leopard with an Intel Core i5 processor,
-		running GHC 7.0.3 in 64-bit mode.
-		
-		* an Arch Linux desktop with an AMD Phenom II X4 940 quad-core processor.
-		
-		* a MacBook Pro running Snow Leopard with an Intel Core 2 Duo processor,
-		running GHC 6.12.3 in 32-bit mode.
-		
-		Please send bug reports to
-		&lt;https://github.com/gregorycollins/hashtables/issues&gt;.
-	</longdescription>
-	<use>
-		<flag name="bounds-checking">if on, use bounds-checking array accesses</flag>
-		<flag name="portable">if on, use only pure Haskell code and no GHC extensions.</flag>
-		<flag name="unsafe-tricks">turn on unsafe GHC tricks</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">gregorycollins/hashtables</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/haskeline-0.7.1.2 b/dev-haskell/haskeline-0.7.1.2
new file mode 100644
index 000000000000..36aa9139e0f3
--- /dev/null
+++ b/dev-haskell/haskeline-0.7.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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?] ) >=dev-haskell/cabal-1.16 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8e6c044b0402dca3311ff2aefa344591
diff --git a/dev-haskell/haskeline-0.7.1.3 b/dev-haskell/haskeline-0.7.1.3
new file mode 100644
index 000000000000..cdb9a8e41a67
--- /dev/null
+++ b/dev-haskell/haskeline-0.7.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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?] ) >=dev-haskell/cabal-1.16 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=543e4a81383c3c0f506373516d5868ad
diff --git a/dev-haskell/haskeline-0.7.2.1 b/dev-haskell/haskeline-0.7.2.1
new file mode 100644
index 000000000000..bd70f057b6bc
--- /dev/null
+++ b/dev-haskell/haskeline-0.7.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=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?] ) >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8ffffe39c75fd1d47a0b4a88851b6500
diff --git a/dev-haskell/haskeline-0.7.2.3 b/dev-haskell/haskeline-0.7.2.3
new file mode 100644
index 000000000000..e6e0d4841b1c
--- /dev/null
+++ b/dev-haskell/haskeline-0.7.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=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?] ) >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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 ~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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=16352e7634785a09a78bb0b5a958d639
diff --git a/dev-haskell/haskeline/Manifest b/dev-haskell/haskeline/Manifest
deleted file mode 100644
index 08fcb68009bc..000000000000
--- a/dev-haskell/haskeline/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST haskeline-0.7.1.2.tar.gz 68251 BLAKE2B 0e28ee337d1d7979d7ae81cf73d9b2d7e566039974420a7706a871b83b21164bef1909507dd301b3bb4c22675513ebffc36e5b68c134f5669af6acdeedc40ffd SHA512 11d3ee9507d10d14ad05a45eb269a70a661e755502c7a39c5516508e66bda7c0d56c0d91db3e6ea665ee532001bef246be14a95c12eb257724616753e2b93f6c
-DIST haskeline-0.7.1.3.tar.gz 68291 BLAKE2B f1e645d7cd4886cd1d7b9cd42ec64b27dceaa8d3f3d569555d3cafe792effc34550a320fe221f3278e33abe390908149990299e041e9480682aca6d649f6b102 SHA512 eed183edd1af5b9d77c61278c40f07599900793e47858771810b48cbd178c34a06264910dd5484f76e5a03e53551e1035e1d291d8e3577ec6f4f5a9ba8d61d5d
-DIST haskeline-0.7.2.1.tar.gz 68409 BLAKE2B e966c75e476e5167fc3b59c4c92d00af135b96f52790ce4641771fcc5d5f25e8c21abb64088da183559e4fec60a985def5d3c90e3f34b292d3d690f2b81c3aa9 SHA512 a2f790b9bb27cc8681567c3c0c3476231976d08a0e2d1e9fb69301f55511edd0221034ae8af27ec4c9db4b15f2d72b8b716d013518d0b8d15d98e859dbf0321b
-DIST haskeline-0.7.2.3.tar.gz 68332 BLAKE2B da80d367102c61775956c5c07906ef4848df60ec1af00a2a0f0199ba06219515f57681a0f158ff7a4c2a478f5af40716a6f240f16a49249249e78cf2a6892a41 SHA512 94e24ef66c7a782057c3495eba74b7ae3c703bff47b2598c840e1372b2b19a09fb97c5075660074ef6bccde9a6c35e234df06fda5de103e2fe5b4fdf7df069b8
-EBUILD haskeline-0.7.1.2.ebuild 1151 BLAKE2B a4a422d784bd46885970cb0b0fa2a73eb521f93126c1e867ec1847af1f47449af5a4e2a5cb598414dafc79de58e14956f1cb2a77c56b63ad6eaae59769b3124f SHA512 c3c847153e2dd990ad42335dc367f25f0e9b0a364b68ce089072215f1e7123d45de8db10fddeba2c4891f512c2fc7d4acd097becf8ff63b0f17f7ea5ffad1133
-EBUILD haskeline-0.7.1.3.ebuild 1117 BLAKE2B 774fc28091bdedc1fb38d921b2397774292993873778b32f612d7b0c5973f715ac7418ecda496af98b3e9fd1963f14cd770a54e3286c89ed1fc4081b3b3692cf SHA512 e26e7cc0dc82c0dd633d5a0c7ea069bbd7ee166af75600b740b846f5a5716d2464325f01341ebcf46ae7505ccacf1db89b2b0e62b4b84c86125a098fe047c211
-EBUILD haskeline-0.7.2.1.ebuild 1263 BLAKE2B 9f943e6beddc2b4696d7bc40eccb86a3591c17bdc56b99c44f77c1614b2c88c0f41608fe3f62951eb3ad7159f7501626942afdee3c17f62658a608900b92288a SHA512 f817ed4dd7db1a3714f0c9c1d5375a8dd3d1e9e73051fc4f423601945b793fc7a75fdda70369c700f10242bd3dfe421a0d7fdb0141e9da31fe58b3c5fe575a02
-EBUILD haskeline-0.7.2.3.ebuild 1268 BLAKE2B 21aec9ec90e1107c5517aff4cee59a28ce8ded32fb0ea70c8f2ea9d11f1514ca577213cfd39aa7e1af1f1a688b8e1c4de4cdbad8dbc583dcf3f259d2f7f98de5 SHA512 04d611adfbb21c2263770d66831012754ee526a7e916bb19a04068f8e728a8d03a9f22c05e69483eca04ba7758d56582ef17e5a9dd71465f5361952500baaded
-MISC metadata.xml 946 BLAKE2B 160e58571e6f868f90e507b4309ea26c352515a4ca67071a8fe130af4d1f2807aa5b123f7f1f0dc2dae4a1a5a3d3ceedce3ab63e65f9da711b522d079e64fded SHA512 dfecbff217817c7e7588112e7fcc36f95c8520423d7b023f979c1316bd314efc62e2d7cff8aa7ca9716bf19ad98d205529ef11b56c4557e2a40624a1c0656e18
diff --git a/dev-haskell/haskeline/haskeline-0.7.1.2.ebuild b/dev-haskell/haskeline/haskeline-0.7.1.2.ebuild
deleted file mode 100644
index 9dc9c7b07fd5..000000000000
--- a/dev-haskell/haskeline/haskeline-0.7.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A command-line interface for user input, written in Haskell"
-HOMEPAGE="http://trac.haskell.org/haskeline"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE="legacy-encoding libiconv +terminfo"
-
-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?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:7.8.4"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag legacy-encoding legacy-encoding) \
-		$(cabal_flag libiconv libiconv) \
-		$(cabal_flag terminfo terminfo)
-}
diff --git a/dev-haskell/haskeline/haskeline-0.7.1.3.ebuild b/dev-haskell/haskeline/haskeline-0.7.1.3.ebuild
deleted file mode 100644
index c5991f38bca9..000000000000
--- a/dev-haskell/haskeline/haskeline-0.7.1.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A command-line interface for user input, written in Haskell"
-HOMEPAGE="http://trac.haskell.org/haskeline"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE="legacy-encoding libiconv +terminfo"
-
-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?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag legacy-encoding legacy-encoding) \
-		$(cabal_flag libiconv libiconv) \
-		$(cabal_flag terminfo terminfo)
-}
diff --git a/dev-haskell/haskeline/haskeline-0.7.2.1.ebuild b/dev-haskell/haskeline/haskeline-0.7.2.1.ebuild
deleted file mode 100644
index fcf75a114844..000000000000
--- a/dev-haskell/haskeline/haskeline-0.7.2.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A command-line interface for user input, written in Haskell"
-HOMEPAGE="http://trac.haskell.org/haskeline"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE="legacy-encoding libiconv +terminfo"
-
-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?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:7.10.1 PM:7.10.2_rc2 PM:7.10.2 PM:7.10.2-r1 PM:7.10.3_rc1 PM:7.10.3"
-
-src_prepare() {
-	cabal_chdeps \
-		'utf8-string==0.3.* && >=0.3.6' 'utf8-string >=0.3.6'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag legacy-encoding legacy-encoding) \
-		$(cabal_flag libiconv libiconv) \
-		$(cabal_flag terminfo terminfo)
-}
diff --git a/dev-haskell/haskeline/haskeline-0.7.2.3.ebuild b/dev-haskell/haskeline/haskeline-0.7.2.3.ebuild
deleted file mode 100644
index 1cef462a5f06..000000000000
--- a/dev-haskell/haskeline/haskeline-0.7.2.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A command-line interface for user input, written in Haskell"
-HOMEPAGE="https://github.com/judah/haskeline"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.0.1
-KEYWORDS="amd64 x86 ~x86-fbsd ~x86-macos"
-IUSE="legacy-encoding libiconv +terminfo"
-
-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?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.0.1_rc4 PM:8.0.1 PM:8.0.2_rc1 PM:9999"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'directory>=1.1 && < 1.3' 'directory>=1.1'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag legacy-encoding legacy-encoding) \
-		$(cabal_flag libiconv libiconv) \
-		$(cabal_flag terminfo terminfo)
-}
diff --git a/dev-haskell/haskeline/metadata.xml b/dev-haskell/haskeline/metadata.xml
deleted file mode 100644
index f7c660f2d70e..000000000000
--- a/dev-haskell/haskeline/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haskeline provides a user interface for line input in command-line
-		programs.  This library is similar in purpose to readline, but since
-		it is written in Haskell it is (hopefully) more easily used in other
-		Haskell programs.
-		
-		Haskeline runs both on POSIX-compatible systems and on Windows.
-	</longdescription>
-	<use>
-		<flag name="terminfo">Use the terminfo package for POSIX consoles.</flag>
-		<flag name="libiconv">Explicitly link against the libiconv library.</flag>
-		<flag name="legacy-encoding">Use legacy iconv encoding for POSIX. This is only intended for testing.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">judah/haskeline</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/haskell-lexer-1.0-r1 b/dev-haskell/haskell-lexer-1.0-r1
new file mode 100644
index 000000000000..b9a807a56d03
--- /dev/null
+++ b/dev-haskell/haskell-lexer-1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A fully compliant Haskell 98 lexer
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/haskell-lexer
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/1.0
+SRC_URI=mirror://hackage/packages/archive/haskell-lexer/1.0/haskell-lexer-1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a0f3dea5592e351fff8c6f0e974e95c9
diff --git a/dev-haskell/haskell-lexer-1.0.1 b/dev-haskell/haskell-lexer-1.0.1
new file mode 100644
index 000000000000..5e01b8ffce45
--- /dev/null
+++ b/dev-haskell/haskell-lexer-1.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= dev-haskell/cabal doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A fully compliant Haskell 98 lexer
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/haskell-lexer
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.1
+SRC_URI=mirror://hackage/packages/archive/haskell-lexer/1.0.1/haskell-lexer-1.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3c46d3ba1af0efa390dd7330151f965f
diff --git a/dev-haskell/haskell-lexer/Manifest b/dev-haskell/haskell-lexer/Manifest
deleted file mode 100644
index 530503b5fbc8..000000000000
--- a/dev-haskell/haskell-lexer/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST haskell-lexer-1.0.1.tar.gz 12380 BLAKE2B 807228188c28ea08cee15bff092bd7f9fd3ec21deaf5701f84ac0c17f33936e37be5294b41459d69bc70b6364240f615c7c13e5da4950da3016e48765f3f0ff3 SHA512 591aa5a1ffcd984127cd730a0ebc01129fa0a6486ca16b03c9462e2123f1ce4d10063b7bb3debc6d2a6b8ba51692b0e34d694adeca9dad47707ecbabacfb4740
-DIST haskell-lexer-1.0.tar.gz 12455 BLAKE2B adb8f62934e3ac70361ed7a1b3f5def75c40f4582e08b505d161d163d88b0e982e53a76a47638d68111e6383aede1b05ba5a83fdf4271ea118d0d7119dbaf586 SHA512 30cfd69a6c102d8baa3e14a0497e00feb6cb6fb93777ec45b8ad3ff39bd1942ecbb8653f72181a5a00b60dbd22c5fc33061869ad86063328a44ef1893dc1f827
-EBUILD haskell-lexer-1.0-r1.ebuild 550 BLAKE2B d7557c3e956968d89bbba685d791a6fba08564184af35131066f990a860897dca722d9ceee8cdc0eef362e59553fc29f383af55ebb3fc1f37383194183287365 SHA512 1598b99409a84676d979dfee24a7ca438af872127f42fe2de488fd9c9ed33ba7e7efa8d92a3577c9b7a07cbfb82a2d6014914467ed7da64e52700e9beab053df
-EBUILD haskell-lexer-1.0.1.ebuild 546 BLAKE2B 308f4873db0baa86de7a2b8333bab780ed2bf7d4f5418d03552e6c03c2343b806f968edaa169ca86514aec5ac2cefd874e0c5fc1bce14f364f60dad53f56d534 SHA512 929723293b53731ab40e20685e5461088cdd9a8778aff7fc09fba855565947b24906c2d0a72ada33ccccaf58a4a2171c445ffe8d5ef7a883d8dc36328e819957
-MISC metadata.xml 326 BLAKE2B 0622a30d9c3f0abf6c292bab23595e135f254994def278d9253aca27bbfaeb8b26e2fdb5bf5bdfbeca4e06dd5e746bf45a8ead7345fea1e44d71575bfa0536a1 SHA512 b37ef7ed33ca35fb56e2662d3a7c7023ea480891f232261e1bccfbf3c1f6c4f2791d815d618b2736fc95a00cf4f052b3d7983d442868fe31e92b7bdb453119c6
diff --git a/dev-haskell/haskell-lexer/haskell-lexer-1.0-r1.ebuild b/dev-haskell/haskell-lexer/haskell-lexer-1.0-r1.ebuild
deleted file mode 100644
index cac3d8b9b055..000000000000
--- a/dev-haskell/haskell-lexer/haskell-lexer-1.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A fully compliant Haskell 98 lexer"
-HOMEPAGE="http://hackage.haskell.org/package/haskell-lexer"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-0"
diff --git a/dev-haskell/haskell-lexer/haskell-lexer-1.0.1.ebuild b/dev-haskell/haskell-lexer/haskell-lexer-1.0.1.ebuild
deleted file mode 100644
index 7f312d642a11..000000000000
--- a/dev-haskell/haskell-lexer/haskell-lexer-1.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A fully compliant Haskell 98 lexer"
-HOMEPAGE="http://hackage.haskell.org/package/haskell-lexer"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/cabal
-"
diff --git a/dev-haskell/haskell-lexer/metadata.xml b/dev-haskell/haskell-lexer/metadata.xml
deleted file mode 100644
index 3c9993d59f15..000000000000
--- a/dev-haskell/haskell-lexer/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A fully compliant Haskell 98 lexer.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/haskell-platform-2012.4.0.0 b/dev-haskell/haskell-platform-2012.4.0.0
new file mode 100644
index 000000000000..84789d108fce
--- /dev/null
+++ b/dev-haskell/haskell-platform-2012.4.0.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst
+DEPEND=>=dev-haskell/async-2.0.1.3:=[profile?] >=dev-haskell/cgi-3001.1.7.4:=[profile?] >=dev-haskell/fgl-5.4.2.4:=[profile?] >=dev-haskell/haskell-src-1.0.1.5:=[profile?] >=dev-haskell/html-1.0.1.2:=[profile?] >=dev-haskell/http-4000.2.5:=[profile?] >=dev-haskell/hunit-1.2.5.1:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/network-2.3.1.0:=[profile?] >=dev-haskell/parallel-3.2.0.3:=[profile?] >=dev-haskell/parsec-3.1.3:=[profile?] >=dev-haskell/primitive-0.5.0.1:=[profile?] >=dev-haskell/quickcheck-2.5.1.1:=[profile?] >=dev-haskell/random-1.0.1.1:=[profile?] >=dev-haskell/regex-base-0.93.2:=[profile?] >=dev-haskell/regex-compat-0.95.1:=[profile?] >=dev-haskell/regex-posix-0.95.2:=[profile?] >=dev-haskell/split-0.2.1.1:=[profile?] >=dev-haskell/stm-2.4:=[profile?] >=dev-haskell/syb-0.3.7:=[profile?] >=dev-haskell/text-0.11.2.3:=[profile?] >=dev-haskell/transformers-0.3.0.0:=[profile?] >=dev-haskell/vector-0.10.0.1:=[profile?] >=dev-haskell/xhtml-3000.2.1:=[profile?] >=dev-haskell/zlib-0.5.4.0:=[profile?] X? ( >=dev-haskell/glut-2.1.2.1:=[profile?] >=dev-haskell/opengl-2.2.3.1:=[profile?] ) >=dev-lang/ghc-7.4.2:= >=dev-haskell/alex-3.0.2 >=dev-haskell/cabal-1.14.0 >=dev-haskell/happy-1.18.10 >=dev-haskell/cabal-install-0.14.0 >=dev-haskell/hscolour-1.19 >=dev-haskell/haddock-2.10.0
+DESCRIPTION=The Haskell Platform
+EAPI=5
+HOMEPAGE=https://www.haskell.org/platform/
+IUSE=profile X
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/async-2.0.1.3:=[profile?] >=dev-haskell/cgi-3001.1.7.4:=[profile?] >=dev-haskell/fgl-5.4.2.4:=[profile?] >=dev-haskell/haskell-src-1.0.1.5:=[profile?] >=dev-haskell/html-1.0.1.2:=[profile?] >=dev-haskell/http-4000.2.5:=[profile?] >=dev-haskell/hunit-1.2.5.1:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/network-2.3.1.0:=[profile?] >=dev-haskell/parallel-3.2.0.3:=[profile?] >=dev-haskell/parsec-3.1.3:=[profile?] >=dev-haskell/primitive-0.5.0.1:=[profile?] >=dev-haskell/quickcheck-2.5.1.1:=[profile?] >=dev-haskell/random-1.0.1.1:=[profile?] >=dev-haskell/regex-base-0.93.2:=[profile?] >=dev-haskell/regex-compat-0.95.1:=[profile?] >=dev-haskell/regex-posix-0.95.2:=[profile?] >=dev-haskell/split-0.2.1.1:=[profile?] >=dev-haskell/stm-2.4:=[profile?] >=dev-haskell/syb-0.3.7:=[profile?] >=dev-haskell/text-0.11.2.3:=[profile?] >=dev-haskell/transformers-0.3.0.0:=[profile?] >=dev-haskell/vector-0.10.0.1:=[profile?] >=dev-haskell/xhtml-3000.2.1:=[profile?] >=dev-haskell/zlib-0.5.4.0:=[profile?] X? ( >=dev-haskell/glut-2.1.2.1:=[profile?] >=dev-haskell/opengl-2.2.3.1:=[profile?] ) >=dev-lang/ghc-7.4.2:= >=dev-haskell/alex-3.0.2 >=dev-haskell/cabal-1.14.0 >=dev-haskell/happy-1.18.10 >=dev-haskell/cabal-install-0.14.0 >=dev-haskell/hscolour-1.19 >=dev-haskell/haddock-2.10.0
+SLOT=0/2012.4.0.0
+_md5_=c948cb313f81710f91f2689e47693f06
diff --git a/dev-haskell/haskell-platform-2013.2.0.0-r2 b/dev-haskell/haskell-platform-2013.2.0.0-r2
new file mode 100644
index 000000000000..b2e092af664a
--- /dev/null
+++ b/dev-haskell/haskell-platform-2013.2.0.0-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst
+DEPEND=>=dev-haskell/async-2.0.1.4:=[profile?] >=dev-haskell/attoparsec-0.10.4.0:=[profile?] >=dev-haskell/case-insensitive-1.0.0.1:=[profile?] >=dev-haskell/cgi-3001.1.7.5:=[profile?] >=dev-haskell/fgl-5.4.2.4:=[profile?] >=dev-haskell/hashable-1.1.2.5:=[profile?] >=dev-haskell/haskell-src-1.0.1.5:=[profile?] >=dev-haskell/html-1.0.1.2:=[profile?] >=dev-haskell/http-4000.2.8:=[profile?] >=dev-haskell/hunit-1.2.5.2:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/network-2.4.1.2:=[profile?] >=dev-haskell/parallel-3.2.0.3:=[profile?] >=dev-haskell/parsec-3.1.3:=[profile?] >=dev-haskell/primitive-0.5.0.1:=[profile?] >=dev-haskell/quickcheck-2.6:2=[profile?] >=dev-haskell/random-1.0.1.1:=[profile?] >=dev-haskell/regex-base-0.93.2:=[profile?] >=dev-haskell/regex-compat-0.95.1:=[profile?] >=dev-haskell/regex-posix-0.95.2:=[profile?] >=dev-haskell/split-0.2.2:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/syb-0.4.0:=[profile?] >=dev-haskell/text-0.11.3.1:=[profile?] >=dev-haskell/transformers-0.3.0.0:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] >=dev-haskell/vector-0.10.0.1:=[profile?] >=dev-haskell/xhtml-3000.2.1:=[profile?] >=dev-haskell/zlib-0.5.4.1:=[profile?] X? ( >=dev-haskell/gluraw-1.3.0.0:=[profile?] >=dev-haskell/glut-2.4.0.0:=[profile?] >=dev-haskell/opengl-2.8.0.0:=[profile?] >=dev-haskell/openglraw-1.3.0.0:=[profile?] ) >=dev-lang/ghc-7.6.2:= >=dev-haskell/alex-3.0.5 >=dev-haskell/cabal-1.16.0.3 >=dev-haskell/cabal-install-1.16.0.3 >=dev-haskell/happy-1.18.10 >=dev-haskell/hscolour-1.19 doc? ( >=dev-haskell/haddock-2.13.2 )
+DESCRIPTION=The Haskell Platform
+EAPI=5
+HOMEPAGE=https://www.haskell.org/platform/
+IUSE=+doc profile +X
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/async-2.0.1.4:=[profile?] >=dev-haskell/attoparsec-0.10.4.0:=[profile?] >=dev-haskell/case-insensitive-1.0.0.1:=[profile?] >=dev-haskell/cgi-3001.1.7.5:=[profile?] >=dev-haskell/fgl-5.4.2.4:=[profile?] >=dev-haskell/hashable-1.1.2.5:=[profile?] >=dev-haskell/haskell-src-1.0.1.5:=[profile?] >=dev-haskell/html-1.0.1.2:=[profile?] >=dev-haskell/http-4000.2.8:=[profile?] >=dev-haskell/hunit-1.2.5.2:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/network-2.4.1.2:=[profile?] >=dev-haskell/parallel-3.2.0.3:=[profile?] >=dev-haskell/parsec-3.1.3:=[profile?] >=dev-haskell/primitive-0.5.0.1:=[profile?] >=dev-haskell/quickcheck-2.6:2=[profile?] >=dev-haskell/random-1.0.1.1:=[profile?] >=dev-haskell/regex-base-0.93.2:=[profile?] >=dev-haskell/regex-compat-0.95.1:=[profile?] >=dev-haskell/regex-posix-0.95.2:=[profile?] >=dev-haskell/split-0.2.2:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/syb-0.4.0:=[profile?] >=dev-haskell/text-0.11.3.1:=[profile?] >=dev-haskell/transformers-0.3.0.0:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] >=dev-haskell/vector-0.10.0.1:=[profile?] >=dev-haskell/xhtml-3000.2.1:=[profile?] >=dev-haskell/zlib-0.5.4.1:=[profile?] X? ( >=dev-haskell/gluraw-1.3.0.0:=[profile?] >=dev-haskell/glut-2.4.0.0:=[profile?] >=dev-haskell/opengl-2.8.0.0:=[profile?] >=dev-haskell/openglraw-1.3.0.0:=[profile?] ) >=dev-lang/ghc-7.6.2:= >=dev-haskell/alex-3.0.5 >=dev-haskell/cabal-1.16.0.3 >=dev-haskell/cabal-install-1.16.0.3 >=dev-haskell/happy-1.18.10 >=dev-haskell/hscolour-1.19 doc? ( >=dev-haskell/haddock-2.13.2 )
+SLOT=0/2013.2.0.0
+_md5_=5c8263546db776d2b6f1cf4aeda4c3d3
diff --git a/dev-haskell/haskell-platform-2014.2.0.0-r1 b/dev-haskell/haskell-platform-2014.2.0.0-r1
new file mode 100644
index 000000000000..9946bf849cee
--- /dev/null
+++ b/dev-haskell/haskell-platform-2014.2.0.0-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst
+DEPEND=>=dev-haskell/cabal-1.18.1.3 >=dev-haskell/xhtml-3000.2.1 >=dev-haskell/async-2.0.1.5 >=dev-haskell/attoparsec-0.10.4.0:=[profile?] >=dev-haskell/case-insensitive-1.1.0.3:=[profile?] >=dev-haskell/fgl-5.5.0.1:=[profile?] >=dev-haskell/hashable-1.2.2.0:=[profile?] >=dev-haskell/haskell-src-1.0.1.6:=[profile?] >=dev-haskell/html-1.0.1.2:=[profile?] >=dev-haskell/http-4000.2.10:=[profile?] >=dev-haskell/hunit-1.2.5.2:=[profile?] >=dev-haskell/mtl-2.1.3.1:=[profile?] >=dev-haskell/network-2.4.2.3:=[profile?] >=dev-haskell/parallel-3.2.0.4:=[profile?] >=dev-haskell/parsec-3.1.5:=[profile?] >=dev-haskell/primitive-0.5.2.1:=[profile?] >=dev-haskell/quickcheck-2.6:2=[profile?] >=dev-haskell/random-1.0.1.1:=[profile?] >=dev-haskell/regex-base-0.93.2:=[profile?] >=dev-haskell/regex-compat-0.95.1:=[profile?] >=dev-haskell/regex-posix-0.95.2:=[profile?] >=dev-haskell/split-0.2.2:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/syb-0.4.1:=[profile?] >=dev-haskell/text-1.1.0.0:=[profile?] >=dev-haskell/transformers-0.3.0.0:=[profile?] >=dev-haskell/unordered-containers-0.2.4.0:=[profile?] >=dev-haskell/vector-0.10.9.1:=[profile?] >=dev-haskell/xhtml-3000.2.1:=[profile?] >=dev-haskell/zlib-0.5.4.1:=[profile?] X? ( >=dev-haskell/gluraw-1.4.0.1:=[profile?] >=dev-haskell/glut-2.5.1.1:=[profile?] >=dev-haskell/opengl-2.9.2.0:=[profile?] >=dev-haskell/openglraw-1.5.0.0:=[profile?] ) >=dev-lang/ghc-7.8.3:= >=dev-haskell/alex-3.1.3 >=dev-haskell/cabal-install-1.18.0.5 >=dev-haskell/happy-1.19.4 >=dev-haskell/hscolour-1.20.3 doc? ( >=dev-haskell/haddock-2.14.2 )
+DESCRIPTION=The Haskell Platform
+EAPI=5
+HOMEPAGE=https://www.haskell.org/platform/
+IUSE=+doc profile +X
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cabal-1.18.1.3 >=dev-haskell/xhtml-3000.2.1 >=dev-haskell/async-2.0.1.5 >=dev-haskell/attoparsec-0.10.4.0:=[profile?] >=dev-haskell/case-insensitive-1.1.0.3:=[profile?] >=dev-haskell/fgl-5.5.0.1:=[profile?] >=dev-haskell/hashable-1.2.2.0:=[profile?] >=dev-haskell/haskell-src-1.0.1.6:=[profile?] >=dev-haskell/html-1.0.1.2:=[profile?] >=dev-haskell/http-4000.2.10:=[profile?] >=dev-haskell/hunit-1.2.5.2:=[profile?] >=dev-haskell/mtl-2.1.3.1:=[profile?] >=dev-haskell/network-2.4.2.3:=[profile?] >=dev-haskell/parallel-3.2.0.4:=[profile?] >=dev-haskell/parsec-3.1.5:=[profile?] >=dev-haskell/primitive-0.5.2.1:=[profile?] >=dev-haskell/quickcheck-2.6:2=[profile?] >=dev-haskell/random-1.0.1.1:=[profile?] >=dev-haskell/regex-base-0.93.2:=[profile?] >=dev-haskell/regex-compat-0.95.1:=[profile?] >=dev-haskell/regex-posix-0.95.2:=[profile?] >=dev-haskell/split-0.2.2:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/syb-0.4.1:=[profile?] >=dev-haskell/text-1.1.0.0:=[profile?] >=dev-haskell/transformers-0.3.0.0:=[profile?] >=dev-haskell/unordered-containers-0.2.4.0:=[profile?] >=dev-haskell/vector-0.10.9.1:=[profile?] >=dev-haskell/xhtml-3000.2.1:=[profile?] >=dev-haskell/zlib-0.5.4.1:=[profile?] X? ( >=dev-haskell/gluraw-1.4.0.1:=[profile?] >=dev-haskell/glut-2.5.1.1:=[profile?] >=dev-haskell/opengl-2.9.2.0:=[profile?] >=dev-haskell/openglraw-1.5.0.0:=[profile?] ) >=dev-lang/ghc-7.8.3:= >=dev-haskell/alex-3.1.3 >=dev-haskell/cabal-install-1.18.0.5 >=dev-haskell/happy-1.19.4 >=dev-haskell/hscolour-1.20.3 doc? ( >=dev-haskell/haddock-2.14.2 )
+SLOT=0/2014.2.0.0
+_md5_=d157a3d262e2497fe65187490049a11f
diff --git a/dev-haskell/haskell-platform/Manifest b/dev-haskell/haskell-platform/Manifest
deleted file mode 100644
index a12c0be6234a..000000000000
--- a/dev-haskell/haskell-platform/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-EBUILD haskell-platform-2012.4.0.0.ebuild 1877 BLAKE2B 0f1941d7691c65c02ab98c99e0f7739a7911b3400b17cdf0faed16882ac66bf681762c95f414926e53696b8375e7f5766e17d9fd761694176f9ed782013b2326 SHA512 d9dcebb520df43fc0ab8aeb1bc09597913b803f5f2c8ce44661f28e75dc0fa81dffccfe030e5229e38fc419fd6ab2ffb047d1dc6ac7ebbdebf1da4e213634a72
-EBUILD haskell-platform-2013.2.0.0-r2.ebuild 2143 BLAKE2B 40768e7768abcfe108165a141c624adbb48085ecd2d5f36b79345e610b0495d830c0678d192187fdbe3db5c84dfbffaef0d53a6c0d828c65568b372bbf02d3b6 SHA512 11f9bb8b2b072883ecbd2a1b663dd61fdac02705c95d1e97a4a25bd764aad97b3c86950ffd3e29fe83d76e14f7d2c9bbda9f98c9154fed7194536c5450bbdd9e
-EBUILD haskell-platform-2014.2.0.0-r1.ebuild 2129 BLAKE2B 95da2299609e5b6e9bec0e9637b532215228367985ab8c7454b878bb28fe9c12af8d8233ec087c26bc956e00fee5e998eef4f0976d4b5392f49d63348ed29951 SHA512 0ed6c2b466803acfe7313f5fd6931ac47f8752907ac999fe66e6400fa95524e362cd25ee786aa115f6a571997ad60c9c9317822b9bd6c3111000b04dcdd10731
-MISC metadata.xml 712 BLAKE2B ce35d5fa9cc59091ade2ae273780e09c16b1a7aed39ea8eba01e7164e0776903635cef566fa5801d826e14c11169229d23dc25c3afd8b19fb46c0289b61e79e5 SHA512 44c4ad8c6ffde41e1c52dd9b477ae002579b5fd2878a68a23826ff56aa856d8e0f5b5d7571de69dd6a5bbb530b59d84237313e575d853b6b054fbb2690d6e227
diff --git a/dev-haskell/haskell-platform/haskell-platform-2012.4.0.0.ebuild b/dev-haskell/haskell-platform/haskell-platform-2012.4.0.0.ebuild
deleted file mode 100644
index b75e2a4eecac..000000000000
--- a/dev-haskell/haskell-platform/haskell-platform-2012.4.0.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The Haskell Platform"
-HOMEPAGE="https://www.haskell.org/platform/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="profile X"
-
-RDEPEND=">=dev-haskell/async-2.0.1.3:=[profile?]
-		>=dev-haskell/cgi-3001.1.7.4:=[profile?]
-		>=dev-haskell/fgl-5.4.2.4:=[profile?]
-		>=dev-haskell/haskell-src-1.0.1.5:=[profile?]
-		>=dev-haskell/html-1.0.1.2:=[profile?]
-		>=dev-haskell/http-4000.2.5:=[profile?]
-		>=dev-haskell/hunit-1.2.5.1:=[profile?]
-		>=dev-haskell/mtl-2.1.2:=[profile?]
-		>=dev-haskell/network-2.3.1.0:=[profile?]
-		>=dev-haskell/parallel-3.2.0.3:=[profile?]
-		>=dev-haskell/parsec-3.1.3:=[profile?]
-		>=dev-haskell/primitive-0.5.0.1:=[profile?]
-		>=dev-haskell/quickcheck-2.5.1.1:=[profile?]
-		>=dev-haskell/random-1.0.1.1:=[profile?]
-		>=dev-haskell/regex-base-0.93.2:=[profile?]
-		>=dev-haskell/regex-compat-0.95.1:=[profile?]
-		>=dev-haskell/regex-posix-0.95.2:=[profile?]
-		>=dev-haskell/split-0.2.1.1:=[profile?]
-		>=dev-haskell/stm-2.4:=[profile?]
-		>=dev-haskell/syb-0.3.7:=[profile?]
-		>=dev-haskell/text-0.11.2.3:=[profile?]
-		>=dev-haskell/transformers-0.3.0.0:=[profile?]
-		>=dev-haskell/vector-0.10.0.1:=[profile?]
-		>=dev-haskell/xhtml-3000.2.1:=[profile?]
-		>=dev-haskell/zlib-0.5.4.0:=[profile?]
-		X? (
-			>=dev-haskell/glut-2.1.2.1:=[profile?]
-			>=dev-haskell/opengl-2.2.3.1:=[profile?]
-		)
-		>=dev-lang/ghc-7.4.2:=
-
-		>=dev-haskell/alex-3.0.2
-		>=dev-haskell/cabal-1.14.0
-		>=dev-haskell/happy-1.18.10
-		>=dev-haskell/cabal-install-0.14.0
-		>=dev-haskell/hscolour-1.19
-		>=dev-haskell/haddock-2.10.0"
-
-DEPEND="${RDEPEND}"
-
-pkg_postinst() {
-	if ! use X; then
-		elog "The haskell platform includes the 3D graphics libraries opengl and glut."
-		elog "To install opengl and glut requires the X use flag."
-	fi
-}
diff --git a/dev-haskell/haskell-platform/haskell-platform-2013.2.0.0-r2.ebuild b/dev-haskell/haskell-platform/haskell-platform-2013.2.0.0-r2.ebuild
deleted file mode 100644
index c63536972351..000000000000
--- a/dev-haskell/haskell-platform/haskell-platform-2013.2.0.0-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The Haskell Platform"
-HOMEPAGE="https://www.haskell.org/platform/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+doc profile +X"
-
-RDEPEND=">=dev-haskell/async-2.0.1.4:=[profile?]
-	>=dev-haskell/attoparsec-0.10.4.0:=[profile?]
-	>=dev-haskell/case-insensitive-1.0.0.1:=[profile?]
-	>=dev-haskell/cgi-3001.1.7.5:=[profile?]
-	>=dev-haskell/fgl-5.4.2.4:=[profile?]
-	>=dev-haskell/hashable-1.1.2.5:=[profile?]
-	>=dev-haskell/haskell-src-1.0.1.5:=[profile?]
-	>=dev-haskell/html-1.0.1.2:=[profile?]
-	>=dev-haskell/http-4000.2.8:=[profile?]
-	>=dev-haskell/hunit-1.2.5.2:=[profile?]
-	>=dev-haskell/mtl-2.1.2:=[profile?]
-	>=dev-haskell/network-2.4.1.2:=[profile?]
-	>=dev-haskell/parallel-3.2.0.3:=[profile?]
-	>=dev-haskell/parsec-3.1.3:=[profile?]
-	>=dev-haskell/primitive-0.5.0.1:=[profile?]
-	>=dev-haskell/quickcheck-2.6:2=[profile?]
-	>=dev-haskell/random-1.0.1.1:=[profile?]
-	>=dev-haskell/regex-base-0.93.2:=[profile?]
-	>=dev-haskell/regex-compat-0.95.1:=[profile?]
-	>=dev-haskell/regex-posix-0.95.2:=[profile?]
-	>=dev-haskell/split-0.2.2:=[profile?]
-	>=dev-haskell/stm-2.4.2:=[profile?]
-	>=dev-haskell/syb-0.4.0:=[profile?]
-	>=dev-haskell/text-0.11.3.1:=[profile?]
-	>=dev-haskell/transformers-0.3.0.0:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.3.0:=[profile?]
-	>=dev-haskell/vector-0.10.0.1:=[profile?]
-	>=dev-haskell/xhtml-3000.2.1:=[profile?]
-	>=dev-haskell/zlib-0.5.4.1:=[profile?]
-	X? (
-		>=dev-haskell/gluraw-1.3.0.0:=[profile?]
-		>=dev-haskell/glut-2.4.0.0:=[profile?]
-		>=dev-haskell/opengl-2.8.0.0:=[profile?]
-		>=dev-haskell/openglraw-1.3.0.0:=[profile?]
-	)
-	>=dev-lang/ghc-7.6.2:=
-	>=dev-haskell/alex-3.0.5
-	>=dev-haskell/cabal-1.16.0.3
-	>=dev-haskell/cabal-install-1.16.0.3
-	>=dev-haskell/happy-1.18.10
-	>=dev-haskell/hscolour-1.19
-	doc? ( >=dev-haskell/haddock-2.13.2 )
-"
-DEPEND="${RDEPEND}"
-
-pkg_postinst() {
-	if ! use X; then
-		elog "The haskell platform includes the 3D graphics libraries opengl and glut."
-		elog "To install opengl and glut requires the X use flag."
-	fi
-}
diff --git a/dev-haskell/haskell-platform/haskell-platform-2014.2.0.0-r1.ebuild b/dev-haskell/haskell-platform/haskell-platform-2014.2.0.0-r1.ebuild
deleted file mode 100644
index 6f3f9525efa2..000000000000
--- a/dev-haskell/haskell-platform/haskell-platform-2014.2.0.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The Haskell Platform"
-HOMEPAGE="https://www.haskell.org/platform/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+doc profile +X"
-
-RDEPEND="
-	>=dev-haskell/cabal-1.18.1.3
-	>=dev-haskell/xhtml-3000.2.1
-
-	>=dev-haskell/async-2.0.1.5
-	>=dev-haskell/attoparsec-0.10.4.0:=[profile?]
-	>=dev-haskell/case-insensitive-1.1.0.3:=[profile?]
-	>=dev-haskell/fgl-5.5.0.1:=[profile?]
-	>=dev-haskell/hashable-1.2.2.0:=[profile?]
-	>=dev-haskell/haskell-src-1.0.1.6:=[profile?]
-	>=dev-haskell/html-1.0.1.2:=[profile?]
-	>=dev-haskell/http-4000.2.10:=[profile?]
-	>=dev-haskell/hunit-1.2.5.2:=[profile?]
-	>=dev-haskell/mtl-2.1.3.1:=[profile?]
-	>=dev-haskell/network-2.4.2.3:=[profile?]
-	>=dev-haskell/parallel-3.2.0.4:=[profile?]
-	>=dev-haskell/parsec-3.1.5:=[profile?]
-	>=dev-haskell/primitive-0.5.2.1:=[profile?]
-	>=dev-haskell/quickcheck-2.6:2=[profile?]
-	>=dev-haskell/random-1.0.1.1:=[profile?]
-	>=dev-haskell/regex-base-0.93.2:=[profile?]
-	>=dev-haskell/regex-compat-0.95.1:=[profile?]
-	>=dev-haskell/regex-posix-0.95.2:=[profile?]
-	>=dev-haskell/split-0.2.2:=[profile?]
-	>=dev-haskell/stm-2.4.2:=[profile?]
-	>=dev-haskell/syb-0.4.1:=[profile?]
-	>=dev-haskell/text-1.1.0.0:=[profile?]
-	>=dev-haskell/transformers-0.3.0.0:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.4.0:=[profile?]
-	>=dev-haskell/vector-0.10.9.1:=[profile?]
-	>=dev-haskell/xhtml-3000.2.1:=[profile?]
-	>=dev-haskell/zlib-0.5.4.1:=[profile?]
-	X? (
-		>=dev-haskell/gluraw-1.4.0.1:=[profile?]
-		>=dev-haskell/glut-2.5.1.1:=[profile?]
-		>=dev-haskell/opengl-2.9.2.0:=[profile?]
-		>=dev-haskell/openglraw-1.5.0.0:=[profile?]
-	)
-
-	>=dev-lang/ghc-7.8.3:=
-
-	>=dev-haskell/alex-3.1.3
-	>=dev-haskell/cabal-install-1.18.0.5
-	>=dev-haskell/happy-1.19.4
-	>=dev-haskell/hscolour-1.20.3
-	doc? ( >=dev-haskell/haddock-2.14.2 )
-"
-DEPEND="${RDEPEND}"
-
-pkg_postinst() {
-	if ! use X; then
-		elog "The haskell platform includes the 3D graphics libraries opengl and glut."
-		elog "To install opengl and glut requires the X use flag."
-	fi
-}
diff --git a/dev-haskell/haskell-platform/metadata.xml b/dev-haskell/haskell-platform/metadata.xml
deleted file mode 100644
index 991c27c26f8e..000000000000
--- a/dev-haskell/haskell-platform/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The Haskell Platform (HP) is the blessed set of libraries and tools on
-		which to build further Haskell libraries and applications. It is
-		intended to provide a comprehensive, stable, and quality tested base for
-		Haskell projects to work from.
-		
-		This version specifies the following additional developer tools be
-		installed, for a system to be in full compliance:
-		
-		* cabal-install
-		* alex
-		* happy
-		* haddock
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/haskell-src-1.0.1.6 b/dev-haskell/haskell-src-1.0.1.6
new file mode 100644
index 000000000000..b0ddce29fe38
--- /dev/null
+++ b/dev-haskell/haskell-src-1.0.1.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c1dadc0806885f15bac0504cd49d1376
diff --git a/dev-haskell/haskell-src-1.0.2.0 b/dev-haskell/haskell-src-1.0.2.0
new file mode 100644
index 000000000000..7e170066e294
--- /dev/null
+++ b/dev-haskell/haskell-src-1.0.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 dev-haskell/happy doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bb058304f328897717d1516582aff2f1
diff --git a/dev-haskell/haskell-src-exts-1.13.5 b/dev-haskell/haskell-src-exts-1.13.5
new file mode 100644
index 000000000000..9ffe5bcd6693
--- /dev/null
+++ b/dev-haskell/haskell-src-exts-1.13.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/cpphs-1.3:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6 dev-haskell/happy doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer
+EAPI=5
+HOMEPAGE=http://code.haskell.org/haskell-src-exts
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cpphs-1.3:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.13.5
+SRC_URI=mirror://hackage/packages/archive/haskell-src-exts/1.13.5/haskell-src-exts-1.13.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=68ff0e9bf8a25fb7a8241269f2c7aacf
diff --git a/dev-haskell/haskell-src-exts-1.14.0 b/dev-haskell/haskell-src-exts-1.14.0
new file mode 100644
index 000000000000..c76581a2ded1
--- /dev/null
+++ b/dev-haskell/haskell-src-exts-1.14.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cpphs-1.3:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.10 dev-haskell/happy test? ( >=dev-haskell/smallcheck-1.0 dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-smallcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer
+EAPI=5
+HOMEPAGE=https://github.com/haskell-suite/haskell-src-exts
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cpphs-1.3:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.14.0
+SRC_URI=mirror://hackage/packages/archive/haskell-src-exts/1.14.0/haskell-src-exts-1.14.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=543e0c89c5ab6e741e22aff81b943771
diff --git a/dev-haskell/haskell-src-exts-1.15.0.1 b/dev-haskell/haskell-src-exts-1.15.0.1
new file mode 100644
index 000000000000..7f090c2d7514
--- /dev/null
+++ b/dev-haskell/haskell-src-exts-1.15.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cpphs-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 dev-haskell/happy test? ( dev-haskell/filemanip dev-haskell/mtl >=dev-haskell/smallcheck-1.0 dev-haskell/syb >=dev-haskell/tasty-0.3 dev-haskell/tasty-golden dev-haskell/tasty-smallcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer
+EAPI=5
+HOMEPAGE=https://github.com/haskell-suite/haskell-src-exts
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cpphs-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.15.0.1
+SRC_URI=mirror://hackage/packages/archive/haskell-src-exts/1.15.0.1/haskell-src-exts-1.15.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d029756aad861e6e3c9eadaae0e62afa
diff --git a/dev-haskell/haskell-src-exts-1.16.0.1 b/dev-haskell/haskell-src-exts-1.16.0.1
new file mode 100644
index 000000000000..0564d8f9a903
--- /dev/null
+++ b/dev-haskell/haskell-src-exts-1.16.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cpphs-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 dev-haskell/happy test? ( dev-haskell/mtl >=dev-haskell/smallcheck-1.0 dev-haskell/syb >=dev-haskell/tasty-0.3 >=dev-haskell/tasty-golden-2.2.2 dev-haskell/tasty-smallcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer
+EAPI=5
+HOMEPAGE=https://github.com/haskell-suite/haskell-src-exts
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cpphs-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.16.0.1
+SRC_URI=mirror://hackage/packages/archive/haskell-src-exts/1.16.0.1/haskell-src-exts-1.16.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=82d7f00a48051bb06f2990f352f114d2
diff --git a/dev-haskell/haskell-src-exts-1.17.1 b/dev-haskell/haskell-src-exts-1.17.1
new file mode 100644
index 000000000000..a9cda96fcd2a
--- /dev/null
+++ b/dev-haskell/haskell-src-exts-1.17.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/cpphs-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 dev-haskell/happy test? ( dev-haskell/mtl dev-haskell/pretty-show >=dev-haskell/smallcheck-1.0 dev-haskell/syb >=dev-haskell/tasty-0.3 >=dev-haskell/tasty-golden-2.2.2 dev-haskell/tasty-smallcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer
+EAPI=5
+HOMEPAGE=https://github.com/haskell-suite/haskell-src-exts
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cpphs-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/1.17.1
+SRC_URI=mirror://hackage/packages/archive/haskell-src-exts/1.17.1/haskell-src-exts-1.17.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ffc78ae5f3926a2e51b0d4b1d185c558
diff --git a/dev-haskell/haskell-src-exts/Manifest b/dev-haskell/haskell-src-exts/Manifest
deleted file mode 100644
index 2687119cb831..000000000000
--- a/dev-haskell/haskell-src-exts/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX haskell-src-exts-1.10.2-Setup.hs 377 BLAKE2B f7528d447151199f2c1ad59e654cc0be99fd5f848c3551219ef32aaaf8da3e1a229be96c03d555e371829921782e16976116fb9cee2bfbe6812ad868823dded3 SHA512 c75fb7a1a9c4b7040d496ea25d0bedff32a27efa46c8235e9f6acf46d51519f3043ed2df4707bf96c62d84fe17d6d6fa0af229d27f87acabb224c4a1181e9673
-DIST haskell-src-exts-1.13.5.tar.gz 291329 BLAKE2B d37ad708c0e55c5ef900a62910b05e2f9677d1d0eabb7a1844178fbf1c9e101a92a09a9a13c2902387e173c6adfd1ddf88f38d5ce820d0d5bcb9ff0a2622e70e SHA512 f7e7978a8417aaad08a88eccf22f0bf99e5586a5f28796c8525ef00fdcdf8bd17936ec93c552b61d723323a691775a41d7737f52ad16620f93bab57ac8064598
-DIST haskell-src-exts-1.14.0.tar.gz 291256 BLAKE2B e0ec5d12d8f5a0fb2fb0745fbf2db1c61133f8c2064419c97fb1a48a8761f6ef6f088135aaa6e856e1a8d4e720dbe3196ed4b051d3649c08e754e9b15f0843b0 SHA512 7d1dc90742ffb1cbde209fcadad05a8c6bc3a731267f92a201533c1d841a6aef144af501ea2e4076a99b0f50734d7823574f581411c4440657ac7f6eeb5880c2
-DIST haskell-src-exts-1.15.0.1.tar.gz 1605910 BLAKE2B 47672c636ff8da5ef38ddf83a895a454667e1c34723cb339d3f665e3a5acf678b4b9c3b1e8c2887a99a3922a14e3d310439113ead871d5869ed51b3ae9b44eec SHA512 d6fe854b2e7a13bb90815848517843ee67faad7e03d5abf6afc9e97252bcb9d915b51d94b757354a9e83b255f9b795e5c9fa2e3e962acd84772eaa9844d9b1d6
-DIST haskell-src-exts-1.16.0.1.tar.gz 1410081 BLAKE2B 6fea8732c6ea264040eb4fec73147463a530f42fcb201190b393aac2461085770853dd0f7615cbe2f2aaf34f75921180565bc72c98dacdc3190c39a08866943f SHA512 b74a824899cbf85a2bf58c7c14df33fac7e70bbb775b51d8a861172da88d1dc6db3644a6534c9076a9c5499023a347cdce7e24b3495045d11a905f31a51492d0
-DIST haskell-src-exts-1.17.1.tar.gz 2489624 BLAKE2B d98a54e9788fbc613d5843fb3886bdd44b20843978a71cdff5460390bc090504ce72191884f49ef35266c5167913ef1dbf53a19a25d235d12192dea1f3b01203 SHA512 e08bc31720640e595803ff33d454b717cd015cf8b70f0196f387e7ebaca4b3551aa41ce6c900370496a68e48e1a9c078235674f7050f6de42ffdfc9fce6544e2
-EBUILD haskell-src-exts-1.13.5.ebuild 1122 BLAKE2B ef19a1a078212bf8eb97d8ddd3596ec8a5694b73290c9eded9f693f22314169974330876e0eaf1cfca05dd77bf580a7232c814cb60122b1adb87898e02af1e9e SHA512 9cdc95567b13957d180ed24e27d7964ca42a921e6da20a8b1d600502683f3e27088d60ef8f8ec790845b77c8693df3b09dad91b70da9fa01af4a4379bcc4ce3b
-EBUILD haskell-src-exts-1.14.0.ebuild 812 BLAKE2B 4bf88fa34190853423041d87ab73b726c23c448b00bf70b3f4a12d289e08924b753bf5228a4e2a0e1f0e3cb3c10b13a9cccfdfb0223e2fb259251f22a97c495b SHA512 c9b5e47777fb32df84ad00b4df7fcdd8dc71b5b206be3a16a7234a25d63052594870213dc4de57e3e9360ac1d4da99edd5c53954fb714600c3ccca4f5f19d44d
-EBUILD haskell-src-exts-1.15.0.1.ebuild 961 BLAKE2B af57d5ec358d077dac768d3ed17f17f1fb9e668503e01a00e119ccf81c929f24e99b46773fc61b89f661887f0ad72edb14fb06abe97445d19b80392167e543f1 SHA512 ce5b9f0456ca191e40ddb7539b44d8e69d1c232153a2f78a905b5033bae1d369fd6ec6fc0e6718765291ce1ded9a9b2492baf228b04bd260fa138fe1be450283
-EBUILD haskell-src-exts-1.16.0.1.ebuild 945 BLAKE2B 2c40f5e1e44d7bf536180ce3f42a9738741543d5a545e06dbe671650a0d6b35640a4db2f781cd0d94532573a647ad1d7de5cb2c63c93dcdf33e56531bf340da2 SHA512 6e006a8c270ffa4d950d5705e972dbdc4ab46b2194f3ad7116889a57e8697c4c0de9efedd113e86104398661b9dbbfd65a2cfe5cb78dc4e018ec2d34d0762967
-EBUILD haskell-src-exts-1.17.1.ebuild 1094 BLAKE2B d9bcf660b0de2a1926cecd900da62b400f9711595565a9afeb069f96d0eb05effe2c6243841400a371b142a96c27c7d07f1e74bc2a9bd8025e86a6131b193183 SHA512 f156510fe19c93654a6384fbeb843bb92a2157720115aae9eeeb9750229ff4ddbf4b59780ae165d2bf464e78cf7952eaecb25638aaa2210d604e1ff2d5f3e9bd
-MISC metadata.xml 778 BLAKE2B 88754b796b4201cb9fd07d237a7c750dfa5f2a306e152bc8e0dedcf410bbbf0836d954e4522dc39790e18f83858844380d96f25be34f3133a042a234d6d50467 SHA512 ac9bfe683996bf5860b908657539f7cb79fcfb300cb6e852e18d1400fbca52e4d7320c525b15cd9a7924bb5be682d75bb5a5f4435012e49eaa66e1076fe73289
diff --git a/dev-haskell/haskell-src-exts/files/haskell-src-exts-1.10.2-Setup.hs b/dev-haskell/haskell-src-exts/files/haskell-src-exts-1.10.2-Setup.hs
deleted file mode 100644
index 63a6c22bf33c..000000000000
--- a/dev-haskell/haskell-src-exts/files/haskell-src-exts-1.10.2-Setup.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-import Distribution.Simple
-import System.Process (rawSystem)
-import System.Exit (ExitCode(..))
-import System.FilePath ((</>))
-main = defaultMainWithHooks $ simpleUserHooks { runTests = \args _ _ _ -> do
-    ExitSuccess <- rawSystem "runhaskell" ("-package-conf=dist/package.conf.inplace" : "Test/Runner.hs" : args)
-    return ()
-                                              }
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.13.5.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.13.5.ebuild
deleted file mode 100644
index c4e54e340d53..000000000000
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.13.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"
-HOMEPAGE="http://code.haskell.org/haskell-src-exts"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cpphs-1.3:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6
-		dev-haskell/happy"
-
-src_prepare() {
-	# test suite is broken, expects the package to be already installed.
-	# this new Setup.hs will use the package inplice for tests
-	cp "${FILESDIR}/haskell-src-exts-1.10.2-Setup.hs" "${S}/Setup.hs" \
-		|| die "Could not cp Setup.hs for tests"
-
-	# remove broken tests. they will fail if you expect them to pass, and pass
-	# if you expect them to fail...
-	rm "${S}/Test/examples/Unicode"{.hs,Syntax.hs} \
-		|| die "Could not rm broken tests"
-}
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.14.0.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.14.0.ebuild
deleted file mode 100644
index 5030dacc8da0..000000000000
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.14.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"
-HOMEPAGE="https://github.com/haskell-suite/haskell-src-exts"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cpphs-1.3:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10
-		dev-haskell/happy
-		test? ( >=dev-haskell/smallcheck-1.0
-			dev-haskell/tasty
-			dev-haskell/tasty-hunit
-			dev-haskell/tasty-smallcheck
-		)"
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.15.0.1.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.15.0.1.ebuild
deleted file mode 100644
index 45a9fc0347a6..000000000000
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.15.0.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-#hackport: flags: +base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"
-HOMEPAGE="https://github.com/haskell-suite/haskell-src-exts"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cpphs-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	dev-haskell/happy
-	test? ( dev-haskell/filemanip
-		dev-haskell/mtl
-		>=dev-haskell/smallcheck-1.0
-		dev-haskell/syb
-		>=dev-haskell/tasty-0.3
-		dev-haskell/tasty-golden
-		dev-haskell/tasty-smallcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=base4
-}
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild
deleted file mode 100644
index 3870a5317444..000000000000
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: +base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"
-HOMEPAGE="https://github.com/haskell-suite/haskell-src-exts"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cpphs-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	dev-haskell/happy
-	test? ( dev-haskell/mtl
-		>=dev-haskell/smallcheck-1.0
-		dev-haskell/syb
-		>=dev-haskell/tasty-0.3
-		>=dev-haskell/tasty-golden-2.2.2
-		dev-haskell/tasty-smallcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=base4
-}
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
deleted file mode 100644
index 1db2c906f294..000000000000
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"
-HOMEPAGE="https://github.com/haskell-suite/haskell-src-exts"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RESTRICT=test # very slow
-
-RDEPEND=">=dev-haskell/cpphs-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	dev-haskell/happy
-	test? ( dev-haskell/mtl
-		dev-haskell/pretty-show
-		>=dev-haskell/smallcheck-1.0
-		dev-haskell/syb
-		>=dev-haskell/tasty-0.3
-		>=dev-haskell/tasty-golden-2.2.2
-		dev-haskell/tasty-smallcheck )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'tasty-golden >= 2.2.2 && < 2.3' 'tasty-golden >= 2.2.2'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=base4
-}
diff --git a/dev-haskell/haskell-src-exts/metadata.xml b/dev-haskell/haskell-src-exts/metadata.xml
deleted file mode 100644
index 05f4bb9d8ad2..000000000000
--- a/dev-haskell/haskell-src-exts/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-    <name>Gentoo Haskell</name>
-  </maintainer>
-  <longdescription lang="en">
-Haskell-Source with eXtensions (HSX, haskell-src-exts) is an extension of the
-standard haskell-src package, and handles most common syntactic extensions to
-Haskell, including:
-
-  * Multi-parameter type classes with functional dependencies
-  * Empty data declarations
-  * GADTs
-  * Implicit parameters (ghc and hugs style)
-  * Template Haskell (broken for 6.4, needs redoing)
-</longdescription>
-  <upstream>
-    <remote-id type="github">haskell-suite/haskell-src-exts</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/haskell-src-meta-0.6.0.10 b/dev-haskell/haskell-src-meta-0.6.0.10
new file mode 100644
index 000000000000..b19bd87f1b95
--- /dev/null
+++ b/dev-haskell/haskell-src-meta-0.6.0.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.17:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?] >=dev-haskell/th-orphans-0.9.1:=[profile?] <dev-haskell/th-orphans-0.13:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parse source to template-haskell abstract syntax
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/haskell-src-meta
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.17:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?] >=dev-haskell/th-orphans-0.9.1:=[profile?] <dev-haskell/th-orphans-0.13:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.6.0.10
+SRC_URI=mirror://hackage/packages/archive/haskell-src-meta/0.6.0.10/haskell-src-meta-0.6.0.10.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0707705b3629eb2d78ccfb9119180f66
diff --git a/dev-haskell/haskell-src-meta-0.6.0.14-r1 b/dev-haskell/haskell-src-meta-0.6.0.14-r1
new file mode 100644
index 000000000000..412fc6b8180e
--- /dev/null
+++ b/dev-haskell/haskell-src-meta-0.6.0.14-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?] >=dev-haskell/th-orphans-0.9.1:=[profile?] <dev-haskell/th-orphans-0.14:=[profile?] >=dev-lang/ghc-7.8.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parse source to template-haskell abstract syntax
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/haskell-src-meta
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?] >=dev-haskell/th-orphans-0.9.1:=[profile?] <dev-haskell/th-orphans-0.14:=[profile?] >=dev-lang/ghc-7.8.1:=
+SLOT=0/0.6.0.14
+SRC_URI=mirror://hackage/packages/archive/haskell-src-meta/0.6.0.14/haskell-src-meta-0.6.0.14.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=467e988f143d3b0134f9abc00ea4dded
diff --git a/dev-haskell/haskell-src-meta-0.6.0.8-r1 b/dev-haskell/haskell-src-meta-0.6.0.8-r1
new file mode 100644
index 000000000000..7c0c27741ded
--- /dev/null
+++ b/dev-haskell/haskell-src-meta-0.6.0.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.17:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/th-orphans-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parse source to template-haskell abstract syntax
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/haskell-src-meta
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.17:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/th-orphans-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.6.0.8
+SRC_URI=mirror://hackage/packages/archive/haskell-src-meta/0.6.0.8/haskell-src-meta-0.6.0.8.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fd85a756c401a72a18b2e4cf6a327b8e
diff --git a/dev-haskell/haskell-src-meta/Manifest b/dev-haskell/haskell-src-meta/Manifest
deleted file mode 100644
index 8c9a40ca4772..000000000000
--- a/dev-haskell/haskell-src-meta/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX haskell-src-meta-0.6.0.8-ghc-7.10.patch 2741 BLAKE2B 7c776bbfe35f8674019b80eb8fe666e57f69d6e7f0b8ea94de1126487c7a890cd3d72d6119309404dce1fab062cba2842d5206f3812a64f4cdd3013732e722f3 SHA512 8acc57e9318068bf4f94c1fc4608badbe5058a833e609c3bbc7abeffd51380da87bf44e308ad38ec6e5481235db7bb11210f7dcb8c4dc1e579f4c2d3d0fd09b8
-DIST haskell-src-meta-0.6.0.10.tar.gz 19432 BLAKE2B 8984179d1964cf06f918175cb08efb444fd8cf7cdf52ac2617b399657dbcf5ba73841fc80fce0dddba1a2d4a21548d3bbbde74ffb49dcc259b4be0ec6c22c5d3 SHA512 efd6e06dc856c05b815a8a36f3411f3d5c171ad5cd84be75baaef1d7a784f3f32d81e9de175fb2ab2455ab6f3a80c2f743e4a277964816d6e8198bc4bf67ab4d
-DIST haskell-src-meta-0.6.0.14.tar.gz 20079 BLAKE2B 49d25b0061d46a0f55cc946944e29022998f1b3929df8632a3b74acbc6392054a695585aac5d2e166945ee4e513c1b049d5321c8047527cdfac42ebd23989a17 SHA512 d043ece8f28a47572f59cfc36a9d7b2c505a3d5c2ef24f0e90496c5d57b88791417234777e146a0e75c0fba10775ba41e627a00519c2e9718bf173d95e2a201f
-DIST haskell-src-meta-0.6.0.8.tar.gz 19449 BLAKE2B 0f8e21e01e26e2eddd8ebd0835b1f69e3dad3111cf7ff264c56a363f8b6f4bd7684ad3fc413c3d1584727d6ab914aa699792a98a092d91bfadae41018f73eca9 SHA512 590e66c837bd64db9bb8d09a698f52fb8b7c3ab07523c0e7fadcbb17bf33ee0fa523ec34012db7622681b4055164288df60083992ddbfb7553087373efbdb751
-EBUILD haskell-src-meta-0.6.0.10.ebuild 820 BLAKE2B f6afb3de5c70b4a1f4c59c63eb4480e27330c388d1631a9671b880fc3ce9b5801542b799250dd9b90667d8fc166561af73ff4ce95461c2fd1a8c1841fae94032 SHA512 796d30fcc6051868a0fc00520c2fd291ebbafa45f53445a1989f42fffb4e870d92ada1c173ddb5d90105394806efc85629b87ef3141445422ea1027f1643bf11
-EBUILD haskell-src-meta-0.6.0.14-r1.ebuild 816 BLAKE2B 1bffa954116f3a14c1a14c276987c6813344262840a255715537029870678810463baf64ca8226a792e1aece9df29364e479810a13276668dc062c76dc34ad22 SHA512 97f4a03d9fec091432a3cef50fdc3475325a1a866f3f261258383552ca7240310c71347761dc29c41ceb1acb04b062748a074da8ad2bf443526261c59f28636e
-EBUILD haskell-src-meta-0.6.0.8-r1.ebuild 933 BLAKE2B 93f9b720c576756e5282b81d3fe6134f22b2f235116888cd4eb873102693da9a3b43cc39acc116fb8a42c074b0ff623f35bced191d47352932bd879bfaecd232 SHA512 0d6720a8a619b643ac3e1d8fa806f35c7d5847d5f55c0c209e4d9eb94b787931cafb6fce5f9b57a8f9479e37d0c31051c053cae60a8f40215a07852cfc1bd472
-MISC metadata.xml 407 BLAKE2B 6b7053f4f1a93c0605e72ea519385a9784d55028bf184ed28a491a56ec64167188b4f97b2b26b32b28a79e8ed4e309930f7a4efb0d587eab8974b0a4cd931b3b SHA512 25b2811713d5574b1787c699c9d24beb1c694b8a397f1bfda992d0f3e6f53d3ec3a26e46beccf1d60d1df574d2c8ba85b58075d40216d3bd224904415f57410a
diff --git a/dev-haskell/haskell-src-meta/files/haskell-src-meta-0.6.0.8-ghc-7.10.patch b/dev-haskell/haskell-src-meta/files/haskell-src-meta-0.6.0.8-ghc-7.10.patch
deleted file mode 100644
index e023b53d3401..000000000000
--- a/dev-haskell/haskell-src-meta/files/haskell-src-meta-0.6.0.8-ghc-7.10.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-commit 24e6f45408083745080ff2f3710f58209041113c
-Author: Luite Stegeman <stegeman@gmail.com>
-Date:   Sun Dec 28 21:33:22 2014 +0100
-
-    updates for GHC 7.10 and Template Haskell 2.10
-
-diff --git a/haskell-src-meta.cabal b/haskell-src-meta.cabal
-index de6a022..42d9619 100644
---- a/haskell-src-meta.cabal
-+++ b/haskell-src-meta.cabal
-@@ -18,14 +18,14 @@ description:        The translation from haskell-src-exts abstract syntax
- extra-source-files: ChangeLog README examples/*.hs
- 
- library
--  build-depends:   base >= 4.2 && < 4.8,
-+  build-depends:   base >= 4.2 && < 4.9,
-                    haskell-src-exts == 1.16.*,
-                    pretty >= 1.0 && < 1.2,
-                    syb >= 0.1 && < 0.5,
-                    th-orphans >= 0.5 && < 0.9
- 
-   if impl(ghc >= 7.4)
--    Build-depends: template-haskell >= 2.7 && < 2.10
-+    Build-depends: template-haskell >= 2.7 && < 2.11
-   else
-     Build-depends: template-haskell >= 2.4 && < 2.7,
-                    uniplate >= 1.3 && < 1.7
-diff --git a/src/Language/Haskell/Meta/Syntax/Translate.hs b/src/Language/Haskell/Meta/Syntax/Translate.hs
-index 189d32e..36a08f1 100644
---- a/src/Language/Haskell/Meta/Syntax/Translate.hs
-+++ b/src/Language/Haskell/Meta/Syntax/Translate.hs
-@@ -384,9 +384,15 @@ a .->. b = AppT (AppT ArrowT a) b
- toCxt :: Hs.Context -> Cxt
- toCxt = fmap toPred
-  where
-+#if MIN_VERSION_template_haskell(2,10,0)
-+  toPred (Hs.ClassA n ts) = foldl' AppT (ConT (toName n)) (fmap toType ts)
-+  toPred (Hs.InfixA t1 n t2) = foldl' AppT (ConT (toName n)) (fmap toType [t1,t2])
-+  toPred (Hs.EqualP t1 t2) = foldl' AppT EqualityT (fmap toType [t1,t2])
-+#else
-   toPred (Hs.ClassA n ts) = ClassP (toName n) (fmap toType ts)
-   toPred (Hs.InfixA t1 n t2) = ClassP (toName n) (fmap toType [t1, t2])
-   toPred (Hs.EqualP t1 t2) = EqualP (toType t1) (toType t2)
-+#endif
-   toPred a@Hs.IParam{} = noTH "toCxt" a
- 
- foldAppT :: Type -> [Type] -> Type
-diff --git a/src/Language/Haskell/Meta/Utils.hs b/src/Language/Haskell/Meta/Utils.hs
-index 36f7e96..d194f3e 100644
---- a/src/Language/Haskell/Meta/Utils.hs
-+++ b/src/Language/Haskell/Meta/Utils.hs
-@@ -166,6 +166,9 @@ renameT env new (ForallT ns cxt t) =
-     unVarT (VarT n) = PlainTV n
-     renamePreds = renameThings renamePred
- 
-+#if MIN_VERSION_template_haskell(2,10,0)
-+    renamePred = renameT
-+#else
-     renamePred env new (ClassP n ts) = let
-         (ts', env', new') = renameTs env new [] ts
-       in (ClassP (normaliseName n) ts', env', new')
-@@ -174,7 +177,7 @@ renameT env new (ForallT ns cxt t) =
-         (t1', env1, new1) = renameT env new t1
-         (t2', env2, new2) = renameT env1 new1 t2
-       in (EqualP t1' t2', env2, new2)
--
-+#endif
- 
- -- | Remove qualification, etc.
- normaliseName :: Name -> Name
diff --git a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.10.ebuild b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.10.ebuild
deleted file mode 100644
index 3673def57289..000000000000
--- a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.10.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parse source to template-haskell abstract syntax"
-HOMEPAGE="http://hackage.haskell.org/package/haskell-src-meta"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.17:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?]
-	>=dev-haskell/th-orphans-0.9.1:=[profile?] <dev-haskell/th-orphans-0.13:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.14-r1.ebuild b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.14-r1.ebuild
deleted file mode 100644
index 56a48d6c8de6..000000000000
--- a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.14-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parse source to template-haskell abstract syntax"
-HOMEPAGE="http://hackage.haskell.org/package/haskell-src-meta"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
-	>=dev-haskell/th-orphans-0.9.1:=[profile?] <dev-haskell/th-orphans-0.14:=[profile?]
-	>=dev-lang/ghc-7.8.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild
deleted file mode 100644
index 24b5528cf8bb..000000000000
--- a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="Parse source to template-haskell abstract syntax"
-HOMEPAGE="http://hackage.haskell.org/package/haskell-src-meta"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.17:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
-	>=dev-haskell/th-orphans-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-PATCHES=("${FILESDIR}/${PN}-0.6.0.8-ghc-7.10.patch")
-
-src_prepare() {
-	base_src_prepare
-	cabal_chdeps \
-		'th-orphans >= 0.5 && < 0.9' 'th-orphans >= 0.5'
-}
diff --git a/dev-haskell/haskell-src-meta/metadata.xml b/dev-haskell/haskell-src-meta/metadata.xml
deleted file mode 100644
index 5707ebf94594..000000000000
--- a/dev-haskell/haskell-src-meta/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The translation from haskell-src-exts abstract syntax
-		to template-haskell abstract syntax isn't 100% complete yet.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/haskell-src/Manifest b/dev-haskell/haskell-src/Manifest
deleted file mode 100644
index b843362de7de..000000000000
--- a/dev-haskell/haskell-src/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST haskell-src-1.0.1.6.tar.gz 52967 BLAKE2B 2c98fa8a52ce54cfd281f3e86a2a8f310284d0977171b4bc5a56873d70b0fb28e0db1eb336a015df56e3d7f85db6ab656276e9c54d53c8c36e0b9687635daf89 SHA512 61035aee535335bb6e2dba96217d48054c89ef3d33af01abfbec077c40d54150bd78b200d5dff4fa6c490c500f32951eb8fb8352243625fc6ad735fad60afda9
-DIST haskell-src-1.0.2.0.tar.gz 53636 BLAKE2B 1348bfc21d66d4226fa1045d2fc64de48ff91ed6ea978964f68389ec53bfbb63f407e130b0c168029d4d1daae2d1ffb59a32912721ad6fafe6054fb74f22cae6 SHA512 202b05ffcc505fb1332f5b3c8984b08a435911f574c4e1b2f2543a8758aa9e9a33f559c5c6cf3f8a3b7cda3f540e2da5b92e6456ee40dfe690cdf69a3e018b06
-EBUILD haskell-src-1.0.1.6.ebuild 624 BLAKE2B 80584cbf08467890e6579b95f3177914d69c56a5693deba65154da12cd6c5ae18ac8bab507f1d8f7a7a22cf6b5a9f0f1652f426228fbc3b9e1e1a3b68b0f6ba4 SHA512 e3396eb456e819a1335c10df2d97a52ee74460e64aab5ff8a78fdfc25ad082503689c3785df0659e9404b0e655ae43e35a8d1dc61d0819c412b8439f6e39ea4a
-EBUILD haskell-src-1.0.2.0.ebuild 645 BLAKE2B 89f0cdb518e0d060da4c56a81f4d5ced8d35083a4ee2914f9635b9f2b88d11b23d76b555dadf055a2fce7c60b26e6c63c7264caf9372800a1901e87f20834ff1 SHA512 86069bd4e5ae3b052139e080ce870b0ca063cde08c572aa1bccbbff8cc04d9c51b8596eaaa7da2718289219915ca32d9922665dfa154e8e1207d7e0d8c5136e7
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/haskell-src/haskell-src-1.0.1.6.ebuild b/dev-haskell/haskell-src/haskell-src-1.0.1.6.ebuild
deleted file mode 100644
index 82a8a71d72a1..000000000000
--- a/dev-haskell/haskell-src/haskell-src-1.0.1.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Support for manipulating Haskell source code"
-HOMEPAGE="http://hackage.haskell.org/package/haskell-src"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/haskell-src/haskell-src-1.0.2.0.ebuild b/dev-haskell/haskell-src/haskell-src-1.0.2.0.ebuild
deleted file mode 100644
index dc22d217bb7b..000000000000
--- a/dev-haskell/haskell-src/haskell-src-1.0.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Support for manipulating Haskell source code"
-HOMEPAGE="http://hackage.haskell.org/package/haskell-src"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-	dev-haskell/happy
-"
diff --git a/dev-haskell/haskell-src/metadata.xml b/dev-haskell/haskell-src/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/haskell-src/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hastache-0.5.1 b/dev-haskell/hastache-0.5.1
new file mode 100644
index 000000000000..68107128ea97
--- /dev/null
+++ b/dev-haskell/hastache-0.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/ieee754:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell implementation of Mustache templates
+EAPI=5
+HOMEPAGE=https://github.com/lymar/hastache
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/ieee754:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.5.1
+SRC_URI=mirror://hackage/packages/archive/hastache/0.5.1/hastache-0.5.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=27d5f0395c17edf0d350a2cc9a27a8f9
diff --git a/dev-haskell/hastache-0.6.1 b/dev-haskell/hastache-0.6.1
new file mode 100644
index 000000000000..ae96456cc355
--- /dev/null
+++ b/dev-haskell/hastache-0.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/ieee754:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell implementation of Mustache templates
+EAPI=5
+HOMEPAGE=https://github.com/lymar/hastache
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/ieee754:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.6.1
+SRC_URI=mirror://hackage/packages/archive/hastache/0.6.1/hastache-0.6.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d853320fe4d79a3181793b234a839f89
diff --git a/dev-haskell/hastache/Manifest b/dev-haskell/hastache/Manifest
deleted file mode 100644
index a1cbb360d85f..000000000000
--- a/dev-haskell/hastache/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST hastache-0.5.1.tar.gz 12674 BLAKE2B d6c3d6882107b1e63c0529db87be49524aa9e898fbccba2e6460bcadd27261e9e09218e99d5fa00c766d789cce4d4d59845730b862295654ef3baeb5d8817144 SHA512 f7fe130ff047332d0db58b831f412ec398c8854f5401ff5de16493f503171e8735708c165bc090220f8db446a44389ec0715e6b4900994759093ff3e69e7a86a
-DIST hastache-0.6.1.tar.gz 16452 BLAKE2B 69e0a6fa7798767d2192fd02ae2f0f2f51962eb4bc6303186ced14a7f9c5c044075be76df5314610c3f816c76fb0d790060e547491bb2e4d972bdec5b93576c3 SHA512 3f7f7d0b97e88aca474b818c0e7b48187bfade855b6117dce50ed3e64b557586b1827272d46438a7e36990fb932d6503c982fa4fc6b2dbb33b463b14d39436b4
-EBUILD hastache-0.5.1.ebuild 834 BLAKE2B c96e78280d3cbb4206299c879ed60a89000a91c75ae8ca145f66e7a3465eab2dd2d7c2291742a328f5bf3f8a854b3b6072b8c19ca07ea1770b6efbf0512f34a5 SHA512 5d82c45570827565d9221f2b1455f54398a5d357ea802a840e7a2a739d75f36a1e3699aff0e42d79e4e17e87cda7309f2d71947af33a6b78c8914d719182ded7
-EBUILD hastache-0.6.1.ebuild 904 BLAKE2B dc771a293c8fa42d0a79437c98c6af0f0daf91b6bd5b05395729a4d8adb8eadb0211c939305c1f128947439a3fdf7cb2c4682f10bf96599a6af9966031b8e696 SHA512 c0628bebcdd7f0ba4c9fa0bad473c02951395d81451daffbdb5cc9d5e74666b4204d03e76ea9879e56ddd1c9ef139690910bfe467f0a9bdefd95259bd11052ec
-MISC metadata.xml 537 BLAKE2B d003f4aee137d713e29cc2f338a742fcb32c193287f0e770335e428bd8b3f5b99fa5ca90caee6bd383006b64db209162d546fb4d71eaaa78b184ee62119638f6 SHA512 519ddad75ab7a51f71220cbf0e99dce2e0a34fc5340d853a1207c68a8eb0144b0053ae45fcbc7a9e56584a5d96e74cccdc9f6369f957cf5fea52dd4912216d52
diff --git a/dev-haskell/hastache/hastache-0.5.1.ebuild b/dev-haskell/hastache/hastache-0.5.1.ebuild
deleted file mode 100644
index 5791c340c8c1..000000000000
--- a/dev-haskell/hastache/hastache-0.5.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell implementation of Mustache templates"
-HOMEPAGE="https://github.com/lymar/hastache"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-		dev-haskell/ieee754:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		dev-haskell/syb:=[profile?]
-		dev-haskell/text:=[profile?]
-		dev-haskell/transformers:=[profile?]
-		dev-haskell/utf8-string:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/hunit
-		)"
diff --git a/dev-haskell/hastache/hastache-0.6.1.ebuild b/dev-haskell/hastache/hastache-0.6.1.ebuild
deleted file mode 100644
index 90ca5fc47e25..000000000000
--- a/dev-haskell/hastache/hastache-0.6.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell implementation of Mustache templates"
-HOMEPAGE="https://github.com/lymar/hastache"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # fails to build with ghc-7.10
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/ieee754:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >=4 && <4.9' 'base >=4'
-}
diff --git a/dev-haskell/hastache/metadata.xml b/dev-haskell/hastache/metadata.xml
deleted file mode 100644
index 3b604aa64bde..000000000000
--- a/dev-haskell/hastache/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haskell implementation of Mustache templates (&lt;https://mustache.github.com/&gt;).
-		
-		See homepage for examples of usage: &lt;https://github.com/lymar/hastache&gt;
-	</longdescription>
-	<upstream>
-		<remote-id type="github">lymar/hastache</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/haxml-1.24 b/dev-haskell/haxml-1.24
new file mode 100644
index 000000000000..94e46f885eb6
--- /dev/null
+++ b/dev-haskell/haxml-1.24
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-haskell/polyparse-1.9:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Utilities for manipulating XML documents
+EAPI=5
+HOMEPAGE=https://archives.haskell.org/projects.haskell.org/HaXml/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/polyparse-1.9:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.24
+SRC_URI=mirror://hackage/packages/archive/HaXml/1.24/HaXml-1.24.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d50f88e1b5d9d349ed52ca362cb15b9c
diff --git a/dev-haskell/haxml-1.24.1 b/dev-haskell/haxml-1.24.1
new file mode 100644
index 000000000000..b08379196228
--- /dev/null
+++ b/dev-haskell/haxml-1.24.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/polyparse-1.9:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Utilities for manipulating XML documents
+EAPI=5
+HOMEPAGE=https://archives.haskell.org/projects.haskell.org/HaXml/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/polyparse-1.9:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.24.1
+SRC_URI=mirror://hackage/packages/archive/HaXml/1.24.1/HaXml-1.24.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cce5ab4a2883b714b7d57f704f32df7d
diff --git a/dev-haskell/haxml-1.25.3 b/dev-haskell/haxml-1.25.3
new file mode 100644
index 000000000000..3011fc3232f1
--- /dev/null
+++ b/dev-haskell/haxml-1.25.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/polyparse-1.10:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Utilities for manipulating XML documents
+EAPI=5
+HOMEPAGE=https://archives.haskell.org/projects.haskell.org/HaXml/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/polyparse-1.10:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.25.3
+SRC_URI=mirror://hackage/packages/archive/HaXml/1.25.3/HaXml-1.25.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=13ce641cc58dfb70ea498a2c5930af45
diff --git a/dev-haskell/haxml/Manifest b/dev-haskell/haxml/Manifest
deleted file mode 100644
index a344351ad7e4..000000000000
--- a/dev-haskell/haxml/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX haxml-1.23.3-haddock.patch 732 BLAKE2B fcab1cb386fd17ab20fd22fe57a98fbc96a3d268d74b5e8412c18c041fd4e268e89552b6e8e1432b8f220cd592e7c10a0c5406d7408dcced10e30f80bbfc81d1 SHA512 daf988ba8f836716249c37cf6b411383a1d6f20cca7ab6f8a20db7afc2c42866de0a4ab770f406aa5d9b77a4ba3da2c6c01982c26fb29e9224775914c1db2833
-DIST HaXml-1.24.1.tar.gz 142739 BLAKE2B d5f972f2dd61b512c5984264bce05e38430627055725cf6be7ff0cfe5db73c6f1be829d5c50278e09808826371169b3e24bbf98561ef3b4bccc7b937f5ec1d7f SHA512 421f3a61e8eebf5ad915551c51dcd843a544e7959b93d6dd4ab2ffc6c20954f559da75dcfecc6fea838f80dc4d3c83243be3ce7a21e92bc165b3e0be120451bf
-DIST HaXml-1.24.tar.gz 143107 BLAKE2B dd7c8507a4d53a7260a9bffcb6c9f6eb54287fa71de31945acab19c0a8b63261905a74d5ec176376016f63092871af56f5ea89d06e0747c26dff02044d5fe894 SHA512 421864e4177b16f485b72d33210a67914c2040664d604db5cc70b356a518114f11dbcc1b1c8f300fd045338605613a14317bd5bf5f041a8e38990d3c5dc7e94c
-DIST HaXml-1.25.3.tar.gz 144189 BLAKE2B f521a02d33c0d39d79a0e26defa2ae64331b5377b18980f38733ab9e2971f0685b4e8e6b68702f72687142484842fb61b4d337f0b277d88520b266799812f356 SHA512 b80a70954a79c9246ed9e92ca2bd7c94f54b2843eb387fa2045652cfa5eee69b8bfae17ef88b391855abe3dc672e3cf212be53e275e6ff350fe1074fff608828
-EBUILD haxml-1.24.1.ebuild 747 BLAKE2B 46e047c496c41b856908e068f53fa8b53c06e16611b264aad52ae6eaa8faf8bc406bf459b6d0d83282803ffa8a9cd89b48d848e2e43348335d91c00b28776e9a SHA512 d7fbb209404502e5ee75e77f61179a09d466cb020b79cee83dd163cd21a56ddd5096728d650e1df319f2242643dc72701d74537c34008e880b3a21f507194dac
-EBUILD haxml-1.24.ebuild 799 BLAKE2B 64b66ddf4d0b63f02c98d97a32e4e1eb02f6696cad923adbc76d5f4bd8afe85c272bb013c8d3a80188ad8420ccfb4446076022e663b3ec019371c4961bfc1134 SHA512 3262d2a8928b1b440f000ed48785fe1bf2b65e9b3fdd1d37d5802240e234cc6975a1bc4469fa5c33431e850644b35875796abc481f14e8e397da92e5987e0707
-EBUILD haxml-1.25.3.ebuild 738 BLAKE2B 03a6c15b30c699c545239507c1a593b80f14e8e2b5a79bb675250af6d856fd3af9fb4f5154e63f73db55cf3b6b61478e4f81394930c350ad4a577c7f77140bfc SHA512 f897c3d0d660989cbb0896329ec128ec332098c9b4abe1a5e8e0fff4fcf24fdc38008cb41c1d5bafbc8f2ce0b63339795f583175fe3095b793dca9442e91fee2
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/haxml/files/haxml-1.23.3-haddock.patch b/dev-haskell/haxml/files/haxml-1.23.3-haddock.patch
deleted file mode 100644
index 1da171b17678..000000000000
--- a/dev-haskell/haxml/files/haxml-1.23.3-haddock.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- HaXml-1.23.3-orig/src/Text/XML/HaXml/Schema/HaskellTypeModel.hs	2012-06-19 01:31:18.000000000 +1000
-+++ HaXml-1.23.3/src/Text/XML/HaXml/Schema/HaskellTypeModel.hs	2012-06-19 01:49:23.784392420 +1000
-@@ -77,8 +77,8 @@
-                  -- rests with the input doc, not with the caller of the parser.
-                | ElementsAttrsAbstract {-typename-}XName
-                                        {-subtypes-}[(XName,Maybe XName)]
--                                --  ^ [(type name, module where declared later)]
-                                        Comment
-+                                --  ^ [(type name, module where declared later)]
- 
-                  -- becomes function
-                  --    elementE :: Parser T
diff --git a/dev-haskell/haxml/haxml-1.24.1.ebuild b/dev-haskell/haxml/haxml-1.24.1.ebuild
deleted file mode 100644
index 50f203a27081..000000000000
--- a/dev-haskell/haxml/haxml-1.24.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HaXml"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Utilities for manipulating XML documents"
-HOMEPAGE="https://archives.haskell.org/projects.haskell.org/HaXml/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/polyparse-1.9:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/haxml/haxml-1.24.ebuild b/dev-haskell/haxml/haxml-1.24.ebuild
deleted file mode 100644
index 1c39524df91e..000000000000
--- a/dev-haskell/haxml/haxml-1.24.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-MY_PN="HaXml"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Utilities for manipulating XML documents"
-HOMEPAGE="https://archives.haskell.org/projects.haskell.org/HaXml/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/polyparse-1.9:=[profile?]
-		dev-haskell/random:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}/${PN}-1.23.3-haddock.patch")
diff --git a/dev-haskell/haxml/haxml-1.25.3.ebuild b/dev-haskell/haxml/haxml-1.25.3.ebuild
deleted file mode 100644
index adabb4a10d3f..000000000000
--- a/dev-haskell/haxml/haxml-1.25.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HaXml"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Utilities for manipulating XML documents"
-HOMEPAGE="https://archives.haskell.org/projects.haskell.org/HaXml/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/polyparse-1.10:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/haxml/metadata.xml b/dev-haskell/haxml/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/haxml/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hcg-minus-0.15 b/dev-haskell/hcg-minus-0.15
new file mode 100644
index 000000000000..07c0130517ea
--- /dev/null
+++ b/dev-haskell/hcg-minus-0.15
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/colour:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=haskell cg (minus)
+EAPI=6
+HOMEPAGE=http://rd.slavepianos.org/t/hcg-minus
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/colour:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.15
+SRC_URI=mirror://hackage/packages/archive/hcg-minus/0.15/hcg-minus-0.15.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=74229605220b9a40f7caff4d45090eee
diff --git a/dev-haskell/hcg-minus/Manifest b/dev-haskell/hcg-minus/Manifest
deleted file mode 100644
index ba20b4ac057e..000000000000
--- a/dev-haskell/hcg-minus/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hcg-minus-0.15.tar.gz 12997 BLAKE2B 77df853ae1fdf22742e5d4f4ea4e42e78619fdd52c2395ad22850d8471c98fab362bb48aede9faebde6b309db13b7d14f322106a19008c6af6d92252826bebc7 SHA512 875b89656a5340bbd9a303a98004bc13d2b7b37fc58762c9a4f96abbb78ec3e67403a5968f8b9ff59d955aaa3d2031eba45cee85a2ec19c442f31ad0f413da45
-EBUILD hcg-minus-0.15.ebuild 557 BLAKE2B c76b27efe09ffccab04a82aeac158e6ee3aee7ff515b8a1cbf82da410b68be81818e1c008fc842c1dbbf03389204fe688e5344c821e5947b9293da86d7a7cec3 SHA512 9aa96f30583412322ed0c7950f3a5f31366a5fe827af2974b77491d316951d2f0164b36b4a17982857a49a2831f5a70cb009c74d484d147c7a198b531595bc7e
-MISC metadata.xml 309 BLAKE2B 4a29fd00c6cad8308ef2954cf7a4ba4d19e25422553842b57cbca4e7302c138bcb9b79be1d6d865f19045221af9c44208c8a60042d0895e61f098d9fc8ec2407 SHA512 f7ee1bb762f2b497baa79e475f6ba201032a06e27f0226d70c51c405640e4ec61a7185209a9b70b212ec69fb9df9f64173341d02f727c6146f4c896b45bbcb1c
diff --git a/dev-haskell/hcg-minus/hcg-minus-0.15.ebuild b/dev-haskell/hcg-minus/hcg-minus-0.15.ebuild
deleted file mode 100644
index c3c337795461..000000000000
--- a/dev-haskell/hcg-minus/hcg-minus-0.15.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="haskell cg (minus)"
-HOMEPAGE="http://rd.slavepianos.org/t/hcg-minus"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/colour:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/hcg-minus/metadata.xml b/dev-haskell/hcg-minus/metadata.xml
deleted file mode 100644
index e019a95fc97b..000000000000
--- a/dev-haskell/hcg-minus/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		cg (minus) library
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hcodecs-0.5 b/dev-haskell/hcodecs-0.5
new file mode 100644
index 000000000000..4be3f62c7376
--- /dev/null
+++ b/dev-haskell/hcodecs-0.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/quickcheck-2.0:2=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files
+EAPI=5
+HOMEPAGE=http://www-db.informatik.uni-tuebingen.de/team/giorgidze
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/quickcheck-2.0:2=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.5
+SRC_URI=mirror://hackage/packages/archive/HCodecs/0.5/HCodecs-0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=033ca852b00a1c2cca630ddec8adf857
diff --git a/dev-haskell/hcodecs/Manifest b/dev-haskell/hcodecs/Manifest
deleted file mode 100644
index f7e1be8a783e..000000000000
--- a/dev-haskell/hcodecs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST HCodecs-0.5.tar.gz 24232 BLAKE2B 0af06721ba03658c421fc3ec66370736fc439bce403307148174363179d08586a93fbde6bb957c68909cc0e876c93b828a715b9fdb872786ca533947a630d02b SHA512 40ee73995c06b34b799f1e8bd310faadc6ab267735313bdb62c0fb7ea95c13e3b443fc230cd529eb5f8ce02685d0506c80bcab3e802f2c407ef7584f6abdbe1d
-EBUILD hcodecs-0.5.ebuild 778 BLAKE2B 3222be2b589e45fb4fce89e0dc7ea47d59e742e7dd34636f64e378917d98192650f2f76bb2cfe52677d7192b0e1ac78471c748dc91343ca19ca2bcbed5a46680 SHA512 78d76fb587d1a6adf92eb4b82c6151417d8d3cb51b0853610c5d9921e9b91cb0776d4e5a18fdd014d4a5cbbc9683c2354c434150e7e61cf5af78f2bdd0930a20
-MISC metadata.xml 712 BLAKE2B e462f9070ae0f8484125a29c6a0f18954eac0d4079d115c69eae6203d0d72daef968e636f195e3e871535cff1b610a222a271cf6aecd250ea3ab77bb90df29ae SHA512 f5043f2281f63be8f6293f1accb48bff651c342a879f6ed722ef3d2a2fdbf95709ca7d36d44eb52ff0658dd34d7952b22e8dd94f0e19dd31fde013d3793b5e31
diff --git a/dev-haskell/hcodecs/hcodecs-0.5.ebuild b/dev-haskell/hcodecs/hcodecs-0.5.ebuild
deleted file mode 100644
index 190b2bf4a126..000000000000
--- a/dev-haskell/hcodecs/hcodecs-0.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HCodecs"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files"
-HOMEPAGE="http://www-db.informatik.uni-tuebingen.de/team/giorgidze"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # hung?
-
-RDEPEND=">=dev-haskell/quickcheck-2.0:2=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hcodecs/metadata.xml b/dev-haskell/hcodecs/metadata.xml
deleted file mode 100644
index 4ac3a65a9972..000000000000
--- a/dev-haskell/hcodecs/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The library provides functions to read, write and manipulate MIDI, WAVE and SoundFont2 multimedia files. It is written entirely in Haskell (without any FFI). It uses efficient  parsing and building combinators for binary data stored in ByteStrings (based on the one in 'binary' package).
-		
-		Correctness of significant parts of the library has been validated with QuickCheck and Haskell Program Coverage (HPC) tool-kits.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hdbc-2.3.1.2 b/dev-haskell/hdbc-2.3.1.2
new file mode 100644
index 000000000000..0797da3d86bc
--- /dev/null
+++ b/dev-haskell/hdbc-2.3.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/convertible-1.0.10.0:=[profile?] <dev-haskell/convertible-1.1.0.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/testpack ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell Database Connectivity
+EAPI=5
+HOMEPAGE=https://github.com/hdbc/hdbc
+IUSE=mysql odbc postgres sqlite test doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+PDEPEND=mysql? ( dev-haskell/hdbc-mysql ) odbc? ( =dev-haskell/hdbc-odbc-2.3* ) postgres? ( =dev-haskell/hdbc-postgresql-2.3* ) sqlite? ( >=dev-haskell/hdbc-sqlite3-2.3 )
+RDEPEND=>=dev-haskell/convertible-1.0.10.0:=[profile?] <dev-haskell/convertible-1.1.0.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=2/2.3.1.2
+SRC_URI=mirror://hackage/packages/archive/HDBC/2.3.1.2/HDBC-2.3.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a74e4421f1c12fefe9f3c28e80352495
diff --git a/dev-haskell/hdbc-2.4.0.1 b/dev-haskell/hdbc-2.4.0.1
new file mode 100644
index 000000000000..63235e638991
--- /dev/null
+++ b/dev-haskell/hdbc-2.4.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/convertible-1.1.0.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.0:2=[profile?] >=dev-haskell/testpack-2.0:=[profile?] ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell Database Connectivity
+EAPI=5
+HOMEPAGE=https://github.com/hdbc/hdbc
+IUSE=test doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/convertible-1.1.0.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=2/2.4.0.1
+SRC_URI=mirror://hackage/packages/archive/HDBC/2.4.0.1/HDBC-2.4.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8d6d7fab9f0e94a0a754bea887946fd4
diff --git a/dev-haskell/hdbc-mysql-0.6.6.1-r3 b/dev-haskell/hdbc-mysql-0.6.6.1-r3
new file mode 100644
index 000000000000..addbfba88fc3
--- /dev/null
+++ b/dev-haskell/hdbc-mysql-0.6.6.1-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hdbc-2.1.0:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-6.12.1:= virtual/mysql >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=MySQL driver for HDBC
+EAPI=6
+HOMEPAGE=https://github.com/bos/hdbc-mysql
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/hdbc-2.1.0:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-6.12.1:= virtual/mysql
+SLOT=0/0.6.6.1
+SRC_URI=mirror://hackage/packages/archive/HDBC-mysql/0.6.6.1/HDBC-mysql-0.6.6.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=09a0ae96e0ca8fb4e633c69987420d40
diff --git a/dev-haskell/hdbc-mysql-0.7.1.0 b/dev-haskell/hdbc-mysql-0.7.1.0
new file mode 100644
index 000000000000..dd23b5f575e9
--- /dev/null
+++ b/dev-haskell/hdbc-mysql-0.7.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hdbc-2.1.0:2=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.0.1:= dev-libs/openssl sys-libs/zlib >=virtual/mysql-4.0 >=dev-haskell/cabal-1.24.0.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=MySQL driver for HDBC
+EAPI=6
+HOMEPAGE=https://github.com/ryantm/hdbc-mysql
+IUSE=debug doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/hdbc-2.1.0:2=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.0.1:= dev-libs/openssl sys-libs/zlib >=virtual/mysql-4.0
+SLOT=0/0.7.1.0
+SRC_URI=mirror://hackage/packages/archive/HDBC-mysql/0.7.1.0/HDBC-mysql-0.7.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b2086b35e0e9266a673f3a8586130564
diff --git a/dev-haskell/hdbc-mysql/Manifest b/dev-haskell/hdbc-mysql/Manifest
deleted file mode 100644
index 2df889d2a25e..000000000000
--- a/dev-haskell/hdbc-mysql/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX hdbc-mysql-0.6.6.1-cabal-1.18.patch 1110 BLAKE2B 49bd9b39d789903063c7c7b0c454f0e9f844c275b8283e632481f183b55bcb8a8656d117ab587004e8f9b6f65b2e7e22d03b20eec7926d1a8eb734e614e98c00 SHA512 fca7c256c0035df6bf3e882a368e1207cee8177a1348e7502982b7085c0d81c667bdd905aa0ad5c04761aa8edd9e62809c690bcd220957769fba221f94c79e28
-AUX hdbc-mysql-0.6.6.1-extralib.patch 460 BLAKE2B 845a5c16767c4b0ed569de5b9a7312eb1a3fe81d798d2d16860be28b297d2c9cf03c4567831fdb40e9be1951e10e9cd5338f74a691936a069beb36dd2dfade56 SHA512 04e374b7803748d34bf8f87505609aa4463e70e49b29054a16f65d693eef2bc5ddcfa56c072a4f95e5576c1ad72b9ee94dd00c16538ce04e34b96c060954b114
-DIST HDBC-mysql-0.6.6.1.tar.gz 23120 BLAKE2B 117c7a8c8c366dd3a4c128f97105812330d85eabf4f6ade8acd1e13c31cd2a57b3b904d0d76887ab5e45fe1f3c4a527c8ca1778e5ae736ae7dbae2e36a9a7c9d SHA512 be74be365021df54c9660af699cfec05271444da0042152c944d43927efcf7cf78712d3bfe25796f944af409b9eb24ab903c0b92bb6b3c6dbcf0a3ee057366bf
-DIST HDBC-mysql-0.7.1.0.tar.gz 24086 BLAKE2B fd480ef5a3374aa8c6d36bd4f34fb1cb558769a134f60ce1b94cba7143b93adecc2cff6253cb1afbefe52c9ed8081fc7f812f7bc6539c043f783e9ced10ff4d7 SHA512 aec9387f08c16c8ccb6df1ca82e69005105a2781e253b6b8788665fa88e54a697601f99d10931ea6d3854dd9c0b43f062bccad1362a1512f5a2135cede0b0cc1
-EBUILD hdbc-mysql-0.6.6.1-r3.ebuild 849 BLAKE2B 7b9bbbdad37c4327f5c356f46fe6343ee619c6fdc842f09e75de841bac0ad82f175feb8b02f201984aa91794d6b08542db6a4fc4d30185fe2262425ac7aeeb43 SHA512 c2ffda9e01cddcbd648c5c8905df6056a11e2e3b446ef3896b2382b4da6fe2d107d50c66fe314856373f9376f92b1442eb2af03f4e9cfb294ad1a4aa67623d9b
-EBUILD hdbc-mysql-0.7.1.0.ebuild 826 BLAKE2B a2a9601e55352b585ea48ce3f4db876f84382c0f66ee3ec1bd0bd8d3da685fabf173019fd125de988b40f6f80db4d66a4eb10410606d9f35e1299cae743c29a6 SHA512 ea1f16c467689697be3b263eeaae14cc8b15455c33cfe81e4838d53b90cb8082c4fde82ee0919029d8cdf2fc3b5444a7c83dddacca09e13d0b0d773cade77e1d
-MISC metadata.xml 475 BLAKE2B 3a0c594d8c7acbfad9b7c48660ac89b0e85ec100646e4999dff911866e654520139eb0003d18f53ddf8ea79e70a9d6a76bd9f4fe760468f7254f8c0b2106524e SHA512 da1098ad2d5808af1dce10679f4e0146f9cab003e5a68fff7b7d389fadcb6a28cc0c67abca16571a6b76bef1c9d838882496cac5fb7febddb4da71b5d9baa4a2
diff --git a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-cabal-1.18.patch b/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-cabal-1.18.patch
deleted file mode 100644
index 83ddd4a4c8ca..000000000000
--- a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-cabal-1.18.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- HDBC-mysql-0.6.6.1-orig/Setup.lhs	2012-08-30 13:40:03.000000000 +1000
-+++ HDBC-mysql-0.6.6.1/Setup.lhs	2014-07-03 22:31:21.162259637 +1000
-@@ -1,6 +1,7 @@
- #!/usr/bin/env runhaskell
- 
- \begin{code}
-+{-# LANGUAGE MultiParamTypeClasses, FlexibleInstances #-}
- import Distribution.Simple
- import Distribution.PackageDescription
- import Distribution.Version
-@@ -26,8 +27,21 @@
-     }
- }
- 
-+-- 'ConstOrId' is a @Cabal-1.16@ vs @Cabal-1.18@ compatibility hack,
-+-- 'programFindLocation' has a new (unused in this case)
-+-- parameter. 'ConstOrId' adds this parameter when types say it is
-+-- mandatory.
-+class ConstOrId a b where
-+    constOrId :: a -> b
-+
-+instance ConstOrId a a where
-+    constOrId = id
-+
-+instance ConstOrId a (b -> a) where
-+    constOrId = const
-+
- mysqlConfigProgram = (simpleProgram "mysql_config") {
--    programFindLocation = \verbosity -> do
-+    programFindLocation = \verbosity -> constOrId $ do
-       mysql_config  <- findProgramOnPath "mysql_config"  verbosity
-       mysql_config5 <- findProgramOnPath "mysql_config5" verbosity
-       return (mysql_config `mplus` mysql_config5)
diff --git a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-extralib.patch b/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-extralib.patch
deleted file mode 100644
index 8b9993969cb3..000000000000
--- a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-extralib.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit d53860f7edb75873e263111129c159802b2ac5a6
-Author: Satoshi Nakamura <snakamura@infoteria.com>
-Date:   Tue May 27 15:44:57 2014 +0900
-
-    Add mysqlclient to Extra-Libraries
-
-diff --git a/HDBC-mysql.cabal b/HDBC-mysql.cabal
-index 2d56d8b..6a8967a 100644
---- a/HDBC-mysql.cabal
-+++ b/HDBC-mysql.cabal
-@@ -32,6 +32,7 @@ library
-     time,
-     utf8-string
-   ghc-options:      -Wall
-+  Extra-Libraries: mysqlclient
- 
- source-repository head
-   type:     git
diff --git a/dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r3.ebuild b/dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r3.ebuild
deleted file mode 100644
index 861ba83ab5ca..000000000000
--- a/dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-CABAL_FEATURES+=" nocabaldep" # workaround depend on old cabal-1.16
-inherit haskell-cabal
-
-MY_PN="HDBC-mysql"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MySQL driver for HDBC"
-HOMEPAGE="https://github.com/bos/hdbc-mysql"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hdbc-2.1.0:=[profile?]
-		dev-haskell/utf8-string:=[profile?]
-		>=dev-lang/ghc-6.12.1:=
-		virtual/mysql"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${P}"-cabal-1.18.patch
-	"${FILESDIR}/${P}"-extralib.patch
-)
diff --git a/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0.ebuild b/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0.ebuild
deleted file mode 100644
index ce4e1c94bf63..000000000000
--- a/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HDBC-mysql"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MySQL driver for HDBC"
-HOMEPAGE="https://github.com/ryantm/hdbc-mysql"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-haskell/hdbc-2.1.0:2=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-	dev-libs/openssl
-	sys-libs/zlib
-	>=virtual/mysql-4.0
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug)
-}
diff --git a/dev-haskell/hdbc-mysql/metadata.xml b/dev-haskell/hdbc-mysql/metadata.xml
deleted file mode 100644
index 8aa39248b6d6..000000000000
--- a/dev-haskell/hdbc-mysql/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides a MySQL driver for HDBC, implemented via
-		bindings to the C @mysqlclient@ library.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bos/hdbc-mysql</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hdbc-odbc-2.3.1.1 b/dev-haskell/hdbc-odbc-2.3.1.1
new file mode 100644
index 000000000000..5e069a17b1ff
--- /dev/null
+++ b/dev-haskell/hdbc-odbc-2.3.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/hdbc-2.1.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.0.1:= >=dev-db/unixODBC-2.2 >=dev-haskell/cabal-1.6 test? ( dev-haskell/convertible dev-haskell/hunit dev-haskell/quickcheck dev-haskell/testpack ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=ODBC driver for HDBC
+EAPI=5
+HOMEPAGE=https://github.com/hdbc/hdbc-odbc
+IUSE=test hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hdbc-2.1.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.0.1:= >=dev-db/unixODBC-2.2
+RESTRICT=test
+SLOT=2/2.3.1.1
+SRC_URI=mirror://hackage/packages/archive/HDBC-odbc/2.3.1.1/HDBC-odbc-2.3.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=acd5b2808b23b996abcb0f0a0af2edb0
diff --git a/dev-haskell/hdbc-odbc-2.4.0.1 b/dev-haskell/hdbc-odbc-2.4.0.1
new file mode 100644
index 000000000000..ec7060d7e011
--- /dev/null
+++ b/dev-haskell/hdbc-odbc-2.4.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hdbc-2.1.0:2=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-db/unixODBC-2.2 >=dev-haskell/cabal-1.8 buildstresstest? ( dev-haskell/random:=[profile?] dev-haskell/resource-pool:=[profile?] ) test? ( dev-haskell/convertible:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/quickcheck:2=[profile?] dev-haskell/testpack:=[profile?] ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=ODBC driver for HDBC
+EAPI=5
+HOMEPAGE=https://github.com/hdbc/hdbc-odbc
+IUSE=buildstresstest test hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hdbc-2.1.0:2=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-db/unixODBC-2.2
+RESTRICT=test
+SLOT=2/2.4.0.1
+SRC_URI=mirror://hackage/packages/archive/HDBC-odbc/2.4.0.1/HDBC-odbc-2.4.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e7cfd43effda515c33907b47aef0555b
diff --git a/dev-haskell/hdbc-odbc/Manifest b/dev-haskell/hdbc-odbc/Manifest
deleted file mode 100644
index 98b962b23473..000000000000
--- a/dev-haskell/hdbc-odbc/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX hdbc-odbc-2.3.1.0-ghc-7.6.patch 1773 BLAKE2B df997ccc0b3bf454df09377c7a53fa407aa816a46da27a1766af89659333377b420fa26aa7a0cf666c1b617cda7d3a8642e58a541043f50811955589e251e643 SHA512 1978f79956a73b8615331698839583a242bf15987875a43df496b3bc68a814e516cd3d6868cad47b2b3f30226295a8affeab9995c056f58b649eb6a673ffb034
-DIST HDBC-odbc-2.3.1.1.tar.gz 24518 BLAKE2B 306c9af823e55c56ad61f46ac44c4b055e725f0f9400998938a1c00d7d0a330bb06f581c15990bab4c60293e323464cd140b6ff14ebd80d35fe6b92d10890ff5 SHA512 dbf95afca7906c4814f79e00d1fef0d26ed71c8da45a0fd51c4e3e4e0427d56d1937be0b0c4088841d5f12d93da0c4c29ec6f359c2e58fdf4c693f34bdae250a
-DIST HDBC-odbc-2.4.0.1.tar.gz 27185 BLAKE2B 5ccd40f9dcc3ee7045f8719b16f0d65f049cd52c323b86aebdc11fba7c9003747f29850aec059d4d092826c579e0f9dc2f9d12dbbf7b1e261ca052a3e5ba122a SHA512 ae9f5ac2aa6adfc155999fb78b35a12e381d1589bf2539306a4e346af4eee401db8af8ef74348cc0707620f9586367701505d0d61bd96f00f0ebeb9240ed9a06
-EBUILD hdbc-odbc-2.3.1.1.ebuild 1467 BLAKE2B 9a9900c30a9d8944c2665975a95818e1b9ff0b1a5bbcb6cfee6ba92a3ae080e85f21fba4ba5bcaabd371a716b27c8efde02591e53665921130d44cbbee56c807 SHA512 4ae7b7fcc5c64bb742d299ac58509918b675e95cfd4136d1a72f58c7c947f0dcc8256758f1e914c88e997839a7ce68230f62b2fc2df9018d1b5bc518f59d8558
-EBUILD hdbc-odbc-2.4.0.1.ebuild 1611 BLAKE2B dabffc858dbe9174e02d88144fa6df1405725345ccd6e18aa8deb4f22f0c40ff011600a2089f4c6baff7985462224a940812d85a66c252fa816009207d3db4d5 SHA512 dce4e392e6cf4357fdd1f8d670a322cd7ebc24e784a95590cff45a6b4fabed8676fb98530503973c07df517774877719c234ba7dd4bf9c8e6ae01f6fd49ccdb1
-MISC metadata.xml 677 BLAKE2B 4bba37b7b13610bbf5d540b8a9d972d3338309aeaa3606f69d3dbf1411015a1d9907c0958a053ca13449002001e53de2669bc90e2331d389e20002ab324e3251 SHA512 bf7a8f735c7cbfd829bbca02e919e17ffe388d8b18289ea8126645588f856594e55f5891f924f19072e6a270d711b2397eab40c32d05d98eec27d69f20467170
diff --git a/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-7.6.patch b/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-7.6.patch
deleted file mode 100644
index 8092cf16da6c..000000000000
--- a/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-7.6.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- HDBC-odbc-2.3.1.0-orig/testsrc/TestSbasics.hs	2011-08-10 07:16:38.000000000 +1000
-+++ HDBC-odbc-2.3.1.0/testsrc/TestSbasics.hs	2012-10-13 12:30:47.216363898 +1100
-@@ -1,9 +1,13 @@
-+{-# LANGUAGE CPP, ScopedTypeVariables #-}
- module TestSbasics(tests) where
- import Test.HUnit
- import Database.HDBC
- import TestUtils
- import System.IO
--import Control.Exception hiding (catch)
-+#if !MIN_VERSION_base(4,6,0)
-+import Prelude hiding (catch)
-+#endif
-+import Control.Exception
- 
- openClosedb = sqlTestCase $ 
-     do dbh <- connectDB
-@@ -123,7 +127,7 @@
-        -- Let's try a rollback.
-        catch (withTransaction dbh (\_ -> do sExecuteMany sth rows
-                                             fail "Foo"))
--             (\_ -> return ())
-+             (\(_::IOException) -> return ())
-        sExecute qrysth []
-        sFetchAllRows qrysth >>= (assertEqual "rollback" [[Just "0"]])
- 
---- HDBC-odbc-2.3.1.0-orig/testsrc/Testbasics.hs	2011-08-10 07:16:38.000000000 +1000
-+++ HDBC-odbc-2.3.1.0/testsrc/Testbasics.hs	2012-10-13 12:30:10.883415738 +1100
-@@ -1,9 +1,13 @@
-+{-# LANGUAGE CPP, ScopedTypeVariables #-}
- module Testbasics(tests) where
- import Test.HUnit
- import Database.HDBC
- import TestUtils
- import System.IO
--import Control.Exception hiding (catch)
-+#if !MIN_VERSION_base(4,6,0)
-+import Prelude hiding (catch)
-+#endif
-+import Control.Exception
- 
- openClosedb = sqlTestCase $ 
-     do dbh <- connectDB
-@@ -140,7 +144,7 @@
-        -- Let's try a rollback.
-        catch (withTransaction dbh (\_ -> do executeMany sth rows
-                                             fail "Foo"))
--             (\_ -> return ())
-+             (\(_::IOException) -> return ())
-        execute qrysth []
-        fetchAllRows qrysth >>= (assertEqual "rollback" [[SqlString "0"]])
- 
diff --git a/dev-haskell/hdbc-odbc/hdbc-odbc-2.3.1.1.ebuild b/dev-haskell/hdbc-odbc/hdbc-odbc-2.3.1.1.ebuild
deleted file mode 100644
index cd66bbb26ccd..000000000000
--- a/dev-haskell/hdbc-odbc/hdbc-odbc-2.3.1.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-# haddock is disabled as it chokes in .hsc file:
-#     Database/HDBC/ODBC/Statement.hsc:462:3:
-#        parse error on input `Word16'
-CABAL_FEATURES="bin lib profile hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HDBC-odbc"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="ODBC driver for HDBC"
-HOMEPAGE="https://github.com/hdbc/hdbc-odbc"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test" # requires configured ODBC
-
-RDEPEND=">=dev-haskell/hdbc-2.1.0:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		dev-haskell/utf8-string:=[profile?]
-		>=dev-lang/ghc-7.0.1:=
-		>=dev-db/unixODBC-2.2
-	"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6
-		test? ( dev-haskell/convertible
-			dev-haskell/hunit
-			dev-haskell/quickcheck
-			dev-haskell/testpack
-		)
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.3.1.0-ghc-7.6.patch"
-}
-
-src_configure() {
-	cabal_src_configure $(cabal_flag test buildtests)
-}
-
-src_test() {
-	# default tests
-	haskell-cabal_src_test || die "cabal test failed"
-
-	# built custom tests
-	"${S}/dist/build/runtests/runtests" || die "unit tests failed"
-}
-
-src_install() {
-	cabal_src_install
-
-	# if tests were enabled, make sure the unit test driver is deleted
-	rm -f "${ED}/usr/bin/runtests"
-}
diff --git a/dev-haskell/hdbc-odbc/hdbc-odbc-2.4.0.1.ebuild b/dev-haskell/hdbc-odbc/hdbc-odbc-2.4.0.1.ebuild
deleted file mode 100644
index dd50a5bc197f..000000000000
--- a/dev-haskell/hdbc-odbc/hdbc-odbc-2.4.0.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-# haddock is disabled as it chokes in .hsc file:
-#     Database/HDBC/ODBC/Statement.hsc:462:3:
-#        parse error on input `Word16'
-CABAL_FEATURES="bin lib profile hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HDBC-odbc"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="ODBC driver for HDBC"
-HOMEPAGE="https://github.com/hdbc/hdbc-odbc"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="buildstresstest test"
-RESTRICT="test" # requires configured ODBC
-
-RDEPEND=">=dev-haskell/hdbc-2.1.0:2=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-db/unixODBC-2.2
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	buildstresstest? ( dev-haskell/random:=[profile?]
-				dev-haskell/resource-pool:=[profile?] )
-	test? ( dev-haskell/convertible:=[profile?]
-			dev-haskell/hunit:=[profile?]
-			dev-haskell/quickcheck:2=[profile?]
-			dev-haskell/testpack:=[profile?] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag buildstresstest buildstresstest) \
-		$(cabal_flag test buildtests)
-}
-
-src_test() {
-	# default tests
-	haskell-cabal_src_test || die "cabal test failed"
-
-	# built custom tests
-	"${S}/dist/build/runtests/runtests" || die "unit tests failed"
-}
-
-src_install() {
-	cabal_src_install
-
-	# if tests were enabled, make sure the unit test driver is deleted
-	rm -f "${ED}/usr/bin/runtests"
-}
diff --git a/dev-haskell/hdbc-odbc/metadata.xml b/dev-haskell/hdbc-odbc/metadata.xml
deleted file mode 100644
index 5c72d4a3ad3d..000000000000
--- a/dev-haskell/hdbc-odbc/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides an ODBC database backend for HDBC.
-		It is cross-platform and supports unixODBC on Unix/Linux/POSIX platforms
-		and Microsoft ODBC on Windows.  It is also the preferred way to access
-		MySQL databases from Haskell.
-	</longdescription>
-	<use>
-		<flag name="buildstresstest">Build stress test</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">hdbc/hdbc-odbc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hdbc-postgresql-2.3.2.3 b/dev-haskell/hdbc-postgresql-2.3.2.3
new file mode 100644
index 000000000000..8f84771a7713
--- /dev/null
+++ b/dev-haskell/hdbc-postgresql-2.3.2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-db/postgresql-7:* dev-haskell/convertible:=[profile?] >=dev-haskell/hdbc-2.2.0:2=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 test? ( >=dev-haskell/hdbc-2.2.6:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/quickcheck:2=[profile?] dev-haskell/testpack:=[profile?] ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=PostgreSQL driver for HDBC
+EAPI=5
+HOMEPAGE=https://github.com/hdbc/hdbc-postgresql
+IUSE=test doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-db/postgresql-7:* dev-haskell/convertible:=[profile?] >=dev-haskell/hdbc-2.2.0:2=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-6.12.1:=
+RESTRICT=test
+SLOT=2/2.3.2.3
+SRC_URI=mirror://hackage/packages/archive/HDBC-postgresql/2.3.2.3/HDBC-postgresql-2.3.2.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a9efda97bdca49f7f589e2521bdab5af
diff --git a/dev-haskell/hdbc-postgresql-2.3.2.4-r1 b/dev-haskell/hdbc-postgresql-2.3.2.4-r1
new file mode 100644
index 000000000000..f2a54ca3058d
--- /dev/null
+++ b/dev-haskell/hdbc-postgresql-2.3.2.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-db/postgresql-7:* dev-haskell/convertible:=[profile?] >=dev-haskell/hdbc-2.2.0:2=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=PostgreSQL driver for HDBC
+EAPI=6
+HOMEPAGE=https://github.com/hdbc/hdbc-postgresql
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-db/postgresql-7:* dev-haskell/convertible:=[profile?] >=dev-haskell/hdbc-2.2.0:2=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=2/2.3.2.4
+SRC_URI=mirror://hackage/packages/archive/HDBC-postgresql/2.3.2.4/HDBC-postgresql-2.3.2.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=16460da3651b473ca502ab7059e16815
diff --git a/dev-haskell/hdbc-postgresql/Manifest b/dev-haskell/hdbc-postgresql/Manifest
deleted file mode 100644
index 34fa4a74ca6d..000000000000
--- a/dev-haskell/hdbc-postgresql/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST HDBC-postgresql-2.3.2.3.tar.gz 25193 BLAKE2B 1f93d2d50e87213415d102fd65bfa2a7d8a0fa5a6cb03223ffa42c6830837cc1ba61421a526756f22b497c7c7486551bac6421d9ddd704ec974d5428b0df656c SHA512 407b18758e75e99230dbad56000839d8499c075e77b63809e079c7968e52177cc599dff30517f8cd08c3e4e263a71a4c65b3040c318b4b3358ff329824f4766f
-DIST HDBC-postgresql-2.3.2.4.tar.gz 25288 BLAKE2B 9ecd290932ed83cd16159d8ea17379327040eb474ccae2819b95891475395e4ccd1d9724393c15f38053137afc8185bb8c1b6c90a11b76412a199a45104af394 SHA512 44f04536d04cf5b9778a03c5cce12d538b121a578e91b338753d64d69939852aacda57fca1e6dd22b5c2160bb29c71b2f8d8f63a9a7b62401db6f89e1d272364
-EBUILD hdbc-postgresql-2.3.2.3.ebuild 1563 BLAKE2B fe553fa150e11eff842e1be0a3bf6fb7d01276035b8d28c253ee56a8a8259fd341312e627854786b6237c1d7d693d2d0839864c1c3efacf4b0d9628b45283f0e SHA512 c2fe5684f691775e0a78840f820a0bafc6fffb555f84268a2547d19e55cbd0b8a53a66e02f9500d52936b042036378cba85c3e09c95a4597f8caeebd276e0589
-EBUILD hdbc-postgresql-2.3.2.4-r1.ebuild 983 BLAKE2B 4146d5a472f8de5fa27d12b93a3009506bad28186b66abd41cc6c94241031e9be0f11621280d8cd6dee6950dbc163d1d3cbf4013f01ff5de9e5752d30d946dd8 SHA512 f1622304d813cad8403e7da56549a6939d977eefba5ad2b1b5f00d5a51e502ec3876a100774f45597416d12653180927d3b354a0956bbbb6825e21191b7e0541
-MISC metadata.xml 312 BLAKE2B 31b0d561388d9aa98ec655f39ec34ae2feec6f3c4083e0bf49a058b54552ef1f06e65d472f7d5a3a6f343a53b83902a00383bfeb1a2e86d34286a5c19858341c SHA512 334d957cf43df9cde23341a942662697f9cc1cf568956d6e01ac8cb8bee488e37719a48f87dd6d6b30478742e4023fd7af104d6f7bfd50aa57efb66d9e9f5a88
diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.3.ebuild b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.3.ebuild
deleted file mode 100644
index 37ee78d5920d..000000000000
--- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-CABAL_FEATURES+=" nocabaldep" # workaround depend on old cabal-1.16
-inherit haskell-cabal
-
-MY_PN="HDBC-postgresql"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PostgreSQL driver for HDBC"
-HOMEPAGE="https://github.com/hdbc/hdbc-postgresql"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test" # requires configured postgresql
-
-RDEPEND=">=dev-db/postgresql-7:*
-	dev-haskell/convertible:=[profile?]
-	>=dev-haskell/hdbc-2.2.0:2=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( >=dev-haskell/hdbc-2.2.6:=[profile?]
-			dev-haskell/hunit:=[profile?]
-			dev-haskell/quickcheck:2=[profile?]
-			dev-haskell/testpack:=[profile?] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test buildtests)
-}
-
-src_test() {
-	# default tests
-	haskell-cabal_src_test || die "cabal test failed"
-
-	# built custom tests
-	"${S}/dist/build/runtests/runtests" || die "unit tests failed"
-}
-
-src_install() {
-	cabal_src_install
-
-	# if tests were enabled, make sure the unit test driver is deleted
-	rm -f "${ED}/usr/bin/runtests"
-}
diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.4-r1.ebuild b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.4-r1.ebuild
deleted file mode 100644
index 128c63c2c02d..000000000000
--- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.4-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: +splitbase
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HDBC-postgresql"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PostgreSQL driver for HDBC"
-HOMEPAGE="https://github.com/hdbc/hdbc-postgresql"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-db/postgresql-7:*
-	dev-haskell/convertible:=[profile?]
-	>=dev-haskell/hdbc-2.2.0:2=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=splitbase
-}
diff --git a/dev-haskell/hdbc-postgresql/metadata.xml b/dev-haskell/hdbc-postgresql/metadata.xml
deleted file mode 100644
index 9b1707d75fe9..000000000000
--- a/dev-haskell/hdbc-postgresql/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">hdbc/hdbc-postgresql</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hdbc-sqlite3-2.3.3.1-r1 b/dev-haskell/hdbc-sqlite3-2.3.3.1-r1
new file mode 100644
index 000000000000..6bcdd38016d8
--- /dev/null
+++ b/dev-haskell/hdbc-sqlite3-2.3.3.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-db/sqlite-3.0 >=dev-haskell/hdbc-2.3.0.0:2=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= buildtests? ( dev-haskell/convertible:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/testpack:=[profile?] ) >=dev-haskell/cabal-1.2.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Sqlite v3 driver for HDBC
+EAPI=6
+HOMEPAGE=https://github.com/hdbc/hdbc-sqlite3
+IUSE=buildtests +splitbase doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-db/sqlite-3.0 >=dev-haskell/hdbc-2.3.0.0:2=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= buildtests? ( dev-haskell/convertible:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/testpack:=[profile?] )
+SLOT=0/2.3.3.1
+SRC_URI=mirror://hackage/packages/archive/HDBC-sqlite3/2.3.3.1/HDBC-sqlite3-2.3.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d842f26dc286881a87f07c096d875a33
diff --git a/dev-haskell/hdbc-sqlite3/Manifest b/dev-haskell/hdbc-sqlite3/Manifest
deleted file mode 100644
index 4fd9be4452c5..000000000000
--- a/dev-haskell/hdbc-sqlite3/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST HDBC-sqlite3-2.3.3.1.tar.gz 15544 BLAKE2B ba1ae8142dd8122a158499623e6a64e64f4d54490565f70e58e083a4993280b73d901a97b1e29cc43d57efd184f931f4cf8a6f107d318bf756dcb9c830c0103e SHA512 17b2929aca806d0672ae83e1aa6122a38596504a4f23f868f1a3ff4e68f97c3aef6499f995659fa4ce82b1e8aab9a107172a7265309d4c3f4e9754e4cf756ec0
-EBUILD hdbc-sqlite3-2.3.3.1-r1.ebuild 1077 BLAKE2B 775137be0106281dcbe68e7522d290c4103d2a25139ac23ba3f4acb65fea5dffafb0ae9f23d0bbdf03f39d3e543bbda6fa065e9904b863c95d39c79b390ff976 SHA512 1e06c54919b643a6cb1ad3f5e324733542ae6d595525c7283351dedf53548e7fab3e84f69a71b68e88a6871bab7e053a83c078be988466d52fd69fe3e43a0689
-MISC metadata.xml 621 BLAKE2B 43b6c2fa50d30996dd81df963a724f9758496d58ee0548d53c5e54ddfe1bbf0781e068d653754979bd85a880f78827ae9ef4851d72ded4b637288a2d5ace1576 SHA512 6bc01a1eb9e0e327824849d9bd87eb06074e02ba0ded646ddcf3ab5dede95940a28be8d3d3c2a5df46e1589d9ef2eba767f31b85da3f9a3a45c596d22f11dae3
diff --git a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
deleted file mode 100644
index 696da308bffe..000000000000
--- a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HDBC-sqlite3"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Sqlite v3 driver for HDBC"
-HOMEPAGE="https://github.com/hdbc/hdbc-sqlite3"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="buildtests +splitbase"
-
-RDEPEND=">=dev-db/sqlite-3.0
-	>=dev-haskell/hdbc-2.3.0.0:2=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	buildtests? ( dev-haskell/convertible:=[profile?]
-			dev-haskell/hunit:=[profile?]
-			dev-haskell/old-locale:=[profile?]
-			dev-haskell/old-time:=[profile?]
-			dev-haskell/testpack:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag buildtests buildtests) \
-		$(cabal_flag splitbase splitbase)
-}
diff --git a/dev-haskell/hdbc-sqlite3/metadata.xml b/dev-haskell/hdbc-sqlite3/metadata.xml
deleted file mode 100644
index a6dc7b001d95..000000000000
--- a/dev-haskell/hdbc-sqlite3/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="buildtests">Build the executable to run unit tests</flag>
-		<flag name="splitbase">Choose the new smaller, split-up package.</flag>
-	</use>
-	<longdescription>
-		This is the Sqlite v3 driver for HDBC, the generic
-		database access system for Haskell
-	</longdescription>
-	<upstream>
-		<remote-id type="github">hdbc/hdbc-sqlite3</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hdbc/Manifest b/dev-haskell/hdbc/Manifest
deleted file mode 100644
index 694ae447f596..000000000000
--- a/dev-haskell/hdbc/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST HDBC-2.3.1.2.tar.gz 23314 BLAKE2B cc6eca2703be4768ea55b7264f960419378e415d165d63b64ac903a5228534cedec7b7e2d9f5c3284781b5a3f253a020deadd3e335bcfa46a77df746e8e99291 SHA512 e98ca4043c311eb8e5adb02d1a59bc0d1be84ba66c224b848649a596de214a2a38b8bedfe71fa8f17ae0843cf073e814c76e7e868aca1e20619e3d5fa573109c
-DIST HDBC-2.4.0.1.tar.gz 23415 BLAKE2B a63037329bd68e09c343497dd0d95a36675872122ff30bbf40ca108f8bd56454df354628b2317c11745ba58c60b5a9023128253e07a24622c1b34ef7356d07f2 SHA512 1a20a533ffe7700cfb48c9875e9c6b09f940c1b808fd1a371327eed9c358abfe0167d206bb5b2dbb904b49f2081f91f81091d4164aad2aa08555f6de01a55d5a
-EBUILD hdbc-2.3.1.2.ebuild 1547 BLAKE2B ecf538c7d940747068f435b066cd43c9f2e53e802e0f06ac02dff6ee582d8fd41daaff2adf3f74463f4498117fdff473fd6fac8fdeeab36b749e4c0156715e80 SHA512 2d1fabcae9662f12389e54bdb362e5ef959c186d689d51460cda8ac1fec5830b06168deaf7543fe117b686fb2d43f554bb6af109ead7f4dd6d62a757a415e9fd
-EBUILD hdbc-2.4.0.1.ebuild 1427 BLAKE2B 26fadca63e03feb3b7b2ef3715025395430deab4df87c15ffab554925b28e07dd70ced4acad9f4d106cdba0967a22b67acd674afbfaa575ffe0af4af74d8948b SHA512 49a199920bba639e88ac82be84cebe5003e125c92e02d314dc2123024280908ae5534fccb4eddfb94570080ae1a3bf00d61290eaee8f4545130977ff5706ec74
-MISC metadata.xml 630 BLAKE2B 1c82d745911411d99810468c26d5b3c4e0da53f9edb5273d0a06819e21c638b37c1178d3aa655e0e591b8cedd4ffce2061377c2b1ef60a4e0b85af064112547f SHA512 21033721685ac01211cd92c395fcff02a337bfac20b04a2b14932b70a9531ecbc8a56c429c51c9227b5c0912499f8e86d6bf7eaf93179dd3b73dff449290ea80
diff --git a/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild b/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild
deleted file mode 100644
index 43595a5a5289..000000000000
--- a/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal versionator
-
-MY_PN="HDBC"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Haskell Database Connectivity"
-HOMEPAGE="https://github.com/hdbc/hdbc"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql odbc postgres sqlite test"
-
-RDEPEND=">=dev-haskell/convertible-1.0.10.0:=[profile?] <dev-haskell/convertible-1.1.0.0:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		dev-haskell/text:=[profile?]
-		dev-haskell/utf8-string:=[profile?]
-		>=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/hunit
-			dev-haskell/quickcheck
-			dev-haskell/testpack
-		)
-	"
-
-DEPENDV="$(get_version_component_range 1-2)"
-PDEPEND="mysql? ( dev-haskell/hdbc-mysql )
-		odbc? ( =dev-haskell/hdbc-odbc-${DEPENDV}* )
-		postgres? ( =dev-haskell/hdbc-postgresql-${DEPENDV}* )
-		sqlite? ( >=dev-haskell/hdbc-sqlite3-${DEPENDV} )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	cabal_src_configure $(cabal_flag test buildtests)
-}
-
-src_test() {
-	# default tests
-	haskell-cabal_src_test || die "cabal test failed"
-
-	# built custom tests
-	"${S}/dist/build/runtests/runtests" || die "unit tests failed"
-}
-
-src_install() {
-	cabal_src_install
-
-	# if tests were enabled, make sure the unit test driver is deleted
-	rm -f "${ED}/usr/bin/runtests"
-}
diff --git a/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild b/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild
deleted file mode 100644
index 1f48de05daec..000000000000
--- a/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: buildtests:test
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HDBC"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Haskell Database Connectivity"
-HOMEPAGE="https://github.com/hdbc/hdbc"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test" # Tests do not compile with time 1.5
-
-RDEPEND=">=dev-haskell/convertible-1.1.0.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit:=[profile?]
-		>=dev-haskell/quickcheck-2.0:2=[profile?]
-		>=dev-haskell/testpack-2.0:=[profile?] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cabal_chdeps \
-		'time >= 1.5 && < 1.6' 'time >= 1.5'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test buildtests)
-}
-
-src_test() {
-	# default tests
-	haskell-cabal_src_test || die "cabal test failed"
-
-	# built custom tests
-	"${S}/dist/build/runtests/runtests" || die "unit tests failed"
-}
-
-src_install() {
-	cabal_src_install
-
-	# if tests were enabled, make sure the unit test driver is deleted
-	rm -f "${ED}/usr/bin/runtests"
-}
diff --git a/dev-haskell/hdbc/metadata.xml b/dev-haskell/hdbc/metadata.xml
deleted file mode 100644
index 70786ef184be..000000000000
--- a/dev-haskell/hdbc/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		HDBC provides an abstraction layer between Haskell programs and SQL
-		relational databases. This lets you write database code once, in
-		Haskell, and have it work with any number of backend SQL databases
-		(MySQL, Oracle, PostgreSQL, ODBC-compliant databases, etc.)
-	</longdescription>
-	<upstream>
-		<remote-id type="github">hdbc/hdbc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hex-0.1.2 b/dev-haskell/hex-0.1.2
new file mode 100644
index 000000000000..dc87d7e33e87
--- /dev/null
+++ b/dev-haskell/hex-0.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= dev-haskell/cabal doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Convert strings into hexadecimal and back
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/hex
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.2
+SRC_URI=mirror://hackage/packages/archive/hex/0.1.2/hex-0.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d517fa334fa3b02ff8d1af76b9586612
diff --git a/dev-haskell/hex/Manifest b/dev-haskell/hex/Manifest
deleted file mode 100644
index fed4355235be..000000000000
--- a/dev-haskell/hex/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hex-0.1.2.tar.gz 1956 BLAKE2B e0552b6278e2be4e8985e9d1e17f653f9fa401a6324dc252c4fc0e6c200564c972541bc9ac37321bff41fa9c52555ff95679a9dc1fdea3e836d88d6016c7a6e0 SHA512 30608035819260b94759d644644b92a7145defa000685de53323ab4e765250ead410010e4ab96e99b97af647e97394c86edaf92cb811aa5df8228669b8ff9b4d
-EBUILD hex-0.1.2.ebuild 545 BLAKE2B 99626873fad6dd48e446eeda33e408e2349e6adaf9cba07d6a406acd07d7fe7581bcadc3192e37a7d8c102ad886b2dfae6b2aadef730700d161e9e2b6dd09021 SHA512 c26273862578f0a0a4504e1d2e3663196f1a8862af5a2c821ecc974d0a44c6a6f4bc6fe8da87f4ab84b66b6a20c8d7d1901ed22e645a230b2256f3977e508a65
-MISC metadata.xml 333 BLAKE2B a530600c09444c9f02f4ca81337b0a5842b100967ab980262b8f68cff01ae59e66041be5ef6949de9d774d39a56ebd915b835b7e17d14606593185f4fe540d19 SHA512 156ecbeac95459ddb51076e7c9d12d663574dbcb483f702fa52c14620297e248d4a631e28143da60f810e4d9742e8c893ddf9eff1bf563db3930aada190de5ac
diff --git a/dev-haskell/hex/hex-0.1.2.ebuild b/dev-haskell/hex/hex-0.1.2.ebuild
deleted file mode 100644
index 02099fa26769..000000000000
--- a/dev-haskell/hex/hex-0.1.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Convert strings into hexadecimal and back"
-HOMEPAGE="http://hackage.haskell.org/package/hex"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/cabal
-"
diff --git a/dev-haskell/hex/metadata.xml b/dev-haskell/hex/metadata.xml
deleted file mode 100644
index 3154e9fd1185..000000000000
--- a/dev-haskell/hex/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Convert strings into hexadecimal and back.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hexpat-0.20.10 b/dev-haskell/hexpat-0.20.10
new file mode 100644
index 000000000000..c17c2e1a7dce
--- /dev/null
+++ b/dev-haskell/hexpat-0.20.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.7:=[profile?] >=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=XML parser/formatter based on expat
+EAPI=6
+HOMEPAGE=http://haskell.org/haskellwiki/Hexpat/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.7:=[profile?] >=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.20.10
+SRC_URI=mirror://hackage/packages/archive/hexpat/0.20.10/hexpat-0.20.10.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1ec93a98808522123c7c23940c996c4d
diff --git a/dev-haskell/hexpat-0.20.11 b/dev-haskell/hexpat-0.20.11
new file mode 100644
index 000000000000..70030faa9628
--- /dev/null
+++ b/dev-haskell/hexpat-0.20.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.7:=[profile?] >=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=XML parser/formatter based on expat
+EAPI=6
+HOMEPAGE=http://haskell.org/haskellwiki/Hexpat/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.7:=[profile?] >=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.20.11
+SRC_URI=mirror://hackage/packages/archive/hexpat/0.20.11/hexpat-0.20.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a5eaf2bf11dcdc5ce1f33214d0cb3435
diff --git a/dev-haskell/hexpat-0.20.13 b/dev-haskell/hexpat-0.20.13
new file mode 100644
index 000000000000..1026a591689e
--- /dev/null
+++ b/dev-haskell/hexpat-0.20.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.7:=[profile?] >=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.8.2:= !bundled-expat? ( dev-libs/expat ) >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=XML parser/formatter based on expat
+EAPI=6
+HOMEPAGE=http://haskell.org/haskellwiki/Hexpat/
+IUSE=bundled-expat doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.7:=[profile?] >=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.8.2:= !bundled-expat? ( dev-libs/expat )
+SLOT=0/0.20.13
+SRC_URI=mirror://hackage/packages/archive/hexpat/0.20.13/hexpat-0.20.13.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=22fd122dbc0dd8ba4b60582fcffc82e1
diff --git a/dev-haskell/hexpat-0.20.9 b/dev-haskell/hexpat-0.20.9
new file mode 100644
index 000000000000..a54d57409c91
--- /dev/null
+++ b/dev-haskell/hexpat-0.20.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.6:=[profile?] >=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=XML parser/formatter based on expat
+EAPI=5
+HOMEPAGE=http://haskell.org/haskellwiki/Hexpat/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.6:=[profile?] >=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.20.9
+SRC_URI=mirror://hackage/packages/archive/hexpat/0.20.9/hexpat-0.20.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=840c2fedea6515b61b30032cbdfd3300
diff --git a/dev-haskell/hexpat/Manifest b/dev-haskell/hexpat/Manifest
deleted file mode 100644
index 02ee15b81da5..000000000000
--- a/dev-haskell/hexpat/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST hexpat-0.20.10.tar.gz 132682 BLAKE2B 0ed27d239cd7a2b5928dbcaffd1b8bda30f69b44b31af0ec6f0340628e75710090bc34950ac91bbcd2a8f1d5422542856e8e5f90c4ba48db810a2183e7a484d0 SHA512 aa230d3e002bc74d7f8c9d72eb373f63ec62f391b855119b1163504c2d4ef54ec555f9f56983f02d9268ca8615415ffee2466f404adca6393b2114b0f8f9001b
-DIST hexpat-0.20.11.tar.gz 143476 BLAKE2B 674677f92d968ef0cb687dca692dc5cb886f8c599dd55923c79efb8404b8b20da6f2186c4b5eb6d466e45b022f929e04b9ae8fb8b80c971a284f882caadaf633 SHA512 c1cb174ad8668826b3b45909589ad339683a54e9fe3c4df246530c2510a5f72b98edd66bd2730478809b3dfd7e98a6bfebec2d88871dc433ef794038988dd982
-DIST hexpat-0.20.13.tar.gz 143733 BLAKE2B 73cb82a98454f7dda6425d1366e3746741e73290dc6eb2d10510caa3a3d749a074f1592766a03a45bd820d6f44d6cbd9215eddb35bc4005b2bf273501a889695 SHA512 900abcb599bd66856c822b791222a814cc6293d655f45c4295e991ba74f750a80fd1c3993a0dfd943de6a83e90a5905711a7ce9c599471b043b10f661ca5a598
-DIST hexpat-0.20.9.tar.gz 132649 BLAKE2B cad85ca4b42551ff8a36eaf2cf59fa0558a21d5f06cf7a146982954ae3fbf8548c5a129ed1be803b0943291d13362e29405641bf637b0854fac1786cd5026f5e SHA512 619bf92d60f2d43c11861507daf6f93716b5ed5c1fc1957a27470b65264d7c0b5edb3f6e2a1a9d25cd5d7edd8146abaf5cbb772f2d84dacd9f2fe9913b81b543
-EBUILD hexpat-0.20.10.ebuild 784 BLAKE2B 426102a6fe3b5c5deddea77b607c9a3812e5103196705d3c72776456eb0a435d0abf53d0abc8cb0332fa5129474b714e825e1649b816f5774f2d69d9088e82ca SHA512 2526f459ae5da90dacb998f2e63dafec8053f8e4cc9f05baa280af9329fce15e61190e7de4334b5c08e5754a2c71d72dbb72b4fe3843aa1d1d4d7255c5c47985
-EBUILD hexpat-0.20.11.ebuild 784 BLAKE2B 50bd16b6ffa03e56ad30d37848cfa197464b73c2e1d4d0e08985d79cf35de2703648d3e06f564aab6282bd48ed22af574e5bdf093ec44d477d761e06d36e6722 SHA512 87e6e5b6671213638709200ce4a129f06a748dfbf3df790e3516c99863fef3c4140496851809f86c80baa9c6cf1af3d77b395ea4c91d3f6fea2c2f5cc8b1d21a
-EBUILD hexpat-0.20.13.ebuild 961 BLAKE2B 5a639fa0134911d69b06ffff20ce516c25ee3fcbba961fa484f34f28612d4c18186998fdd0c2f4502d9f265a3613023de8c5a51fd07d858eb69c706b8ea2144c SHA512 c84f35d947a3948f1e63a08f803d4269b894080e61e7c4122bf064ba817528fd71f57fc164179ee06fed614ae0486b894e328c921f9c78d6fa35ba2d4f033f6d
-EBUILD hexpat-0.20.9.ebuild 815 BLAKE2B 6da75ed2c48ff8c9c20945f0efd32bc076cf563d7b7afa9b5ab179efdc76beb6e9fc7447b55cdc8bf10b2d69bc218342ebb2143d67c979a512d9843fd3ba104a SHA512 6395e521c4aa7dfc55d0b63e4693fc39be71fff2652de7d74bcd57dfb6b91acdcf27d3a2a4492ae722a6fe32c01c1783b59e4505fddf6d0ba5135b808bed9e2b
-MISC metadata.xml 3554 BLAKE2B 20c397df0b40251a6cde688194b7a396b04e0c348541a4f10560cf95fbe05e7b368ddf75c71f04db059bcbdfffd11f93011de9fdd228613450cb41d1cc0f04a4 SHA512 d096692b1c981f774cc784ebe97163d5f021e8e979e265b86dbe143cb332ffe234c20a986eb210f440da996f26e22d9901c9048f078c26ab30182f986901dea8
diff --git a/dev-haskell/hexpat/hexpat-0.20.10.ebuild b/dev-haskell/hexpat/hexpat-0.20.10.ebuild
deleted file mode 100644
index 58416216d3ad..000000000000
--- a/dev-haskell/hexpat/hexpat-0.20.10.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="XML parser/formatter based on expat"
-HOMEPAGE="http://haskell.org/haskellwiki/Hexpat/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.7:=[profile?]
-	>=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/hexpat/hexpat-0.20.11.ebuild b/dev-haskell/hexpat/hexpat-0.20.11.ebuild
deleted file mode 100644
index d376e49dfe17..000000000000
--- a/dev-haskell/hexpat/hexpat-0.20.11.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="XML parser/formatter based on expat"
-HOMEPAGE="http://haskell.org/haskellwiki/Hexpat/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.7:=[profile?]
-	>=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/hexpat/hexpat-0.20.13.ebuild b/dev-haskell/hexpat/hexpat-0.20.13.ebuild
deleted file mode 100644
index 0ea6497b4e00..000000000000
--- a/dev-haskell/hexpat/hexpat-0.20.13.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-#hackport: flags: bundle:bundled-expat
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="XML parser/formatter based on expat"
-HOMEPAGE="http://haskell.org/haskellwiki/Hexpat/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bundled-expat"
-
-RDEPEND=">=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.7:=[profile?]
-	>=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	!bundled-expat? ( dev-libs/expat )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bundled-expat bundle)
-}
diff --git a/dev-haskell/hexpat/hexpat-0.20.9.ebuild b/dev-haskell/hexpat/hexpat-0.20.9.ebuild
deleted file mode 100644
index 7d68b46ead13..000000000000
--- a/dev-haskell/hexpat/hexpat-0.20.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="XML parser/formatter based on expat"
-HOMEPAGE="http://haskell.org/haskellwiki/Hexpat/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.6:=[profile?]
-	>=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/hexpat/metadata.xml b/dev-haskell/hexpat/metadata.xml
deleted file mode 100644
index 686f514d51ef..000000000000
--- a/dev-haskell/hexpat/metadata.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name='bundled-expat'> Use bundled expat instead of <pkg>dev-libs/expat</pkg></flag>
-	</use>
-	<longdescription>
-		This package provides a general purpose Haskell XML library using Expat to
-		do its parsing (&lt;http://expat.sourceforge.net/&gt; - a fast stream-oriented XML
-		parser written in C).  It is extensible to any string type, with @String@,
-		@ByteString@ and @Text@ provided out of the box.
-		
-		Basic usage: Parsing a tree (/Tree/), formatting a tree (/Format/).
-		Other features: Helpers for processing XML trees (/Proc/), trees annotated with
-		XML source location (/Annotated/), extended XML trees with comments,
-		processing instructions, etc (/Extended/), XML cursors (/Cursor/),
-		SAX-style parse (/SAX/), and access to the low-level interface in case speed
-		is paramount (/Internal.IO/).
-		
-		The design goals are speed, speed, speed, interface simplicity and modularity.
-		
-		For introduction and examples, see the /Text.XML.Expat.Tree/ module. For benchmarks,
-		&lt;http://haskell.org/haskellwiki/Hexpat/&gt;
-		
-		If you want to do interactive I\/O, an obvious option is to use lazy parsing
-		with one of the lazy I\/O functions such as hGetContents.  However, this can be
-		problematic in some applications because it doesn't handle I\/O errors properly
-		and can give no guarantee of timely resource cleanup.  In these cases, chunked
-		I\/O is a better approach: Take a look at the /hexpat-enumerator/ package.
-		
-		/IO/ is filed under /Internal/ because it's low-level and most users won't want
-		it.  The other /Internal/ modules are re-exported by /Annotated/, /Tree/ and /Extended/,
-		so you won't need to import them directly.
-		
-		Credits to Iavor Diatchki and the @xml@ (XML.Light) package for /Proc/ and /Cursor/.
-		Thanks to the many contributors.
-		
-		BOUND VS. UNBOUND THREADS: GHC (at least versions 6.12.X) will spawn threads
-		if you call a safe FFI callback from an unbound thread.  This can get out of
-		control in a busy application.  To avoid this, from version 0.19.1 we now delegate
-		processing to a single worker thread if the calling thread is not bound.
-		This essentially means that hexpat currently won't exploit multicores very well.
-		It also means that hexpat may be more efficient on threads spawned with forkOS
-		(to give you a bound thread) rather than forkIO.
-		
-		ChangeLog: 0.15 changes intended to fix a (rare) \"error: a C finalizer called back into Haskell.\"
-		that seemed only to happen only on ghc6.12.X; 0.15.1 Fix broken Annotated parse;
-		0.16 switch from mtl to transformers; 0.17 fix mapNodeContainer &amp; rename some things.;
-		0.18 rename defaultEncoding to overrideEncoding. 0.18.3 formatG and indent were demanding list
-		items more than once (inefficient in chunked processing); 0.19 add Extended.hs;
-		0.19.1 fix a memory leak introduced in 0.19, delegate parsing to bound thread
-		if unbound (see note above); 0.19.2 include expat source code so \'cabal install\' just works
-		on Linux, Mac and Windows (thanks Jacob Stanley); 0.19.3 fix misconfiguration of expat
-		which broke entity parsing; 0.19.4 bump version constraint for text; 0.19.5 bump text
-		to &lt; 0.12 and fix text-0.10.0.1 breakage; 0.19.6 dependency breakage with List;
-		0.19.7 ghc-7.2.1 compatibility; 0.19.8 fix space leak on lazy parse under ghc-7.2.1
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hgettext-0.1.30 b/dev-haskell/hgettext-0.1.30
new file mode 100644
index 000000000000..8537a7c35798
--- /dev/null
+++ b/dev-haskell/hgettext-0.1.30
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cabal-1.10:=[profile?] dev-haskell/haskell-src-exts:=[profile?] dev-haskell/setlocale:=[profile?] dev-haskell/uniplate:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Bindings to libintl.h (gettext, bindtextdomain)
+EAPI=5
+HOMEPAGE=https://github.com/vasylp/hgettext
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cabal-1.10:=[profile?] dev-haskell/haskell-src-exts:=[profile?] dev-haskell/setlocale:=[profile?] dev-haskell/uniplate:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.1.30
+SRC_URI=mirror://hackage/packages/archive/hgettext/0.1.30/hgettext-0.1.30.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dfe675e8e50d669deb0d32cd66074e72
diff --git a/dev-haskell/hgettext/Manifest b/dev-haskell/hgettext/Manifest
deleted file mode 100644
index a152f0388ce8..000000000000
--- a/dev-haskell/hgettext/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hgettext-0.1.30.tar.gz 6289 BLAKE2B 1da585c19bdf8882249b22cbf9d65056b6b5856d4207578f48aeabbebb9ef68fdfff2cc29d275c74b42a0e1e54edbc4652a7cbaba1bcf59a2c6e52502636440c SHA512 f37c580e4e0e60691b86a6fa392e2809ef132d394507879adec2bd498bf0f678217d88475f261a1d359d36ffbd08e6177194a65872854d14f8f9d071f2f91af9
-EBUILD hgettext-0.1.30.ebuild 709 BLAKE2B f94c16194155daeacd9ee0899dde5f5ee6d25586c4d273fc58c0d3dd1e88ea69253f39c50f1be550c5146e6c966f85236bb5226b405b5d1795d84cf6487c6d5d SHA512 5f90ad26077cf6f8823dcb7c82919fe2b7dc868d91f918fc375c419c0ecb694052ee4146e4bda9e40705b41c5976c547699a4df67edf3d477a45b07a439f9f60
-MISC metadata.xml 418 BLAKE2B e76b5658d3392306a6e4901942f3c3604ee52db0fe71ad14723d3fcf994a13729c006520b500995010065b865bc43bf7458238668d5525b94ea9cd794c33b64b SHA512 4ed28a4f85bb76aa116e6fdae6891daed92836e81f40509939ea92b9245eca4b53801448274ad7c8988edbe8f16c43464d83ceca6c25efe7fe32668a404169ce
diff --git a/dev-haskell/hgettext/hgettext-0.1.30.ebuild b/dev-haskell/hgettext/hgettext-0.1.30.ebuild
deleted file mode 100644
index f543a0b129f2..000000000000
--- a/dev-haskell/hgettext/hgettext-0.1.30.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to libintl.h (gettext, bindtextdomain)"
-HOMEPAGE="https://github.com/vasylp/hgettext"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cabal-1.10:=[profile?]
-	dev-haskell/haskell-src-exts:=[profile?]
-	dev-haskell/setlocale:=[profile?]
-	dev-haskell/uniplate:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/hgettext/metadata.xml b/dev-haskell/hgettext/metadata.xml
deleted file mode 100644
index 2f5aa808eec0..000000000000
--- a/dev-haskell/hgettext/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Bindings to libintl.h (gettext, bindtextdomain)
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vasylp/hgettext</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/highlighting-kate-0.5.14 b/dev-haskell/highlighting-kate-0.5.14
new file mode 100644
index 000000000000..4e7b82432ad9
--- /dev/null
+++ b/dev-haskell/highlighting-kate-0.5.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] ) !pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] ) >=dev-haskell/cabal-1.10 test? ( dev-haskell/diff ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Syntax highlighting
+EAPI=5
+HOMEPAGE=https://github.com/jgm/highlighting-kate
+IUSE=executable pcre-light doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] ) !pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] )
+SLOT=0/0.5.14
+SRC_URI=mirror://hackage/packages/archive/highlighting-kate/0.5.14/highlighting-kate-0.5.14.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=184a7b479fad6c2ac1108683d6b17ea2
diff --git a/dev-haskell/highlighting-kate-0.5.5 b/dev-haskell/highlighting-kate-0.5.5
new file mode 100644
index 000000000000..b14e497892c2
--- /dev/null
+++ b/dev-haskell/highlighting-kate-0.5.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-6.10.4:= pcre-light? ( =dev-haskell/pcre-light-0.4*:=[profile?] ) !pcre-light? ( dev-haskell/regex-pcre-builtin:=[profile?] ) >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Syntax highlighting
+EAPI=5
+HOMEPAGE=https://github.com/jgm/highlighting-kate
+IUSE=executable pcre-light doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-6.10.4:= pcre-light? ( =dev-haskell/pcre-light-0.4*:=[profile?] ) !pcre-light? ( dev-haskell/regex-pcre-builtin:=[profile?] )
+SLOT=0/0.5.5
+SRC_URI=mirror://hackage/packages/archive/highlighting-kate/0.5.5/highlighting-kate-0.5.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2d0eea2201d6ae505d867058c7066087
diff --git a/dev-haskell/highlighting-kate-0.6 b/dev-haskell/highlighting-kate-0.6
new file mode 100644
index 000000000000..af31233d8cfb
--- /dev/null
+++ b/dev-haskell/highlighting-kate-0.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] ) !pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] ) >=dev-haskell/cabal-1.10 test? ( dev-haskell/diff ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Syntax highlighting
+EAPI=5
+HOMEPAGE=https://github.com/jgm/highlighting-kate
+IUSE=executable pcre-light doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] ) !pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] )
+SLOT=0/0.6
+SRC_URI=mirror://hackage/packages/archive/highlighting-kate/0.6/highlighting-kate-0.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=be14e5994e916bdfc210a53368002ba3
diff --git a/dev-haskell/highlighting-kate-0.6.1 b/dev-haskell/highlighting-kate-0.6.1
new file mode 100644
index 000000000000..d5f61538a5b4
--- /dev/null
+++ b/dev-haskell/highlighting-kate-0.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] ) !pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] ) >=dev-haskell/cabal-1.10 test? ( dev-haskell/diff ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Syntax highlighting
+EAPI=5
+HOMEPAGE=https://github.com/jgm/highlighting-kate
+IUSE=executable pcre-light doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] ) !pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] )
+SLOT=0/0.6.1
+SRC_URI=mirror://hackage/packages/archive/highlighting-kate/0.6.1/highlighting-kate-0.6.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ecae40e80bd654482a5eb7b373cde543
diff --git a/dev-haskell/highlighting-kate-0.6.2 b/dev-haskell/highlighting-kate-0.6.2
new file mode 100644
index 000000000000..ab32a8486c89
--- /dev/null
+++ b/dev-haskell/highlighting-kate-0.6.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] ) !pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] ) >=dev-haskell/cabal-1.10 test? ( dev-haskell/diff ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Syntax highlighting
+EAPI=5
+HOMEPAGE=https://github.com/jgm/highlighting-kate
+IUSE=executable pcre-light doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] ) !pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] )
+SLOT=0/0.6.2
+SRC_URI=mirror://hackage/packages/archive/highlighting-kate/0.6.2/highlighting-kate-0.6.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=717ad66d3cfb5730d6386f8dabdd78e6
diff --git a/dev-haskell/highlighting-kate-0.6.3 b/dev-haskell/highlighting-kate-0.6.3
new file mode 100644
index 000000000000..1d01e9c64ff9
--- /dev/null
+++ b/dev-haskell/highlighting-kate-0.6.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] ) !pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] ) >=dev-haskell/cabal-1.10 test? ( dev-haskell/diff ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Syntax highlighting
+EAPI=6
+HOMEPAGE=https://github.com/jgm/highlighting-kate
+IUSE=executable pcre-light doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] ) !pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] )
+SLOT=0/0.6.3
+SRC_URI=mirror://hackage/packages/archive/highlighting-kate/0.6.3/highlighting-kate-0.6.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dd588ad68e3365eabe9fe999341ad669
diff --git a/dev-haskell/highlighting-kate/Manifest b/dev-haskell/highlighting-kate/Manifest
deleted file mode 100644
index d7e461f8d721..000000000000
--- a/dev-haskell/highlighting-kate/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-DIST highlighting-kate-0.5.14.tar.gz 865527 BLAKE2B 655c3e2e3239d1074bb64c05f492e0d43c1a1206e8d3ebc0c39f42fc4d9d339b8b1806586772f5d83a65d5c7d50e2c714201e3a4d1f4edaf4366a46bc1c2efd2 SHA512 da2d1a5940357c3e067e51119fb6d209b42ea76828ed90bf4feeea099eeb844d53498dad6ef0d833c903db4d39e63dc4cbc2ebd913b51e41af3799a32d2c3b89
-DIST highlighting-kate-0.5.5.tar.gz 668017 BLAKE2B 7c57c27495aab3125325a35b384999bda688674ff4085fa7b1403e0993b3e6aec1412203d83fef07988836f7904fc480ddde266fd0335dc76c4fc347b2585017 SHA512 50c24f0a7f247ff1c5410aa31b270851c88cc3c24480da332c0a344c6959a7f8748dad4650374844b36eccee0824c991797d8327bf2b15ae055918acf129bd95
-DIST highlighting-kate-0.6.1.tar.gz 913389 BLAKE2B 4730b4c641e3a90255449c629cfefb75c89aebf121511688cb6630a3dbe0803a02a6dc8a6d6aacdff1634d23bb2e8e7f5904c66f693691585a71651ebee49e75 SHA512 c7b0696acaee1e7679582dde6da0bd0d46a573955249d4b6b1455ac9f29839daaf0dd9c7f2b2229d335d24fd512c802e268cd96b9b6ca2a7509490b1e66ab774
-DIST highlighting-kate-0.6.2.tar.gz 919467 BLAKE2B 15bcdd28afc9347869d96a92d4b07f6145751f64c7dd18cd94b318ee726b067b9b2819a1166b57db55d1f46690645a1509dfb3b1c06cdabdf4605b1ce1b8481e SHA512 b6574957352800d359f184b91f145623b7370e3e1e92ead79c5c6c5ed7a13b85e09e6f17a4d1af2b2628e30f6f34859143dfcc226b5d6f0e5d8a2fe5022c0924
-DIST highlighting-kate-0.6.3.tar.gz 905495 BLAKE2B 0849b39ddd3f1e0e0cf3885fb8261c0e5bc5815acf832f8b225b3e1b75c429ec03de86508b9d1e5aed9ae19ba321de712e01142c72ec35b13f2861e6d3005b73 SHA512 0927c28038a17270513e82ee40efda2cba6b081a80a2060d96b2a0b27291f19d9f28fd1dbceccf5e1def9cd8f5d372700239cb760738523c95c30c5b4342260e
-DIST highlighting-kate-0.6.tar.gz 922847 BLAKE2B b523ba1ef469845bcd8d45994e40552ff672cf701bca3be63cb9c98d46b3c867d464f7f2a421102cf91ce3e483527b9d892194eb43aeaed97bbcc4dfda8891e5 SHA512 2042e22299735e49e45cb34f2807f883da91c98ca3fd37cd1698f5d1cfea49df79cfb8da6ac9664aba0629c5500e6cd9e9c812d897f59b9bd75b2a5cd5c12933
-EBUILD highlighting-kate-0.5.14.ebuild 1085 BLAKE2B 5e232c8f9967f1528ced7e8ea4aa957e29f103c2ee49b405149553a335cfb4ab3cec7142d080364508f923d9d2caa23a39fb2d760a099a6f260b8d8a9a6bf74b SHA512 dedb7f8738c1652845b605c2674fb16f42e1c6c86231bef2e6fad306a24bf6ba9a275201559057378fdc37221cdb577d8b16260bfe614f884c98c131bc3c42a3
-EBUILD highlighting-kate-0.5.5.ebuild 962 BLAKE2B 08403a178e49e34eb961d3f8fa0e6c90ce94e66469acfc7a96298a5bfb5d541b2c12708d6e828b11dfae87e0f293ac8712bda996c0cf419d8a46631713d1cf38 SHA512 5e8aa52e047260ea45f0c595456c8cf58620a9f883ac9b31f1bfaceb181fb0a7e59e5281bf7d3e369e9a3bd2b76c02789305972d052ec51ad5de082e4eb904f2
-EBUILD highlighting-kate-0.6.1.ebuild 1085 BLAKE2B f21bdeefb00d4a80dc3092da867c794ebe34951b5ee817e7c8f7c8923bbd934e200eb0b326c52b1c6a8bc384bc321e947c49a8a0cc34c85b9d588478ba008d4c SHA512 0930ab5ed1122a9cf4ffa792ba5b327f97cd114078ddbfc00601118167c4e9f87bd0fdc0655604d272a32967eff005302b7f1340436d52678ffc99e8c8f339a2
-EBUILD highlighting-kate-0.6.2.ebuild 1085 BLAKE2B 41737d13af8a15cc44ec1119dbea5fc5c374f63f2b69e230bc837f293c15b2ba75d849759e7a34db93711ef403fd2c92c4e7081175e95c1ed344865cb2367c7e SHA512 2d35ff94d3e688b5d6c4c511c80b31e346b0f9b10b8714af18e161f3822efb72d131708a31e9df7ff4d02017333f9d90ab617f05be7972eb47655191e40d5d6e
-EBUILD highlighting-kate-0.6.3.ebuild 1079 BLAKE2B c51179e19ebf416afa7f797518419c2c7efc5b0c88623e0243d2e6969e215d9457b8ce2a3f24715439e1579a248500c28c47920f2ec05cd20ffd0478b2fbf864 SHA512 4281292331e7d44943b2ec1d7681702ed59a9506546f98cc371b4c3f3aa438e942163329a6a98bca33b5f759e5fe108391d9409a980cbc0b39aeaaea07cd0593
-EBUILD highlighting-kate-0.6.ebuild 1083 BLAKE2B 513cb1942c4f2a37027bcf6aca18fa54956ba2016b37d2108168121e0e90658ce4405e68b1385ea7defda0bc26a62ac3e9eeebec92deb985302a75018a70f036 SHA512 7a799743a7c4129747902dcee6781e03e8952b44f2caacab87d148fd12c5e9ed7de6e5a3e54eccb3006e36412af60f576cfeb6a5b4646384c557c0b16c41703f
-MISC metadata.xml 948 BLAKE2B 9524a77a83d911547f79794d84651b82f8bb96b988de701504183dd89258b3590c0ec1159bee2b1227f146c11918835cc96eedb2c4e6ab2068d702d40b850af0 SHA512 6f3c1d7ba5507213d394caeb2c535c9249a18cc40c29100b3b5fba7a25ad372f8447d4da47596f5ced0dcc231297e44f0f67aadcc05ab3ae2135e54c5aee0cb3
diff --git a/dev-haskell/highlighting-kate/highlighting-kate-0.5.14.ebuild b/dev-haskell/highlighting-kate/highlighting-kate-0.5.14.ebuild
deleted file mode 100644
index f6cc91235009..000000000000
--- a/dev-haskell/highlighting-kate/highlighting-kate-0.5.14.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Syntax highlighting"
-HOMEPAGE="https://github.com/jgm/highlighting-kate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable pcre-light"
-
-RDEPEND=">=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] )
-	!pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/diff )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag pcre-light pcre-light)
-}
diff --git a/dev-haskell/highlighting-kate/highlighting-kate-0.5.5.ebuild b/dev-haskell/highlighting-kate/highlighting-kate-0.5.5.ebuild
deleted file mode 100644
index 6c914b777c5c..000000000000
--- a/dev-haskell/highlighting-kate/highlighting-kate-0.5.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Syntax highlighting"
-HOMEPAGE="https://github.com/jgm/highlighting-kate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="executable pcre-light"
-
-RDEPEND=">=dev-haskell/blaze-html-0.4.2:=[profile?]
-		<dev-haskell/blaze-html-0.7:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		dev-haskell/parsec:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		pcre-light? ( =dev-haskell/pcre-light-0.4*:=[profile?]
-		)
-		!pcre-light? ( dev-haskell/regex-pcre-builtin:=[profile?]
-		)"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag pcre-light pcre-light)
-}
diff --git a/dev-haskell/highlighting-kate/highlighting-kate-0.6.1.ebuild b/dev-haskell/highlighting-kate/highlighting-kate-0.6.1.ebuild
deleted file mode 100644
index 2187920079a2..000000000000
--- a/dev-haskell/highlighting-kate/highlighting-kate-0.6.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Syntax highlighting"
-HOMEPAGE="https://github.com/jgm/highlighting-kate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable pcre-light"
-
-RDEPEND=">=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] )
-	!pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/diff )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag pcre-light pcre-light)
-}
diff --git a/dev-haskell/highlighting-kate/highlighting-kate-0.6.2.ebuild b/dev-haskell/highlighting-kate/highlighting-kate-0.6.2.ebuild
deleted file mode 100644
index afc142fa2366..000000000000
--- a/dev-haskell/highlighting-kate/highlighting-kate-0.6.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Syntax highlighting"
-HOMEPAGE="https://github.com/jgm/highlighting-kate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable pcre-light"
-
-RDEPEND=">=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] )
-	!pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/diff )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag pcre-light pcre-light)
-}
diff --git a/dev-haskell/highlighting-kate/highlighting-kate-0.6.3.ebuild b/dev-haskell/highlighting-kate/highlighting-kate-0.6.3.ebuild
deleted file mode 100644
index a3dc5a42c908..000000000000
--- a/dev-haskell/highlighting-kate/highlighting-kate-0.6.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Syntax highlighting"
-HOMEPAGE="https://github.com/jgm/highlighting-kate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable pcre-light"
-
-RDEPEND=">=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] )
-	!pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/diff )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag pcre-light pcre-light)
-}
diff --git a/dev-haskell/highlighting-kate/highlighting-kate-0.6.ebuild b/dev-haskell/highlighting-kate/highlighting-kate-0.6.ebuild
deleted file mode 100644
index 07fe060323fd..000000000000
--- a/dev-haskell/highlighting-kate/highlighting-kate-0.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Syntax highlighting"
-HOMEPAGE="https://github.com/jgm/highlighting-kate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="executable pcre-light"
-
-RDEPEND=">=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] )
-	!pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/diff )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag pcre-light pcre-light)
-}
diff --git a/dev-haskell/highlighting-kate/metadata.xml b/dev-haskell/highlighting-kate/metadata.xml
deleted file mode 100644
index 06830317afe1..000000000000
--- a/dev-haskell/highlighting-kate/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		highlighting-kate is a syntax highlighting library
-		with support for nearly one hundred languages. The syntax
-		parsers are automatically generated from Kate
-		syntax descriptions (&lt;http://kate-editor.org/&gt;),
-		so any syntax supported by Kate can be added.
-		An (optional) command-line program is provided, along
-		with a utility for generating new parsers from Kate
-		XML syntax descriptions.
-	</longdescription>
-	<use>
-		<flag name="executable">Build the Highlight executable.</flag>
-		<flag name="pcre-light">Use the pcre-light library instead of regex-pcre-builtin.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">jgm/highlighting-kate</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hinotify-0.3.8.1 b/dev-haskell/hinotify-0.3.8.1
new file mode 100644
index 000000000000..af23c3e2d416
--- /dev/null
+++ b/dev-haskell/hinotify-0.3.8.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell binding to inotify
+EAPI=5
+HOMEPAGE=https://github.com/kolmodin/hinotify.git
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.8.1
+SRC_URI=mirror://hackage/packages/archive/hinotify/0.3.8.1/hinotify-0.3.8.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8f553cbf66981eb81863bc9c341ff0f6
diff --git a/dev-haskell/hinotify/Manifest b/dev-haskell/hinotify/Manifest
deleted file mode 100644
index 1198eeef7ac8..000000000000
--- a/dev-haskell/hinotify/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hinotify-0.3.8.1.tar.gz 8344 BLAKE2B 6258434aaa02faf35e96c8b1ce8c5bb66bdab2abbfa0689706a657f18cb374a6fbeb83762cbf58dfde6716cecf1b67a07fa2b6e02b3d6d589a7b879066e83617 SHA512 965484ed676985303e0e559985d80e37af3d1cd0d7a0bb111679ba2ac1ead4c541a409630bb679ab70e33c0e2dcb070e17b162ff8a967c65e438ec071b756f87
-EBUILD hinotify-0.3.8.1.ebuild 547 BLAKE2B 9f60e4fe8fdb86a9a44712d162f95b047bcb724930e69b6b06bdb3df4cb14c0e95eddc74e54613c150f84e14a1992ec8471f88067411eef2a2cff49cd332c8f4 SHA512 65b01dd715411754ad435a225d22d160f718d9e69469b872c99704855a18c198634380359d22ded3a86ceb03ad5c0da0fc72d40976b753389310f98b5e161ee7
-MISC metadata.xml 313 BLAKE2B bab3730bd2a22da830374304d09c0b2b68b09547549162b3cbd7072ea9f42f0689c7f1dd5f9c072162662a3c9d4a94e0c29323064b98195c3301a96ce7e53f0c SHA512 c126a37566ae8dda3d2b87795f45fd5f2e167a68fbb0f73291b19b3e8c355c8d6084187a721fc3e29b7d23fc53f3470727cf0a430774790c0997b4548c910176
diff --git a/dev-haskell/hinotify/hinotify-0.3.8.1.ebuild b/dev-haskell/hinotify/hinotify-0.3.8.1.ebuild
deleted file mode 100644
index cc43578121c1..000000000000
--- a/dev-haskell/hinotify/hinotify-0.3.8.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell binding to inotify"
-HOMEPAGE="https://github.com/kolmodin/hinotify.git"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/hinotify/metadata.xml b/dev-haskell/hinotify/metadata.xml
deleted file mode 100644
index 162bc3660228..000000000000
--- a/dev-haskell/hinotify/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">kolmodin/hinotify.git</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hit-0.6.3 b/dev-haskell/hit-0.6.3
new file mode 100644
index 000000000000..d52635228f38
--- /dev/null
+++ b/dev-haskell/hit-0.6.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10.1:=[profile?] dev-haskell/byteable:=[profile?] dev-haskell/cryptohash:=[profile?] >=dev-haskell/hourglass-0.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/parsec-3:=[profile?] dev-haskell/patience:=[profile?] dev-haskell/random:=[profile?] dev-haskell/system-fileio:=[profile?] dev-haskell/system-filepath:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/utf8-string:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/zlib:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= executable? ( >=dev-haskell/hashable-1.2:=[profile?] dev-haskell/hashtables:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/bytedump-1.0 dev-haskell/tasty dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Git operations in haskell
+EAPI=6
+HOMEPAGE=https://github.com/vincenthz/hit
+IUSE=debug executable doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.10.1:=[profile?] dev-haskell/byteable:=[profile?] dev-haskell/cryptohash:=[profile?] >=dev-haskell/hourglass-0.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/parsec-3:=[profile?] dev-haskell/patience:=[profile?] dev-haskell/random:=[profile?] dev-haskell/system-fileio:=[profile?] dev-haskell/system-filepath:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/utf8-string:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/zlib:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= executable? ( >=dev-haskell/hashable-1.2:=[profile?] dev-haskell/hashtables:=[profile?] )
+SLOT=0/0.6.3
+SRC_URI=mirror://hackage/packages/archive/hit/0.6.3/hit-0.6.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a228cd379a2dfc3c91464b1e8205c5c8
diff --git a/dev-haskell/hit/Manifest b/dev-haskell/hit/Manifest
deleted file mode 100644
index bcef7fac466a..000000000000
--- a/dev-haskell/hit/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hit-0.6.3.tar.gz 38690 BLAKE2B 928a532cacb2393b46b9e5abeee6d66bf140e9e4a71f359b8a35016f97db4eeb32f4efb6c56d74528d3311ae4d6477716670c14ae6ad7361a7892575185dd336 SHA512 82ccfeb77a439caa1792f1ae29535636764be9e6e94f75973f37a86db6627a492e57da835954384ef8468799de9f0897e20905f65dad256fe3547a4248d5fffc
-EBUILD hit-0.6.3.ebuild 1450 BLAKE2B 76458303cac6d86593d06f05ffe3e479f88c0349081d175a72fde6d4a83e12ea138e26e75a33e8cc376d1471b4257eeaa83e6bd046bc1334e316d508baac541c SHA512 973a7050384748b2a93234be69c0bd1838a93c0d43fd5e3c9226974b7e0dd75c613df53c3cf24a7218676524d2fc29042e574d8216dddec5ad911d4566ef458e
-MISC metadata.xml 717 BLAKE2B c3c7f87958186af89f91d209015050b8adf88a9da76dbcb4e64f2132d4eca3f209b8c97873af77cc98d5d3a605cf13eb8edb1261ed4b80086c8aa6774e1c5ea4 SHA512 64247968400adb4b29dc6de54ecada645f2c7365c9ca111e8639f803a416a6865ad783f19d73a0a70b35be9bc900d0d5fb346e657b85f18ffb37c482ecc74c77
diff --git a/dev-haskell/hit/hit-0.6.3.ebuild b/dev-haskell/hit/hit-0.6.3.ebuild
deleted file mode 100644
index 466101757343..000000000000
--- a/dev-haskell/hit/hit-0.6.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Git operations in haskell"
-HOMEPAGE="https://github.com/vincenthz/hit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug executable"
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	dev-haskell/cryptohash:=[profile?]
-	>=dev-haskell/hourglass-0.2:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?]
-	dev-haskell/patience:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/system-fileio:=[profile?]
-	dev-haskell/system-filepath:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	executable? ( >=dev-haskell/hashable-1.2:=[profile?]
-			dev-haskell/hashtables:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/bytedump-1.0
-		dev-haskell/tasty
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug) \
-		$(cabal_flag executable executable)
-}
diff --git a/dev-haskell/hit/metadata.xml b/dev-haskell/hit/metadata.xml
deleted file mode 100644
index aeb520f51526..000000000000
--- a/dev-haskell/hit/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		An haskell implementation of git storage operations, allowing users
-		to manipulate git repositories (read and write).
-
-		This implementation is fully interoperable with the main C implementation.
-
-		This is stricly only manipulating the git store (what's inside the .git directory),
-		and doesn't do anything with the index or your working directory files.
-	</longdescription>
-	<use>
-		<flag name="executable">Build the executable</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/hjsmin-0.1.5.1 b/dev-haskell/hjsmin-0.1.5.1
new file mode 100644
index 000000000000..d2457f5012ec
--- /dev/null
+++ b/dev-haskell/hjsmin-0.1.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] >=dev-haskell/language-javascript-0.5.14:=[profile?] <dev-haskell/language-javascript-0.6:=[profile?] >=dev-haskell/optparse-applicative-0.7:=[profile?] >=dev-haskell/text-0.8:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2 dev-haskell/test-framework dev-haskell/test-framework-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell implementation of a javascript minifier
+EAPI=5
+HOMEPAGE=https://github.com/erikd/hjsmin
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] >=dev-haskell/language-javascript-0.5.14:=[profile?] <dev-haskell/language-javascript-0.6:=[profile?] >=dev-haskell/optparse-applicative-0.7:=[profile?] >=dev-haskell/text-0.8:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.5.1
+SRC_URI=mirror://hackage/packages/archive/hjsmin/0.1.5.1/hjsmin-0.1.5.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=28a13bfc0904cc27d3a92bf1f9479ae8
diff --git a/dev-haskell/hjsmin-0.2.0.2 b/dev-haskell/hjsmin-0.2.0.2
new file mode 100644
index 000000000000..99a27f3b678b
--- /dev/null
+++ b/dev-haskell/hjsmin-0.2.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] >=dev-haskell/language-javascript-0.6:=[profile?] <dev-haskell/language-javascript-0.7:=[profile?] >=dev-haskell/optparse-applicative-0.7:=[profile?] >=dev-haskell/text-0.8:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell implementation of a javascript minifier
+EAPI=6
+HOMEPAGE=https://github.com/erikd/hjsmin
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] >=dev-haskell/language-javascript-0.6:=[profile?] <dev-haskell/language-javascript-0.7:=[profile?] >=dev-haskell/optparse-applicative-0.7:=[profile?] >=dev-haskell/text-0.8:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.0.2
+SRC_URI=mirror://hackage/packages/archive/hjsmin/0.2.0.2/hjsmin-0.2.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4e1c8883db6ace18d0da6343076ba373
diff --git a/dev-haskell/hjsmin/Manifest b/dev-haskell/hjsmin/Manifest
deleted file mode 100644
index 02174a650b36..000000000000
--- a/dev-haskell/hjsmin/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST hjsmin-0.1.5.1.tar.gz 116938 BLAKE2B fbf3f19f5c137c74dc7d98e29fa2481bfdf7e8fa775a3c9537c6c46afcd91fcf53fa77c2c7e2a8291998c10e6e03312d322bc080d69aa5fa37236cd1a67c739d SHA512 e157246de9d80f6ca877d9eda185bb37a2ea0cb41fa147f387abd9050d0c5c8deee54a3caff5da82a3207672465908c9814dc6fdbb70e8fd77095af1257d2ae2
-DIST hjsmin-0.2.0.2.tar.gz 4211 BLAKE2B c6f81e0a3d5ec30da1bb83d7e7c396175ae3e1cb1810f13eed0c27351e808e37bab3dbf4678e1c84575449177a3269ef76d8c09d553b3bdbd01fc6bdbf686702 SHA512 ffd67972cef49b5026995e9852e603035513e18089df9f77c35ec084ee3487904018aea018a08408ab53f441aa5200efdd7f5a28191cd814c5e2fc91c2552902
-EBUILD hjsmin-0.1.5.1.ebuild 925 BLAKE2B 9df0f9f66ff8c1ea2351fb0d7f0584fdcdac6e0183c1c64a54fb53e19e90fbc6f5de6ff193ab947fb5ffe2d7f411cadc09f882029e101c76c936d846ad7084b4 SHA512 00fcc9d1c40fc06af88c8a4be9fbc02c768eb49c5bb8997cedb957c8f643026e80670f5fde6f50db2fe90108a5cd7fdd52227630309322e913b55c3264539ee9
-EBUILD hjsmin-0.2.0.2.ebuild 787 BLAKE2B 0640df382709b0d4c348d4d4295f057c961e7ac08a9ef133074b4282cbb68905b580bd7fddd48e41064863d6ae90f9b9201f694355f5608b2151868f32c33ecd SHA512 44e6f42d67e4d8083310c866b47614e3290de5b4273dba6ae531687240d78f4f9bedc876bdeb5df27b1f940ade5598193492a329abe634963d8bc6802dc59790
-MISC metadata.xml 503 BLAKE2B 9e214f7e6d156005d13a0f4b0fb341b237716e97c0f0122e3ef153ebaa41900428343d762b2adaaed81cd414bcbf3ef7ead89d3c7a159c08237c28f7f05181fc SHA512 1b03f37ba387cc9b8f448827a192ea2a02f45d757c82937756c6dc52eeaeabaa6bddcf9e1e50ae46698d55fae44b77d897e287a9426c1363bf0248331338e0c5
diff --git a/dev-haskell/hjsmin/hjsmin-0.1.5.1.ebuild b/dev-haskell/hjsmin/hjsmin-0.1.5.1.ebuild
deleted file mode 100644
index 28c797df6dd7..000000000000
--- a/dev-haskell/hjsmin/hjsmin-0.1.5.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell implementation of a javascript minifier"
-HOMEPAGE="https://github.com/erikd/hjsmin"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?]
-	>=dev-haskell/language-javascript-0.5.14:=[profile?] <dev-haskell/language-javascript-0.6:=[profile?]
-	>=dev-haskell/optparse-applicative-0.7:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
diff --git a/dev-haskell/hjsmin/hjsmin-0.2.0.2.ebuild b/dev-haskell/hjsmin/hjsmin-0.2.0.2.ebuild
deleted file mode 100644
index 4517a34cf814..000000000000
--- a/dev-haskell/hjsmin/hjsmin-0.2.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell implementation of a javascript minifier"
-HOMEPAGE="https://github.com/erikd/hjsmin"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?]
-	>=dev-haskell/language-javascript-0.6:=[profile?] <dev-haskell/language-javascript-0.7:=[profile?]
-	>=dev-haskell/optparse-applicative-0.7:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-"
diff --git a/dev-haskell/hjsmin/metadata.xml b/dev-haskell/hjsmin/metadata.xml
deleted file mode 100644
index a9dfd41191a5..000000000000
--- a/dev-haskell/hjsmin/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Reduces size of javascript files by stripping out extraneous whitespace and
-		other syntactic elements, without changing the semantics.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">alanz/hjsmin</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hlint-1.8.57 b/dev-haskell/hlint-1.8.57
new file mode 100644
index 000000000000..ca173d818857
--- /dev/null
+++ b/dev-haskell/hlint-1.8.57
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cpphs-1.11:=[profile?] >=dev-haskell/haskell-src-exts-1.14:=[profile?] <dev-haskell/haskell-src-exts-1.15:=[profile?] >=dev-haskell/hscolour-1.17:=[profile?] >=dev-haskell/transformers-0.0:=[profile?] >=dev-haskell/uniplate-1.5:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Source code suggestions
+EAPI=5
+HOMEPAGE=http://community.haskell.org/~ndm/hlint/
+IUSE=emacs doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cpphs-1.11:=[profile?] >=dev-haskell/haskell-src-exts-1.14:=[profile?] <dev-haskell/haskell-src-exts-1.15:=[profile?] >=dev-haskell/hscolour-1.17:=[profile?] >=dev-haskell/transformers-0.0:=[profile?] >=dev-haskell/uniplate-1.5:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.8.57
+SRC_URI=mirror://hackage/packages/archive/hlint/1.8.57/hlint-1.8.57.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d6f7bd27a76e0061dcc4d94560521718
diff --git a/dev-haskell/hlint-1.9.21 b/dev-haskell/hlint-1.9.21
new file mode 100644
index 000000000000..fac23234314a
--- /dev/null
+++ b/dev-haskell/hlint-1.9.21
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.6.2:=[profile?] >=dev-haskell/cmdargs-0.10:=[profile?] >=dev-haskell/cpphs-1.18.1:=[profile?] >=dev-haskell/extra-0.5:2=[profile?] >=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.17:=[profile?] >=dev-haskell/transformers-0.0:=[profile?] >=dev-haskell/uniplate-1.5:=[profile?] >=dev-lang/ghc-7.4.1:= gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Source code suggestions
+EAPI=5
+HOMEPAGE=http://community.haskell.org/~ndm/hlint/
+IUSE=emacs +gpl doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/ansi-terminal-0.6.2:=[profile?] >=dev-haskell/cmdargs-0.10:=[profile?] >=dev-haskell/cpphs-1.18.1:=[profile?] >=dev-haskell/extra-0.5:2=[profile?] >=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.17:=[profile?] >=dev-haskell/transformers-0.0:=[profile?] >=dev-haskell/uniplate-1.5:=[profile?] >=dev-lang/ghc-7.4.1:= gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] )
+SLOT=0/1.9.21
+SRC_URI=mirror://hackage/packages/archive/hlint/1.9.21/hlint-1.9.21.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=66523b423e3426b9266792aa576a41f4
diff --git a/dev-haskell/hlint-1.9.35 b/dev-haskell/hlint-1.9.35
new file mode 100644
index 000000000000..066151210c98
--- /dev/null
+++ b/dev-haskell/hlint-1.9.35
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.6.2:=[profile?] >=dev-haskell/cmdargs-0.10:=[profile?] >=dev-haskell/cpphs-1.20.1:=[profile?] >=dev-haskell/extra-1.4.9:2=[profile?] >=dev-haskell/haskell-src-exts-1.17:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?] >=dev-haskell/refact-0.3:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/uniplate-1.5:=[profile?] >=dev-lang/ghc-7.4.1:= gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Source code suggestions
+EAPI=5
+HOMEPAGE=https://github.com/ndmitchell/hlint#readme
+IUSE=emacs +gpl doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/ansi-terminal-0.6.2:=[profile?] >=dev-haskell/cmdargs-0.10:=[profile?] >=dev-haskell/cpphs-1.20.1:=[profile?] >=dev-haskell/extra-1.4.9:2=[profile?] >=dev-haskell/haskell-src-exts-1.17:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?] >=dev-haskell/refact-0.3:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/uniplate-1.5:=[profile?] >=dev-lang/ghc-7.4.1:= gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] )
+SLOT=0/1.9.35
+SRC_URI=mirror://hackage/packages/archive/hlint/1.9.35/hlint-1.9.35.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=288bff7ab62c56671fab0b8897ec45ee
diff --git a/dev-haskell/hlint/Manifest b/dev-haskell/hlint/Manifest
deleted file mode 100644
index 78e54f544fe1..000000000000
--- a/dev-haskell/hlint/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX 60hlint-gentoo.el 231 BLAKE2B 2fef831bc7a3056d59e67dcfbb6cd5ca86a4ad4d46c8728ba528b0bd8b5c9e10fb765282de3f856ee59146e1f1043d7b5cb47c8352e60a72f2a86119654283c6 SHA512 1e83147144fb72a9e98fd405116baa2ff10532bdfb954fd86486f1abc3a6df7db54f90875dfe325f827546c03cc6c1d9980003fa839857f8c6b4410cfe8cccd4
-DIST hlint-1.8.57.tar.gz 79071 BLAKE2B 5c538ecd36a22d879b0746fa0f3df3715e7d8f85407ff3375f4b850256eb125d0dd01d875fe6babe8c912b62402da7fd88df6d05194e5501c449f9230f33b500 SHA512 1fca029067cf34f9d024640fbacfc455e733adb239e339471131b014c3d5cab671e5c267d855d1df7dd76440dab45a8981502dd840073005a4e5c50d177f91da
-DIST hlint-1.9.21.tar.gz 88802 BLAKE2B 08708331c50b73433c7fde7c826d976126f7bdd758722f6a8903d18d45da6d9ffcd32b883036f17c74165feb0245199e2e248fee9701c01153736d62f73b9494 SHA512 e7e87aba3905bb577d952a960a92038816bf057ed19aa85cff0deaa653a9c248b6a4b44b907024ad271abf615ab94ebac6f4801c77f545cadbddf0db57f13ad8
-DIST hlint-1.9.35.tar.gz 97402 BLAKE2B ea3bb516769c496be4943ab57a37bde97e1a03fca56dd6c9bdc3da30ac86b1b0538796e868de85049d28fa8286bfd45e0f1fb960e15cf12294bdb74dab08f926 SHA512 14daa5ad5652f93b3e3c4d5cff1df3735755c1561c2eb6c7ae3d05401d4a253ccba87d0cb5d09e690ce1a30f0352a26839856dd648bb10a13013cb43aed28606
-EBUILD hlint-1.8.57.ebuild 1479 BLAKE2B 1e13e963eaf39dbf23f5a0451b0cfce5903ae615fb2005bb0f3b73a6614130db960eed419fc1cd92778dc380086be6547c82177471b6e095985c4981f26c0830 SHA512 b7aac6a6acf6132f8ca844df4ef723d5ae827c64f2176ab9c0c08937c1acaea70cec115efe526fb297bb406add5131a9378006e3392e688c6850b10d50d8c4e5
-EBUILD hlint-1.9.21.ebuild 1648 BLAKE2B f272d8620d969c543b67684eab08c3bcb9fa9055747eab64e804e80b3fc3a057a707b34f9fbd934466edc699f8562472f496ff1ada313c51ce94114cc97b0e9d SHA512 7f1b3517bf00907c0b401c16d7b1f770a90dc846c234a36fe43851f58378818bef0e7740efb9545b300743c5903e6927ba95d4892e5f0a59fd680ed86ca3213b
-EBUILD hlint-1.9.35.ebuild 1714 BLAKE2B 0a271bec10325798e2309b4e7949b74eeeeaf83c68467ca96d9c63477af0ca71e65412b156bb8efa1040630a4f1606ccf76b9c3e976efcfca638c1728661e40e SHA512 40b549a30d2fb9f9e1eb75f2b118657bbae0d8b1f2a211dfebf4357d4d2d8fc53a425b3acabed0f1e41361bb8a2a9bf8a88cdb753cb5b74690c46fd8201231c1
-MISC metadata.xml 514 BLAKE2B 9d4466ded84b33d243146bf75ecc80aa920dd4d959ed661498d6bc8d51676bea2024441300a79a3c6f39bb94bfc4d9b3a5727f5f79c012ff8ea91ad5596bc0d7 SHA512 09783e5f456c5e5f7c9b4cc0b61d5d45d9a77ba4e582368f75e17fb8cd3b7a94ac56c6acbe1a5eee4a65a53fce1c72bf7ce3d0a00e736aaa249c0211b76926c5
diff --git a/dev-haskell/hlint/files/60hlint-gentoo.el b/dev-haskell/hlint/files/60hlint-gentoo.el
deleted file mode 100644
index 990d5a89b5fb..000000000000
--- a/dev-haskell/hlint/files/60hlint-gentoo.el
+++ /dev/null
@@ -1,7 +0,0 @@
-
-;; hlint emacs integration site initialisation
-(add-to-list 'load-path "@SITELISP@")
-(require 'hs-lint)
-(defun hlint-haskell-mode-hook ()
-   (local-set-key "\C-cl" 'hs-lint))
-(add-hook 'haskell-mode-hook 'hlint-haskell-mode-hook)
diff --git a/dev-haskell/hlint/hlint-1.8.57.ebuild b/dev-haskell/hlint/hlint-1.8.57.ebuild
deleted file mode 100644
index 09ef9f412f3a..000000000000
--- a/dev-haskell/hlint/hlint-1.8.57.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal elisp-common
-
-DESCRIPTION="Source code suggestions"
-HOMEPAGE="http://community.haskell.org/~ndm/hlint/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs"
-
-RDEPEND=">=dev-haskell/cpphs-1.11:=[profile?]
-	>=dev-haskell/haskell-src-exts-1.14:=[profile?] <dev-haskell/haskell-src-exts-1.15:=[profile?]
-	>=dev-haskell/hscolour-1.17:=[profile?]
-	>=dev-haskell/transformers-0.0:=[profile?]
-	>=dev-haskell/uniplate-1.5:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_configure() {
-	local threaded_flag=""
-	if $(ghc-supports-threaded-runtime); then
-		threaded_flag="--flags=threaded"
-	else
-		threaded_flag="--flags=-threaded"
-	fi
-	cabal_src_configure \
-		$threaded_flag
-}
-
-src_compile() {
-	cabal_src_compile
-
-	use emacs && elisp-compile data/hs-lint.el
-}
-
-src_install() {
-	cabal_src_install
-
-	if use emacs; then
-		elisp-install ${PN} data/*.el data/*.elc || die "elisp-install failed."
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	doman data/hlint.1
-}
-
-pkg_postinst() {
-	ghc-package_pkg_postinst
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-haskell/hlint/hlint-1.9.21.ebuild b/dev-haskell/hlint/hlint-1.9.21.ebuild
deleted file mode 100644
index 2d5630a9754a..000000000000
--- a/dev-haskell/hlint/hlint-1.9.21.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal elisp-common
-
-DESCRIPTION="Source code suggestions"
-HOMEPAGE="http://community.haskell.org/~ndm/hlint/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="emacs +gpl"
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
-	>=dev-haskell/cmdargs-0.10:=[profile?]
-	>=dev-haskell/cpphs-1.18.1:=[profile?]
-	>=dev-haskell/extra-0.5:2=[profile?]
-	>=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.17:=[profile?]
-	>=dev-haskell/transformers-0.0:=[profile?]
-	>=dev-haskell/uniplate-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_configure() {
-	local threaded_flag=""
-	if $(ghc-supports-threaded-runtime); then
-		threaded_flag="--flags=threaded"
-	else
-		threaded_flag="--flags=-threaded"
-	fi
-
-	haskell-cabal_src_configure \
-		$(cabal_flag gpl gpl) \
-		$threaded_flag
-}
-
-src_compile() {
-	cabal_src_compile
-
-	use emacs && elisp-compile data/hs-lint.el
-}
-
-src_install() {
-	cabal_src_install
-
-	if use emacs; then
-		elisp-install ${PN} data/*.el data/*.elc || die "elisp-install failed."
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	doman data/hlint.1
-}
-
-pkg_postinst() {
-	ghc-package_pkg_postinst
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-haskell/hlint/hlint-1.9.35.ebuild b/dev-haskell/hlint/hlint-1.9.35.ebuild
deleted file mode 100644
index df5bd496ce4b..000000000000
--- a/dev-haskell/hlint/hlint-1.9.35.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal elisp-common
-
-DESCRIPTION="Source code suggestions"
-HOMEPAGE="https://github.com/ndmitchell/hlint#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs +gpl"
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
-	>=dev-haskell/cmdargs-0.10:=[profile?]
-	>=dev-haskell/cpphs-1.20.1:=[profile?]
-	>=dev-haskell/extra-1.4.9:2=[profile?]
-	>=dev-haskell/haskell-src-exts-1.17:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?]
-	>=dev-haskell/refact-0.3:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/uniplate-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_configure() {
-	local threaded_flag=""
-	if $(ghc-supports-threaded-runtime); then
-		threaded_flag="--flags=threaded"
-	else
-		threaded_flag="--flags=-threaded"
-	fi
-
-	haskell-cabal_src_configure \
-		$(cabal_flag gpl gpl) \
-		$threaded_flag
-}
-
-src_compile() {
-	cabal_src_compile
-
-	use emacs && elisp-compile data/hs-lint.el
-}
-
-src_install() {
-	cabal_src_install
-
-	if use emacs; then
-		elisp-install ${PN} data/*.el data/*.elc || die "elisp-install failed."
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	doman data/hlint.1
-}
-
-pkg_postinst() {
-	haskell-cabal_pkg_postinst
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	haskell-cabal_pkg_postrm
-	use emacs && elisp-site-regen
-}
diff --git a/dev-haskell/hlint/metadata.xml b/dev-haskell/hlint/metadata.xml
deleted file mode 100644
index d9589665f744..000000000000
--- a/dev-haskell/hlint/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		HLint gives suggestions on how to improve your source code.
-	</longdescription>
-	<use>
-		<flag name="gpl">Use GPL libraries, specifically hscolour.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ndmitchell/hlint</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hoauth2-0.4.8 b/dev-haskell/hoauth2-0.4.8
new file mode 100644
index 000000000000..81502201de54
--- /dev/null
+++ b/dev-haskell/hoauth2-0.4.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.10:=[profile?] >=dev-haskell/http-conduit-2.0:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell OAuth2 authentication
+EAPI=5
+HOMEPAGE=https://github.com/freizl/hoauth2
+IUSE=test doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.10:=[profile?] >=dev-haskell/http-conduit-2.0:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.4.8
+SRC_URI=mirror://hackage/packages/archive/hoauth2/0.4.8/hoauth2-0.4.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5696df7dab7867c8b5b3ba9f9573c441
diff --git a/dev-haskell/hoauth2-0.5.7 b/dev-haskell/hoauth2-0.5.7
new file mode 100644
index 000000000000..964ea51565b4
--- /dev/null
+++ b/dev-haskell/hoauth2-0.5.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-1.1:=[profile?] >=dev-haskell/http-conduit-2.2:=[profile?] <dev-haskell/http-conduit-2.3:=[profile?] >=dev-haskell/http-types-0.9:=[profile?] <dev-haskell/http-types-0.10:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell OAuth2 authentication client
+EAPI=6
+HOMEPAGE=https://github.com/freizl/hoauth2
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-1.1:=[profile?] >=dev-haskell/http-conduit-2.2:=[profile?] <dev-haskell/http-conduit-2.3:=[profile?] >=dev-haskell/http-types-0.9:=[profile?] <dev-haskell/http-types-0.10:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.5.7
+SRC_URI=mirror://hackage/packages/archive/hoauth2/0.5.7/hoauth2-0.5.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=60b49d813d8c9597a15bf2df5ec6d0df
diff --git a/dev-haskell/hoauth2/Manifest b/dev-haskell/hoauth2/Manifest
deleted file mode 100644
index b1a8a3c3b0c6..000000000000
--- a/dev-haskell/hoauth2/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST hoauth2-0.4.8.tar.gz 8599 BLAKE2B 9cfaf6bf26937a5b3e9e03489843cd9173aea20d4360bfbbdbb9e083f7ec0c2191f19b6c8b86f07d5216c8fa064558183203d0f3d05e8390afb2a7d3a2f82455 SHA512 b2abf00d0ae7d15911f4a1e17d90d6f0b3931800bc66d77545c566fc64de527cfc86121b57a4ff4187a4a0aa81aea2e150412bf928fdec8e506ab24f9e1bea29
-DIST hoauth2-0.5.7.tar.gz 12245 BLAKE2B 641c30f90c4420c40e0c73397d5a830c1b9f24095bf31108531303fbfc8d56e4a614a09c2e2fdc11204521d2299faf2c15fd8dc6a0541627c0804ce485cd8bc6 SHA512 218c5cb722861af099efa1cf66025b3fbdaba3574b19fbe39db5bb3ca8431c8436329b9bf9cd7a642227e2bca964843bba6b94cb70d5020321b3f743cc020569
-EBUILD hoauth2-0.4.8.ebuild 964 BLAKE2B a73e30606dc5d53cd5c8f2e86aa276932c243904a3d9a0ec758ba1763da42b04441c24f1f00f0e67187255e81d0c6b1bc4009c4deacf76749f13985fb583a249 SHA512 d7d0a0769b46595ddf82206dcfe6984b7ef3486a5a222b31a8d6dee51411d8c75678466fb001a0fa518a1625aa80b6e9535e089809f69e786fe0425c4b5b2a29
-EBUILD hoauth2-0.5.7.ebuild 999 BLAKE2B 9a1411df326c0393d7b7e9f83460ee0879496122ad5a1c53207a2e18d2a28473e168716ea3f21d7f20cb7a93a39a8089ad9b30c86873f045f9d504364e791523 SHA512 63b481adf04376f29cf55ada974f38aa1f25cbb94fe315ce205b69ebd288623cae4cedec2ab17831347bb49d3ffbe3a3b96852b897a62ca2beff781016eea526
-MISC metadata.xml 655 BLAKE2B 19a9e440b04b5bf2e3bc9847baf82c2dba9e10f0c1156ddea8346f1c7511b9447874916b8ffdbac637fd5e41e2cc78a0d7ee6fe9034d13366920c7bf27e80072 SHA512 e8ea432f6d8785580b6486b34c43423dd0e141a102abf18ff4a5b1b418df23101d82e6f3cffac71b749af75793f61f645ee5074abe79f633127c82ce740d1f72
diff --git a/dev-haskell/hoauth2/hoauth2-0.4.8.ebuild b/dev-haskell/hoauth2/hoauth2-0.4.8.ebuild
deleted file mode 100644
index 15d726a7c80f..000000000000
--- a/dev-haskell/hoauth2/hoauth2-0.4.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell OAuth2 authentication"
-HOMEPAGE="https://github.com/freizl/hoauth2"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RESTRICT=test # missing files
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.10:=[profile?]
-	>=dev-haskell/http-conduit-2.0:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?]
-	>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test test)
-}
diff --git a/dev-haskell/hoauth2/hoauth2-0.5.7.ebuild b/dev-haskell/hoauth2/hoauth2-0.5.7.ebuild
deleted file mode 100644
index 11d19920caeb..000000000000
--- a/dev-haskell/hoauth2/hoauth2-0.5.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -test
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell OAuth2 authentication client"
-HOMEPAGE="https://github.com/freizl/hoauth2"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-1.1:=[profile?]
-	>=dev-haskell/http-conduit-2.2:=[profile?] <dev-haskell/http-conduit-2.3:=[profile?]
-	>=dev-haskell/http-types-0.9:=[profile?] <dev-haskell/http-types-0.10:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-test
-}
diff --git a/dev-haskell/hoauth2/metadata.xml b/dev-haskell/hoauth2/metadata.xml
deleted file mode 100644
index 409b57ebc713..000000000000
--- a/dev-haskell/hoauth2/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haskell OAuth2 authentication.
-		
-		Tested following services
-		
-		* google web oauth: &lt;https://developers.google.com/accounts/docs/OAuth2WebServer&gt;
-		
-		* weibo oauth2: &lt;http://open.weibo.com/wiki/Oauth2&gt;
-		
-		* github oauth: &lt;https://developer.github.com/v3/oauth/&gt;
-	</longdescription>
-	<upstream>
-		<remote-id type="github">freizl/hoauth2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hostname-1.0 b/dev-haskell/hostname-1.0
new file mode 100644
index 000000000000..ed36ec730954
--- /dev/null
+++ b/dev-haskell/hostname-1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b13b8a87ce3edbed57c6bbb86c066e0b
diff --git a/dev-haskell/hostname/Manifest b/dev-haskell/hostname/Manifest
deleted file mode 100644
index 947d14551f23..000000000000
--- a/dev-haskell/hostname/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hostname-1.0.tar.gz 1982 BLAKE2B 25122384852611f2e9120e242251f553357d006331c07ecc36b5e78b22d9b0d30bd67d9c1011615f3255a8d4887729e2f4ea17992177c1c661ec8bd73cd63002 SHA512 6e879490e45b20a50b6f2f6bb5f613c1697344e03ec569332587c56e016bb71f742564781682dc8cad3f3fca07f38054ba0862099dc0377857a9e3eb337077ed
-EBUILD hostname-1.0.ebuild 591 BLAKE2B 7b1d9575fa7fc8b4c903b5dcae153bbdbd1add58c7bdb2c94f52d7e378b5fb6c33145269f193ae6f9c5f8b4db3058f717a3a91c4725d3e50d8b96b2b304c6686 SHA512 13b18d3422a62e9e5facd8962e8d64ce3f9cb948a67ce4771783ce8845a7be2fb3da5840244d81ce3712363fa2c982c84f89959b8adc825a18a7a76d88b8a050
-MISC metadata.xml 373 BLAKE2B 36f6110c3b2d90d87ef72038fd7f329765eeb11b035f96694007f65283723a3e9dda768555121f178c7b9da145335ad25e1b61ffc8b5988331d08cf0aad5524b SHA512 bc66b3025c78763f60dcc6a07ef29857f06738b72b5b5aed90c2a43b690a01a6f478929d0c8440d4372e16c8873cf88d513c0d6fbc06f623223f416269f2bea4
diff --git a/dev-haskell/hostname/hostname-1.0.ebuild b/dev-haskell/hostname/hostname-1.0.ebuild
deleted file mode 100644
index 4db16a3b21f3..000000000000
--- a/dev-haskell/hostname/hostname-1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.14
-
-EAPI="4"
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A a cross-platform means of determining the hostname"
-HOMEPAGE="http://hackage.haskell.org/package/hostname"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/hostname/metadata.xml b/dev-haskell/hostname/metadata.xml
deleted file mode 100644
index 055b354b3aa2..000000000000
--- a/dev-haskell/hostname/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A very simple package providing a cross-platform means of determining the hostname
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hourglass-0.2.9 b/dev-haskell/hourglass-0.2.9
new file mode 100644
index 000000000000..6e8738b25194
--- /dev/null
+++ b/dev-haskell/hourglass-0.2.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/mtl dev-haskell/old-locale dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=simple performant time related library
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-hourglass
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.9
+SRC_URI=mirror://hackage/packages/archive/hourglass/0.2.9/hourglass-0.2.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7e9d23c0bfc18a23c38bd755f3d07c98
diff --git a/dev-haskell/hourglass/Manifest b/dev-haskell/hourglass/Manifest
deleted file mode 100644
index 5c825db07ad5..000000000000
--- a/dev-haskell/hourglass/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hourglass-0.2.9.tar.gz 24919 BLAKE2B f4b1332a72a887c3c72eaf41086059a6156a609e3386d66a475191ef5d864fb53499b05713deec751f991f110e24d0dce51de1314cc846a145b356c18cee613b SHA512 ba6ee78b900139e8267a4bd9676abc2189e6c581225c5718c6f753515b1b7037ee4f8197f6910cc8ef769110234ec1cef7b3af0d1c6c7cef93bd87c81c7f57d4
-EBUILD hourglass-0.2.9.ebuild 690 BLAKE2B 2732a843fe54dba84a390bfa9694c49aaeefc51f0bc89610b90bc197a3d3550c7e6e164455463cbe0857c82052275f06290c0402a7b58d04dd84b159d79a31f6 SHA512 b1df6de18cce13c6ae8db898b43bdf28014baa22bb09e015e4bf5997d1a92b2a8246e248df334004994af3141d81d47c620e8bbae9445932d06da2750d1e079f
-MISC metadata.xml 660 BLAKE2B fc66061dbbb891e1eb7e7d18e218a302cf98da733dc943e19740324c9be32124af9c1facb4a3a50ba388b7e4f3c17058d254b6e6acea70821fcca153d2dd9538 SHA512 e7158ee20ead18c600918b0b5051e4e8ec3dafec9829007a065d4d7ee9114eff48ae14895eaae3b654e12466dcda884c27c4f39b026ca231e3078eaf2858b603
diff --git a/dev-haskell/hourglass/hourglass-0.2.9.ebuild b/dev-haskell/hourglass/hourglass-0.2.9.ebuild
deleted file mode 100644
index d7d1242d5cba..000000000000
--- a/dev-haskell/hourglass/hourglass-0.2.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="simple performant time related library"
-HOMEPAGE="https://github.com/vincenthz/hs-hourglass"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/mtl
-		dev-haskell/old-locale
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/hourglass/metadata.xml b/dev-haskell/hourglass/metadata.xml
deleted file mode 100644
index aeb2e0a19f66..000000000000
--- a/dev-haskell/hourglass/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Simple time library focusing on simple but powerful and performant API
-		
-		The backbone of the library are the Timeable and Time type classes.
-		
-		Each Timeable instances can be converted to type that has a Time instances,
-		and thus are different representations of current time.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-hourglass</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hpack-0.14.1 b/dev-haskell/hpack-0.14.1
new file mode 100644
index 000000000000..10c346843171
--- /dev/null
+++ b/dev-haskell/hpack-0.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/base-compat-0.8:=[profile?] dev-haskell/glob:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/aeson-0.10 dev-haskell/aeson-qq >=dev-haskell/hspec-2 <dev-haskell/hspec-3 dev-haskell/interpolate >=dev-haskell/mockery-0.3 dev-haskell/quickcheck dev-haskell/temporary ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An alternative format for Haskell packages
+EAPI=6
+HOMEPAGE=https://github.com/sol/hpack#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/base-compat-0.8:=[profile?] dev-haskell/glob:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.14.1
+SRC_URI=mirror://hackage/packages/archive/hpack/0.14.1/hpack-0.14.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=40a259ce4d53492db5d2cde871563c83
diff --git a/dev-haskell/hpack/Manifest b/dev-haskell/hpack/Manifest
deleted file mode 100644
index 8996e2bc736f..000000000000
--- a/dev-haskell/hpack/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX hpack-0.14.1-aeson-1.patch 1088 BLAKE2B fbdac681ca35879fe0cf789cf8f4f8b459e3900a6b56bedb48afd8fef7b6cc890341c5649da8127752a4131402d8e67f50c3722ce9ba41cbd5a97f4976809d76 SHA512 ac178c92f2dbd1e0b498b82363b5c03525597c2f3d0fe834f9e7b6e80312e6adae773861b6c18768cd45c2ea323b10ea65b8e5f2991cd3678e9966d9fd876172
-DIST hpack-0.14.1.tar.gz 38373 BLAKE2B d5c3b900e3e2fd852081934f4a7b4a327f4647608ceecf76ac65faf4e464bed7428e4b444f7b06f8a0e7661458e1817aedaaa2ea2dd8161a362be9f596f7f0be SHA512 5bd7b5335aef1a3d866c07937e457397c82235c99b578b6270b699895b9a5d39259eef324e6741af9a6e296bfe56587fc9888dc0fc2e4bd6fe99bbc74a7e0b04
-EBUILD hpack-0.14.1.ebuild 1034 BLAKE2B 9d64e89ecd9196402c1fe91a33065d47fada4bd494a2941a16ef088f5c850eebfb37ca4858c14bb6a682706eaebe90e0813ba84411f5f61c89a996320b454aee SHA512 bb59bedb19029098e7dc2759f22cc1b587f9fd868c6edc7f99817301e606af0482fafee4694f80315dbdd98438c30503b548716c60da17966ec1d472fe09d49b
-MISC metadata.xml 333 BLAKE2B e31588ab4845a712814c6d194bcf1d2b4600011055f83c672ee183f2f8bfdc4d8da339027953a59aabf0765c683a1aaf92f3dcfb8eb6899f2b77c2df856f08e4 SHA512 0de08ff54a63322f19c4b560d10130fe7d78ff9c4880fdac2da4d5ebcdeb1fe3800e8910b60319e4218c8cc9ac547fa4b01885f8a21078da2f4c80e6e84b405b
diff --git a/dev-haskell/hpack/files/hpack-0.14.1-aeson-1.patch b/dev-haskell/hpack/files/hpack-0.14.1-aeson-1.patch
deleted file mode 100644
index a4b3fd1f4b6a..000000000000
--- a/dev-haskell/hpack/files/hpack-0.14.1-aeson-1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/Hpack/Config.hs b/src/Hpack/Config.hs
-index cb84f71..5566b8c 100644
---- a/src/Hpack/Config.hs
-+++ b/src/Hpack/Config.hs
-@@ -101,3 +101,9 @@ githubBaseUrl = "https://github.com/"
- 
--genericParseJSON_ :: forall a. (Generic a, GFromJSON (Rep a), HasTypeName a) => Value -> Parser a
-+#if MIN_VERSION_aeson(1,0,0)
-+#    define AESON_ARITY Zero
-+#else
-+#    define AESON_ARITY
-+#endif
-+
-+genericParseJSON_ :: forall a. (Generic a, GFromJSON AESON_ARITY (Rep a), HasTypeName a) => Value -> Parser a
- genericParseJSON_ = genericParseJSON defaultOptions {fieldLabelModifier = hyphenize name}
-diff --git a/test/Hpack/ConfigSpec.hs b/test/Hpack/ConfigSpec.hs
-index 320ba9a..d13d932 100644
---- a/test/Hpack/ConfigSpec.hs
-+++ b/test/Hpack/ConfigSpec.hs
-@@ -971,3 +971,3 @@ spec = do
-             |]
--          readPackageConfig file `shouldReturn` Left (file ++ ": Error in $.executables.foo: failed to parse field executables: The key \"main\" was not found")
-+          readPackageConfig file `shouldReturn` Left (file ++ ": Error in $.executables.foo: key \"main\" not present")
- 
diff --git a/dev-haskell/hpack/hpack-0.14.1.ebuild b/dev-haskell/hpack/hpack-0.14.1.ebuild
deleted file mode 100644
index 7ae2c30ef742..000000000000
--- a/dev-haskell/hpack/hpack-0.14.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An alternative format for Haskell packages"
-HOMEPAGE="https://github.com/sol/hpack#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
-	>=dev-haskell/base-compat-0.8:=[profile?]
-	dev-haskell/glob:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/yaml:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/aeson-0.10
-		dev-haskell/aeson-qq
-		>=dev-haskell/hspec-2 <dev-haskell/hspec-3
-		dev-haskell/interpolate
-		>=dev-haskell/mockery-0.3
-		dev-haskell/quickcheck
-		dev-haskell/temporary )
-"
-
-PATCHES=("${FILESDIR}"/${P}-aeson-1.patch)
diff --git a/dev-haskell/hpack/metadata.xml b/dev-haskell/hpack/metadata.xml
deleted file mode 100644
index acec350af770..000000000000
--- a/dev-haskell/hpack/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		An alternative format for Haskell packages
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hps-0.15 b/dev-haskell/hps-0.15
new file mode 100644
index 000000000000..4bb4c5e6586e
--- /dev/null
+++ b/dev-haskell/hps-0.15
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hcg-minus-0.15:=[profile?] <dev-haskell/hcg-minus-0.16:=[profile?] >=dev-lang/ghc-7.4.1:= build-exec? ( dev-haskell/random:=[profile?] ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell Postscript
+EAPI=6
+HOMEPAGE=http://rd.slavepianos.org/?t=hps
+IUSE=build-exec doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-haskell/hcg-minus-0.15:=[profile?] <dev-haskell/hcg-minus-0.16:=[profile?] >=dev-lang/ghc-7.4.1:= build-exec? ( dev-haskell/random:=[profile?] )
+SLOT=0/0.15
+SRC_URI=mirror://hackage/packages/archive/hps/0.15/hps-0.15.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d9d9de6afe28f258bc9c42ca253eb03f
diff --git a/dev-haskell/hps/Manifest b/dev-haskell/hps/Manifest
deleted file mode 100644
index da91bd4ca239..000000000000
--- a/dev-haskell/hps/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hps-0.15.tar.gz 12111 BLAKE2B 24dc23e3315f69bab6975b4b091c026c91a478b6d9c4cf220d4cea527a72522b0ef17dceeab5d7907c9f598268d2e1e7dfcd4849740615bdfa0667fe936c9738 SHA512 19b86161b46d523357863acbbdc8b7311e9f6b286429dbf1f56e044ced578d7c7026315d02b50ef831b3bce412ca623082956039181e832fb766e30729ea27c6
-EBUILD hps-0.15.ebuild 752 BLAKE2B e16b104349e53e9b345db033fd60ca39961ff6704d4b8c3c119a6f78f11a8a379f89ad21bbafcdaa0710a92ae7e76c00fc8db929c46bf43c6937d42dab8f7eb3 SHA512 1f8af8bf11755c5cdc0ed65e4725134018afa24699dd0bcea7fb659d75777b18b4d7048a6036833e8886aa252be9d98ccbdd3560fa8f765bc4f5512087db2cee
-MISC metadata.xml 445 BLAKE2B 9f80506c0b02afedfc8fb4b897d8cf6e217a5d7962920ee4c7825fd4e1863d73c5cfaa24907cba982dcdb6f7af320e1c27e3c6eeef37fd960851338941b9249a SHA512 e71f6cbd322644db836bf7cf5fc6056db4e0f744aa58a3acb62bdd6ecbb62955945ad693c618352a6b18133fe314a7161d86e0fdb8439265259dbf673d4dad03
diff --git a/dev-haskell/hps/hps-0.15.ebuild b/dev-haskell/hps/hps-0.15.ebuild
deleted file mode 100644
index 0e5de65a0b07..000000000000
--- a/dev-haskell/hps/hps-0.15.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell Postscript"
-HOMEPAGE="http://rd.slavepianos.org/?t=hps"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="build-exec"
-
-RDEPEND=">=dev-haskell/hcg-minus-0.15:=[profile?] <dev-haskell/hcg-minus-0.16:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	build-exec? ( dev-haskell/random:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag build-exec build-exec)
-}
diff --git a/dev-haskell/hps/metadata.xml b/dev-haskell/hps/metadata.xml
deleted file mode 100644
index d47195469b5a..000000000000
--- a/dev-haskell/hps/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="build-exec">Build the `hps-fractals' executable</flag>
-	</use>
-	<longdescription>
-		Haskell library partially implementing the
-		postscript drawing model.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hs-bibutils-5.5 b/dev-haskell/hs-bibutils-5.5
new file mode 100644
index 000000000000..fc1b01002d1a
--- /dev/null
+++ b/dev-haskell/hs-bibutils-5.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.4 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell bindings to bibutils, the bibliography conversion utilities
+EAPI=5
+HOMEPAGE=http://istitutocolli.org/repos/hs-bibutils/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/5.5
+SRC_URI=mirror://hackage/packages/archive/hs-bibutils/5.5/hs-bibutils-5.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9f129c6b969278f0dd1f7c97716175ac
diff --git a/dev-haskell/hs-bibutils/Manifest b/dev-haskell/hs-bibutils/Manifest
deleted file mode 100644
index 72f4506e4cbd..000000000000
--- a/dev-haskell/hs-bibutils/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hs-bibutils-5.5.tar.gz 499546 BLAKE2B c2a83885bf09f9a2b774fba30456e2e0931a37fc77626ac006edf70cbb305253ee254aa09da43d18e525a2d02d282d940c32e2cb0d1395c436ef41cf79880b33 SHA512 cee3c3500213d93b424bf3fd36a6b4657aec3a2787373a55bfee7f4de25e43a801ed68bdb815ba57ca8ecfe2d352e406e43baf40339fba79a061180fa4ab628c
-EBUILD hs-bibutils-5.5.ebuild 611 BLAKE2B 52517b93cecde7e31e91e5d42236081633c9574e2534f68fe7835e6c8590909fdcd8955b2daa344d33ee628cf94d4c68a1ba1e88f8d0833e407882c32d960cf6 SHA512 ed7db5391b43f4bc2a6239dbf3e9c68055b9a399cc73108fbfe049ccc7ef60f3b6e69d393c63f16dac2b0dcea16a28b743ce59bb6e955f637688bac6e28738b4
-MISC metadata.xml 452 BLAKE2B 80ecec14af0fbd0ae8208c189826a991114d20eb944cdfd615a54ca816ba5f7779156ef939e4423da03734bbca48d871fdbf9349c26ad90f8058f235ace3cc2f SHA512 fc30ac4300af4f68e0d1ee47bb97230f236cb36577933629a63d1f505d69aaa1d55f10ca65e0f608fff51e16c04dbe7befd19fec17490ca40ecdc1b047b2c2f5
diff --git a/dev-haskell/hs-bibutils/hs-bibutils-5.5.ebuild b/dev-haskell/hs-bibutils/hs-bibutils-5.5.ebuild
deleted file mode 100644
index 0e26a3ec3985..000000000000
--- a/dev-haskell/hs-bibutils/hs-bibutils-5.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to bibutils, the bibliography conversion utilities"
-HOMEPAGE="http://istitutocolli.org/repos/hs-bibutils/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.4
-"
diff --git a/dev-haskell/hs-bibutils/metadata.xml b/dev-haskell/hs-bibutils/metadata.xml
deleted file mode 100644
index cc5b5145105c..000000000000
--- a/dev-haskell/hs-bibutils/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haskell bindings to Chris Putnam's bibutils, a
-		library that interconverts between various
-		bibliography formats using a common MODS-format
-		XML intermediate.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hs3-0.5.9 b/dev-haskell/hs3-0.5.9
new file mode 100644
index 000000000000..36245bf9bd69
--- /dev/null
+++ b/dev-haskell/hs3-0.5.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/crypto-4.1.0:=[profile?] dev-haskell/dataenc:=[profile?] >=dev-haskell/http-4000.0.0:=[profile?] >=dev-haskell/hxt-9.0.0:=[profile?] <dev-haskell/hxt-10:=[profile?] >=dev-haskell/missingh-0.18.6:=[profile?] dev-haskell/random:=[profile?] dev-haskell/regex-compat:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] <dev-haskell/network-uri-2.6:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Interface to Amazon's Simple Storage Service (S3)
+EAPI=5
+HOMEPAGE=https://gregheartsfield.com/hS3/
+IUSE=+network-uri doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/crypto-4.1.0:=[profile?] dev-haskell/dataenc:=[profile?] >=dev-haskell/http-4000.0.0:=[profile?] >=dev-haskell/hxt-9.0.0:=[profile?] <dev-haskell/hxt-10:=[profile?] >=dev-haskell/missingh-0.18.6:=[profile?] dev-haskell/random:=[profile?] dev-haskell/regex-compat:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] <dev-haskell/network-uri-2.6:=[profile?] )
+SLOT=0/0.5.9
+SRC_URI=mirror://hackage/packages/archive/hS3/0.5.9/hS3-0.5.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ab846aee4f22a46805f8ff41e0a19039
diff --git a/dev-haskell/hs3/Manifest b/dev-haskell/hs3/Manifest
deleted file mode 100644
index d3938cb0948c..000000000000
--- a/dev-haskell/hs3/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hS3-0.5.9.tar.gz 19981 BLAKE2B 085c09739c666b658f0fcf2e82cd7bd7c1fd033d29490a7a6754c43ecaaf495ce914a2c987d2fd852b95b2714cabbf9d6106cd9a3b9c92daceb9b70f46832191 SHA512 30a3393f28a6ddd930cda1b866527ead9be59d376c2a6c3123eab3278a996602307612f3eaf126b36ef4a09c65784b842442ff09caafbf605474b42b6582c79d
-EBUILD hs3-0.5.9.ebuild 1260 BLAKE2B de04979762cce1dd35a4bc82a10789c23cfeff7107cc5c637f36c0839a5f72548769425215a08a8a0bfe6db11f3b67376f086039d2bf6f5ca85bf65136853b90 SHA512 83e19fc056ed79ef5efa1814444bda4f3c619a3922adae9d724dd2aaccef913ca09b6e1b196eb33745339e7419a19543c1fcd6e8361dfa352bb344aaac8d3625
-MISC metadata.xml 606 BLAKE2B 2f04cc657650a93cf3366b1932824e4694f473c25bdbb5bd636b1b15a8fa7f4ca11590b3ba0b9b6b8ee028d6e7739893c52126d0b13a4429a3653654cf2d1eb5 SHA512 c8e235ef80c751d633fb7c8c79846d47c79d6d87c418dd4f3a61261b5a0e9d66ae1a76310a9c31284e49e775373e6c1950e24d49d9c28250a5913e1d36bdfa84
diff --git a/dev-haskell/hs3/hs3-0.5.9.ebuild b/dev-haskell/hs3/hs3-0.5.9.ebuild
deleted file mode 100644
index 231d1897aec5..000000000000
--- a/dev-haskell/hs3/hs3-0.5.9.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="hS3"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Interface to Amazon's Simple Storage Service (S3)"
-HOMEPAGE="https://gregheartsfield.com/hS3/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/crypto-4.1.0:=[profile?]
-	dev-haskell/dataenc:=[profile?]
-	>=dev-haskell/http-4000.0.0:=[profile?]
-	>=dev-haskell/hxt-9.0.0:=[profile?] <dev-haskell/hxt-10:=[profile?]
-	>=dev-haskell/missingh-0.18.6:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/regex-compat:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?]
-			<dev-haskell/network-uri-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/hs3/metadata.xml b/dev-haskell/hs3/metadata.xml
deleted file mode 100644
index f5992552813d..000000000000
--- a/dev-haskell/hs3/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This is the Haskell S3 library.  It provides an
-		interface to Amazon's Simple Storage Service (S3), allowing Haskell
-		developers to reliably store and retrieve arbitrary amounts of
-		data from anywhere on the Internet.
-	</longdescription>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/hsb2hs-0.2 b/dev-haskell/hsb2hs-0.2
new file mode 100644
index 000000000000..87f45cf2aa59
--- /dev/null
+++ b/dev-haskell/hsb2hs-0.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cabal-1.6 >dev-haskell/preprocessor-tools-1.0 >=dev-lang/ghc-7.4.1
+DESCRIPTION=Preprocesses a file, adding blobs from files as string literals
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/hsb2hs
+KEYWORDS=amd64 x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/hsb2hs/0.2/hsb2hs-0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7750b088b12b64f435703d77ee8ca8ff
diff --git a/dev-haskell/hsb2hs-0.3.1 b/dev-haskell/hsb2hs-0.3.1
new file mode 100644
index 000000000000..fdbc6f89c32a
--- /dev/null
+++ b/dev-haskell/hsb2hs-0.3.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>dev-haskell/preprocessor-tools-1.0:= >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6
+DESCRIPTION=Preprocesses a file, adding blobs from files as string literals
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/hsb2hs
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>dev-haskell/preprocessor-tools-1.0:= >=dev-lang/ghc-7.4.1:=
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/hsb2hs/0.3.1/hsb2hs-0.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=634f74b09825524e8a8582eea5aa7959
diff --git a/dev-haskell/hsb2hs/Manifest b/dev-haskell/hsb2hs/Manifest
deleted file mode 100644
index d7d36308a602..000000000000
--- a/dev-haskell/hsb2hs/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST hsb2hs-0.2.tar.gz 2341 BLAKE2B e66860951d395913ce3fa2874d1d42f9522ec59b7fb49c24378ac1fd9ac25fa08ab6b9d03bdeb7e6586650aa137e2461eb43586e166ef686ec6d4b68895d9a5b SHA512 d5150ee9914a4916b5162b704a29c23e2c8562c773226b2b2f017304cdd4ce55872f8c7e9be7a5385acc31711f622e74c508bdc40ba1d22981b0e8aec5e4e516
-DIST hsb2hs-0.3.1.tar.gz 2387 BLAKE2B 747ad23761939c543d067a031869528b55149bc7c01bb417d107d4be2c61726d286798b174805469f176dfd74c003534feec92ee0aba27aee9ce4e5a9bf55900 SHA512 3be89ccfee5b10e604434943ba22476c4cba2e9f4c57e169fd3674d4a46250c8d4c35edcb46ff5509ccfca80ec7d45a594008791970d15256864abfdf29381e1
-EBUILD hsb2hs-0.2.ebuild 572 BLAKE2B 593817d6d79b8655bcaa0c84b61282411839715c066944e60ed73295ca287b6a820db024e3cd2d813859613244ad27af09581ddb914b2e5c97d884836b2e93f3 SHA512 d11ba8ab28e8cc79f20743d31dc69e4ef540cd09a2f18cbf9152042c2cafe4ae151f40099a4ec49817ac2f944f50c14681ea89b07af5828db8ff7eb4d042015e
-EBUILD hsb2hs-0.3.1.ebuild 575 BLAKE2B 1b333b67997629ed7bc43c87f4072e8616fe027a27603f027c9c892a6c9bbeaf018540b2b1a22e9dfdeff90be0db51330cbeb0a714b7d4e47f3cadd00d4439e8 SHA512 c0cff25bcd539b27bc6dfe8a5b7c777ed8f1513180d767c064e1fa8973bfac349647a895e82876cfa6710953c4ff26fa31eea8b9fde26a5b2c9e82c39e420cf1
-MISC metadata.xml 560 BLAKE2B 41868a670fbba28b8c473817e2db85bcf05a48b540bdb90c117b71023fd123a0dfd291a529860b09d65995b147dbcfd6721c3cdebfbac55f4c02915c556a452d SHA512 b048484522a8117cdd729b682c9ea9023ea4a5820903822ac732d54972ea518fdbf928e6d22a5c9eee10e92cbcfb4095978d66cd2543935cb70c2dc2e066f9e9
diff --git a/dev-haskell/hsb2hs/hsb2hs-0.2.ebuild b/dev-haskell/hsb2hs/hsb2hs-0.2.ebuild
deleted file mode 100644
index 6ea5d000c42c..000000000000
--- a/dev-haskell/hsb2hs/hsb2hs-0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="Preprocesses a file, adding blobs from files as string literals"
-HOMEPAGE="http://hackage.haskell.org/package/hsb2hs"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-	>dev-haskell/preprocessor-tools-1.0
-	>=dev-lang/ghc-7.4.1
-"
diff --git a/dev-haskell/hsb2hs/hsb2hs-0.3.1.ebuild b/dev-haskell/hsb2hs/hsb2hs-0.3.1.ebuild
deleted file mode 100644
index ebff5b68e3b0..000000000000
--- a/dev-haskell/hsb2hs/hsb2hs-0.3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="Preprocesses a file, adding blobs from files as string literals"
-HOMEPAGE="http://hackage.haskell.org/package/hsb2hs"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">dev-haskell/preprocessor-tools-1.0:=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/hsb2hs/metadata.xml b/dev-haskell/hsb2hs/metadata.xml
deleted file mode 100644
index ffccae0e3680..000000000000
--- a/dev-haskell/hsb2hs/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		hsb2hs is a preprocessor that allows you to include the contents of
-		files as string literals in your Haskell programs and libraries.
-		It is an alternative to file-embed for those who do not want to rely
-		on Template Haskell.  See @README.markdown@ for instructions.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hscolour-1.19 b/dev-haskell/hscolour-1.19
new file mode 100644
index 000000000000..03f821824d79
--- /dev/null
+++ b/dev-haskell/hscolour-1.19
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-lang/ghc-6.6.1 >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) )
+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
+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	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9c0ebe520f66db0dbc2d70f6b7d71a3a
diff --git a/dev-haskell/hscolour-1.20.3-r1 b/dev-haskell/hscolour-1.20.3-r1
new file mode 100644
index 000000000000..d7a767ef0427
--- /dev/null
+++ b/dev-haskell/hscolour-1.20.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b2f91ed2a4ab30706b7f8994d1811724
diff --git a/dev-haskell/hscolour-1.22 b/dev-haskell/hscolour-1.22
new file mode 100644
index 000000000000..cc77dd9f087c
--- /dev/null
+++ b/dev-haskell/hscolour-1.22
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=68e42f574f24caa201dc1e16abc96121
diff --git a/dev-haskell/hscolour-1.23-r1 b/dev-haskell/hscolour-1.23-r1
new file mode 100644
index 000000000000..f28a7b67f192
--- /dev/null
+++ b/dev-haskell/hscolour-1.23-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ed7493ac07dffbf81bedcceaeb39d9fb
diff --git a/dev-haskell/hscolour-1.24 b/dev-haskell/hscolour-1.24
new file mode 100644
index 000000000000..a454f57e1912
--- /dev/null
+++ b/dev-haskell/hscolour-1.24
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7dfbb113e4a409b1c830fb8b47448afa
diff --git a/dev-haskell/hscolour/Manifest b/dev-haskell/hscolour/Manifest
deleted file mode 100644
index f330570667d0..000000000000
--- a/dev-haskell/hscolour/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX hscolour-1.19-ghc-7.5.patch 1701 BLAKE2B 70c2628e3adaab9c7ec06dbf054c55d9e4f7709c09ddfe39fa578194c870e17afd2c9d78743cf929b1edd94f0948458ae8b64e6dfa68f4b774b3c3b3e1ea42e5 SHA512 302fe056e61d58537c2010c2d286ff6abf1b4eea25beb9b2069492000b1edc257830892369bd16576675d00fb376c04f83f17508b9491140ee92d062b9736c29
-DIST hscolour-1.19.tar.gz 25466 BLAKE2B 852fa5e8d08cabc16c930f32951043f92c8f564773da07de0eeda931caef0197b09d307fffcb9c0c1e86ef139238d46261d355f3b54889bf61d49692b6d8a2e4 SHA512 8f2a9f16cf82fbe41513600c210a0d3af58f1b06ab1ed14a2493203cfce20a8ac959b3a34966273277ac3ceaf3b4916e82892880dd7685f8de12b2636bf53ae1
-DIST hscolour-1.20.3.tar.gz 25810 BLAKE2B 28a394ab9f90ac4a7d311e1aa7e4f41c55b26e51e02a72ed3d869d1d9dae566c7a70f3e15c136cbb538f56c303c0a5083d4f725ce2fc6f9cadf27d21b1b563a6 SHA512 759f0a3c3c36b48db7932477468f1c5de8fddec654010dbbd0d136e0f8a8f4e3c34bc9349467766a1cb90ffb56b950ee6b7926f4f62dcb68f8e048e2c212d853
-DIST hscolour-1.22.tar.gz 25979 BLAKE2B 42d974c9ffe439010df53d88c0b71397869eef64765eb60554e5bce060492a780d4bea8eeb805f271ac2b62ad4060bf5dee96f69ebe90caa9f62a572d8266207 SHA512 9762599fb4eef8f68a0a40ddfc8e7f50eb8592b1b3d7e4c8177f23f08300264c80a73dbedbe954fbcb9ff3fe1b80497b131e3f8d9adb8c1697d7195d48ef69a0
-DIST hscolour-1.23.tar.gz 26027 BLAKE2B 4dba77d61aff026f515d47c0cf84bd747b28f5d00739986f8a877171860835610812b8e1827879f8bad118bb7234ccfddccc8651c819696841a35ee3229f1b48 SHA512 a1525e0827bc399c0747898c814ad4b7947620c610e6ec579afa120ddb5f1d012f7f10547f09dd10e0bba9cd89cd220ab204ee0e40c37f0048c7222db04de23f
-DIST hscolour-1.24.tar.gz 26057 BLAKE2B b11a4b8506ee49e845519cc44ee19b5fbc196fd07132cb6999f361870a58991c0f22e288696cbfdcfbaee95dba9e2580e8f878fda3122a5bfe0f1b46c7818fa9 SHA512 c191375ccbda80d6f7271cff69648151fe6142e72d9a47cfba71176ab89cb9740a008020e1a48a106d5f10516eec03ed68ca7610736f6ab6fba84f85fedb0fb7
-EBUILD hscolour-1.19.ebuild 646 BLAKE2B 6b9eaf28e6b85446b4735f32f2a9be74e19d8a1c4f05cd93093d85ccdce4a9dae52b3da3b161bd75548b60d1163c416c5f56d198a38d084c092704a04c02b672 SHA512 577c856e3859a4e8ab416de4e70fbf7a2dbe0463fe6d44426d572d35e9ad5e04ee3391e945614433910a848d1c36d3fda55dd7733795d7057702a1bc61d1c85e
-EBUILD hscolour-1.20.3-r1.ebuild 786 BLAKE2B 5b91f73ea053e07a835f88bfa2a46992c4e74bc60bdabf70ec3a7b17f4c5ef2e2a7707249d140677cd014641c52e27da19396d86aa7da528fb11cf74fbca3686 SHA512 2796862e8bed140443d4f31a78b2d2c3579b346c828b8be3bd1acabdb2445f083b13ba48de26ca905b9e9c483558b58c5f379183076d39c22230b5d88620c617
-EBUILD hscolour-1.22.ebuild 793 BLAKE2B ef585c18a9b146931f79da001e2238f378a081d8802bbfdfc4d3394ef02d10ff209fc06d7b676d5bee595e425d7ad5a1b123cb175fc569f0f958172b96c53268 SHA512 75eb4da6727f94f70aa25d91c75cd104043cd5e05833d080304fd833944e8bcd8d792391540b588517ab97a74e606eafeea9279468c6ed2e99df30f58f1a4b1d
-EBUILD hscolour-1.23-r1.ebuild 764 BLAKE2B 0ef62b075fa3cd1f6ada4d2e282eb67cd8394b9cd9a7571cb92f17a2c28f0b4739595bf1ba0a469f011df80d3af0d05b6019f3e5596f3c71da2c2637222e16c5 SHA512 e132531d2c6241edb6f100fac5ebda3ad21d9d23ac9e2ee700aa9eed00db95bda06a018d439815ea0408a5d2e15317e4d415fe524c5760bf56fb3e94577dc11e
-EBUILD hscolour-1.24.ebuild 766 BLAKE2B 31b481cc40b08b4bb6ab7e2949753e64d4c0452c28187e05728dcd26ee890a18f02d0f5d827f9cfb0ebf1f5cf04d32c1eb23fef4d95903e0e7dc9fee4423931e SHA512 d8f0cbcb70aa1c55ed11966b23b283e63f93f4dd3b35223d9eda770415c9454d8a6a379686f75b923b4368aba5a1c8bd1cff2b4d821c45e3e4578f82476786f8
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/hscolour/files/hscolour-1.19-ghc-7.5.patch b/dev-haskell/hscolour/files/hscolour-1.19-ghc-7.5.patch
deleted file mode 100644
index 25e29728ca3a..000000000000
--- a/dev-haskell/hscolour/files/hscolour-1.19-ghc-7.5.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- hscolour-1.19-orig/Language/Haskell/HsColour/Colourise.hs	2011-06-06 03:05:04.000000000 +1000
-+++ hscolour-1.19/Language/Haskell/HsColour/Colourise.hs	2012-06-24 10:29:57.990963394 +1000
-@@ -1,3 +1,7 @@
-+{-# LANGUAGE CPP #-}
-+#if (__GLASGOW_HASKELL__>=705)
-+{-# LANGUAGE ScopedTypeVariables #-}
-+#endif
- module Language.Haskell.HsColour.Colourise
-   ( module Language.Haskell.HsColour.ColourHighlight
-   , ColourPrefs(..)
-@@ -9,6 +13,9 @@
- import Language.Haskell.HsColour.ColourHighlight
- import Language.Haskell.HsColour.Classify (TokenType(..))
- 
-+#if (__GLASGOW_HASKELL__>=705)
-+import Control.Exception (catch, SomeException)
-+#endif
- import System.IO (hPutStrLn,stderr)
- import System.Environment (getEnv)
- import Data.List
-@@ -51,6 +58,16 @@
- -- | Read colour preferences from .hscolour file in the current directory, or failing that,
- --   from \$HOME\/.hscolour, and failing that, returns a default set of prefs.
- readColourPrefs :: IO ColourPrefs
-+#if (__GLASGOW_HASKELL__>=705)
-+readColourPrefs = catch
-+  (do val <- readFile ".hscolour"
-+      parseColourPrefs ".hscolour" val)
-+  (\(_ :: SomeException) -> catch
-+    (do home <- getEnv "HOME"
-+        val <- readFile (home++"/.hscolour")
-+        parseColourPrefs (home++"/.hscolour") val)
-+    (\(_ :: SomeException) -> return defaultColourPrefs))
-+#else
- readColourPrefs = catch
-   (do val <- readFile ".hscolour"
-       parseColourPrefs ".hscolour" val)
-@@ -59,6 +76,7 @@
-         val <- readFile (home++"/.hscolour")
-         parseColourPrefs (home++"/.hscolour") val)
-     (\_-> return defaultColourPrefs))
-+#endif
- 
- -- | Convert token classification to colour highlights.
- colourise :: ColourPrefs -> TokenType -> [Highlight]
diff --git a/dev-haskell/hscolour/hscolour-1.19.ebuild b/dev-haskell/hscolour/hscolour-1.19.ebuild
deleted file mode 100644
index 5af8f7dc228f..000000000000
--- a/dev-haskell/hscolour/hscolour-1.19.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-CABAL_FEATURES="bin lib profile haddock"
-inherit base haskell-cabal
-
-DESCRIPTION="Colourise Haskell code"
-HOMEPAGE="http://code.haskell.org/~malcolm/hscolour/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.6.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-PATCHES=("${FILESDIR}/${PN}-1.19-ghc-7.5.patch")
-
-src_install() {
-	cabal_src_install
-	if use doc; then
-		dohtml hscolour.css
-	fi
-}
diff --git a/dev-haskell/hscolour/hscolour-1.20.3-r1.ebuild b/dev-haskell/hscolour/hscolour-1.20.3-r1.ebuild
deleted file mode 100644
index 5a5381e147a3..000000000000
--- a/dev-haskell/hscolour/hscolour-1.20.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-# disabled haddock as there is USE="doc hscolour" case with circular depends
-CABAL_FEATURES="bin lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Colourise Haskell code"
-HOMEPAGE="http://code.haskell.org/~malcolm/hscolour/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_configure() {
-	haskell-cabal_src_configure --ghc-options=-rtsopts
-}
-
-src_install() {
-	cabal_src_install
-	if use doc; then
-		dohtml hscolour.css
-	fi
-}
diff --git a/dev-haskell/hscolour/hscolour-1.22.ebuild b/dev-haskell/hscolour/hscolour-1.22.ebuild
deleted file mode 100644
index 5afdddee51bf..000000000000
--- a/dev-haskell/hscolour/hscolour-1.22.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-# disabled haddock as there is USE="doc hscolour" case with circular depends
-CABAL_FEATURES="bin lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Colourise Haskell code"
-HOMEPAGE="http://code.haskell.org/~malcolm/hscolour/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_configure() {
-	haskell-cabal_src_configure --ghc-options=-rtsopts
-}
-
-src_install() {
-	cabal_src_install
-	if use doc; then
-		dohtml hscolour.css
-	fi
-}
diff --git a/dev-haskell/hscolour/hscolour-1.23-r1.ebuild b/dev-haskell/hscolour/hscolour-1.23-r1.ebuild
deleted file mode 100644
index 8964998e00c7..000000000000
--- a/dev-haskell/hscolour/hscolour-1.23-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="Colourise Haskell code"
-HOMEPAGE="http://code.haskell.org/~malcolm/hscolour/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	# llvm-general-pure passes rtsopts
-	haskell-cabal_src_configure --ghc-options=-rtsopts
-}
-
-src_install() {
-	cabal_src_install
-	if use doc; then
-		dohtml hscolour.css
-	fi
-}
diff --git a/dev-haskell/hscolour/hscolour-1.24.ebuild b/dev-haskell/hscolour/hscolour-1.24.ebuild
deleted file mode 100644
index d1862033b496..000000000000
--- a/dev-haskell/hscolour/hscolour-1.24.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="Colourise Haskell code"
-HOMEPAGE="http://code.haskell.org/~malcolm/hscolour/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	# llvm-general-pure passes rtsopts
-	haskell-cabal_src_configure --ghc-options=-rtsopts
-}
-
-src_install() {
-	cabal_src_install
-	if use doc; then
-		dohtml hscolour.css
-	fi
-}
diff --git a/dev-haskell/hscolour/metadata.xml b/dev-haskell/hscolour/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/hscolour/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hslogger-1.2.10 b/dev-haskell/hslogger-1.2.10
new file mode 100644
index 000000000000..ef948f8d9c5a
--- /dev/null
+++ b/dev-haskell/hslogger-1.2.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Versatile logging framework
+EAPI=6
+HOMEPAGE=http://software.complete.org/hslogger
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~sparc ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.10
+SRC_URI=mirror://hackage/packages/archive/hslogger/1.2.10/hslogger-1.2.10.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=181b6a017f093bf6ab27071a90c67db8
diff --git a/dev-haskell/hslogger-1.2.9 b/dev-haskell/hslogger-1.2.9
new file mode 100644
index 000000000000..4a1b678554b5
--- /dev/null
+++ b/dev-haskell/hslogger-1.2.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Versatile logging framework
+EAPI=5
+HOMEPAGE=http://software.complete.org/hslogger
+IUSE=buildtests doc hscolour profile
+KEYWORDS=amd64 ~sparc x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.9
+SRC_URI=mirror://hackage/packages/archive/hslogger/1.2.9/hslogger-1.2.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=55974a8cd4ca4fb8cc494cf46f41c5bb
diff --git a/dev-haskell/hslogger/Manifest b/dev-haskell/hslogger/Manifest
deleted file mode 100644
index 8525beffe5fe..000000000000
--- a/dev-haskell/hslogger/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST hslogger-1.2.10.tar.gz 35889 BLAKE2B 68f18236cfe19ad1f5b6fd8b9fc32dc571fe7aca730c5210863aedc88e32b1094e939c8825730fbf901fc1993c595ed0711f3d2efb041c789d674e4dcdb93723 SHA512 c2e3c6e7c8598aca2a18e507defa7536db7fdf15265b900401f8558b3259cd770531a3a302d6eb9ecca63a9629f0d5796e1ec94d8f21ecf153a1fc49f889183a
-DIST hslogger-1.2.9.tar.gz 35576 BLAKE2B 56c3a917d2db7207d29c304b00a237b7d62a4f8f07d72f7b1ce834d3e60bb55f825173cd8894d2063973df4095ef3409a2c1aabb99d89257a5d8562d58add76b SHA512 6315dd7e6d6769a6a8fb8576b54875fbe79860d1e3158ddbca7f15b286f13b59cf7e817ac5325f31ae82e8f5328d32f22ee6aa37f5ae11e9070f209454ec801c
-EBUILD hslogger-1.2.10.ebuild 778 BLAKE2B 3486e66f823172b661945e705744c0860464cb28aa2682feeaf82b59a6793c72af17237465652edd56738f6860f6084399b62fe3e7d630dc258d5102af49b038 SHA512 20f8d887464d9aeb10500f7b8cdc957e074017b16ac0266666b85a27dd51853eb6ff9bcc4f665b2938163c4a1f499afc71b38ee4f1d47703c77bc7dcb138c44f
-EBUILD hslogger-1.2.9.ebuild 756 BLAKE2B b5e58643a90972f7bc342d1c30a0182fc5dddee81630347e1bc206f954ad806f2ae128f3a524f10d4fc1bd42463d0893fafda702f21e8ef2a5a2d8ea45eb94a3 SHA512 743af85e6aac9e0507733bc6cf50b92f6520780b63150d7a063543b756c75e7e01715cc2f836af33252dc878b4d915c727546f07820166aeb699628b2554a01a
-MISC metadata.xml 801 BLAKE2B e5af214c9807a2ff22ebbead5482080e8b8c4931a2d99ff7f43c7523007d571e900279fc01c2f19623eaca57d4613ebf6840f3dc9537e0620494d9c734cf7fbb SHA512 82ef25fd07b9b815bde8b9fda3ad8b441c7dfcce19a26c14a20f1c180f69e35f758d422b3102d58006b536fe329fa0360855930b803f0fbb0c1091c6b8f0c5d1
diff --git a/dev-haskell/hslogger/hslogger-1.2.10.ebuild b/dev-haskell/hslogger/hslogger-1.2.10.ebuild
deleted file mode 100644
index c583d7436b8e..000000000000
--- a/dev-haskell/hslogger/hslogger-1.2.10.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -test,-buildtests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Versatile logging framework"
-HOMEPAGE="http://software.complete.org/hslogger"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-buildtests \
-		--flag=-test
-}
diff --git a/dev-haskell/hslogger/hslogger-1.2.9.ebuild b/dev-haskell/hslogger/hslogger-1.2.9.ebuild
deleted file mode 100644
index 27cc5e8e1576..000000000000
--- a/dev-haskell/hslogger/hslogger-1.2.9.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Versatile logging framework"
-HOMEPAGE="http://software.complete.org/hslogger"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~sparc x86 ~amd64-linux"
-IUSE="buildtests"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag buildtests buildtests)
-}
diff --git a/dev-haskell/hslogger/metadata.xml b/dev-haskell/hslogger/metadata.xml
deleted file mode 100644
index 188bf6c536c0..000000000000
--- a/dev-haskell/hslogger/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="buildtests">Build the executable to run unit tests.</flag>
-	</use>
-	<longdescription>
-		hslogger is a logging framework for Haskell, roughly similar to
-		Python's logging module.
-		
-		hslogger lets each log message have a priority and source be associated
-		with it.  The programmer can then define global handlers that route
-		or filter messages based on the priority and source.  hslogger also
-		has a syslog handler built in.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">jgoerzen/hslogger</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hslua-0.3.13 b/dev-haskell/hslua-0.3.13
new file mode 100644
index 000000000000..f54ac77f3dbb
--- /dev/null
+++ b/dev-haskell/hslua-0.3.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.1:=[profile?] >=dev-lang/ghc-7.4.1:= system-lua? ( dev-lang/lua ) >=dev-haskell/cabal-1.8 system-lua? ( virtual/pkgconfig ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Lua language interpreter embedding in Haskell
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/hslua
+IUSE=apicheck system-lua doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/mtl-2.1:=[profile?] >=dev-lang/ghc-7.4.1:= system-lua? ( dev-lang/lua )
+SLOT=0/0.3.13
+SRC_URI=mirror://hackage/packages/archive/hslua/0.3.13/hslua-0.3.13.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9776bfa0950d1ee5798bd44b214dcaf1
diff --git a/dev-haskell/hslua-0.3.6.1 b/dev-haskell/hslua-0.3.6.1
new file mode 100644
index 000000000000..7d5e10c4b01a
--- /dev/null
+++ b/dev-haskell/hslua-0.3.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.1:=[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 Lua language interpreter embedding in Haskell
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/hslua
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-2.1:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.3.6.1
+SRC_URI=mirror://hackage/packages/archive/hslua/0.3.6.1/hslua-0.3.6.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=50568da6e8d975da3f850736deb0b29a
diff --git a/dev-haskell/hslua/Manifest b/dev-haskell/hslua/Manifest
deleted file mode 100644
index 767723b40854..000000000000
--- a/dev-haskell/hslua/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST hslua-0.3.13.tar.gz 128230 BLAKE2B ab252781f3130557ad25c9c36cbdc260addf58ce64f1b828dd85d3f0765b2604014da88a6bb9e6777bbd74dd869be42341e53e191e7cb46beff3e2dd6e1ec293 SHA512 5a11243f9a1da3a50ae5f30e310b2e661ed40655886b3bc6a2ba01b49fc0fbbc1ea20e24d3c227a8454cbcfd98161ad47edb5c3c111d6df09764f79476a9782a
-DIST hslua-0.3.6.1.tar.gz 127569 BLAKE2B 3738ba495dfb93e32cf62526228fc54f43267500faa283f54683cb0f9ac14237eedfad325345f5b86c3ee94b5fc33e9a534a2beb69407ce9c5699cdfa8a25ad2 SHA512 abe8a8513d74fbdf94cc9486996264c074c6b4df8e21702a03c887772624fe33f86f805275dab11a340d7f14a6f3dad71f06aaf0f7e20951df1ef9f2e670863b
-EBUILD hslua-0.3.13.ebuild 815 BLAKE2B 8024fb35a83272ebc9723f6b936d1bce14da139601f2e9efff61e07126a02c1fc30a840d5fd466cd654f84281640801cf3a55784dcd5fbc3a3bdb1401d72ec86 SHA512 705042731d2292791984f82597e9271b70fe845f2fe23364e65b57d24ed08f36d0ce5dfb8a6e41708aafc7dbd5b9169873d13559251874277e8a97b89df112c9
-EBUILD hslua-0.3.6.1.ebuild 593 BLAKE2B 55970a9eb264eeeff533d0c08e08a2e1ee0fa6d07056843a208e0296e52259cec6b1cea4b4c07afa16e9b0989f223e739e05d9ae81d896554726f15f427d3480 SHA512 7a2ba1a7c8ca828ff7641e41dff6dc10624a2b084ea3ddb0673b5f81ecf8ab34ca3b794ed0c019552cec087273d25cf42f3c262794e0a5fc538b7359a7d7be94
-MISC metadata.xml 666 BLAKE2B 79f4d48f058b1f78b5a23ebc273672b9ebf7cfef346294b7a0640884d83756068f721937f29e97b8e4cf3e0b8ae813cfa878f5ae3fa69cadd66a06da246ac22c SHA512 f4ab4bcc7fff745cc935ab20cf8efa1227b72b3e86d13a10327a4713498d533e40869c0dfb4c6a70280180975d57351e80129afea7f7ba466e3807e82cf99cf6
diff --git a/dev-haskell/hslua/hslua-0.3.13.ebuild b/dev-haskell/hslua/hslua-0.3.13.ebuild
deleted file mode 100644
index 897f2b65e560..000000000000
--- a/dev-haskell/hslua/hslua-0.3.13.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Lua language interpreter embedding in Haskell"
-HOMEPAGE="http://hackage.haskell.org/package/hslua"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="apicheck system-lua"
-
-RDEPEND=">=dev-haskell/mtl-2.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	system-lua? ( dev-lang/lua )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	system-lua? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag apicheck apicheck) \
-		$(cabal_flag system-lua system-lua)
-}
diff --git a/dev-haskell/hslua/hslua-0.3.6.1.ebuild b/dev-haskell/hslua/hslua-0.3.6.1.ebuild
deleted file mode 100644
index 41905a38765c..000000000000
--- a/dev-haskell/hslua/hslua-0.3.6.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Lua language interpreter embedding in Haskell"
-HOMEPAGE="http://hackage.haskell.org/package/hslua"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.1:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/hslua/metadata.xml b/dev-haskell/hslua/metadata.xml
deleted file mode 100644
index e1447dd132e6..000000000000
--- a/dev-haskell/hslua/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="apicheck">Compile Lua with -DLUA_USE_APICHECK..</flag>
-		<flag name="system-lua">Use the system-wide lua instead of the bundled copy.</flag>
-	</use>
-	<longdescription>
-		The Scripting.Lua module is a wrapper of Lua language interpreter
-		as described in www.lua.org.
-		
-		The package is standalone: full Lua interpreter version 5.1.4
-		is distributed in this package as well.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hsopenssl-0.10.4 b/dev-haskell/hsopenssl-0.10.4
new file mode 100644
index 000000000000..285f71c7158b
--- /dev/null
+++ b/dev-haskell/hsopenssl-0.10.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/network-2.1.0.0:=[profile?] >=dev-lang/ghc-6.12.1:= dev-libs/openssl:* >=dev-haskell/cabal-1.8.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Partial OpenSSL binding for Haskell
+EAPI=5
+HOMEPAGE=https://github.com/phonohawk/HsOpenSSL
+IUSE=+fast-bignum doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=>=dev-haskell/network-2.1.0.0:=[profile?] >=dev-lang/ghc-6.12.1:= dev-libs/openssl:*
+SLOT=0/0.10.4
+SRC_URI=mirror://hackage/packages/archive/HsOpenSSL/0.10.4/HsOpenSSL-0.10.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6c63f15d5e94cb5fa02ecc6befb1032b
diff --git a/dev-haskell/hsopenssl-0.11.1.1-r1 b/dev-haskell/hsopenssl-0.11.1.1-r1
new file mode 100644
index 000000000000..6f5e81e5d060
--- /dev/null
+++ b/dev-haskell/hsopenssl-0.11.1.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.0 <dev-haskell/hunit-1.3 >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Partial OpenSSL binding for Haskell
+EAPI=5
+HOMEPAGE=https://github.com/phonohawk/HsOpenSSL
+IUSE=+fast-bignum libressl doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=public-domain
+RDEPEND=>=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
+RESTRICT=test
+SLOT=0/0.11.1.1
+SRC_URI=mirror://hackage/packages/archive/HsOpenSSL/0.11.1.1/HsOpenSSL-0.11.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b3b05d7d754d147e672c54f616b229dc
diff --git a/dev-haskell/hsopenssl-0.11.4 b/dev-haskell/hsopenssl-0.11.4
new file mode 100644
index 000000000000..e4f42820290f
--- /dev/null
+++ b/dev-haskell/hsopenssl-0.11.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-lang/ghc-7.10.1:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) >=dev-haskell/cabal-1.22.2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Partial OpenSSL binding for Haskell
+EAPI=6
+HOMEPAGE=https://github.com/vshabanov/HsOpenSSL
+IUSE=libressl doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=public-domain
+RDEPEND=>=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-lang/ghc-7.10.1:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
+RESTRICT=test
+SLOT=0/0.11.4
+SRC_URI=mirror://hackage/packages/archive/HsOpenSSL/0.11.4/HsOpenSSL-0.11.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cd30419304b0a8d464100355f0c40c58
diff --git a/dev-haskell/hsopenssl/Manifest b/dev-haskell/hsopenssl/Manifest
deleted file mode 100644
index 7fec76406559..000000000000
--- a/dev-haskell/hsopenssl/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST HsOpenSSL-0.10.4.tar.gz 67538 BLAKE2B d52fbc67bd053c8ce526bb0d30ef74ab11bbb200d01c2e00672c63f774911d113cd03c4c212077db9b56b1ac82a196bbb23adc0504b1b953c322deefa1c224dc SHA512 ab26d19a196ee299763c4a0953e5b805c9f34f9f6b8502562812e597cfdfa07bccfec08919682ce90aa3022144133ba609346139734fbfe89a42f7a6aba939e7
-DIST HsOpenSSL-0.11.1.1.tar.gz 72297 BLAKE2B 73838757886f3a7c0d9101459f995f07fab4f2f9db0ae7007178ddea9bed20c9a0538388a06bc59652701be30ef54ac2419426d7d1b7eb63d3012f79028dc208 SHA512 a7260bb47a4886e550fce71f83f1d9ab93e54fb40886b618f86db191651f95beeac30334d58ab10ab084bfcf9ff8a1b994254c13c09e678dae3b23a12b279541
-DIST HsOpenSSL-0.11.4.tar.gz 77764 BLAKE2B 883d38142f1c93c7fb02de59bf993433c2accf49750bdfb0dd1e1d948ed4bb964b9ef3e9d473f1904acc8954336daca176bad3b0f477a834a39a4b8ea93c68d7 SHA512 be67eec8af517bec360618883bdce1ed195bf11361ae7cad372a50cc135f0e1825a86cc581a5e94375ad85cc163553270d5c431e2a03a6a4b80dc03b027fdcac
-EBUILD hsopenssl-0.10.4.ebuild 798 BLAKE2B 0ed1f657fcb189572aa2289d394f5e1d46075d22fa2daaba8217e24a844abbb8855a135b5d2be4ba0ba74feda2d51b4b86df0ef9544046298b20babedd4fea1a SHA512 60cd15f89592a381ccec6dcdcefec88a38854221a421cde5ed52ea6d031a83c82e90ed95f4a9b9ed7cacd825b7dbdd17084eee9f0683b991ae0b66a6b0972dca
-EBUILD hsopenssl-0.11.1.1-r1.ebuild 1481 BLAKE2B aee91d16b1eda58eb2e39871fa6464d234d648c5a911d3157a2c0302772dd2d704570eeb6749047618dde4293286742c2e25739e46e50f28b42dd7278a71f9ec SHA512 a16cf5aa02820c0a86c56a650d72fbc689f4059950424a15a74bd9861e0481059707b30883f50a22aca1336cd7916109dd3c4ba50334714e3f33c18c9031144d
-EBUILD hsopenssl-0.11.4.ebuild 992 BLAKE2B f7c7e354748fd66a4d01d0ffbd7ef67316a526e330fb9f6ac5328ac599c9da1b51949ea7d7f020da6b9c49edf4230e8fef01464fa0bfe3eaf0212ba75ca445d2 SHA512 2cd27d03f8185f17072e0653dde6eeda0d4bf9820c911fa507861258cdb7012a84d60fe2d70c0b8f1d87af9ae68f1c1926c018db4cbda07895e6f57c56f70d38
-MISC metadata.xml 1174 BLAKE2B 26b5c812f3c01512d1f0c6b754a9c9742dd62d91be4097bda649e01b17fee3c4aff921cc3b63e6c4e90c370e94625c5718e269022791d6883f81f517cc5b0d92 SHA512 3de12003fe30d1d183838d2ee19f898a2ec58807c13745d264f30be21d655b7fa40a8dc7163763dc3d72070125c81f4fabd20bc2422e2704cf060d29fb55d2db
diff --git a/dev-haskell/hsopenssl/hsopenssl-0.10.4.ebuild b/dev-haskell/hsopenssl/hsopenssl-0.10.4.ebuild
deleted file mode 100644
index c8d0fad5e1d1..000000000000
--- a/dev-haskell/hsopenssl/hsopenssl-0.10.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HsOpenSSL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Partial OpenSSL binding for Haskell"
-HOMEPAGE="https://github.com/phonohawk/HsOpenSSL"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fast-bignum"
-
-RDEPEND=">=dev-haskell/network-2.1.0.0:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-	dev-libs/openssl:*
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag fast-bignum fast-bignum)
-}
diff --git a/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild b/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild
deleted file mode 100644
index 98ac0d866d91..000000000000
--- a/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HsOpenSSL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Partial OpenSSL binding for Haskell"
-HOMEPAGE="https://github.com/phonohawk/HsOpenSSL"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+fast-bignum libressl"
-
-RESTRICT=test # whoops, not good
-
-RDEPEND=">=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-2.7:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.0 <dev-haskell/hunit-1.3
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cabal_chdeps \
-		'time       >= 1.1.1 && < 1.6' 'time       >= 1.1.1'
-}
-
-src_configure() {
-	local fbn_flag=$(cabal_flag fast-bignum fast-bignum)
-
-	# not ported to integer-gmp-1.0:
-	#  https://github.com/phonohawk/HsOpenSSL/issues/36
-	[[ $(ghc-version) == 7.10.* ]] && fbn_flag=-f-fast-bignum
-
-	haskell-cabal_src_configure \
-		${fbn_flag}
-}
diff --git a/dev-haskell/hsopenssl/hsopenssl-0.11.4.ebuild b/dev-haskell/hsopenssl/hsopenssl-0.11.4.ebuild
deleted file mode 100644
index a8a85232fe6e..000000000000
--- a/dev-haskell/hsopenssl/hsopenssl-0.11.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -homebrew-openssl,-macports-openssl
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HsOpenSSL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Partial OpenSSL binding for Haskell"
-HOMEPAGE="https://github.com/vshabanov/HsOpenSSL"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="libressl"
-
-RESTRICT=test # whoops, not good
-
-RDEPEND=">=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-2.7:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-homebrew-openssl \
-		--flag=-macports-openssl
-}
diff --git a/dev-haskell/hsopenssl/metadata.xml b/dev-haskell/hsopenssl/metadata.xml
deleted file mode 100644
index 07731d9ca92b..000000000000
--- a/dev-haskell/hsopenssl/metadata.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="fast-bignum">Enable fast moving of bignums between OpenSSL and GMP (GHC Only)</flag>
-	</use>
-	<longdescription>
-		
-		HsOpenSSL is an OpenSSL binding for Haskell. It can generate RSA
-		and DSA keys, read and write PEM files, generate message digests,
-		sign and verify messages, encrypt and decrypt messages. It has
-		also some capabilities of creating SSL clients and servers.
-		
-		Please note that this project has started at the time when there
-		were no pure-Haskell implementations of TLS. Now there is tls
-		package (&lt;http://hackage.haskell.org/package/tls&gt;), which looks
-		pretty saner than HsOpenSSL especially for initialisation and
-		error handlings. So PHO (the initial author of HsOpenSSL) highly
-		encourages you to use and improve the tls package instead as long
-		as possible.
-		
-	</longdescription>
-	<upstream>
-		<remote-id type="github">phonohawk/HsOpenSSL</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hspec-1.10.0 b/dev-haskell/hspec-1.10.0
new file mode 100644
index 000000000000..f6e33e0a4f9a
--- /dev/null
+++ b/dev-haskell/hspec-1.10.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] >=dev-haskell/async-2:=[profile?] >=dev-haskell/hspec-expectations-0.5.0:=[profile?] <dev-haskell/hspec-expectations-0.5.1:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] dev-haskell/tf-random:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/doctest-0.9.4.1 dev-haskell/ghc-paths >=dev-haskell/hspec-meta-1.9.1 >=dev-haskell/silently-1.2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Behavior-Driven Development for Haskell
+EAPI=5
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] >=dev-haskell/async-2:=[profile?] >=dev-haskell/hspec-expectations-0.5.0:=[profile?] <dev-haskell/hspec-expectations-0.5.1:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] dev-haskell/tf-random:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.10.0
+SRC_URI=mirror://hackage/packages/archive/hspec/1.10.0/hspec-1.10.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e1ca5780fc6ec73a85e8c4d96eeb96fe
diff --git a/dev-haskell/hspec-1.5.4 b/dev-haskell/hspec-1.5.4
new file mode 100644
index 000000000000..da1dc34835c0
--- /dev/null
+++ b/dev-haskell/hspec-1.5.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] =dev-haskell/hspec-expectations-0.3.2*:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:=[profile?] dev-haskell/quickcheck-io:=[profile?] =dev-haskell/random-1.0*:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/doctest-0.9.4.1 dev-haskell/ghc-paths >=dev-haskell/hspec-meta-1.5.1 >=dev-haskell/silently-1.2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Behavior-Driven Development for Haskell
+EAPI=5
+HOMEPAGE=https://hspec.github.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] =dev-haskell/hspec-expectations-0.3.2*:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:=[profile?] dev-haskell/quickcheck-io:=[profile?] =dev-haskell/random-1.0*:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/1.5.4
+SRC_URI=mirror://hackage/packages/archive/hspec/1.5.4/hspec-1.5.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ce9deff22a970186c5bc98c825697ed7
diff --git a/dev-haskell/hspec-1.7.2.1 b/dev-haskell/hspec-1.7.2.1
new file mode 100644
index 000000000000..b24e65439aa3
--- /dev/null
+++ b/dev-haskell/hspec-1.7.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] >=dev-haskell/hspec-expectations-0.3.3:=[profile?] <dev-haskell/hspec-expectations-0.3.4:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:=[profile?] dev-haskell/quickcheck-io:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 test? ( >=dev-haskell/doctest-0.9.4.1 dev-haskell/ghc-paths >=dev-haskell/hspec-meta-1.7.1 >=dev-haskell/silently-1.2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Behavior-Driven Development for Haskell
+EAPI=5
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] >=dev-haskell/hspec-expectations-0.3.3:=[profile?] <dev-haskell/hspec-expectations-0.3.4:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:=[profile?] dev-haskell/quickcheck-io:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/1.7.2.1
+SRC_URI=mirror://hackage/packages/archive/hspec/1.7.2.1/hspec-1.7.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f72d930b1383d6a61c48315d64671c11
diff --git a/dev-haskell/hspec-1.8.1.1 b/dev-haskell/hspec-1.8.1.1
new file mode 100644
index 000000000000..f90186234962
--- /dev/null
+++ b/dev-haskell/hspec-1.8.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] >=dev-haskell/hspec-expectations-0.5.0:=[profile?] <dev-haskell/hspec-expectations-0.5.1:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:=[profile?] dev-haskell/quickcheck-io:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/doctest-0.9.4.1 dev-haskell/ghc-paths >=dev-haskell/hspec-meta-1.8.0 >=dev-haskell/silently-1.2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Behavior-Driven Development for Haskell
+EAPI=5
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] >=dev-haskell/hspec-expectations-0.5.0:=[profile?] <dev-haskell/hspec-expectations-0.5.1:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:=[profile?] dev-haskell/quickcheck-io:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.8.1.1
+SRC_URI=mirror://hackage/packages/archive/hspec/1.8.1.1/hspec-1.8.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=718f02e1de0432c6676754a05ad65524
diff --git a/dev-haskell/hspec-1.8.3 b/dev-haskell/hspec-1.8.3
new file mode 100644
index 000000000000..c83f82f35e5f
--- /dev/null
+++ b/dev-haskell/hspec-1.8.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] >=dev-haskell/hspec-expectations-0.5.0:=[profile?] <dev-haskell/hspec-expectations-0.5.1:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:=[profile?] dev-haskell/quickcheck-io:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/doctest-0.9.4.1 dev-haskell/ghc-paths >=dev-haskell/hspec-meta-1.8.0 >=dev-haskell/silently-1.2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Behavior-Driven Development for Haskell
+EAPI=5
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] >=dev-haskell/hspec-expectations-0.5.0:=[profile?] <dev-haskell/hspec-expectations-0.5.1:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:=[profile?] dev-haskell/quickcheck-io:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.8.3
+SRC_URI=mirror://hackage/packages/archive/hspec/1.8.3/hspec-1.8.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b04b1f49a79fc1efa74d565052c3ed2a
diff --git a/dev-haskell/hspec-2.1.2 b/dev-haskell/hspec-2.1.2
new file mode 100644
index 000000000000..4d457ede4cf7
--- /dev/null
+++ b/dev-haskell/hspec-2.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=~dev-haskell/hspec-core-2.1.2:=[profile?] ~dev-haskell/hspec-discover-2.1.2:=[profile?] >=dev-haskell/hspec-expectations-0.6.1:=[profile?] <dev-haskell/hspec-expectations-0.6.2:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hspec-core >=dev-haskell/hspec-meta-1.12 dev-haskell/stringbuilder ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Testing Framework for Haskell
+EAPI=5
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=~dev-haskell/hspec-core-2.1.2:=[profile?] ~dev-haskell/hspec-discover-2.1.2:=[profile?] >=dev-haskell/hspec-expectations-0.6.1:=[profile?] <dev-haskell/hspec-expectations-0.6.2:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.1.2
+SRC_URI=mirror://hackage/packages/archive/hspec/2.1.2/hspec-2.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c041d228552d9b93ebd1043cfb011a88
diff --git a/dev-haskell/hspec-2.1.4 b/dev-haskell/hspec-2.1.4
new file mode 100644
index 000000000000..885ecdd3572d
--- /dev/null
+++ b/dev-haskell/hspec-2.1.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=~dev-haskell/hspec-core-2.1.4:=[profile?] ~dev-haskell/hspec-discover-2.1.4:=[profile?] >=dev-haskell/hspec-expectations-0.6.1:=[profile?] <dev-haskell/hspec-expectations-0.6.2:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hspec-core >=dev-haskell/hspec-meta-1.12 dev-haskell/stringbuilder ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Testing Framework for Haskell
+EAPI=5
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=~dev-haskell/hspec-core-2.1.4:=[profile?] ~dev-haskell/hspec-discover-2.1.4:=[profile?] >=dev-haskell/hspec-expectations-0.6.1:=[profile?] <dev-haskell/hspec-expectations-0.6.2:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/2.1.4
+SRC_URI=mirror://hackage/packages/archive/hspec/2.1.4/hspec-2.1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0075773c3020bb482d3f782cb5f014ef
diff --git a/dev-haskell/hspec-2.2.1 b/dev-haskell/hspec-2.2.1
new file mode 100644
index 000000000000..6e6ed039b696
--- /dev/null
+++ b/dev-haskell/hspec-2.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=~dev-haskell/hspec-core-2.2.1:=[profile?] ~dev-haskell/hspec-discover-2.2.1:=[profile?] >=dev-haskell/hspec-expectations-0.7.2:=[profile?] <dev-haskell/hspec-expectations-0.7.3:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hspec-core >=dev-haskell/hspec-meta-2.2.0 dev-haskell/stringbuilder ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Testing Framework for Haskell
+EAPI=5
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=~dev-haskell/hspec-core-2.2.1:=[profile?] ~dev-haskell/hspec-discover-2.2.1:=[profile?] >=dev-haskell/hspec-expectations-0.7.2:=[profile?] <dev-haskell/hspec-expectations-0.7.3:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/2.2.1
+SRC_URI=mirror://hackage/packages/archive/hspec/2.2.1/hspec-2.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bf4f92addceff192f0a02f09ab7cfbc8
diff --git a/dev-haskell/hspec-2.2.4 b/dev-haskell/hspec-2.2.4
new file mode 100644
index 000000000000..9baa34244c56
--- /dev/null
+++ b/dev-haskell/hspec-2.2.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=~dev-haskell/hspec-core-2.2.4:=[profile?] ~dev-haskell/hspec-discover-2.2.4:=[profile?] >=dev-haskell/hspec-expectations-0.7.2:=[profile?] <dev-haskell/hspec-expectations-0.7.3:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-meta-2.2.0 dev-haskell/stringbuilder ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Testing Framework for Haskell
+EAPI=6
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=~dev-haskell/hspec-core-2.2.4:=[profile?] ~dev-haskell/hspec-discover-2.2.4:=[profile?] >=dev-haskell/hspec-expectations-0.7.2:=[profile?] <dev-haskell/hspec-expectations-0.7.3:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0/2.2.4
+SRC_URI=mirror://hackage/packages/archive/hspec/2.2.4/hspec-2.2.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0ab5871481fff24f83ebb34005ecf4c6
diff --git a/dev-haskell/hspec-core-2.1.2 b/dev-haskell/hspec-core-2.1.2
new file mode 100644
index 000000000000..eebafbef1f5e
--- /dev/null
+++ b/dev-haskell/hspec-core-2.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] >=dev-haskell/async-2:=[profile?] dev-haskell/hspec-expectations:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] dev-haskell/tf-random:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-meta-1.12 >=dev-haskell/silently-1.2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Testing Framework for Haskell
+EAPI=5
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] >=dev-haskell/async-2:=[profile?] dev-haskell/hspec-expectations:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] dev-haskell/tf-random:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.1.2
+SRC_URI=mirror://hackage/packages/archive/hspec-core/2.1.2/hspec-core-2.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2775258560e2e56d881335f33d8c3809
diff --git a/dev-haskell/hspec-core-2.1.4 b/dev-haskell/hspec-core-2.1.4
new file mode 100644
index 000000000000..77e2291ba7f3
--- /dev/null
+++ b/dev-haskell/hspec-core-2.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] >=dev-haskell/async-2:=[profile?] dev-haskell/hspec-expectations:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] dev-haskell/tf-random:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-meta-1.12 >=dev-haskell/silently-1.2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Testing Framework for Haskell
+EAPI=5
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] >=dev-haskell/async-2:=[profile?] dev-haskell/hspec-expectations:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] dev-haskell/tf-random:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.1.4
+SRC_URI=mirror://hackage/packages/archive/hspec-core/2.1.4/hspec-core-2.1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=19ffa4ab5ed9f7608f145cd0291690dd
diff --git a/dev-haskell/hspec-core-2.2.1 b/dev-haskell/hspec-core-2.2.1
new file mode 100644
index 000000000000..5a11cf855798
--- /dev/null
+++ b/dev-haskell/hspec-core-2.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] >=dev-haskell/async-2:=[profile?] >=dev-haskell/hspec-expectations-0.7.2:=[profile?] <dev-haskell/hspec-expectations-0.7.3:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] dev-haskell/tf-random:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-meta-2.2.0 >=dev-haskell/silently-1.2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Testing Framework for Haskell
+EAPI=5
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] >=dev-haskell/async-2:=[profile?] >=dev-haskell/hspec-expectations-0.7.2:=[profile?] <dev-haskell/hspec-expectations-0.7.3:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] dev-haskell/tf-random:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/2.2.1
+SRC_URI=mirror://hackage/packages/archive/hspec-core/2.2.1/hspec-core-2.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b2c6ed29f89449ca76d4f92cdfc612b8
diff --git a/dev-haskell/hspec-core-2.2.4 b/dev-haskell/hspec-core-2.2.4
new file mode 100644
index 000000000000..b0f2d6290863
--- /dev/null
+++ b/dev-haskell/hspec-core-2.2.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] >=dev-haskell/async-2:=[profile?] >=dev-haskell/hspec-expectations-0.7.2:=[profile?] <dev-haskell/hspec-expectations-0.7.3:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] dev-haskell/tf-random:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-meta-2.2.0 >=dev-haskell/silently-1.2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Testing Framework for Haskell
+EAPI=6
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] >=dev-haskell/async-2:=[profile?] >=dev-haskell/hspec-expectations-0.7.2:=[profile?] <dev-haskell/hspec-expectations-0.7.3:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] dev-haskell/tf-random:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0/2.2.4
+SRC_URI=mirror://hackage/packages/archive/hspec-core/2.2.4/hspec-core-2.2.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fe09862ca055a2a8e79ad986c2e59e50
diff --git a/dev-haskell/hspec-core/Manifest b/dev-haskell/hspec-core/Manifest
deleted file mode 100644
index 317d730ed027..000000000000
--- a/dev-haskell/hspec-core/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST hspec-core-2.1.2.tar.gz 29341 BLAKE2B dadc4c0d71a58fbc07d8a0d41c0822fe0db05112821a8ab2112dae41c663197080b819b0d93ebde0a64ee7b2509885efd8e1b481b1fea6566a2006640be2d846 SHA512 5af471a54b9bcfdc76ef8f0293d483b11997d88113cc28899d4148d76404b08f456a04566734d69c6c607904e80ce295dc9364d8d396f17bec748c8a32308c1c
-DIST hspec-core-2.1.4.tar.gz 29371 BLAKE2B 670147b4742ea4baa284bc70eddf615fdb79b338f7d5e2fe3042defe608d5b02ce110a6c123ac641c2ea44006b9ef2a95632227f9ea4ee967d37d21e209a12e6 SHA512 71f23c7b4075d5d48fc91b1394d1d1418f89c8756baddabea27ab09430ae982759377cb9f3fca42da72382c19fd8bfd151e89fea122e91faafb91e787bdf7b63
-DIST hspec-core-2.2.1.tar.gz 31651 BLAKE2B bcb278f103b651937c0f23fe14fd7fdc514e67c9e331d41f04cbcdfa96e925e938f8d2da4b5108e56c902f5f71654feaabd35429e1241a7a002a4a8bf0847ca2 SHA512 fa44e935609cf636ef13025ae03456e74b404d47e64fc58acf0ea1d204e32c145a471c60501e9cba3f8d2d1d211f4c999eb41798c8df45842abbc1befda14c6a
-DIST hspec-core-2.2.4.tar.gz 31553 BLAKE2B 4f5c438c652c20a9f51e6112ed455f4fc7b11713d1ce10df08504367fe4a17ec6637b346c05f519a4514d4cd38cd8b79023df13735804c846bf4efca9c084e17 SHA512 1c99ae88635886f74d1a0a28c7b3edfa4678031f62bb916724cc1efd62388ab24a7db1772955f55c7c5d1be75399a92784a5f9c0b2d2b49c0500d5ac6977b9b9
-EBUILD hspec-core-2.1.2.ebuild 1004 BLAKE2B 1bc2522bfa6031bee0bc7118167ef5897570886b5c621dd42167a136037acdf054f02be092f431679906a8ee4c50cdd04afa062895f89c5c72f2aa875e18d0c2 SHA512 fd45c6d4b9107101bdc0fca748d16107630659fa6c2722235097fb75cb0c9ba64e4c41e8fd711e685331cf136cf902d15bbab0bc5c4f7985021ce57c22c94836
-EBUILD hspec-core-2.1.4.ebuild 997 BLAKE2B b050359f636ca03f7c808fa4d4518a51e3a7d94430614409f93be775064c7b6eccd10754d86f0434140b21210f49fc250b606f35ebbabea6be9340988a8e9d9b SHA512 39ffd8a80abdba0bb50308117a0b9c555a91187bdf0151a77ef7f4e5abd21d84cb3006ad5d17af690a28b11031690ccc2c465069ebecf78ea8c9e3902b955d45
-EBUILD hspec-core-2.2.1.ebuild 1097 BLAKE2B 97ef5781eb717b5b113d44cd174bc2bed1a3fee814329680050bd9aef08ab481684f96aa5b2be92f7e48286422a16ed2d5d2be558d01a236405f345c91b79f92 SHA512 bac48a955cbbb8262582e186a014c3c9896d304e911ed5855a99eddb6520b1bb243ee27900d8fce5f994eba9ff3b55ae214540e4b1f3bf1549d99e76a6c953d9
-EBUILD hspec-core-2.2.4.ebuild 1049 BLAKE2B 9ed94d06ca204c878944d6d8ef280a08243ef12b366b202251d653deef43ec2302651b20913784a9249eed8ad856b7a13a6ca7038d4c00c2bc214c74f1a676cd SHA512 56ce9555b6b31fbbf25c25236db8eaf76f139520303519b3065af5df7ca419475a7010afb5860f961bb2ebb3781f44c378d12ef0ab051e59fee24a9fce75ccc9
-MISC metadata.xml 392 BLAKE2B 21503e4f536ae16eabc53969be84c5c9573ddd259a43f688a6bc9ef27c1b7b39d4dc1beb38e2b9c13d468a1a8a8115b9cbc4796bb8c5f311f604d2aee0f08988 SHA512 09a01472812d1cdce41fbd23bda48ebbb76480d9f075b2224937480c0ec81b8635c6f4d471fe1613cba5aa8fdbac6d155a0eda68e6ffae4c19de1c594e4ec755
diff --git a/dev-haskell/hspec-core/hspec-core-2.1.2.ebuild b/dev-haskell/hspec-core/hspec-core-2.1.2.ebuild
deleted file mode 100644
index f32b184383e3..000000000000
--- a/dev-haskell/hspec-core/hspec-core-2.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Testing Framework for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	>=dev-haskell/async-2:=[profile?]
-	dev-haskell/hspec-expectations:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	dev-haskell/tf-random:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-meta-1.12
-		>=dev-haskell/silently-1.2.4 )
-"
diff --git a/dev-haskell/hspec-core/hspec-core-2.1.4.ebuild b/dev-haskell/hspec-core/hspec-core-2.1.4.ebuild
deleted file mode 100644
index 71acb66b965a..000000000000
--- a/dev-haskell/hspec-core/hspec-core-2.1.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Testing Framework for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	>=dev-haskell/async-2:=[profile?]
-	dev-haskell/hspec-expectations:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	dev-haskell/tf-random:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-meta-1.12
-		>=dev-haskell/silently-1.2.4 )
-"
diff --git a/dev-haskell/hspec-core/hspec-core-2.2.1.ebuild b/dev-haskell/hspec-core/hspec-core-2.2.1.ebuild
deleted file mode 100644
index f9ce1a1d3e69..000000000000
--- a/dev-haskell/hspec-core/hspec-core-2.2.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Testing Framework for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # circular depends
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	>=dev-haskell/async-2:=[profile?]
-	>=dev-haskell/hspec-expectations-0.7.2:=[profile?] <dev-haskell/hspec-expectations-0.7.3:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	dev-haskell/tf-random:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-meta-2.2.0
-		>=dev-haskell/silently-1.2.4 )
-"
diff --git a/dev-haskell/hspec-core/hspec-core-2.2.4.ebuild b/dev-haskell/hspec-core/hspec-core-2.2.4.ebuild
deleted file mode 100644
index a3c56d7c3ce5..000000000000
--- a/dev-haskell/hspec-core/hspec-core-2.2.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Testing Framework for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RESTRICT=test # circular depends
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	>=dev-haskell/async-2:=[profile?]
-	>=dev-haskell/hspec-expectations-0.7.2:=[profile?] <dev-haskell/hspec-expectations-0.7.3:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	dev-haskell/tf-random:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-meta-2.2.0
-		>=dev-haskell/silently-1.2.4 )
-"
diff --git a/dev-haskell/hspec-core/metadata.xml b/dev-haskell/hspec-core/metadata.xml
deleted file mode 100644
index d7d62d8eae45..000000000000
--- a/dev-haskell/hspec-core/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package exposes internal types and functions that can be
-		used to extend Hspec's functionality.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hspec-discover-2.1.2 b/dev-haskell/hspec-discover-2.1.2
new file mode 100644
index 000000000000..a83016b170fa
--- /dev/null
+++ b/dev-haskell/hspec-discover-2.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-meta-1.12 )
+DESCRIPTION=Automatically discover and run Hspec tests
+EAPI=5
+HOMEPAGE=http://hspec.github.io/
+IUSE=profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/2.1.2
+SRC_URI=mirror://hackage/packages/archive/hspec-discover/2.1.2/hspec-discover-2.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=568cbccfb22a25e616d960f94a5b435c
diff --git a/dev-haskell/hspec-discover-2.1.4 b/dev-haskell/hspec-discover-2.1.4
new file mode 100644
index 000000000000..68c04fec49fc
--- /dev/null
+++ b/dev-haskell/hspec-discover-2.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-meta-1.12 )
+DESCRIPTION=Automatically discover and run Hspec tests
+EAPI=5
+HOMEPAGE=http://hspec.github.io/
+IUSE=profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/2.1.4
+SRC_URI=mirror://hackage/packages/archive/hspec-discover/2.1.4/hspec-discover-2.1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6878737a2506c1bbc20b180a62d2a7e4
diff --git a/dev-haskell/hspec-discover-2.2.1 b/dev-haskell/hspec-discover-2.2.1
new file mode 100644
index 000000000000..f0fd692a5055
--- /dev/null
+++ b/dev-haskell/hspec-discover-2.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-meta-2.2.0 )
+DESCRIPTION=Automatically discover and run Hspec tests
+EAPI=5
+HOMEPAGE=http://hspec.github.io/
+IUSE=profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/2.2.1
+SRC_URI=mirror://hackage/packages/archive/hspec-discover/2.2.1/hspec-discover-2.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=52172d0677f0b8ae8448ecdbdc08ffd0
diff --git a/dev-haskell/hspec-discover-2.2.4 b/dev-haskell/hspec-discover-2.2.4
new file mode 100644
index 000000000000..dc30bd8fbd9d
--- /dev/null
+++ b/dev-haskell/hspec-discover-2.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-meta-2.2.0 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Automatically discover and run Hspec tests
+EAPI=6
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/2.2.4
+SRC_URI=mirror://hackage/packages/archive/hspec-discover/2.2.4/hspec-discover-2.2.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3eb08729df7c24e57f77568d3ceee73d
diff --git a/dev-haskell/hspec-discover/Manifest b/dev-haskell/hspec-discover/Manifest
deleted file mode 100644
index 42cae7f45afd..000000000000
--- a/dev-haskell/hspec-discover/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST hspec-discover-2.1.2.tar.gz 5365 BLAKE2B 935070852def9c9de8059ba127e779260c79a7bb4f0437af02847d4fbb79650a726c679654b87733357ab5b557f91b1663c5b39b463e1f7c8bd9622ed18900fa SHA512 5d90e0732e0e36bf1c8da81c3ccdb000e10467e285399111c3a42df8695ca94b95e43af51bc6df861d6dd8e2fb99b8f626a67253a8902a932aa91369f7653353
-DIST hspec-discover-2.1.4.tar.gz 5570 BLAKE2B 40d84878a528df128f38914fb0fa110e482dcd138f0479364f887dbbf15f01cda472e4e490138067150b129c12a0554b90fdcd11ad420866c59db0ec48f572f1 SHA512 f511fe71ab380b640baa4e50fb5fa00089141aaaa53f04a2c24e48feb1d9d2b82dce95e1c55763f880eebdb89cc04707822cab0e9d3f69ee166a9afd7b84bef5
-DIST hspec-discover-2.2.1.tar.gz 5630 BLAKE2B b561b5f4ed0ca7e0f78dbc495422b098e2775822e4e2c6a6257fbb47206a0106e00dbbd7b313cb283bddd0f64b7bae441df5efedff3c8b208003a89d14a06c85 SHA512 cc27b6e8cee362c031a87c8af4b264824c13bc147e8780d601c7fc2390103447aacab187eb57e8079b558c0d5e643d796141ff44f079fb6b9a83fd3951f63cd9
-DIST hspec-discover-2.2.4.tar.gz 5878 BLAKE2B 250dccc3c82e0b7a4b1505d1a8a47cd8c1fc0454f545102d4db0d8f43057cdbd1d8866c933d461efc03773c89f5d9def75094c4868955696f4a11505fbf68255 SHA512 217ecedaaf35e28f270cd0b2933fb8818ae82e0ecc0152affa6e71cbc1c5a62897ac6421c384dc91567fd5e911ee02047e3b59a5772a8a5533115b0708fb7e76
-EBUILD hspec-discover-2.1.2.ebuild 570 BLAKE2B 4ccaec02e269c1883ebf2708cdb2fe980b2e369858304c6232791f7f376acf13af79e95c9611041e6924de2838306d2e92004a106bc7841c42a5f1589bd6059e SHA512 cb244175b620f50bf612128acc4044afc3e78ee4d873cc71913cce52de08a94d81304872835bb6045c62066046b986f8d0a1b5b40b73cbc990977cd22f096192
-EBUILD hspec-discover-2.1.4.ebuild 563 BLAKE2B 80a768623e580b6b31400b67b3492a76fd0e107da7de9e8f6409171d143e536bc6ce07e5f1956c2ee4cbb89028480c0a069cda9d8962de0d5a1ce18f911790d6 SHA512 8b50aae5328d1683771b94135d7f001dd31ad615a8c76574748a881d40f93cfdbe8e619a853dd2aa791b4718dbc8a5bec8622df611ad25553648a707f30584b4
-EBUILD hspec-discover-2.2.1.ebuild 571 BLAKE2B 2e77d193a83f5329e5160a6f84d9c0092ec841033af8688bb15e4cbd2f4a04801adc58737f478a514369abb922ce37541a98d990289dd64133dbebc3a59a96ee SHA512 d0770e803f96a9989bfa216d1107399641fd75599e28198b5a1801b5a12817344e3fde64b04f4b907dcba454724529b0511b32dd822532757cd16e9da91ea034
-EBUILD hspec-discover-2.2.4.ebuild 587 BLAKE2B c11e4baecc5b01c00566890b0af9dad63b32eeb2b2cd6b4c88031d544b4cfb32f99707333a1c802c082a1795ef517f1e2056b4a599c2d6aebcf9b33266be2f08 SHA512 6ac654a53a26b0e23194e8864b72df16e1cc6d5c9a65ad7bc4f5bae9e17403321ee8e5bdb154091950034f3ba096b3ec33e3a4e3e3107b45a6e7fef07f6301bb
-MISC metadata.xml 389 BLAKE2B fe21f0084f5a7f2cb5ed9b1bfd7187ae41efeae05a3e53c0e4dc6b97cadbff63c4ae53117d98fc6e899187924f9ca11d0774fc1d6b1f8be5f291129c7453811a SHA512 d6832a55f8fe0b07c71522025f6c35c722c02ca0c5bb1882e4c7136b6e19a015973f1dd7dbb8d08e797007a09434b8bc62b87acc6d26445f0788fcc5a621a167
diff --git a/dev-haskell/hspec-discover/hspec-discover-2.1.2.ebuild b/dev-haskell/hspec-discover/hspec-discover-2.1.2.ebuild
deleted file mode 100644
index 0d3d6223dea5..000000000000
--- a/dev-haskell/hspec-discover/hspec-discover-2.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Automatically discover and run Hspec tests"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-meta-1.12 )
-"
diff --git a/dev-haskell/hspec-discover/hspec-discover-2.1.4.ebuild b/dev-haskell/hspec-discover/hspec-discover-2.1.4.ebuild
deleted file mode 100644
index 0d9c38b32c3a..000000000000
--- a/dev-haskell/hspec-discover/hspec-discover-2.1.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="bin lib profile test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Automatically discover and run Hspec tests"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-meta-1.12 )
-"
diff --git a/dev-haskell/hspec-discover/hspec-discover-2.2.1.ebuild b/dev-haskell/hspec-discover/hspec-discover-2.2.1.ebuild
deleted file mode 100644
index a3ed1152445a..000000000000
--- a/dev-haskell/hspec-discover/hspec-discover-2.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Automatically discover and run Hspec tests"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-meta-2.2.0 )
-"
diff --git a/dev-haskell/hspec-discover/hspec-discover-2.2.4.ebuild b/dev-haskell/hspec-discover/hspec-discover-2.2.4.ebuild
deleted file mode 100644
index a9a147b72283..000000000000
--- a/dev-haskell/hspec-discover/hspec-discover-2.2.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Automatically discover and run Hspec tests"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-meta-2.2.0 )
-"
diff --git a/dev-haskell/hspec-discover/metadata.xml b/dev-haskell/hspec-discover/metadata.xml
deleted file mode 100644
index 07830dd91b22..000000000000
--- a/dev-haskell/hspec-discover/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Automatically discover and run Hspec tests
-		
-		&lt;http://hspec.github.io/hspec-discover.html&gt;
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hspec-expectations-0.3.2 b/dev-haskell/hspec-expectations-0.3.2
new file mode 100644
index 000000000000..954da48994ad
--- /dev/null
+++ b/dev-haskell/hspec-expectations-0.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/hunit:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/markdown-unlit dev-haskell/silently ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Catchy combinators for HUnit
+EAPI=5
+HOMEPAGE=https://github.com/sol/hspec-expectations#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/hunit:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.3.2
+SRC_URI=mirror://hackage/packages/archive/hspec-expectations/0.3.2/hspec-expectations-0.3.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d9d0112989a88d120c249cb0d340c216
diff --git a/dev-haskell/hspec-expectations-0.3.3 b/dev-haskell/hspec-expectations-0.3.3
new file mode 100644
index 000000000000..e7c0aa382717
--- /dev/null
+++ b/dev-haskell/hspec-expectations-0.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/hunit:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/markdown-unlit dev-haskell/silently ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Catchy combinators for HUnit
+EAPI=5
+HOMEPAGE=https://github.com/sol/hspec-expectations#readme
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-haskell/hunit:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.3.3
+SRC_URI=mirror://hackage/packages/archive/hspec-expectations/0.3.3/hspec-expectations-0.3.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=506d506e987b4162157bdc50747ceeca
diff --git a/dev-haskell/hspec-expectations-0.5.0.1 b/dev-haskell/hspec-expectations-0.5.0.1
new file mode 100644
index 000000000000..7aeab86c831c
--- /dev/null
+++ b/dev-haskell/hspec-expectations-0.5.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/hunit:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/markdown-unlit dev-haskell/silently ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Catchy combinators for HUnit
+EAPI=5
+HOMEPAGE=https://github.com/sol/hspec-expectations#readme
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-haskell/hunit:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.5.0.1
+SRC_URI=mirror://hackage/packages/archive/hspec-expectations/0.5.0.1/hspec-expectations-0.5.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7725477b2c818d29aba63b7636135338
diff --git a/dev-haskell/hspec-expectations-0.6.1 b/dev-haskell/hspec-expectations-0.6.1
new file mode 100644
index 000000000000..80c61d66afe4
--- /dev/null
+++ b/dev-haskell/hspec-expectations-0.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/hunit:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/markdown-unlit dev-haskell/silently ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Catchy combinators for HUnit
+EAPI=5
+HOMEPAGE=https://github.com/sol/hspec-expectations#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/hunit:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.6.1
+SRC_URI=mirror://hackage/packages/archive/hspec-expectations/0.6.1/hspec-expectations-0.6.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=528f235eecba50d18699db41e260fa58
diff --git a/dev-haskell/hspec-expectations-0.6.1.1 b/dev-haskell/hspec-expectations-0.6.1.1
new file mode 100644
index 000000000000..f9ca234e9347
--- /dev/null
+++ b/dev-haskell/hspec-expectations-0.6.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/hunit:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 dev-haskell/markdown-unlit dev-haskell/silently ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Catchy combinators for HUnit
+EAPI=5
+HOMEPAGE=https://github.com/sol/hspec-expectations#readme
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-haskell/hunit:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.6.1.1
+SRC_URI=mirror://hackage/packages/archive/hspec-expectations/0.6.1.1/hspec-expectations-0.6.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f124a7afd953155bf54410ac59df88ef
diff --git a/dev-haskell/hspec-expectations-0.7.2 b/dev-haskell/hspec-expectations-0.7.2
new file mode 100644
index 000000000000..455ccb72c364
--- /dev/null
+++ b/dev-haskell/hspec-expectations-0.7.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/hunit:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Catchy combinators for HUnit
+EAPI=5
+HOMEPAGE=https://github.com/sol/hspec-expectations#readme
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-haskell/hunit:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.2
+SRC_URI=mirror://hackage/packages/archive/hspec-expectations/0.7.2/hspec-expectations-0.7.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=38251a4369786c7e91ae9987e86db3da
diff --git a/dev-haskell/hspec-expectations/Manifest b/dev-haskell/hspec-expectations/Manifest
deleted file mode 100644
index b0b24ddc030c..000000000000
--- a/dev-haskell/hspec-expectations/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-DIST hspec-expectations-0.3.2.tar.gz 3707 BLAKE2B b231a5859f47d2e0f261ccf86f3f032377c91c8e49e7672952255b7ffc6e80db56854a6d9276ade0637aa60e97a95917c8f9d199528fa5f8d7ef705dc1219d6f SHA512 0ccb5a8999c41df00d977cefd985f2fd9d3d1abe79e79e340ab92ab87d875edbbd22f5b7a16e9f2c7f7ad127d7a30a8491b4bb6c59e92eec0c6a1439604c2599
-DIST hspec-expectations-0.3.3.tar.gz 3848 BLAKE2B 3a814f54d8d5559ad5d8753d0b0ee01f8e3dd07dc0809b6d4cbaa612dcb5dfe1241b1cc59aa88863a267f680e44c0b3e4d04fe75cfe00864c8a6bb229e26f873 SHA512 efc475bc6f5378fa54eddc66be9c2d69e3a8431be4dc9d30fed84e403bc5982894dd1f06aa0c55b4dd8904251ec4ca4753879c315efedbb162af30caa304e1cd
-DIST hspec-expectations-0.5.0.1.tar.gz 3971 BLAKE2B e63f58bf28739d0fa4ac575ba1cc5dc0f2d8aa98d0fedca557125c1f33eb468712a63093efd244ffa0db4fdf00e49bd3f26d9a07cbfeb96bbfc503a8c69f0f53 SHA512 fba29e65c6d666f493dd55d5ed62131a5233317c587b49ba98b1447be5ddc1f530a2bd6537b88afd78ec8c35760139303c0f8ec0de52ac01e499f3eb114e4fb0
-DIST hspec-expectations-0.6.1.1.tar.gz 4553 BLAKE2B acabe7c00f5fa05538ffe3b16ea0a95c237c5a67fad98896bd7a65801ddfda5f26a791a03c3298f35d1e8edfc986208b037ba8053c58f3dc06d9ce56e6260880 SHA512 37804b7ebe3fa134e005f4cc34a980b43a78f37a50b7aa668762086e125bb46e84dc3ca2b2f2c8a9dff31f1c89d7113c78d9a0fc4c787c746d9d5315d8938973
-DIST hspec-expectations-0.6.1.tar.gz 4553 BLAKE2B 233453a972c85e9599beef759df9bb391eb1472085ba2d44ff5ee67a1e9a6646dcd25db9ba72a35859a7552d91a5d3c8e29682347d41b7ca3e38b08007657425 SHA512 dad4bdf7f10241650a5d59e0131aa93d52040d1cd7aec63ba8a9090919d2d7f49f9f5a7ead7da3d79e619f37ffed2323eb62f68c076959f58c8e2208f8fb46b2
-DIST hspec-expectations-0.7.2.tar.gz 3993 BLAKE2B 1bafd6d3e9ee45d05885b81de6a5bce2137a2226dc49bd8459293df65d123f95531c0f2d1cb283da83e828186276e06452c25b33a76d8ef30358b81feb93e701 SHA512 0c66b0997b8b751529b3f72733a3c88f6767e564e2ff60aa5ff231c10d47295f01f747d9a2955b678fc7658fd0c5cad8647ca8a4da68e607e78397028f53de09
-EBUILD hspec-expectations-0.3.2.ebuild 683 BLAKE2B bc23785f63aaab0e2500fa0ea215f09aacd9d91d6bfd296e1a6503fd832d893b5aeab3b90dc4019c47d3c47acf946ac77b2ca83dd18fa72b036c3add01a31e04 SHA512 e7255c96af79baa6ff0dc9c5da5fa396073d34067520815b4de30a9fea239d96fae28ae8cbf653cf1e139692ec3a9961374390f015e4d70546b9a0e8e96b1171
-EBUILD hspec-expectations-0.3.3.ebuild 676 BLAKE2B 3bc5be4c79bf20e726cde20eccddcb09330237f73d1eddb2487c1353808eb561e4b0cbcf67ce94da7a7977a98d333ef09f8b8a99a0fb07af00da3e14dde58677 SHA512 05446454f6ebe5cb4b418d78784ccd81fee7efea932e630183b3ae69d7cdfd2f03be94549aabf26ba25aa62a4f100814985d17b39f2744b67b2382c8829cebe9
-EBUILD hspec-expectations-0.5.0.1.ebuild 676 BLAKE2B cd138969a4d734ea6db1d16bc34812ac0f8bbee6b7272d49e4ddd3672fdfec14a389b99eff5ad2715ec282e7740c7e7e2a9e33f5c7d5a4595f9ff929e616265d SHA512 1f5278116714c0fd96a67faaca4e41d5241376e699b2ab9918344cb275bdd0f7798a65339ff58ebf214ab18c59ac85a832d2019796568b5b76af18de8bb66a6c
-EBUILD hspec-expectations-0.6.1.1.ebuild 786 BLAKE2B ca6ac4ae60cbff23349f689f227b3a4f0341ace8def06096aec2be761ea6f0b89d6add75fd70cc163ed85dce9461e12080d4244b4582a28d4bd5a8097eb144dc SHA512 954164694a9b31e918590936081639f213752b0228c964f34da86c058219b421af8f67fef504e19453b94f00a5e5f8acb3348463594b01cb786eca234aec5542
-EBUILD hspec-expectations-0.6.1.ebuild 677 BLAKE2B 72c655cbd998caa1b9f1708393ff2e920297d1e0be41c3cb4b6f79faa2dbfab3fcf8766cc627d2c869fa91fad0b3ddc9c44d5ec2a4b5e1484909601c6c2a0776 SHA512 c27839931f9b0c76dbc321cdb149a5540e20b29d736989fce636032af66bc974ad124b261935a2a620314fff4ddb52e070bed76942e3230a4c08a56fea6759b5
-EBUILD hspec-expectations-0.7.2.ebuild 578 BLAKE2B eb162cf55c15cb440c1dac7bc126e44e3225e00bc7f17b626d7cbe1bcfeb67dbcaecb162cdf644220d88552fb3055767c6acde8b084868a828276e820e9c4958 SHA512 ace2fcc31d08c128ee302a9356418b6f824de8da0a009f6fa1ee25ccef26d489c31a5b332f70f3ef4d7ab05bdade93ed9fbe3d4a7590bee2e4c39534e8226e12
-MISC metadata.xml 471 BLAKE2B e8473c3d0b1919312334f324da57f409ce668e4b364e70e74fc2c61830e039b256c0c7251c4e29f2c37e9182df8b75ad455d56d23383b4803ccc48603dbc2da4 SHA512 51d1288db4d4c64234cbfa82fba10c6b9bb830fc7e9e0dd58eab31450a03d6b2a8f265121009f039064c917dbb46a235e425c1ae1c4a2cfc526c6b818e6ac97f
diff --git a/dev-haskell/hspec-expectations/hspec-expectations-0.3.2.ebuild b/dev-haskell/hspec-expectations/hspec-expectations-0.3.2.ebuild
deleted file mode 100644
index 53d26070bc5c..000000000000
--- a/dev-haskell/hspec-expectations/hspec-expectations-0.3.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Catchy combinators for HUnit"
-HOMEPAGE="https://github.com/sol/hspec-expectations#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/markdown-unlit
-			dev-haskell/silently
-		)"
diff --git a/dev-haskell/hspec-expectations/hspec-expectations-0.3.3.ebuild b/dev-haskell/hspec-expectations/hspec-expectations-0.3.3.ebuild
deleted file mode 100644
index 02275b448962..000000000000
--- a/dev-haskell/hspec-expectations/hspec-expectations-0.3.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Catchy combinators for HUnit"
-HOMEPAGE="https://github.com/sol/hspec-expectations#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/markdown-unlit
-		dev-haskell/silently )
-"
diff --git a/dev-haskell/hspec-expectations/hspec-expectations-0.5.0.1.ebuild b/dev-haskell/hspec-expectations/hspec-expectations-0.5.0.1.ebuild
deleted file mode 100644
index d85f7ffcdbf6..000000000000
--- a/dev-haskell/hspec-expectations/hspec-expectations-0.5.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Catchy combinators for HUnit"
-HOMEPAGE="https://github.com/sol/hspec-expectations#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/markdown-unlit
-		dev-haskell/silently )
-"
diff --git a/dev-haskell/hspec-expectations/hspec-expectations-0.6.1.1.ebuild b/dev-haskell/hspec-expectations/hspec-expectations-0.6.1.1.ebuild
deleted file mode 100644
index 2d3c64cc9639..000000000000
--- a/dev-haskell/hspec-expectations/hspec-expectations-0.6.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Catchy combinators for HUnit"
-HOMEPAGE="https://github.com/sol/hspec-expectations#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RESTRICT=test # circular depend: hspec-expectations[test]->hspec[test]->hspec-expectations
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
-		dev-haskell/markdown-unlit
-		dev-haskell/silently )
-"
diff --git a/dev-haskell/hspec-expectations/hspec-expectations-0.6.1.ebuild b/dev-haskell/hspec-expectations/hspec-expectations-0.6.1.ebuild
deleted file mode 100644
index 97e40590d722..000000000000
--- a/dev-haskell/hspec-expectations/hspec-expectations-0.6.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Catchy combinators for HUnit"
-HOMEPAGE="https://github.com/sol/hspec-expectations#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/markdown-unlit
-		dev-haskell/silently )
-"
diff --git a/dev-haskell/hspec-expectations/hspec-expectations-0.7.2.ebuild b/dev-haskell/hspec-expectations/hspec-expectations-0.7.2.ebuild
deleted file mode 100644
index fe8de0e2a043..000000000000
--- a/dev-haskell/hspec-expectations/hspec-expectations-0.7.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Catchy combinators for HUnit"
-HOMEPAGE="https://github.com/sol/hspec-expectations#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/hspec-expectations/metadata.xml b/dev-haskell/hspec-expectations/metadata.xml
deleted file mode 100644
index 813f06e30a59..000000000000
--- a/dev-haskell/hspec-expectations/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Catchy combinators for HUnit: &lt;https://github.com/sol/hspec-expectations#readme&gt;
-	</longdescription>
-	<upstream>
-		<remote-id type="github">sol/hspec-expectations#readme</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hspec-meta-1.10.0 b/dev-haskell/hspec-meta-1.10.0
new file mode 100644
index 000000000000..f303218ba480
--- /dev/null
+++ b/dev-haskell/hspec-meta-1.10.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] >=dev-haskell/async-2:=[profile?] dev-haskell/hspec-expectations:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] dev-haskell/tf-random:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A version of Hspec which is used to test Hspec itself
+EAPI=5
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] >=dev-haskell/async-2:=[profile?] dev-haskell/hspec-expectations:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] dev-haskell/tf-random:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.10.0
+SRC_URI=mirror://hackage/packages/archive/hspec-meta/1.10.0/hspec-meta-1.10.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a961d2b3d66d4e13871f92a91fc4e3ce
diff --git a/dev-haskell/hspec-meta-1.7.2 b/dev-haskell/hspec-meta-1.7.2
new file mode 100644
index 000000000000..0c0d3e7f7cdd
--- /dev/null
+++ b/dev-haskell/hspec-meta-1.7.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] >=dev-haskell/hspec-expectations-0.3.3:=[profile?] <dev-haskell/hspec-expectations-0.3.4:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:=[profile?] dev-haskell/quickcheck-io:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A version of Hspec which is used to test Hspec itself
+EAPI=5
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] >=dev-haskell/hspec-expectations-0.3.3:=[profile?] <dev-haskell/hspec-expectations-0.3.4:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:=[profile?] dev-haskell/quickcheck-io:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/1.7.2
+SRC_URI=mirror://hackage/packages/archive/hspec-meta/1.7.2/hspec-meta-1.7.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e1797159121da265ee3cc2b62cc1c448
diff --git a/dev-haskell/hspec-meta-1.8.1 b/dev-haskell/hspec-meta-1.8.1
new file mode 100644
index 000000000000..e2988df84aca
--- /dev/null
+++ b/dev-haskell/hspec-meta-1.8.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] dev-haskell/hspec-expectations:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:=[profile?] dev-haskell/quickcheck-io:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A version of Hspec which is used to test Hspec itself
+EAPI=5
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] dev-haskell/hspec-expectations:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:=[profile?] dev-haskell/quickcheck-io:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.8.1
+SRC_URI=mirror://hackage/packages/archive/hspec-meta/1.8.1/hspec-meta-1.8.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5ab8b6edb6610b759e5c810670299ed1
diff --git a/dev-haskell/hspec-meta-1.8.3 b/dev-haskell/hspec-meta-1.8.3
new file mode 100644
index 000000000000..75db373bae8a
--- /dev/null
+++ b/dev-haskell/hspec-meta-1.8.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] dev-haskell/hspec-expectations:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:=[profile?] dev-haskell/quickcheck-io:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A version of Hspec which is used to test Hspec itself
+EAPI=5
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] dev-haskell/hspec-expectations:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:=[profile?] dev-haskell/quickcheck-io:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.8.3
+SRC_URI=mirror://hackage/packages/archive/hspec-meta/1.8.3/hspec-meta-1.8.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2392c05894c94d3ef254a24802bc8285
diff --git a/dev-haskell/hspec-meta-2.0.0 b/dev-haskell/hspec-meta-2.0.0
new file mode 100644
index 000000000000..d87b6b2e9b44
--- /dev/null
+++ b/dev-haskell/hspec-meta-2.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/ansi-terminal:=[profile?] dev-haskell/async:=[profile?] dev-haskell/hspec-expectations:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A version of Hspec which is used to test Hspec itself
+EAPI=5
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-haskell/ansi-terminal:=[profile?] dev-haskell/async:=[profile?] dev-haskell/hspec-expectations:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.0.0
+SRC_URI=mirror://hackage/packages/archive/hspec-meta/2.0.0/hspec-meta-2.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a159dd725093a5bc0a6819f8ea713d4e
diff --git a/dev-haskell/hspec-meta-2.2.0 b/dev-haskell/hspec-meta-2.2.0
new file mode 100644
index 000000000000..a7f50345b459
--- /dev/null
+++ b/dev-haskell/hspec-meta-2.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/ansi-terminal:=[profile?] dev-haskell/async:=[profile?] dev-haskell/hspec-expectations:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A version of Hspec which is used to test Hspec itself
+EAPI=5
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/ansi-terminal:=[profile?] dev-haskell/async:=[profile?] dev-haskell/hspec-expectations:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.2.0
+SRC_URI=mirror://hackage/packages/archive/hspec-meta/2.2.0/hspec-meta-2.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4f6fb9a9bf6d5ea353bb8a09e57181b6
diff --git a/dev-haskell/hspec-meta-2.2.1 b/dev-haskell/hspec-meta-2.2.1
new file mode 100644
index 000000000000..2aff67985c14
--- /dev/null
+++ b/dev-haskell/hspec-meta-2.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/ansi-terminal:=[profile?] dev-haskell/async:=[profile?] dev-haskell/hspec-expectations:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A version of Hspec which is used to test Hspec itself
+EAPI=5
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-haskell/ansi-terminal:=[profile?] dev-haskell/async:=[profile?] dev-haskell/hspec-expectations:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.2.1
+SRC_URI=mirror://hackage/packages/archive/hspec-meta/2.2.1/hspec-meta-2.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=744d08ef629c37e37f2b8b70f7a72bba
diff --git a/dev-haskell/hspec-meta/Manifest b/dev-haskell/hspec-meta/Manifest
deleted file mode 100644
index 3791a2abc128..000000000000
--- a/dev-haskell/hspec-meta/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-DIST hspec-meta-1.10.0.tar.gz 20256 BLAKE2B fbf55eeaa085a97114eaa39fc5cce83c09efe72ffda9e055e1b1382246d5584125863e2b8744f6391b59c69145ca8d87407cfd4dbcd03cbe6c2a3277b2951f30 SHA512 212510fd48d0285fd8bf11dda5645457ea2d33c865f00ca6e0db366e9cd1f1d65dabf79fb5178494e7d0a8cc36389b0f38af3b305dcccfe50f1f97d853ccccef
-DIST hspec-meta-1.7.2.tar.gz 22207 BLAKE2B b41d42afc93a1bfecdf90459645cf421ddd8ff6aa29c30311a432a39e3edf1637ff359a7f0d01e49b836d8c18d5d2465ba0e03f7bb7c51987f7792732ed1253f SHA512 4e3d44c9a8e57dffcd54a8f34c1f2271e593dfdc7fa10adbe5c5a3d25b7203ccffed906c390ede724ce1340cf3f7d04eb8075194ddd9dd0b9a9341091cfde833
-DIST hspec-meta-1.8.1.tar.gz 20555 BLAKE2B 124a32a479795109f854fe8f8eb219e49e4d0d455d7cea464c2664b9dadb8b2f32187853f831aa74b19e2efcc027aec92841909b9048641357d299f260c8f220 SHA512 555421fa7a693b59b7fe01340096b94ffaa263e5d6e23d5fd538284c385279f56ac1bf5b9ed07e6e74dfd8a0cc0875b2c245a72e6cce1c4e3edb68969e8403f9
-DIST hspec-meta-1.8.3.tar.gz 20877 BLAKE2B 7840d09c0fb00270a5d79af088e616a271abb1159ed782e2b94dab008fd3f2b6ff73f7b8a73166aa56bfc32b211940832b006150ac3fc3532d9d9a54d519f115 SHA512 fb71234784d5ae0906c664b24ef99578ceb4b764bf8badb528c940637774d8b598a43abc4240e4a0720cac5b088612723ab63b94d92ee5f5b3317422ea89f5d2
-DIST hspec-meta-2.0.0.tar.gz 23370 BLAKE2B 402999f1db24d8f0a79f7b7f999d2c39aa6be3ade6e6daf99b58abe5c573fe0dac39fd09d454ecb34ac29e4b5354933d729951d7d5ed200bff92a50e4da8d325 SHA512 434bf1e181cc41780f1367019e200b330a3d793232774188552d893197c1e86731aae73a4d8f44faef2289c6eeb26398481cc0b1aa8a23a414dd849655d7cfca
-DIST hspec-meta-2.2.0.tar.gz 24918 BLAKE2B 903a7dfe4b5f4f8d644fadbd8b5246b252173b6b04a319d4a7af798f1db5ffc02c66c45954c42912f5814ba9017453a5f78954a0ecf166281021e4335bec3a2d SHA512 2c2f928523d38d8b8a53ad64abcd3e612d2de3cd443197653283e02f19133ff91d42d47a85819f03189d02afc515427a0c88f43a0ae6ab819644674b30bae1d2
-DIST hspec-meta-2.2.1.tar.gz 25104 BLAKE2B b7a39dc75fd16f08d01c4ddc68b5e9c8ac81d7c3eeecd9b9d93be46802de5d2d6f7009e24d2a99f104c7d498ed405b68e6c9f916542bbb4d38e429b3731672aa SHA512 836532f58896993c83aefa57c3e0643359c02aeb208321421a6042c60a9fd7e75a80f53af2d1929cd284cc82e0d5a7b5cbf7baad175a9cfd1b742932d364b4c1
-EBUILD hspec-meta-1.10.0.ebuild 946 BLAKE2B 8e672337332e58ea01deea351e345e232ab40d630733631306a9681df5eb23c850dd3c06633741db5cae622e8537e69023a872d8b3d1d2aff94183d810dbb641 SHA512 e15238e4734e94dd39d5ee534e44b77909f67b77bd9523a156a9c2e7d58a5268f188b12a5478e74dd98ca5e4b187c09e8c34216770e3c8bc0f46c4a575aced49
-EBUILD hspec-meta-1.7.2.ebuild 1022 BLAKE2B 483908047d3cd5d3dbe91acfbe504527f586333b2709d3c9dd8a8ee6b8ee24d1fb2afb3818cdbadfee9d12f0e139737b0c0a8b1be504fa7c92f3eb016b64a890 SHA512 f66406df3be9415f1d8a16c7bcd9c4ff8ae2fc651c75c0fc980502c62a24d1bd4691c86f46465f75d6b496d6c3ad42d42fd365a99c0b6268afd3bb5caf422d79
-EBUILD hspec-meta-1.8.1.ebuild 959 BLAKE2B 1ee6ca81f6bc266c9d893eb6c646ba12aae162bf6528f29dc9ad1bc66b2b96e8c47f8ac20434893d6a09e769ef0163a2fb0712b519b09328105771521ae4df80 SHA512 013e8232b6599b652d8cdc94c398534f037e896af547d904d493a1dfa11cb6e7c50dd945ac9d8d597c4aa1d1ce34da7b4b3b2aa52346d27b8643dbe2a25ba446
-EBUILD hspec-meta-1.8.3.ebuild 961 BLAKE2B 4e3a4acc502a139d6b87cf6c00b0097f8f4e2a00dfbde6ab26a398685bd21ba4ae4bd2ccaa87604342bf1db01bae27c7076ff590ed700fe8a5c5b6d88f16314f SHA512 c343159f03602f991ce2bcbc07666cc1554320866c702105ff98c5370cb411913b7afcde9aa1aa200069cf0fb0c035189aa059e7f1911fb9f20348e4912f2e02
-EBUILD hspec-meta-2.0.0.ebuild 892 BLAKE2B df5300db7113ed5b3d9bf1e24aea3e37ee13a6947304641838d2c839771fc6121d89b77a4361430f2dba20f47c72bd238dd006655f10d93b933d106c9ffd0ad5 SHA512 fcfb7d372d57dd60bb8f83cb3d93749e7ebe01f9d511c745388be0f48a81c96a721a02b45377cb97d92db268b922c0aa7a384ef8f2d1695bc809b1efa30aeea3
-EBUILD hspec-meta-2.2.0.ebuild 894 BLAKE2B f395c58d818278acf60fa5dec0a65ab80b6ad60f053566812c9d987ed074775122eea509c3f560335aa3c7c530f650c3912067ce32153b38ba5355c9a2f8f9a9 SHA512 da740c62941a7cfafac9dd016d2458e5bc447a684d350ddcc9a1e9804123260556dfc44422f403147879893b4fb1297bbc4ba4e51c97ad42cc039c9611c5f3b0
-EBUILD hspec-meta-2.2.1.ebuild 892 BLAKE2B 77f83fdc8057b728822de6f3b3939388f443f7e3b1436c0ee823e431afdce4234ff34aee304f205fb834693d1afdcc30020ba125ecd07d637fe69a4bc6bbd8da SHA512 b2a8ac15490c3dd1a1e351b0af43a1f2299d979c4eb9b5168ec72af81b8b8f2a8fd1b39cf10ed2a344f6b43aeee5dedd5623c9d26eb3612a635f02d2b4eecdd3
-MISC metadata.xml 377 BLAKE2B ca726852abecbdb02e2fabc55495e7d0392fe74d87ccf1e20c3ef47979eb94c7f36733c4735d3a8e833890ea6d8cbc1eb7415f198c394a0dafcbf72d55a30896 SHA512 70eebf5c6ef843e63ffc25ce6b9f01e7c4d85561998b795bc856ef8c94919b7c26cdf6a959aee25575b44bac02e3e2fe28c22203f77db8669e98b5c4914b91eb
diff --git a/dev-haskell/hspec-meta/hspec-meta-1.10.0.ebuild b/dev-haskell/hspec-meta/hspec-meta-1.10.0.ebuild
deleted file mode 100644
index 58278cd5600d..000000000000
--- a/dev-haskell/hspec-meta/hspec-meta-1.10.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A version of Hspec which is used to test Hspec itself"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	>=dev-haskell/async-2:=[profile?]
-	dev-haskell/hspec-expectations:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	dev-haskell/tf-random:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/hspec-meta/hspec-meta-1.7.2.ebuild b/dev-haskell/hspec-meta/hspec-meta-1.7.2.ebuild
deleted file mode 100644
index 57233a03d7ff..000000000000
--- a/dev-haskell/hspec-meta/hspec-meta-1.7.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A version of Hspec which is used to test Hspec itself"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	>=dev-haskell/hspec-expectations-0.3.3:=[profile?] <dev-haskell/hspec-expectations-0.3.4:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/hspec-meta/hspec-meta-1.8.1.ebuild b/dev-haskell/hspec-meta/hspec-meta-1.8.1.ebuild
deleted file mode 100644
index 668e8536fc53..000000000000
--- a/dev-haskell/hspec-meta/hspec-meta-1.8.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A version of Hspec which is used to test Hspec itself"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	dev-haskell/hspec-expectations:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/hspec-meta/hspec-meta-1.8.3.ebuild b/dev-haskell/hspec-meta/hspec-meta-1.8.3.ebuild
deleted file mode 100644
index 2d3668eb6a98..000000000000
--- a/dev-haskell/hspec-meta/hspec-meta-1.8.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A version of Hspec which is used to test Hspec itself"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	dev-haskell/hspec-expectations:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/hspec-meta/hspec-meta-2.0.0.ebuild b/dev-haskell/hspec-meta/hspec-meta-2.0.0.ebuild
deleted file mode 100644
index 00aa814d6a88..000000000000
--- a/dev-haskell/hspec-meta/hspec-meta-2.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A version of Hspec which is used to test Hspec itself"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/ansi-terminal:=[profile?]
-	dev-haskell/async:=[profile?]
-	dev-haskell/hspec-expectations:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/hspec-meta/hspec-meta-2.2.0.ebuild b/dev-haskell/hspec-meta/hspec-meta-2.2.0.ebuild
deleted file mode 100644
index 79f62c69f532..000000000000
--- a/dev-haskell/hspec-meta/hspec-meta-2.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A version of Hspec which is used to test Hspec itself"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/ansi-terminal:=[profile?]
-	dev-haskell/async:=[profile?]
-	dev-haskell/hspec-expectations:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/hspec-meta/hspec-meta-2.2.1.ebuild b/dev-haskell/hspec-meta/hspec-meta-2.2.1.ebuild
deleted file mode 100644
index ff0c6287be1e..000000000000
--- a/dev-haskell/hspec-meta/hspec-meta-2.2.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A version of Hspec which is used to test Hspec itself"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/ansi-terminal:=[profile?]
-	dev-haskell/async:=[profile?]
-	dev-haskell/hspec-expectations:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/hspec-meta/metadata.xml b/dev-haskell/hspec-meta/metadata.xml
deleted file mode 100644
index 16c1f0318cf6..000000000000
--- a/dev-haskell/hspec-meta/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A stable version of Hspec which is used to test the
-		in-development version of Hspec.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hspec-smallcheck-0.4.1 b/dev-haskell/hspec-smallcheck-0.4.1
new file mode 100644
index 000000000000..969ed89fd07d
--- /dev/null
+++ b/dev-haskell/hspec-smallcheck-0.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?] >=dev-haskell/smallcheck-1.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hspec dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=SmallCheck support for the Hspec testing framework
+EAPI=6
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?] >=dev-haskell/smallcheck-1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.1
+SRC_URI=mirror://hackage/packages/archive/hspec-smallcheck/0.4.1/hspec-smallcheck-0.4.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4f6c3003cce52668d696071b36fd5b46
diff --git a/dev-haskell/hspec-smallcheck/Manifest b/dev-haskell/hspec-smallcheck/Manifest
deleted file mode 100644
index dd50e002d182..000000000000
--- a/dev-haskell/hspec-smallcheck/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hspec-smallcheck-0.4.1.tar.gz 1861 BLAKE2B 4b11d0739f11e759d811955941b52ec5b7e660801bf90610300f514a214bc439571c7e05dec77c8a7c388a010847eb324cbb693e10ca6741e7ea5428e0eac927 SHA512 bdb8dc6432d085dd192af77d34ae4188e002a419025006680abc076bea1216f0481c629a1c6025382de963d1ee351913f9f3159ed92fbedd0972363f27bded27
-EBUILD hspec-smallcheck-0.4.1.ebuild 730 BLAKE2B fdcfc2a6b8f454d2acc5efecbea62bb799ae038702a3e16fe9e816aae8c47faa10c48fe6047d3ba462be1d81cfe5369af0c75c6c480486b507d00d1f696e574d SHA512 538cb544c0329dce88fabcac4efaaa5bafad26797033726eaaeee0e0aa298a5f9bfb1d6a0dc716ba860c23ff95149c9586c00fc60144d25ee24e8b95459b4ebe
-MISC metadata.xml 341 BLAKE2B 8300a65d19be2c21db748909cf5924c8bcda502d7b7eb17377920a731929866b99d7fbcc933335e744161a92b0cf9a8672f2e84d028c5f71143ca168140525ae SHA512 5b34d293c4beff1d722c3fe9e1ead2666bed3fac5b7ad8d5acc16891fe5781857b3d9d4292298fc0b500957e0474427183a4518c6809fc6576d1d05ab26c56d5
diff --git a/dev-haskell/hspec-smallcheck/hspec-smallcheck-0.4.1.ebuild b/dev-haskell/hspec-smallcheck/hspec-smallcheck-0.4.1.ebuild
deleted file mode 100644
index c985caa6d77b..000000000000
--- a/dev-haskell/hspec-smallcheck/hspec-smallcheck-0.4.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="SmallCheck support for the Hspec testing framework"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?]
-	>=dev-haskell/smallcheck-1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/hspec-smallcheck/metadata.xml b/dev-haskell/hspec-smallcheck/metadata.xml
deleted file mode 100644
index f9940a6d1350..000000000000
--- a/dev-haskell/hspec-smallcheck/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		SmallCheck support for the Hspec testing framework
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hspec/Manifest b/dev-haskell/hspec/Manifest
deleted file mode 100644
index b489acdefee4..000000000000
--- a/dev-haskell/hspec/Manifest
+++ /dev/null
@@ -1,19 +0,0 @@
-DIST hspec-1.10.0.tar.gz 31928 BLAKE2B cd6ca92cbccaf9b60cd780d429471fcd97072255efc26a787bd6ef37d4c2d360182c9eec97945481fcf5b268124c1671b94ddd48cab03bcd6a89d2ab1e3dd8de SHA512 118fd02c78fc68e743cf2342c111fecda535b0487241e5f2d93281d2538d6b9d2e12f3f5b2b15c15dade1ffc9314e2c90f5327225d92e2ea8ef2770a912c9b83
-DIST hspec-1.5.4.tar.gz 30050 BLAKE2B fdb514050c4eb91b1f0a819e58ffdde1853ad1dbd692b0623be5dfadbec1014a6c83810d339419dda64a8873faf5afb5e619eeaf7ca24cf25015852a2669bf4d SHA512 a2587d3b105786e74664ca378c09c971f11f48daf6175dd6eb6ada84116312911545bedf93b8ef3a50c86374899f1b6267404f82587047d8d5163515ac58b346
-DIST hspec-1.7.2.1.tar.gz 34555 BLAKE2B 1f4884053079186c151cc3b9a18dc28f3066a7694c6f92d116c50e6b159233441aaac0988cb8bbc581a843461ea933e3b1034f113509c47dae7e6af1efef9e02 SHA512 e57788ff751b32d1130e866af3cb43aa2be7e2215205d47c06ea07f9a5cd6aed41ee8167ae49e3ea5d80bf00f5c12d0705dd3d4a616b58a422d9dcf48d7938e2
-DIST hspec-1.8.1.1.tar.gz 33019 BLAKE2B 6eb938d69ff79601922221bfd79c3445557d253725bafbd9daed0b4a973c77b6f2f4afa7f83499e5372de174c3895c1c6dbd1406f8f7b34c8c9c3a1bc6c4efc8 SHA512 248b1e6c712b525d4a1502e40ee8b31d186e3da48ca6fd500ee7d4a6e2e36cdb5be5d2aef1260ea7e0c24151ceb31ab01ee912ce779c159fb99227ab24f392e1
-DIST hspec-1.8.3.tar.gz 32691 BLAKE2B b6171b72c251cc9185634bdc8e2828e49b09392f0a3be18ec1423ac6224a89524e89e488ecebd542c2fcfe389e3d71d344c264e6b1b377ac80510061b5939a8f SHA512 bb07f0b0049439d31541ea5da5caab06f581149481db9f97c070535b6e2c7dac46c688be13ab89448f353aae594130c8cee51bd46a168d3073cf5b93e7e5390a
-DIST hspec-2.1.2.tar.gz 5200 BLAKE2B 387a3f54bb55b805c6a8b437cf814ffdb800cffdf57e88b675cfb6cd24cb6cfde51aacaa2643e42a6d05d9aad5cb10134a8b20fda5a599b9cc09eb731b7d4863 SHA512 9709ff584e616b1128e4ad00f93cdb6673a5db61442cb0684ca01c3e9546bfb401a8d894dea2eadec3fee4696a74f5ca846beab841cd88afa15d63aadcbe7d82
-DIST hspec-2.1.4.tar.gz 5201 BLAKE2B 056e64b74bcdf8ca0ad5c1b37c67b5a9b921a1ecd06627cba31216c074afb8304fb03e465dbfbd1deaaa0d0977d11b48d5864836ba21d9884f3b7aa3f5165483 SHA512 04def062e104e939510fba9e4d386df40f964abc07bd0c6aefcd2dca0b4abb8519073ba1ebe6e47685eb558c30f9be0986cce30fbc1cef83e0b9daf66f040398
-DIST hspec-2.2.1.tar.gz 5398 BLAKE2B ffd5cc2195aee1b6226ed6f67aaa742bbc03078a8431dd46b538bf333d3a3f8e6a3c2d2ec2a7438ed62e87f6ee903a4ef752096f9bfd58d9d42e8ac5b345d674 SHA512 47af2f1f129c8d045305e080f504c469332bd9c50c0f98a3a165bd8fd11772a499b13e223067d59a959d2e83d2858447d89bf9b83ce4c4d857e7d39379bb07b2
-DIST hspec-2.2.4.tar.gz 5438 BLAKE2B 29f4e53c8bde62314e0d351c25afb93219783b3a071fb77820955ef4dc812d206f92de43d621a05eb83070c04dcc873f82fc1100f6bfb264d7510ff755aa820d SHA512 65a76857fc6e46b1f94a419e4541e14addfad78e0cd72355aa00ba0cf035479024abf6b970e094ad86a42db6e303662a55bf25e81384ce39f00eb7e07259582d
-EBUILD hspec-1.10.0.ebuild 1130 BLAKE2B 6aa13aeaf3bf664c1cde7d7d6d9102adb32cd7c281efea6e8f039c7f89d60bfdeb17eb02d51cd74f6c982101f1c3216e3fc1b878619369c9ba8f20cd9209324c SHA512 a908a9ca712668f051c9a138c2977bff7d90496f4be8ba8c1e035e1c62f6c227e53199711afb926eb54ccf68489d80df9e385fd9f9bf0852fe0f0178e681a032
-EBUILD hspec-1.5.4.ebuild 1077 BLAKE2B a0df7f0a5830f6ab1f6c1db334b6c6819936593aa5d3665ac5ed29ba5e04437add1d2924f647ee24f831bfd512e590b3654fd83b0df0025188cc82c86e894fc3 SHA512 e46cb5121ff39edd49061715d1fa00a2193a5016c1ba31b53fc5206273ceb9b43c2680cdbb39e288d5bcb69a7efbf0aed63e0b1508366c408880fdad1b751a39
-EBUILD hspec-1.7.2.1.ebuild 1148 BLAKE2B 980103f030ad9790a02d0b06c7a512836d661946df1b0ae13ddcc7b1036bf382c783f40517c0fc8d8ee322d7ce00442d54a2e35260b0089950c7ef7d2ace93bb SHA512 ee33473973900ff035871da8a4affdbb6b3e3fc40a034322a35afd15f5e04e26ea5e9d1ee93ca75e43b32abded498c0be93f1601d275f3dd84c513fe9f57b529
-EBUILD hspec-1.8.1.1.ebuild 1143 BLAKE2B f06e2d1ae9ec2b96e966ee1dd40b4847e66a85dcd055f86723c2e861eaca1416e898596467ca815fe65a683dfe341851c82369afbdfdf7f4f91fafdb14f262b2 SHA512 f1d8e46232b5de326f144b4eb316c9de56317fcd1ddd11ce62e6539cfc7d227376c5a50e0d2e490385d0db9ebb74401777a9ad5e238dcac45df692edb6bd2dd4
-EBUILD hspec-1.8.3.ebuild 1145 BLAKE2B 6d7337d0d75bfa55b12bfc4b135cfda25798a507569dfc039a25054727ab6f1c11ebdfbeb3dd0d26337f102ad59b3d5ebdced53f7a9cda0cdc912d73faf3f335 SHA512 1bffef8b416b3d7024dfc9f8bfae5a13aded7eed881e1252e624181595fda9476f21fb55c1cd8d28212f3149dac65a5fea629251d8a29e3aeb912e2d98d6dd4d
-EBUILD hspec-2.1.2.ebuild 956 BLAKE2B 8efb946b75ea72adb92122a04c7c85424d35be1290d3952dbf165babbb71ba637aea4c35459756af51683605e1898769b1814f0b4ecd2e93cd2ec42367bfaae8 SHA512 958a57ee167df43ddb2d60724b69d96403b9a29d0e593818f9f08b64d6c3065b007112f85847601420e7d66ac3d157ed616f2ad20f840c33d2976e4a3e2ea3ea
-EBUILD hspec-2.1.4.ebuild 1022 BLAKE2B 743fd2fbb301491f018fd2aaafde86cdca2d0a2bdb194eb50deced7ce1e31caf6ab7f096c4b182faaf7900ecf9b1bdfd1fbf93b896bc2d7c24e9db68d9b052ec SHA512 cc014369e6175f3c107b110ceea09d7eae9d6c3f009067c4ce751d84979bc915ac684c1422d11dd85204e4197eebae8255dd2142acb947944b23b16761afccc8
-EBUILD hspec-2.2.1.ebuild 998 BLAKE2B 6677f69f2ee53b1c1a793ed4c78ba612d600717f37bb49139b783e9eb192d5c60d9bc6eec0fc6de6b0e0337c95c2ac9d35ace1d0a06c8ed9308434a28ca4980a SHA512 76af20692363375cf71fdbf08c208637fbfe52a003a7081afb8f917a18679cfde6ed1594ef32cac42ac30ef39e7d1ad867e0d476fe487e8d894ec77b617dea2a
-EBUILD hspec-2.2.4.ebuild 925 BLAKE2B 5a140da1a0c2fbfd211927df2463d3ebe57201227a23b4865f92940b3c4a4e4cbb2bd17a2efc18d9ffa1da4c38447812552ca979e0a30a1d1827e5f6b1c3ce3c SHA512 629ac0245f15b32fe2136d30a214a3d870d62f2416ed7317936d940bf9e503172032e1d19abfd31d720021be5bc04f1f566597739fae497d64407624dc3463df
-MISC metadata.xml 555 BLAKE2B e95567c7dfe51abe6b4dbf29a28f22c7165a4ffca7e4c854855a1bcfc69e54f9f989f5f6fa50caa304a3d2460ef92a28a5b9a72497f990985b965d52470a83eb SHA512 fda12d5aed53f2c99effaa133127b2811a3b502e405f60a84effc3e340b567d6315e3ec54b2a7c98cc28d3df80bc2fc6091c6b868a7c097fc923d91ddd189005
diff --git a/dev-haskell/hspec/hspec-1.10.0.ebuild b/dev-haskell/hspec/hspec-1.10.0.ebuild
deleted file mode 100644
index 7420ba384057..000000000000
--- a/dev-haskell/hspec/hspec-1.10.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Behavior-Driven Development for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	>=dev-haskell/async-2:=[profile?]
-	>=dev-haskell/hspec-expectations-0.5.0:=[profile?] <dev-haskell/hspec-expectations-0.5.1:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	dev-haskell/tf-random:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.9.4.1
-		dev-haskell/ghc-paths
-		>=dev-haskell/hspec-meta-1.9.1
-		>=dev-haskell/silently-1.2.4 )
-"
diff --git a/dev-haskell/hspec/hspec-1.5.4.ebuild b/dev-haskell/hspec/hspec-1.5.4.ebuild
deleted file mode 100644
index 7e30fa449369..000000000000
--- a/dev-haskell/hspec/hspec-1.5.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Behavior-Driven Development for Haskell"
-HOMEPAGE="https://hspec.github.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-		=dev-haskell/hspec-expectations-0.3.2*:=[profile?]
-		>=dev-haskell/hunit-1.2.5:=[profile?]
-		>=dev-haskell/quickcheck-2.5.1:=[profile?]
-		dev-haskell/quickcheck-io:=[profile?]
-		=dev-haskell/random-1.0*:=[profile?]
-		dev-haskell/setenv:=[profile?]
-		>=dev-haskell/transformers-0.2.2.0:=[profile?]
-		<dev-haskell/transformers-0.4.0:=[profile?]
-		>=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/doctest-0.9.4.1
-			dev-haskell/ghc-paths
-			>=dev-haskell/hspec-meta-1.5.1
-			>=dev-haskell/silently-1.2.4
-		)"
diff --git a/dev-haskell/hspec/hspec-1.7.2.1.ebuild b/dev-haskell/hspec/hspec-1.7.2.1.ebuild
deleted file mode 100644
index 7f08e31a6b8c..000000000000
--- a/dev-haskell/hspec/hspec-1.7.2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Behavior-Driven Development for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	>=dev-haskell/hspec-expectations-0.3.3:=[profile?] <dev-haskell/hspec-expectations-0.3.4:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( >=dev-haskell/doctest-0.9.4.1
-		dev-haskell/ghc-paths
-		>=dev-haskell/hspec-meta-1.7.1
-		>=dev-haskell/silently-1.2.4 )
-"
diff --git a/dev-haskell/hspec/hspec-1.8.1.1.ebuild b/dev-haskell/hspec/hspec-1.8.1.1.ebuild
deleted file mode 100644
index a89313a6f8d3..000000000000
--- a/dev-haskell/hspec/hspec-1.8.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Behavior-Driven Development for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	>=dev-haskell/hspec-expectations-0.5.0:=[profile?] <dev-haskell/hspec-expectations-0.5.1:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.9.4.1
-		dev-haskell/ghc-paths
-		>=dev-haskell/hspec-meta-1.8.0
-		>=dev-haskell/silently-1.2.4 )
-"
diff --git a/dev-haskell/hspec/hspec-1.8.3.ebuild b/dev-haskell/hspec/hspec-1.8.3.ebuild
deleted file mode 100644
index 96a910318c98..000000000000
--- a/dev-haskell/hspec/hspec-1.8.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Behavior-Driven Development for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	>=dev-haskell/hspec-expectations-0.5.0:=[profile?] <dev-haskell/hspec-expectations-0.5.1:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.9.4.1
-		dev-haskell/ghc-paths
-		>=dev-haskell/hspec-meta-1.8.0
-		>=dev-haskell/silently-1.2.4 )
-"
diff --git a/dev-haskell/hspec/hspec-2.1.2.ebuild b/dev-haskell/hspec/hspec-2.1.2.ebuild
deleted file mode 100644
index d82cc9f6e372..000000000000
--- a/dev-haskell/hspec/hspec-2.1.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Testing Framework for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~dev-haskell/hspec-core-2.1.2:=[profile?]
-	~dev-haskell/hspec-discover-2.1.2:=[profile?]
-	>=dev-haskell/hspec-expectations-0.6.1:=[profile?] <dev-haskell/hspec-expectations-0.6.2:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hspec-core
-		>=dev-haskell/hspec-meta-1.12
-		dev-haskell/stringbuilder )
-"
diff --git a/dev-haskell/hspec/hspec-2.1.4.ebuild b/dev-haskell/hspec/hspec-2.1.4.ebuild
deleted file mode 100644
index 548d33f526e8..000000000000
--- a/dev-haskell/hspec/hspec-2.1.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Testing Framework for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RESTRICT=test # circular depend: hspec[test]->stringbuider[test]->hspec
-
-RDEPEND="~dev-haskell/hspec-core-2.1.4:=[profile?]
-	~dev-haskell/hspec-discover-2.1.4:=[profile?]
-	>=dev-haskell/hspec-expectations-0.6.1:=[profile?] <dev-haskell/hspec-expectations-0.6.2:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hspec-core
-		>=dev-haskell/hspec-meta-1.12
-		dev-haskell/stringbuilder )
-"
diff --git a/dev-haskell/hspec/hspec-2.2.1.ebuild b/dev-haskell/hspec/hspec-2.2.1.ebuild
deleted file mode 100644
index f43ba1672ec9..000000000000
--- a/dev-haskell/hspec/hspec-2.2.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Testing Framework for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # has circular dependency
-
-RDEPEND="~dev-haskell/hspec-core-2.2.1:=[profile?]
-	~dev-haskell/hspec-discover-2.2.1:=[profile?]
-	>=dev-haskell/hspec-expectations-0.7.2:=[profile?] <dev-haskell/hspec-expectations-0.7.3:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hspec-core
-		>=dev-haskell/hspec-meta-2.2.0
-		dev-haskell/stringbuilder )
-"
diff --git a/dev-haskell/hspec/hspec-2.2.4.ebuild b/dev-haskell/hspec/hspec-2.2.4.ebuild
deleted file mode 100644
index 537e9754d4ce..000000000000
--- a/dev-haskell/hspec/hspec-2.2.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Testing Framework for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RESTRICT=test # has circular dependency
-
-RDEPEND="~dev-haskell/hspec-core-2.2.4:=[profile?]
-	~dev-haskell/hspec-discover-2.2.4:=[profile?]
-	>=dev-haskell/hspec-expectations-0.7.2:=[profile?] <dev-haskell/hspec-expectations-0.7.3:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-meta-2.2.0
-		dev-haskell/stringbuilder )
-"
diff --git a/dev-haskell/hspec/metadata.xml b/dev-haskell/hspec/metadata.xml
deleted file mode 100644
index 3ab9e7c8a695..000000000000
--- a/dev-haskell/hspec/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Behavior Driven Development for Haskell
-		
-		Hspec is roughly based on the Ruby library RSpec. However, Hspec is just a framework for running HUnit and QuickCheck tests. Compared to other options, it provides a much nicer syntax that makes tests very easy to read.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hsql-1.8.2-r1 b/dev-haskell/hsql-1.8.2-r1
new file mode 100644
index 000000000000..95c5f7f2626a
--- /dev/null
+++ b/dev-haskell/hsql-1.8.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/old-time:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Database access from Haskell
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/hsql
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/old-time:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.8.2
+SRC_URI=mirror://hackage/packages/archive/hsql/1.8.2/hsql-1.8.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=26fa62e98c720b4427a34405860d66ea
diff --git a/dev-haskell/hsql-mysql-1.8.2 b/dev-haskell/hsql-mysql-1.8.2
new file mode 100644
index 000000000000..5f5937281027
--- /dev/null
+++ b/dev-haskell/hsql-mysql-1.8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/cabal[profile?] >=dev-haskell/hsql-1.8.2[profile?] >=dev-lang/ghc-6.10.1 >=virtual/mysql-4.0 >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=MySQL driver for HSQL
+EAPI=4
+HOMEPAGE=http://hackage.haskell.org/package/hsql-mysql
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/cabal[profile?] >=dev-haskell/hsql-1.8.2[profile?] >=dev-lang/ghc-6.10.1 >=virtual/mysql-4.0
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/hsql-mysql/1.8.2/hsql-mysql-1.8.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f7bc0069c50bb1e95cb3a3070355f976
diff --git a/dev-haskell/hsql-mysql-1.8.3 b/dev-haskell/hsql-mysql-1.8.3
new file mode 100644
index 000000000000..b0302c581871
--- /dev/null
+++ b/dev-haskell/hsql-mysql-1.8.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/cabal[profile?] >=dev-haskell/hsql-1.8.2[profile?] >=dev-lang/ghc-6.10.1 >=virtual/mysql-4.0 >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=MySQL driver for HSQL
+EAPI=4
+HOMEPAGE=http://hackage.haskell.org/package/hsql-mysql
+IUSE=doc hscolour profile
+LICENSE=BSD
+RDEPEND=dev-haskell/cabal[profile?] >=dev-haskell/hsql-1.8.2[profile?] >=dev-lang/ghc-6.10.1 >=virtual/mysql-4.0
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/hsql-mysql/1.8.3/hsql-mysql-1.8.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2f15aa376f5859e2863e079867f8966d
diff --git a/dev-haskell/hsql-mysql/Manifest b/dev-haskell/hsql-mysql/Manifest
deleted file mode 100644
index 9ab3cd21397a..000000000000
--- a/dev-haskell/hsql-mysql/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST hsql-mysql-1.8.2.tar.gz 4659 BLAKE2B 342f9baf9deb2596d2276e8050c202bbf476f56c5eb654f71b52959b8d5fba31ad4cfaf4c2b9ac47cc862e4d97468dbe5c312a73c2f8496f561183b1d226b46d SHA512 8476cfe746085f75a50aa2d24ecfd87abb8e5809f6292e3f5ebab184d96672178dc23a2d6f749b99d916932e19894ed022138eb192e4e90de94097625374941b
-DIST hsql-mysql-1.8.3.tar.gz 4366 BLAKE2B af5fcd66b15d7ac4d9fb3cf72688fcd47e262cc9fdbf77b93fef5d13d8242806c433dac98ae52948639a48d8318db3736c3bba03ced3c9463a0d49bf699d0980 SHA512 8004ad313774ecb628e9d1a8876c90efba854d2e36c5918d378269e6e1c3d09eb1c2ad0250f1455879d5097a75ec33a18a379228ea250a69af261c6e7846577e
-EBUILD hsql-mysql-1.8.2.ebuild 635 BLAKE2B b540d0be200dec98d70c06a2e9dc872839aa5f0261449431f70c21492a2e715c7f8da779a64ece46dbd76abfcdc6e5c3cc2c3040efa67d3999b64b64fd76a6c7 SHA512 acdae1e510e71db0326a5eb4756b5aa1697eb234c82f92dc4a1363106e71643e3d3a98852cbf0982797ecdb2bea3b606ca8e35d1e4c5396c94660800766b7a6b
-EBUILD hsql-mysql-1.8.3.ebuild 629 BLAKE2B 07ead4c2314ba75ad6731cce076071b6d1a7627dea46865056b038348ba1ef80daf4b53c20a0f13892141b771dd70d7fed1da83cbc867a844f99b219c0898a0a SHA512 d33100c7b125d6df04f477cd31d683fc141ddfe28d15324b7b01cd4aea90cc9575feb9904b4ab7294f1b50977d300878a8826b16d8bc7e9acf84af208f09ebe9
-MISC metadata.xml 313 BLAKE2B 4456a237bb4f7affc6a3cd88289257f2e4b6b725ab49899b74688f9d7d1db61f4f1dc1b599a6e472d8aab0b1522e460124e5f3a05caf1949fd8905864597f6fe SHA512 b98d5ba0bc7057fc7ca264ac3be581e8752175971a4d4e8e7821447298035612c1c7814c74ec6ae60f79281af37d56fad50af4709e52b44c94dca71878a7e3c3
diff --git a/dev-haskell/hsql-mysql/hsql-mysql-1.8.2.ebuild b/dev-haskell/hsql-mysql/hsql-mysql-1.8.2.ebuild
deleted file mode 100644
index b4c83d8ab963..000000000000
--- a/dev-haskell/hsql-mysql/hsql-mysql-1.8.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.13
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="MySQL driver for HSQL"
-HOMEPAGE="http://hackage.haskell.org/package/hsql-mysql"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/cabal[profile?]
-		>=dev-haskell/hsql-1.8.2[profile?]
-		>=dev-lang/ghc-6.10.1
-		>=virtual/mysql-4.0"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10"
diff --git a/dev-haskell/hsql-mysql/hsql-mysql-1.8.3.ebuild b/dev-haskell/hsql-mysql/hsql-mysql-1.8.3.ebuild
deleted file mode 100644
index e1edbce91285..000000000000
--- a/dev-haskell/hsql-mysql/hsql-mysql-1.8.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.13
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="MySQL driver for HSQL"
-HOMEPAGE="http://hackage.haskell.org/package/hsql-mysql"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="" # buggy, has no headers
-IUSE=""
-
-RDEPEND="dev-haskell/cabal[profile?]
-		>=dev-haskell/hsql-1.8.2[profile?]
-		>=dev-lang/ghc-6.10.1
-		>=virtual/mysql-4.0"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10"
diff --git a/dev-haskell/hsql-mysql/metadata.xml b/dev-haskell/hsql-mysql/metadata.xml
deleted file mode 100644
index 0a9da2fcff00..000000000000
--- a/dev-haskell/hsql-mysql/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		MySQL driver for HSQL.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hsql-odbc-1.8.2 b/dev-haskell/hsql-odbc-1.8.2
new file mode 100644
index 000000000000..643e4809f329
--- /dev/null
+++ b/dev-haskell/hsql-odbc-1.8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hsql-1.8.2[profile?] >=dev-lang/ghc-6.10.1 >=dev-db/unixODBC-2.2 dev-haskell/cabal doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Haskell Interface to ODBC
+EAPI=4
+HOMEPAGE=http://hackage.haskell.org/package/hsql-odbc
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hsql-1.8.2[profile?] >=dev-lang/ghc-6.10.1 >=dev-db/unixODBC-2.2
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/hsql-odbc/1.8.2/hsql-odbc-1.8.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4e74dd8aee0c5de11b53f2f893cb8cbd
diff --git a/dev-haskell/hsql-odbc/Manifest b/dev-haskell/hsql-odbc/Manifest
deleted file mode 100644
index 896f5b128a08..000000000000
--- a/dev-haskell/hsql-odbc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hsql-odbc-1.8.2.tar.gz 8041 BLAKE2B 80b3881297218b7dadfc7826acdb19e9f61d41124f5ca2d5a589ceabdfb03a6b64020432b43579e9fc9af82956e64147354b35ac5fb08b8e6eccd13e0f10afd1 SHA512 78f91ee63007e02820eefd1bd9ae08b9659667aa70f545ef83ff6d83d592c7f542339db129bb6c3ad14f4cdde320b3a4e1251c25267db716dbd88cbb5931a6d5
-EBUILD hsql-odbc-1.8.2.ebuild 605 BLAKE2B 0543d31ef7514234cd9b2ac041d56a5bdaac7616f5beccbcee95a01756c4654695bb351a9b5409a5dea06faaeb977200bf643ab8dfdc19ebab83004113a779e1 SHA512 674645b681373df3142c9ec7e2623b1cbc4a2d9c166898002164d6fb993b5ece128a128ad5ad95d025186f18e4a2c9bdcc780a3a929cb119007fe27e33a47b83
-MISC metadata.xml 312 BLAKE2B 32b0d8d9d9bd075ada8a8aa688d088fedc4a2012f2595c435b1431df4ed7f3c6ea84910847ec59ac728a2a4a7322ac6839b8edd6a8651953e37e4b43a245d6d1 SHA512 45f671f7f757de6d1e94cb82e6c791aa1b9e97f0f2a78a84cbba3b433ed190befa0c3c9930e990251bedfbfa15bf6f75fd087db40235882171d7cc1176b97d94
diff --git a/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild b/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild
deleted file mode 100644
index f0644ef9a061..000000000000
--- a/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.13
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="A Haskell Interface to ODBC"
-HOMEPAGE="http://hackage.haskell.org/package/hsql-odbc"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hsql-1.8.2[profile?]
-		>=dev-lang/ghc-6.10.1
-		>=dev-db/unixODBC-2.2"
-DEPEND="${RDEPEND}
-		dev-haskell/cabal"
diff --git a/dev-haskell/hsql-odbc/metadata.xml b/dev-haskell/hsql-odbc/metadata.xml
deleted file mode 100644
index b9392b99fd84..000000000000
--- a/dev-haskell/hsql-odbc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		ODBC driver for HSQL.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hsql-postgresql-1.8.2 b/dev-haskell/hsql-postgresql-1.8.2
new file mode 100644
index 000000000000..f0be6e221e74
--- /dev/null
+++ b/dev-haskell/hsql-postgresql-1.8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hsql-1.8.2[profile?] <dev-haskell/hsql-1.9[profile?] >=dev-lang/ghc-6.10.1 >=dev-db/postgresql-7 dev-haskell/cabal doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Haskell Interface to PostgreSQL via the PQ library
+EAPI=4
+HOMEPAGE=http://hackage.haskell.org/package/hsql-postgresql
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hsql-1.8.2[profile?] <dev-haskell/hsql-1.9[profile?] >=dev-lang/ghc-6.10.1 >=dev-db/postgresql-7
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/hsql-postgresql/1.8.2/hsql-postgresql-1.8.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c8c2a755f8d96e007f62e3150580f682
diff --git a/dev-haskell/hsql-postgresql/Manifest b/dev-haskell/hsql-postgresql/Manifest
deleted file mode 100644
index bde16f45ee0e..000000000000
--- a/dev-haskell/hsql-postgresql/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hsql-postgresql-1.8.2.tar.gz 7008 BLAKE2B 76ee3053cbd61e5d869dc27370fabe59033159ed3c3cd23ee02616ee0fac7499e46e9430c67fc657a7e424b4a45bfbccf2be490347e708c91cc054a08e022c62 SHA512 93432e63302968149a9d037099f51d491823091d9c5ac8866a6f966130c020d8c9ff63a91f8f923984705eee4db30d8a871086e682634863d30886d8ac736f02
-EBUILD hsql-postgresql-1.8.2.ebuild 670 BLAKE2B 3daf373301b621f8bc0cf3c92d0d59b8b774e5d3e6507d31f1edfe947fe55b28dd3301d1cb58a7f2fffa38294e356531b33b72e4a1baf9b044741d53b5515606 SHA512 cb348f9db144bf937fb44356043768c204e8541710bb24267eb252656e0aefcbd19a0bcee1c7a21f0801e028a191c794ea36f3c58270582bfcd4d91a7c1c760e
-MISC metadata.xml 318 BLAKE2B 42f53003e70731dcd49fbc39d159eefd348e5e53155aa1627e1d6d8a9f8ffdd9561903c327a6ec0951f2fe18f059ae2acf7f0d9a753af73eed11a376f6d576a3 SHA512 69728c6094e02a3e957733bfaf7011a226fa0d0ad69fac131e5bbd8af2c3d7c57e70f87b368aa0b7c49a99b4c539b910c0a48107675383d3b19fd8f056ed2cdc
diff --git a/dev-haskell/hsql-postgresql/hsql-postgresql-1.8.2.ebuild b/dev-haskell/hsql-postgresql/hsql-postgresql-1.8.2.ebuild
deleted file mode 100644
index 8dd40ca478e2..000000000000
--- a/dev-haskell/hsql-postgresql/hsql-postgresql-1.8.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.13
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="A Haskell Interface to PostgreSQL via the PQ library"
-HOMEPAGE="http://hackage.haskell.org/package/hsql-postgresql"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hsql-1.8.2[profile?]
-		<dev-haskell/hsql-1.9[profile?]
-		>=dev-lang/ghc-6.10.1
-		>=dev-db/postgresql-7"
-DEPEND="${RDEPEND}
-		dev-haskell/cabal"
diff --git a/dev-haskell/hsql-postgresql/metadata.xml b/dev-haskell/hsql-postgresql/metadata.xml
deleted file mode 100644
index 785469351f17..000000000000
--- a/dev-haskell/hsql-postgresql/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		PostgreSQL driver for HSQL.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hsql-sqlite3-1.8.2-r1 b/dev-haskell/hsql-sqlite3-1.8.2-r1
new file mode 100644
index 000000000000..9642d89c6ef6
--- /dev/null
+++ b/dev-haskell/hsql-sqlite3-1.8.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-db/sqlite-3.0 >=dev-haskell/hsql-1.8.2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=SQLite3 driver for HSQL
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/hsql-sqlite3
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-db/sqlite-3.0 >=dev-haskell/hsql-1.8.2:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.8.2
+SRC_URI=mirror://hackage/packages/archive/hsql-sqlite3/1.8.2/hsql-sqlite3-1.8.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0cf17f5a18506c34053bc985a9b13b3e
diff --git a/dev-haskell/hsql-sqlite3/Manifest b/dev-haskell/hsql-sqlite3/Manifest
deleted file mode 100644
index cbabc9ee8c78..000000000000
--- a/dev-haskell/hsql-sqlite3/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hsql-sqlite3-1.8.2.tar.gz 4752 BLAKE2B 84a77f8bc835b4337d99cdd974f7cd5960f7b52faeb4c06e2572d31887bdae3d2cdf6bf00d4c44eae7a4f98b116a134e950353932ef9cb43d557b11b85ffff96 SHA512 962d4396a3844f4d1b4f4be6f6d81e085f1deaa2e7ca0776a93aed4f34cb5e40edab96d568fa3a086ea0c4017dff7de8dd1d25e81ad27840c844ed885af5e42e
-EBUILD hsql-sqlite3-1.8.2-r1.ebuild 620 BLAKE2B be62625d0919dfe8406af976c67092b69d2be3611c76b4d58688e86a2a1eade3c34463764555b440ff870dc92828a8f9eb7fcf1526d8d3373c2f7a5bdf7ea96a SHA512 1707a64b7d8bed1f623898fdd49f471e3bbb0c2049917942ab62f231514286702de943642cb2be91fa547ef8a600d36666083afb8225f7d4d596b3792ae2d979
-MISC metadata.xml 369 BLAKE2B f9a73abb5c6344b68e146cfee342fe63e5830c73d3e2110d1c7e70a4ef59879ab555e0824ed76dc60ea18c0f03a10ec16cd52af3d7af051926078d712bd30a21 SHA512 382796958de20ebe7a8894a85d41e3a695861647909b57e3816475ea0d54fbdc6f57895101b85d4f35a4046d11d3cd356c26d0602143d03bc954cc9ccd485abb
diff --git a/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild b/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild
deleted file mode 100644
index 57d46dd2e1fe..000000000000
--- a/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="SQLite3 driver for HSQL"
-HOMEPAGE="http://hackage.haskell.org/package/hsql-sqlite3"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-db/sqlite-3.0
-		>=dev-haskell/hsql-1.8.2:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-0"
diff --git a/dev-haskell/hsql-sqlite3/metadata.xml b/dev-haskell/hsql-sqlite3/metadata.xml
deleted file mode 100644
index cb7c1126d7b1..000000000000
--- a/dev-haskell/hsql-sqlite3/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A Haskell Interface to SQLite 3 via libsqlite3
-		in the standard library path.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hsql/Manifest b/dev-haskell/hsql/Manifest
deleted file mode 100644
index d841fe775633..000000000000
--- a/dev-haskell/hsql/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hsql-1.8.2.tar.gz 10568 BLAKE2B 9890847e6ec5c78feb414e247098a108bf0d6135f8795e9efeb4934fb1b5ad76ab3fb8e78f14016007932b2c51bdda635551078c391db5ccb758b1ddd25632b1 SHA512 f4a002573bead2de330d526ab4158517e66f92f4d6a87a517dd2e7949abb7566c318d96e4072535b157f3d40a5714702f4127ea106ab976bf5f0ec302e50c6f6
-EBUILD hsql-1.8.2-r1.ebuild 835 BLAKE2B a06a3d7cba76b116e046c4a5aa6e72f78f9409affaeae3e6b1a378d0c267cb91e0af2dbc973b9eaaac04a43f8b0959fccc4932be9a766b3c21fa6838efcf252a SHA512 50e9f634a0f33c841bc90c3179b7a9b5788e28c83401d3ce4d1272f97c1a3543a8651b6a534192af83b2b90e79ef35d0f22b51c6ade3651491c5c65fb0e4c494
-MISC metadata.xml 339 BLAKE2B 0f227505e5d36cc98afc1d9e770c9cfde26195ff4e32321fcf2996774df9319777f216a4c363c673fa1698c7bae4e312b6f7df1674b7895ef9f3a36b2cc2fe6d SHA512 9eed48b011c1e92d73780819bc36bd99a57369569dc4923c6f6fdf49095ddf0fdf170a15cdb610cc0ec2bc72464ab16fd543d94565dab1c7bc4ff713ba0e4b18
diff --git a/dev-haskell/hsql/hsql-1.8.2-r1.ebuild b/dev-haskell/hsql/hsql-1.8.2-r1.ebuild
deleted file mode 100644
index 7a23c081fb5a..000000000000
--- a/dev-haskell/hsql/hsql-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Database access from Haskell"
-HOMEPAGE="http://hackage.haskell.org/package/hsql"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/old-time:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-pkg_postinst () {
-	ghc-package_pkg_postinst
-
-	elog "You will probably want to emerge one or more HSQL backend."
-	elog "These backends are available:"
-	elog "		hsql-postgresql"
-	elog "		hsql-mysql"
-	elog "		hsql-sqlite"
-	elog "		hsql-odbc"
-}
diff --git a/dev-haskell/hsql/metadata.xml b/dev-haskell/hsql/metadata.xml
deleted file mode 100644
index 205f44e51ba7..000000000000
--- a/dev-haskell/hsql/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Simple library for database access from Haskell.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hstringtemplate-0.7.3 b/dev-haskell/hstringtemplate-0.7.3
new file mode 100644
index 000000000000..e8fd60bbb8a0
--- /dev/null
+++ b/dev-haskell/hstringtemplate-0.7.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/mtl:=[profile?] <dev-haskell/parsec-4:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] dev-haskell/void:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=StringTemplate implementation in Haskell
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/HStringTemplate
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/mtl:=[profile?] <dev-haskell/parsec-4:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] dev-haskell/void:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.3
+SRC_URI=mirror://hackage/packages/archive/HStringTemplate/0.7.3/HStringTemplate-0.7.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b73b0a306fe97ce79ae073b35ad38717
diff --git a/dev-haskell/hstringtemplate-0.8.3 b/dev-haskell/hstringtemplate-0.8.3
new file mode 100644
index 000000000000..826b8004a816
--- /dev/null
+++ b/dev-haskell/hstringtemplate-0.8.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] <dev-haskell/parsec-4:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/void:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=StringTemplate implementation in Haskell
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/HStringTemplate
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] <dev-haskell/parsec-4:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/void:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.8.3
+SRC_URI=mirror://hackage/packages/archive/HStringTemplate/0.8.3/HStringTemplate-0.8.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f15843bf1c2d22d06441f97faf8fb34d
diff --git a/dev-haskell/hstringtemplate-0.8.5 b/dev-haskell/hstringtemplate-0.8.5
new file mode 100644
index 000000000000..758fba3c0d4c
--- /dev/null
+++ b/dev-haskell/hstringtemplate-0.8.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] <dev-haskell/parsec-4:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/void:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=StringTemplate implementation in Haskell
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/HStringTemplate
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] <dev-haskell/parsec-4:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/void:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.8.5
+SRC_URI=mirror://hackage/packages/archive/HStringTemplate/0.8.5/HStringTemplate-0.8.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=11b397a9be892a8efc6004ecfd275d86
diff --git a/dev-haskell/hstringtemplate/Manifest b/dev-haskell/hstringtemplate/Manifest
deleted file mode 100644
index c00b908fe3eb..000000000000
--- a/dev-haskell/hstringtemplate/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST HStringTemplate-0.7.3.tar.gz 15961 BLAKE2B ffdf31dfebc407737332005ff422b1154dea6307819b7d4acfc79985fef91d9b52bd19ad62a5f11e3152257b8f876050375923fdd439b51603aa5d38436f902d SHA512 987e827dabf64f13df9ec584c6ac4d9b121bec07543f9600e212c1a20fe03aa1fcb24f8f669b5ae53f85e4ec9d2d6a7c76a2845496a8440332b601c64fcb552c
-DIST HStringTemplate-0.8.3.tar.gz 16023 BLAKE2B 5a85cf34a3be754dff9ea7b1c86d4444cdeefe97c658e8fa57e191491d0201790036c6893ebb046c404e65546854bd8351898bb56a9b46a4fb7050913425373f SHA512 d356ea7defea10535f5ec188a4bdc6ecba89f447c509af04421753dc9b0f4cf85aa24ec1dd2c8ba0b31bfef06576e0a9f8c457e890468244bae22abc47d26f8e
-DIST HStringTemplate-0.8.5.tar.gz 15740 BLAKE2B 4eb9f8bc269271bb7b307bfacdcc1426486629968da951caa9d4f835b0f1c4b12580d6dc0382ec578ac4e98e5b2b19218f0402a0ffb19d66e7ec75d7caf604a1 SHA512 81c38009abf568316263aab479bcd2e04b03419b52c98d566a402b0d1c65a49052c8f68a7c6e6b285d108489c0fb2387ab98622aacdaa7596fb009517ecbc2d5
-EBUILD hstringtemplate-0.7.3.ebuild 866 BLAKE2B 68dd39fc2cc57ec24853a250219e46cecfbe3f4f54e07505de868bc441f52d1d7cb59bf74abd34bfe40fd744f0eed05e71bd55045db82f58d35993087385ce97 SHA512 987c3ca5570d6b47a1cb7bb7d9d80480ab8f82e12dfd84583e5d54dba5ca2521dafbb10c3e30dbf76128819e34beaea08b9f48d7cea75082ddd0eb38ad571ea7
-EBUILD hstringtemplate-0.8.3.ebuild 872 BLAKE2B 2ad61966096cfc0e8d2afc35e6567ed634ab80459cf64633eac3ca618a939e4865be42d2e3f8f6a55cc2d09330deb5bb253947988aec3a8206bb3de606f79094 SHA512 f44546f0778d44e12f71bd5dfc4ed1f3eecd5c823c10b7a0eccf894b765adc0cd6d6deb4b898a614a55f6294d4c72fecdd1be850bc94dcb989cdb3fc0fe479c0
-EBUILD hstringtemplate-0.8.5.ebuild 872 BLAKE2B 1fbfae0df16dcaee6cdd3ac19841287de02b418cbfd9957fc11b5cebd9258c3ab271b8a217a3ecfc9105f6e8e482b8567a898dd0d3020a79bc7ac62ea48d47be SHA512 e15c9acf679d5ec4d1205c4dab56e4e39cd89e69fbdf6a0ba9186041f37f98d9bfa99a84087681bb47893394fc81ed050ddb645db43f967521dc5a214455bd01
-MISC metadata.xml 335 BLAKE2B 5daa9c8eed8c54c4d3c53936da7f9f260598daeed4af59ffcf8d5676ef5b54c3ab3718186c6462cfdcc6f2127764d9ed61b172db1ad67d9e6a758de7e34210f8 SHA512 17244d55739dbeb542275ce7c0f57ea8c017e0277be42b69fe57a1c3db37ffeebd165cf44be5e7363b3aaf7e5f78555f27e3f0373baab4b268b12ef2740e7910
diff --git a/dev-haskell/hstringtemplate/hstringtemplate-0.7.3.ebuild b/dev-haskell/hstringtemplate/hstringtemplate-0.7.3.ebuild
deleted file mode 100644
index 75759dddbfc2..000000000000
--- a/dev-haskell/hstringtemplate/hstringtemplate-0.7.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HStringTemplate"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="StringTemplate implementation in Haskell"
-HOMEPAGE="http://hackage.haskell.org/package/HStringTemplate"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	<dev-haskell/parsec-4:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	dev-haskell/void:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hstringtemplate/hstringtemplate-0.8.3.ebuild b/dev-haskell/hstringtemplate/hstringtemplate-0.8.3.ebuild
deleted file mode 100644
index 7449198f799c..000000000000
--- a/dev-haskell/hstringtemplate/hstringtemplate-0.8.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HStringTemplate"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="StringTemplate implementation in Haskell"
-HOMEPAGE="http://hackage.haskell.org/package/HStringTemplate"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	<dev-haskell/parsec-4:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/void:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hstringtemplate/hstringtemplate-0.8.5.ebuild b/dev-haskell/hstringtemplate/hstringtemplate-0.8.5.ebuild
deleted file mode 100644
index a419075b977f..000000000000
--- a/dev-haskell/hstringtemplate/hstringtemplate-0.8.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HStringTemplate"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="StringTemplate implementation in Haskell"
-HOMEPAGE="http://hackage.haskell.org/package/HStringTemplate"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	<dev-haskell/parsec-4:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/void:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hstringtemplate/metadata.xml b/dev-haskell/hstringtemplate/metadata.xml
deleted file mode 100644
index 908980a64424..000000000000
--- a/dev-haskell/hstringtemplate/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A port of the Java library by Terrence Parr.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/htf-0.13.1.0 b/dev-haskell/htf-0.13.1.0
new file mode 100644
index 000000000000..dd3eee0deefd
--- /dev/null
+++ b/dev-haskell/htf-0.13.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/aeson-0.6:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/cpphs-1.19:=[profile?] >=dev-haskell/diff-0.3:=[profile?] dev-haskell/haskell-src:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] >=dev-haskell/old-time-1.0:=[profile?] >=dev-haskell/quickcheck-2.3:2=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-haskell/regex-compat-0.92:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/vector:=[profile?] >=dev-haskell/xmlgen-0.6:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( dev-haskell/aeson-pretty >=dev-haskell/temporary-1.1 >=dev-haskell/unordered-containers-0.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=The Haskell Test Framework
+EAPI=5
+HOMEPAGE=https://github.com/skogsbaer/HTF/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/cpphs-1.19:=[profile?] >=dev-haskell/diff-0.3:=[profile?] dev-haskell/haskell-src:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] >=dev-haskell/old-time-1.0:=[profile?] >=dev-haskell/quickcheck-2.3:2=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-haskell/regex-compat-0.92:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/vector:=[profile?] >=dev-haskell/xmlgen-0.6:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/0.13.1.0
+SRC_URI=mirror://hackage/packages/archive/HTF/0.13.1.0/HTF-0.13.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=869830a85d31a8ee7a891702d85686df
diff --git a/dev-haskell/htf/Manifest b/dev-haskell/htf/Manifest
deleted file mode 100644
index ca3093852474..000000000000
--- a/dev-haskell/htf/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX htf-0.13.1.0-aeson-pretty-0.8.patch 352 BLAKE2B 6397b1d33f5bc58f9e56498f4356203e3b1c26b11758e25319c2bdf9e488601f694d30cea0fbafe4ae8f4908ec9fe01a620123d7a763163ae679239cc8bc2e3e SHA512 31f927eeccab5037ec3394a2a608b434e43fa9c3bfd0a0d4bd6662add7abbb259986ed0ef1a84c31d2e84b68cdb6e3d6133e5bed34331b81cb7b3fc61fa8e8d8
-DIST HTF-0.13.1.0.tar.gz 78310 BLAKE2B eab7a9c2eb05246dbd413f31c32554b01527211bb469ceec8a54d11e427ca74ee706640fe3d49fc40486a238db4e284ce97511c371e7eb7161d65cb841f77a76 SHA512 1292f8f0b9189e1ce05de1cf6f686ce77a839c4191a5f8b8000c8d740abe4b8f457a7c5ed8aadc13221fe9fde9b4c15bde9f9f6f53ac03178cd1884572fb4069
-EBUILD htf-0.13.1.0.ebuild 1421 BLAKE2B a335bba84855370c8b809029a62d249e8d4f9a74b016d528438dbcb1d5365d2e7838e354dff257ccd4cea467a0810c1b216ee1b916cde6566de6fd7859fd3d18 SHA512 b4254f185765e75a289d4856efe1eb8abbb5d6ec7d939cb1cac7385934736749a9748afa282ad788b09e88beaa0f75cf15852a9e42d40ac0b29a1d9cc884ccde
-MISC metadata.xml 923 BLAKE2B 690bbf2765309647e8029490cd2c7ba9055f00e8f4ccfd45ae8ef826deac43a13bf919b73607fc0241e9f60d6cda44bba1ae95de8031f76744d3eb5fefe7138b SHA512 1bcdd3551b19f09f600b050f84ab81de6e99133b29a8a94942ff068ef354a9bb31226395cb221c416a65466a96973a92521d3aa3b13c94b557bdedf011e28164
diff --git a/dev-haskell/htf/files/htf-0.13.1.0-aeson-pretty-0.8.patch b/dev-haskell/htf/files/htf-0.13.1.0-aeson-pretty-0.8.patch
deleted file mode 100644
index ac1472051eba..000000000000
--- a/dev-haskell/htf/files/htf-0.13.1.0-aeson-pretty-0.8.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/tests/TestHTF.hs b/tests/TestHTF.hs
-index 4a71874..c0442a5 100644
---- a/tests/TestHTF.hs
-+++ b/tests/TestHTF.hs
-@@ -383,3 +383,3 @@ checkOutput output =
-           BSL.toStrict $
--          J.encodePretty' (J.Config 2 J.compare) json
-+          J.encodePretty' (J.defConfig { J.confIndent = J.Spaces 2, J.confCompare = J.compare }) json
- 
diff --git a/dev-haskell/htf/htf-0.13.1.0.ebuild b/dev-haskell/htf/htf-0.13.1.0.ebuild
deleted file mode 100644
index 764b01df66c6..000000000000
--- a/dev-haskell/htf/htf-0.13.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HTF"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="The Haskell Test Framework"
-HOMEPAGE="https://github.com/skogsbaer/HTF/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/cpphs-1.19:=[profile?]
-	>=dev-haskell/diff-0.3:=[profile?]
-	dev-haskell/haskell-src:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?]
-	>=dev-haskell/old-time-1.0:=[profile?]
-	>=dev-haskell/quickcheck-2.3:2=[profile?]
-	>=dev-haskell/random-1.0:=[profile?]
-	>=dev-haskell/regex-compat-0.92:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-haskell/xmlgen-0.6:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/aeson-pretty
-		>=dev-haskell/temporary-1.1
-		>=dev-haskell/unordered-containers-0.2 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-aeson-pretty-0.8.patch
-}
diff --git a/dev-haskell/htf/metadata.xml b/dev-haskell/htf/metadata.xml
deleted file mode 100644
index be697624296d..000000000000
--- a/dev-haskell/htf/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The Haskell Test Framework (/HTF/ for short) lets you define unit
-		tests (&lt;http://hunit.sourceforge.net&gt;), QuickCheck properties
-		(&lt;http://www.cs.chalmers.se/~rjmh/QuickCheck/&gt;), and black box
-		tests in an easy and convenient way. The HTF uses a custom
-		preprocessor that collects test definitions automatically.
-		Furthermore, the preprocessor allows the HTF to report failing
-		test cases with exact file name and line number information.
-		
-		The documentation of the "Test.Framework.Tutorial" module
-		provides a tutorial for the HTF.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">skogsbaer/HTF</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/html-1.0.1.2-r1 b/dev-haskell/html-1.0.1.2-r1
new file mode 100644
index 000000000000..cb6401e765b1
--- /dev/null
+++ b/dev-haskell/html-1.0.1.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=88da0389166dd9514ab93f108ff65e35
diff --git a/dev-haskell/html-conduit-1.1.1.1 b/dev-haskell/html-conduit-1.1.1.1
new file mode 100644
index 000000000000..fbbc42a55f24
--- /dev/null
+++ b/dev-haskell/html-conduit-1.1.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1.1:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/tagstream-conduit-0.4:=[profile?] <dev-haskell/tagstream-conduit-0.6:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/xml-conduit-1.1:=[profile?] <dev-haskell/xml-conduit-1.3:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parse HTML documents using xml-conduit datatypes
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/xml
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1.1:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/tagstream-conduit-0.4:=[profile?] <dev-haskell/tagstream-conduit-0.6:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/xml-conduit-1.1:=[profile?] <dev-haskell/xml-conduit-1.3:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.1.1
+SRC_URI=mirror://hackage/packages/archive/html-conduit/1.1.1.1/html-conduit-1.1.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=887fce5d3d8735c7798ab8d3f24fdbed
diff --git a/dev-haskell/html-conduit-1.2.1 b/dev-haskell/html-conduit-1.2.1
new file mode 100644
index 000000000000..c1dcfea92401
--- /dev/null
+++ b/dev-haskell/html-conduit-1.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1.1:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/tagstream-conduit-0.5.5.3:=[profile?] <dev-haskell/tagstream-conduit-0.6:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/xml-conduit-1.3:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parse HTML documents using xml-conduit datatypes
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/xml
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1.1:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/tagstream-conduit-0.5.5.3:=[profile?] <dev-haskell/tagstream-conduit-0.6:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/xml-conduit-1.3:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.1
+SRC_URI=mirror://hackage/packages/archive/html-conduit/1.2.1/html-conduit-1.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=67245d6bbd20d019bb950cdf97f1a6fe
diff --git a/dev-haskell/html-conduit-1.2.1.1 b/dev-haskell/html-conduit-1.2.1.1
new file mode 100644
index 000000000000..8c186ad8429f
--- /dev/null
+++ b/dev-haskell/html-conduit-1.2.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1.1:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/tagstream-conduit-0.5.5.3:=[profile?] <dev-haskell/tagstream-conduit-0.6:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/xml-conduit-1.3:=[profile?] <dev-haskell/xml-conduit-1.5:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parse HTML documents using xml-conduit datatypes
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/xml
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1.1:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/tagstream-conduit-0.5.5.3:=[profile?] <dev-haskell/tagstream-conduit-0.6:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/xml-conduit-1.3:=[profile?] <dev-haskell/xml-conduit-1.5:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.2.1.1
+SRC_URI=mirror://hackage/packages/archive/html-conduit/1.2.1.1/html-conduit-1.2.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=21e052c1eaa3f503d1d8f95cec6e90af
diff --git a/dev-haskell/html-conduit/Manifest b/dev-haskell/html-conduit/Manifest
deleted file mode 100644
index 8d042dca874d..000000000000
--- a/dev-haskell/html-conduit/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST html-conduit-1.1.1.1.tar.gz 4004 BLAKE2B e38440a26bbe1d0f888dc4e773647f6e5df3982ba139a7dbfc2b746122045763f8986bf73a13d89331dda9cb2de4891ff6b8cb002cd21bfa16a64e8dbb5246f3 SHA512 fc69c595f97c952d624cc8a22597d6f966ca343dd8f6b9c5da8085ba9a7609e1bcfa803dbb705e9911c5a86de7456331226080869a04a56b69ec36f4ab5bdb50
-DIST html-conduit-1.2.1.1.tar.gz 4125 BLAKE2B 6bdd59682118a5c6724f360142f89577aa1c19502a3896b7b8cc59978c05cf13b1a626e433d4ee74348792ccb12927f10fefb49f28644e4997d54675bdb3d067 SHA512 601c1b840ab194b6a3e89c1a7af7335a8a8e2a9c01bdd4d19914c1b512bc1d56dfa199855072b9e0406f8744607bd3e3efe3a480d2dc824048b67cfe1034e9b7
-DIST html-conduit-1.2.1.tar.gz 4117 BLAKE2B 9eeaa5a5a336c9ff9f43224d4dce2f92f5c2ebf1ed6a4e302c3a0891f8111065ee4cf0eeeef745ef83d8d23dfb38b964b0089302cd8a16d517353d985ee60f60 SHA512 557dc27479cb83cb958839ec29faca4997ff52f848430b5a3c20f17dcf388c76848d0c83db376077f8a6f192312e124d5b0e6b86589d40053e1a657ca96ee5ac
-EBUILD html-conduit-1.1.1.1.ebuild 1240 BLAKE2B 2d9c0bf4ac67e9e607b3f53c0c01ef982770bde2ecb85e732ca7c2968206677e70042f3a543bfb924bd691ffe5e52c8783818005a9cbec3f65a8c9213210adb1 SHA512 c95344541ade71b9e1869002cfdee8098f3d4474f703d0ed855a68446b92a76aec99695ce28077955a9a486dca78bec468d316c674f6c1f0d9b0dc9e3b42d008
-EBUILD html-conduit-1.2.1.1.ebuild 1117 BLAKE2B a08bf9497eb702a2c7daa6e0f39a312454951b72e3152e53002329f569103bc39df1afc00e3650a278559327b4a88dbc1cdfd28f87e326531d4907c7bd61bc85 SHA512 b5e74cba93fad317f78376e796e2727eb7bc16fa67da23c6f99a07015751cefcd90acc4bf7fcd02fc07ab0a1723876f8ba189a488bda9f3baeeff718cdb6fd79
-EBUILD html-conduit-1.2.1.ebuild 1152 BLAKE2B 208bed9241013a4fd5952c1379553e2112c043e45c92fc6835c8c1a7a126782a9e4c250334facb1636227840f118026097f4e74206a7033cf678f42fad9d62c8 SHA512 df1b64d19c18bd9175b6efa6b7ba92782bfa3acddf593e7b546c343d0f0146e14981d04fe83dd8e7627a4fbf120fa809460ca18a2b1d28a9f0fef39465fe77e1
-MISC metadata.xml 603 BLAKE2B 2e16ecb493a304d9b03caff945ba91f4e6b85f15669947c1a6e30c9c25fc8629aafb03318e77c714396f523fffea98cc687efd9ea8f23d89fab984347cf666c9 SHA512 5a83ca04664dfd65f6e9a8987695cd7936c4b16d4774adfc9599f71bb64360fc1b16927d82de20881447a64cd9c63bee50442514457f6b079ceddd2480be93bf
diff --git a/dev-haskell/html-conduit/html-conduit-1.1.1.1.ebuild b/dev-haskell/html-conduit/html-conduit-1.1.1.1.ebuild
deleted file mode 100644
index d5ce6db3bbc0..000000000000
--- a/dev-haskell/html-conduit/html-conduit-1.1.1.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Parse HTML documents using xml-conduit datatypes"
-HOMEPAGE="https://github.com/snoyberg/xml"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.1.1:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	>=dev-haskell/tagstream-conduit-0.4:=[profile?] <dev-haskell/tagstream-conduit-0.6:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/xml-conduit-1.1:=[profile?] <dev-haskell/xml-conduit-1.3:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/html-conduit/html-conduit-1.2.1.1.ebuild b/dev-haskell/html-conduit/html-conduit-1.2.1.1.ebuild
deleted file mode 100644
index bee33c971690..000000000000
--- a/dev-haskell/html-conduit/html-conduit-1.2.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Parse HTML documents using xml-conduit datatypes"
-HOMEPAGE="https://github.com/snoyberg/xml"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.1.1:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/tagstream-conduit-0.5.5.3:=[profile?] <dev-haskell/tagstream-conduit-0.6:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/xml-conduit-1.3:=[profile?] <dev-haskell/xml-conduit-1.5:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/html-conduit/html-conduit-1.2.1.ebuild b/dev-haskell/html-conduit/html-conduit-1.2.1.ebuild
deleted file mode 100644
index 732d4cf1840e..000000000000
--- a/dev-haskell/html-conduit/html-conduit-1.2.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Parse HTML documents using xml-conduit datatypes"
-HOMEPAGE="https://github.com/snoyberg/xml"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.1.1:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/tagstream-conduit-0.5.5.3:=[profile?] <dev-haskell/tagstream-conduit-0.6:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/xml-conduit-1.3:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/html-conduit/metadata.xml b/dev-haskell/html-conduit/metadata.xml
deleted file mode 100644
index 96b5e032235d..000000000000
--- a/dev-haskell/html-conduit/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package uses tagstream-conduit for its parser. It automatically balances mismatched tags, so that there shouldn't be any parse failures. It does not handle a full HTML document rendering, such as adding missing html and head tags.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/xml</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/html/Manifest b/dev-haskell/html/Manifest
deleted file mode 100644
index 467ef821aca8..000000000000
--- a/dev-haskell/html/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST html-1.0.1.2.tar.gz 11021 BLAKE2B 95ce5a7cfe1a9342d490c46255c5c1a5885a428a60941cead82f353420f60401f10ead1aeb1dc317251bee2553ae89f5de288e8e1946269e5f08630130163717 SHA512 e7ce2be53ce4c7898aa8772c34d1469a90fcb5258ffec0cb1da544f334b6f13ecb73060dfec2284622be1156a2adbadec8b9cac5088c1ca9d84edfb50719b9e0
-EBUILD html-1.0.1.2-r1.ebuild 626 BLAKE2B bb5f175cf9bb40718360442cb0ae8aa41800e110eef26d2e14946c3805c60a9bf34053af320b5ded66ea6b8ffc54d471a462502da0c49909355c07e8b790640f SHA512 e67a9d1f3f190ea8c3b7fcb209c600d0679419f1a70a9d6102b15fa7cf66c95e33c705d5851e1f12b64d23e7d040a69053377053a79bbd990841ab1e76971f89
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/html/html-1.0.1.2-r1.ebuild b/dev-haskell/html/html-1.0.1.2-r1.ebuild
deleted file mode 100644
index 99ba285f8a7c..000000000000
--- a/dev-haskell/html/html-1.0.1.2-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HTML combinator library"
-HOMEPAGE="http://hackage.haskell.org/package/html"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-0"
diff --git a/dev-haskell/html/metadata.xml b/dev-haskell/html/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/html/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/http-4000.2.17 b/dev-haskell/http-4000.2.17
new file mode 100644
index 000000000000..a1c0965bea86
--- /dev/null
+++ b/dev-haskell/http-4000.2.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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:= >=dev-haskell/cabal-1.8 dev-lang/ghc doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2478b098b077878de2d9242241af7edd
diff --git a/dev-haskell/http-4000.2.20 b/dev-haskell/http-4000.2.20
new file mode 100644
index 000000000000..c30ef0eee696
--- /dev/null
+++ b/dev-haskell/http-4000.2.20
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?] 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.2.1.5:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.8 dev-lang/ghc test? ( >=dev-haskell/httpd-shed-0.4 <dev-haskell/httpd-shed-0.5 >=dev-haskell/hunit-1.2.0.1 <dev-haskell/hunit-1.3 >=dev-haskell/puremd5-0.2.4 <dev-haskell/puremd5-2.2 >=dev-haskell/split-0.1.3 <dev-haskell/split-0.3 >=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A library for client-side HTTP
+EAPI=5
+HOMEPAGE=https://github.com/haskell/HTTP
+IUSE=conduit10 +network-uri doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?] 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.2.1.5:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/4000.2.20
+SRC_URI=mirror://hackage/packages/archive/HTTP/4000.2.20/HTTP-4000.2.20.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0b897a7c0d4891e3ac2e6c7e23f95fa6
diff --git a/dev-haskell/http-4000.2.22 b/dev-haskell/http-4000.2.22
new file mode 100644
index 000000000000..c9f3c3e152ba
--- /dev/null
+++ b/dev-haskell/http-4000.2.22
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-time-1.0.0.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[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.2.1.8:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.8 dev-lang/ghc test? ( >=dev-haskell/httpd-shed-0.4 <dev-haskell/httpd-shed-0.5 >=dev-haskell/hunit-1.2.0.1 <dev-haskell/hunit-1.4 >=dev-haskell/puremd5-0.2.4 <dev-haskell/puremd5-2.2 >=dev-haskell/split-0.1.3 <dev-haskell/split-0.3 >=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A library for client-side HTTP
+EAPI=5
+HOMEPAGE=https://github.com/haskell/HTTP
+IUSE=conduit10 +network-uri doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-time-1.0.0.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[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.2.1.8:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/4000.2.22
+SRC_URI=mirror://hackage/packages/archive/HTTP/4000.2.22/HTTP-4000.2.22.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1f9126e5bdee948389a202cfc821e666
diff --git a/dev-haskell/http-4000.2.8 b/dev-haskell/http-4000.2.8
new file mode 100644
index 000000000000..d2a2d2efbcfd
--- /dev/null
+++ b/dev-haskell/http-4000.2.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=<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?] >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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 ~amd64-linux ~x86-fbsd ~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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=509638fb77e3a10330b1ee146a824979
diff --git a/dev-haskell/http-4000.3.5 b/dev-haskell/http-4000.3.5
new file mode 100644
index 000000000000..c36f6c7d82eb
--- /dev/null
+++ b/dev-haskell/http-4000.3.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[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.2.1.8:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/httpd-shed-0.4 <dev-haskell/httpd-shed-0.5 >=dev-haskell/hunit-1.2.0.1 <dev-haskell/hunit-1.6 >=dev-haskell/puremd5-0.2.4 <dev-haskell/puremd5-2.2 >=dev-haskell/split-0.1.3 <dev-haskell/split-0.3 >=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A library for client-side HTTP
+EAPI=6
+HOMEPAGE=https://github.com/haskell/HTTP
+IUSE=conduit10 +network-uri doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[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.2.1.8:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/4000.3.5
+SRC_URI=mirror://hackage/packages/archive/HTTP/4000.3.5/HTTP-4000.3.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=abdbec35da551f8bc74c8adece95a8a0
diff --git a/dev-haskell/http-api-data-0.3.3 b/dev-haskell/http-api-data-0.3.3
new file mode 100644
index 000000000000..3fb0efbdbe51
--- /dev/null
+++ b/dev-haskell/http-api-data-0.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/hashable:=[profile?] >=dev-haskell/text-0.5:=[profile?] >=dev-haskell/time-locale-compat-0.1.1.0:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/uri-bytestring:=[profile?] >=dev-haskell/uuid-types-1.0.2:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?] >=dev-lang/ghc-7.6.1:= use-text-show? ( >=dev-haskell/text-show-2:=[profile?] ) >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/doctest-0.11 <dev-haskell/doctest-0.12 >=dev-haskell/hspec-1.3 dev-haskell/hunit >=dev-haskell/quickcheck-2.9 >=dev-haskell/quickcheck-instances-0.3.12 dev-haskell/uuid ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Converting to/from HTTP API data like URL pieces, headers and query parameters
+EAPI=6
+HOMEPAGE=https://github.com/fizruk/http-api-data
+IUSE=use-text-show doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/hashable:=[profile?] >=dev-haskell/text-0.5:=[profile?] >=dev-haskell/time-locale-compat-0.1.1.0:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/uri-bytestring:=[profile?] >=dev-haskell/uuid-types-1.0.2:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?] >=dev-lang/ghc-7.6.1:= use-text-show? ( >=dev-haskell/text-show-2:=[profile?] )
+SLOT=0/0.3.3
+SRC_URI=mirror://hackage/packages/archive/http-api-data/0.3.3/http-api-data-0.3.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5e59fe9e06aebf41dd329c34c8ec23e0
diff --git a/dev-haskell/http-api-data/Manifest b/dev-haskell/http-api-data/Manifest
deleted file mode 100644
index b7d0e9360648..000000000000
--- a/dev-haskell/http-api-data/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST http-api-data-0.3.3.tar.gz 17668 BLAKE2B 8b4dfbf237312cd89413d45d31fd0730eecc4459e63d3e6f66bc1fb128f5c1d0358c3726df453e805014f5607373b2883fab0e38b54ede83ac4417cc6be81296 SHA512 125240fe0da41ff118937864cc5386d50b58cba98fa9d463202ac73a07b2d530563c3a7c41f81be42f25d99bcfc12ed01dca095a000f0cefc655d8046c3aa00c
-EBUILD http-api-data-0.3.3.ebuild 1316 BLAKE2B 923b09ea2ff113e3fc64991b32ea7ef5c00a2a9b505d38c760159f59122c4ad9eb694b687ed4b096398be0ec94c933b735cef85b596dad07ed800a634adbf5f1 SHA512 55d11acc2835eaa3b1bfe70e624b0dab85c05195c99fe2776a6589df90bc6f12628e3b1bb133affb50ebee97a461892279ea7cf84bd3a19773708e633f2ae2ec
-MISC metadata.xml 451 BLAKE2B 8c5f2ff5dd8eb41a933d14573e09c78963212aeac180065cc12eb69708f76d5fe7d7843384e4ff2095d3daf5764388a9cb14b96aeb37bbf3da7207178b3c28ca SHA512 c1d1bbb22c5eda41eecfd560624513271598fa334ff36eb58fed7aac29e1631296ca2ee53fd05b1157615a0d394dfa8e1dbc23257d4e7f5ce8d0456ebf342a7f
diff --git a/dev-haskell/http-api-data/http-api-data-0.3.3.ebuild b/dev-haskell/http-api-data/http-api-data-0.3.3.ebuild
deleted file mode 100644
index de3935c12d39..000000000000
--- a/dev-haskell/http-api-data/http-api-data-0.3.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Converting to/from HTTP API data like URL pieces, headers and query parameters"
-HOMEPAGE="https://github.com/fizruk/http-api-data"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="use-text-show"
-
-RDEPEND="dev-haskell/hashable:=[profile?]
-	>=dev-haskell/text-0.5:=[profile?]
-	>=dev-haskell/time-locale-compat-0.1.1.0:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/uri-bytestring:=[profile?]
-	>=dev-haskell/uuid-types-1.0.2:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-	use-text-show? ( >=dev-haskell/text-show-2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/doctest-0.11 <dev-haskell/doctest-0.12
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.9
-		>=dev-haskell/quickcheck-instances-0.3.12
-		dev-haskell/uuid )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag use-text-show use-text-show)
-}
diff --git a/dev-haskell/http-api-data/metadata.xml b/dev-haskell/http-api-data/metadata.xml
deleted file mode 100644
index 249526e7aece..000000000000
--- a/dev-haskell/http-api-data/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="use-text-show">Use text-show library for efficient ToHttpApiData implementations</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">fizruk/http-api-data</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/http-attoparsec-0.1.1-r2 b/dev-haskell/http-attoparsec-0.1.1-r2
new file mode 100644
index 000000000000..74ed165f64a9
--- /dev/null
+++ b/dev-haskell/http-attoparsec-0.1.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/attoparsec-0.10.4.0:=[profile?] >=dev-haskell/http-types-0.8.0:=[profile?] <dev-haskell/http-types-0.9:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Attoparsec parsers for http-types
+EAPI=5
+HOMEPAGE=https://github.com/tlaitinen/http-attoparsec
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.10.4.0:=[profile?] >=dev-haskell/http-types-0.8.0:=[profile?] <dev-haskell/http-types-0.9:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/0.1.1
+SRC_URI=mirror://hackage/packages/archive/http-attoparsec/0.1.1/http-attoparsec-0.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=871a81d76b6ed6fb9a6e7f46af7db0ef
diff --git a/dev-haskell/http-attoparsec-0.1.1-r3 b/dev-haskell/http-attoparsec-0.1.1-r3
new file mode 100644
index 000000000000..fc6b8a80c8fb
--- /dev/null
+++ b/dev-haskell/http-attoparsec-0.1.1-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/attoparsec-0.10.4.0:=[profile?] >=dev-haskell/http-types-0.8.0:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Attoparsec parsers for http-types
+EAPI=5
+HOMEPAGE=https://github.com/tlaitinen/http-attoparsec
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.10.4.0:=[profile?] >=dev-haskell/http-types-0.8.0:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/0.1.1
+SRC_URI=mirror://hackage/packages/archive/http-attoparsec/0.1.1/http-attoparsec-0.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ddd5676d9441a3a51eb6c2ef682d23f4
diff --git a/dev-haskell/http-attoparsec/Manifest b/dev-haskell/http-attoparsec/Manifest
deleted file mode 100644
index a26aaf01b357..000000000000
--- a/dev-haskell/http-attoparsec/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX http-attoparsec-0.1.1-http.patch 314 BLAKE2B 3af42442fa504726c5eacaf7686448611c22ef4ea6e8908f06e54a5bedd8969bf0d69598865d758027116d034ee9012d78baf331c3c51a728f337e780ea8bf2f SHA512 bb52b574df35cf76b0269a216d8d11cb04dafeba88a7f0d0581a0296e49d8eb125038a431174618964d3afa76c50b9eb5315101648ce8a2564e4ea685445620c
-DIST http-attoparsec-0.1.1.tar.gz 2501 BLAKE2B ffd8cfdcd7bf8b5916348633d519531a3a50426a03d9aef2818ebc3577c30f54e2e3c9ff1a4e7cfa7ea8cbe48a08c97262a796fead873128eb70d3074807a994 SHA512 7be64a4f8df874b392b3d75ecb16bb4e4f689e2c9e65eb406c7287bd637eced2c2580d27be3cfa164aac9cdfdd89cb8aaa8d9ab708e44542a478ec76a9b5955d
-EBUILD http-attoparsec-0.1.1-r2.ebuild 780 BLAKE2B bb68a5dcbeee2987961668bdf331f1c8e506ee8ad21f89f00ba36679dce9a257af8bccfe97f1c3a153b205d69cea3d6eff162005feaa7ca151e0828d5e1826d4 SHA512 f8f084fd72e06f8ee226434cf0cc8663b76edada42c8ac974f3bee04a6249c5e4a127e306d8bdb131073209a9f5be330ce7b0980a6167640ac686e34b750d45b
-EBUILD http-attoparsec-0.1.1-r3.ebuild 838 BLAKE2B eeff3f02692bd75885810e5d7a44185368662dee2bdeeab1267bc1a00f88306e814efec60d820363c9d8839b1fabc75da4d10f71f71e79f9c2c6ab379d0ee8e2 SHA512 97701d2125e03196bf62991d367bd861bde8eb2539e0b7d62917e8c5bdee898884223b79b83b986899c14e579af75fa5c10d65cfd8e126d34f854a9d2d977978
-MISC metadata.xml 415 BLAKE2B 71fc9526cf2479451dc041043f4438985998615205db06bc7f7e6c2d726b68bf4506c42c222fe075ed07269469a994174bfeb224361217ab27243f1bee05922b SHA512 9e100f10d0b808f50bdada4a11e37cf273d7471054d26aeffafb4c1c5a4528750610179117a94b350222322ff6b983daa70f877c4bdc22aef177ff5816823a9a
diff --git a/dev-haskell/http-attoparsec/files/http-attoparsec-0.1.1-http.patch b/dev-haskell/http-attoparsec/files/http-attoparsec-0.1.1-http.patch
deleted file mode 100644
index 2de100c5deb5..000000000000
--- a/dev-haskell/http-attoparsec/files/http-attoparsec-0.1.1-http.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/Network/HTTP/Attoparsec.hs b/Network/HTTP/Attoparsec.hs
-index ec464d0..37f9983 100644
---- a/Network/HTTP/Attoparsec.hs
-+++ b/Network/HTTP/Attoparsec.hs
-@@ -7,3 +7,3 @@ module Network.HTTP.Attoparsec
- where
--import Network.HTTP.Types.Header
-+import Network.HTTP.Types.Header hiding (parseByteRanges)
- 
diff --git a/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r2.ebuild b/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r2.ebuild
deleted file mode 100644
index 4ea20efa90de..000000000000
--- a/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Attoparsec parsers for http-types"
-HOMEPAGE="https://github.com/tlaitinen/http-attoparsec"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.4.0:=[profile?]
-	>=dev-haskell/http-types-0.8.0:=[profile?] <dev-haskell/http-types-0.9:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'attoparsec >= 0.10.4.0 && < 0.12' 'attoparsec >= 0.10.4.0'
-}
diff --git a/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r3.ebuild b/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r3.ebuild
deleted file mode 100644
index 2dcf768bf7ed..000000000000
--- a/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Attoparsec parsers for http-types"
-HOMEPAGE="https://github.com/tlaitinen/http-attoparsec"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.4.0:=[profile?]
-	>=dev-haskell/http-types-0.8.0:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-http.patch
-
-	cabal_chdeps \
-		'attoparsec >= 0.10.4.0 && < 0.12' 'attoparsec >= 0.10.4.0' \
-		'http-types >= 0.8.0 && < 0.9' 'http-types >= 0.8.0'
-}
diff --git a/dev-haskell/http-attoparsec/metadata.xml b/dev-haskell/http-attoparsec/metadata.xml
deleted file mode 100644
index 218272ffd685..000000000000
--- a/dev-haskell/http-attoparsec/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Attoparsec parsers for http-types.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">tlaitinen/http-attoparsec</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/http-client-0.4.18.1 b/dev-haskell/http-client-0.4.18.1
new file mode 100644
index 000000000000..a3eb4203c259
--- /dev/null
+++ b/dev-haskell/http-client-0.4.18.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-1.0:=[profile?] dev-haskell/cookie:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] dev-haskell/mime-types:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.10 test? ( dev-haskell/async dev-haskell/hspec dev-haskell/monad-control >=dev-haskell/streaming-commons-0.1.1 dev-haskell/zlib !network-uri? ( dev-haskell/network-uri ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An HTTP client engine, intended as a base layer for more user-friendly packages
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/http-client
+IUSE=+network-uri doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-1.0:=[profile?] dev-haskell/cookie:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] dev-haskell/mime-types:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/0.4.18.1
+SRC_URI=mirror://hackage/packages/archive/http-client/0.4.18.1/http-client-0.4.18.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=39d4ffd5f00f1f153051d7062f5e0127
diff --git a/dev-haskell/http-client-0.4.30 b/dev-haskell/http-client-0.4.30
new file mode 100644
index 000000000000..055ba430c14d
--- /dev/null
+++ b/dev-haskell/http-client-0.4.30
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-1.0:=[profile?] dev-haskell/cookie:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] dev-haskell/mime-types:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.10 test? ( dev-haskell/async dev-haskell/hspec dev-haskell/monad-control >=dev-haskell/streaming-commons-0.1.1 dev-haskell/zlib !network-uri? ( dev-haskell/network-uri ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An HTTP client engine, intended as a base layer for more user-friendly packages
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/http-client
+IUSE=+network-uri doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-1.0:=[profile?] dev-haskell/cookie:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] dev-haskell/mime-types:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/0.4.30
+SRC_URI=mirror://hackage/packages/archive/http-client/0.4.30/http-client-0.4.30.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=386e77a474fcd98f937112f4a007463b
diff --git a/dev-haskell/http-client-0.5.5 b/dev-haskell/http-client-0.5.5
new file mode 100644
index 000000000000..7c9be8a1bc4b
--- /dev/null
+++ b/dev-haskell/http-client-0.5.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-1.0:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] dev-haskell/mime-types:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/async dev-haskell/hspec dev-haskell/monad-control >=dev-haskell/streaming-commons-0.1.1 dev-haskell/zlib !network-uri? ( dev-haskell/network-uri ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An HTTP client engine
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/http-client
+IUSE=+network-uri doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-1.0:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] dev-haskell/mime-types:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/0.5.5
+SRC_URI=mirror://hackage/packages/archive/http-client/0.5.5/http-client-0.5.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1f373bdec5866eb26239451c666194aa
diff --git a/dev-haskell/http-client-0.5.7.0 b/dev-haskell/http-client-0.5.7.0
new file mode 100644
index 000000000000..864771b9d7a8
--- /dev/null
+++ b/dev-haskell/http-client-0.5.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-1.0:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] dev-haskell/mime-types:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/async dev-haskell/hspec dev-haskell/monad-control >=dev-haskell/streaming-commons-0.1.1 dev-haskell/zlib !network-uri? ( dev-haskell/network-uri ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An HTTP client engine
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/http-client
+IUSE=+network-uri doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-1.0:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] dev-haskell/mime-types:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+RESTRICT=test
+SLOT=0/0.5.7.0
+SRC_URI=mirror://hackage/packages/archive/http-client/0.5.7.0/http-client-0.5.7.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d3879fc435533acdfbeea7d6e8fd48bf
diff --git a/dev-haskell/http-client-conduit-0.2.0.1 b/dev-haskell/http-client-conduit-0.2.0.1
new file mode 100644
index 000000000000..5bc208699f0a
--- /dev/null
+++ b/dev-haskell/http-client-conduit-0.2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/conduit:=[profile?] >=dev-haskell/http-client-0.2:=[profile?] >=dev-haskell/resourcet-0.4.6:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Frontend support for using http-client with conduit
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/http-client
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/conduit:=[profile?] >=dev-haskell/http-client-0.2:=[profile?] >=dev-haskell/resourcet-0.4.6:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.2.0.1
+SRC_URI=mirror://hackage/packages/archive/http-client-conduit/0.2.0.1/http-client-conduit-0.2.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=705c4b33b2d8b7ffa0891eea666de890
diff --git a/dev-haskell/http-client-conduit-0.3.0 b/dev-haskell/http-client-conduit-0.3.0
new file mode 100644
index 000000000000..187e38bd6379
--- /dev/null
+++ b/dev-haskell/http-client-conduit-0.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/http-client-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10
+DESCRIPTION=Frontend support for using http-client with conduit (deprecated)
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/http-client
+IUSE=profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/http-client-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.0
+SRC_URI=mirror://hackage/packages/archive/http-client-conduit/0.3.0/http-client-conduit-0.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=123eb00d623a6176477538afdbfcdd03
diff --git a/dev-haskell/http-client-conduit/Manifest b/dev-haskell/http-client-conduit/Manifest
deleted file mode 100644
index f1ef93b76583..000000000000
--- a/dev-haskell/http-client-conduit/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST http-client-conduit-0.2.0.1.tar.gz 2104 BLAKE2B 2f8bb34e48bdc4671c51013fe81a2a0fc90f4e01cb6e22ff9bcdd8507f5f02606ca8eb2199892fa8d2106a5e86a110b4feee100a77b08815419656dfe40edf32 SHA512 1fd691f613cf874ea6f596a1d178bee034aef48923d8665b33cb7519d49034c56198a1b98786f3b65e9b5fce36d7bea8e76bafd696c52f01a240da29a06696ab
-DIST http-client-conduit-0.3.0.tar.gz 1176 BLAKE2B 29a8da8e051c31b24c710db783d330eb25316f500968df8b546cf085ca179526b26f1709d2e05cfb4d32703cf1233a8b9e9d0e0b04bc66b15fb38bbf6ce1ae7b SHA512 c6d3a2ee7d2b3efca346835d226421bf18443d7248d743b0467b32a9697d845697267a5fa9ee5a7bdf2c6918c60f4f6897f3df109b9337ab3967b3b9ef2528fe
-EBUILD http-client-conduit-0.2.0.1.ebuild 721 BLAKE2B df907da2d08525ece30c49ef4e6398a350a9f682cca1f827aa37a61837e7b1a743364d6b6a928958f2e433394be3a622d4748ca5424b14e121178ba1b5fb65b9 SHA512 a8f9145285324a04e72846d9429bf97464a8bd465b66e2e9d225fa7d0ae494c5c959d095af43de8fe37400c95a596e88e98e098cab6254d2374f656c53d0f9ab
-EBUILD http-client-conduit-0.3.0.ebuild 629 BLAKE2B bb527df25dac6c8db3dcd8fb6be1f1c1f1dbe9e66c5a2e3d09d7deec37037e78b31ca5f1bf8d26d730799c8b8db1c96a64c4635b5fe771c728fbbe2c9ecd7c6d SHA512 de9560196b9b1100818c89284dea78ff491f300c08dfd3fbe5e7390e377c365ab75d32cd9903202e06ebf02e3534f8a06ca94d22aaa0fbc07ebf3c78c4eb11ec
-MISC metadata.xml 441 BLAKE2B 33456ac8ae2845eed00ed66ca3d754b83e90c33a57f6e84dc0ce31dedd9f2fd2b711397759b8024629dd011e18b5942db3567093a3226bced39a8abcdd6c6d44 SHA512 dbea66c32c3fface3c17b221436091de83efa7368384bdfdc76acc36672e6d7afbb3c5ffd08afe627c43d0e891dac4fc8053ea6de6294e0d1a7a0eb87edf4988
diff --git a/dev-haskell/http-client-conduit/http-client-conduit-0.2.0.1.ebuild b/dev-haskell/http-client-conduit/http-client-conduit-0.2.0.1.ebuild
deleted file mode 100644
index 8d85de5bc9c1..000000000000
--- a/dev-haskell/http-client-conduit/http-client-conduit-0.2.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Frontend support for using http-client with conduit"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/conduit:=[profile?]
-	>=dev-haskell/http-client-0.2:=[profile?]
-	>=dev-haskell/resourcet-0.4.6:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/http-client-conduit/http-client-conduit-0.3.0.ebuild b/dev-haskell/http-client-conduit/http-client-conduit-0.3.0.ebuild
deleted file mode 100644
index 462e15796ad9..000000000000
--- a/dev-haskell/http-client-conduit/http-client-conduit-0.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile" # haddock hoogle hscolour" no files
-inherit haskell-cabal
-
-DESCRIPTION="Frontend support for using http-client with conduit (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/http-client-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/http-client-conduit/metadata.xml b/dev-haskell/http-client-conduit/metadata.xml
deleted file mode 100644
index dabba697851d..000000000000
--- a/dev-haskell/http-client-conduit/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Intended for use by higher-level libraries, such as http-conduit.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/http-client</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/http-client-multipart-0.2.0.0 b/dev-haskell/http-client-multipart-0.2.0.0
new file mode 100644
index 000000000000..7fa6d59d780c
--- /dev/null
+++ b/dev-haskell/http-client-multipart-0.2.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/blaze-builder:=[profile?] >=dev-haskell/http-client-0.2:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/mime-types:=[profile?] dev-haskell/random:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generate multipart uploads for http-client
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/http-client
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/blaze-builder:=[profile?] >=dev-haskell/http-client-0.2:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/mime-types:=[profile?] dev-haskell/random:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.2.0.0
+SRC_URI=mirror://hackage/packages/archive/http-client-multipart/0.2.0.0/http-client-multipart-0.2.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9d284075ff998dda618554440bd0a1b1
diff --git a/dev-haskell/http-client-multipart-0.3.0.0 b/dev-haskell/http-client-multipart-0.3.0.0
new file mode 100644
index 000000000000..00c18ea2e518
--- /dev/null
+++ b/dev-haskell/http-client-multipart-0.3.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/http-client-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10
+DESCRIPTION=Generate multipart uploads for http-client. (deprecated)
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/http-client
+IUSE=profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/http-client-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.0.0
+SRC_URI=mirror://hackage/packages/archive/http-client-multipart/0.3.0.0/http-client-multipart-0.3.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1ccec7003f1eed23b724d4b85c3d3a6e
diff --git a/dev-haskell/http-client-multipart/Manifest b/dev-haskell/http-client-multipart/Manifest
deleted file mode 100644
index ea6cda521bb4..000000000000
--- a/dev-haskell/http-client-multipart/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST http-client-multipart-0.2.0.0.tar.gz 4006 BLAKE2B aa3e8e2ba3fc24ce4754cf31816dc4bde866a7f0c2651f12a18001fbd75fe63b196dd17883d8b976ac13d1a8b39aefb51f939283dae86058d47437b62bd7b98c SHA512 7f3bc5b1b2dce4a8b5645b87a6f16e4baa3b61fbe71a7ba90a6c225af4a8d27b956280ab01805547d93378b32d5b4ab482e610f9423ccfda53d937d56586c497
-DIST http-client-multipart-0.3.0.0.tar.gz 1130 BLAKE2B 016468d0509055776615ba0e23f234f24868557c0b0c8e366e7ef7157028461e8fd5f0af73d84db68179c68c52624a8251c41195342798234c93801e7f7ed0b9 SHA512 4d0985d6cbc5e6ec4fe79b5037a4e378afd4b14382f2b26d62870ac091de661cf80be827851a8a8de014d6cd846867ea54ac7722deb6f97ecd70bee61fc1caeb
-EBUILD http-client-multipart-0.2.0.0.ebuild 809 BLAKE2B 21d6b936558fe7c46449bf2f57c33846738200684e57a803d0fbbe79c0607c6e301c82d798b2655d11ffe44467b499fc3b7b0cad9b134dff789553705c2f251d SHA512 1b5004834e12d83b4dbe044c539a3b5aee6ca43c011848e521b3d977a56a31db7ff652721b9713a207a808af89d38f98ad27f1d385f880ee9d9a9e267c283b5d
-EBUILD http-client-multipart-0.3.0.0.ebuild 621 BLAKE2B 6cff348f62bc1e2b121d29a8283381c16e8387178180b1837abf1e6945f48ac193fc44d03a16b586b49543d7256574bedd973b3eac5b815a1934921deab07448 SHA512 41636b07c8ef6f9d0e5d378a5d712129903ef507871e7ef2cf82d6f0f6d0e44cc58d231dcf7cefc2f5d95318baab119151c294ad20bd8ed84fd753e417fdd807
-MISC metadata.xml 419 BLAKE2B 3744e8047c3e8b68c06830a13590d1b7da53ff0aaeb807e706993c3005d3d91b037d3706c4423ec91af4c2804caed19542f7c801b17ab4177449999701c25547 SHA512 7a0628973d356a3cf697e545a01918105e4321887ff0458c157211b58e2dc647fb20a1d27f43cf21d19a3a807b05751d413867f231c40a4e04c298241126bb59
diff --git a/dev-haskell/http-client-multipart/http-client-multipart-0.2.0.0.ebuild b/dev-haskell/http-client-multipart/http-client-multipart-0.2.0.0.ebuild
deleted file mode 100644
index 47780ab9ef33..000000000000
--- a/dev-haskell/http-client-multipart/http-client-multipart-0.2.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate multipart uploads for http-client"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/http-client-0.2:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	dev-haskell/mime-types:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/http-client-multipart/http-client-multipart-0.3.0.0.ebuild b/dev-haskell/http-client-multipart/http-client-multipart-0.3.0.0.ebuild
deleted file mode 100644
index ffc4ac32ca92..000000000000
--- a/dev-haskell/http-client-multipart/http-client-multipart-0.3.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile" # haddock hoogle hscolour" no files
-inherit haskell-cabal
-
-DESCRIPTION="Generate multipart uploads for http-client. (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/http-client-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/http-client-multipart/metadata.xml b/dev-haskell/http-client-multipart/metadata.xml
deleted file mode 100644
index 56a6a08a0e25..000000000000
--- a/dev-haskell/http-client-multipart/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Generate multipart uploads for http-client.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/http-client</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/http-client-tls-0.2.2 b/dev-haskell/http-client-tls-0.2.2
new file mode 100644
index 000000000000..36580d31ff86
--- /dev/null
+++ b/dev-haskell/http-client-tls-0.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/connection-0.2.2:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/http-client-0.3.5:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/tls-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hspec dev-haskell/http-types ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=http-client backend using the connection package and tls library
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/http-client
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/connection-0.2.2:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/http-client-0.3.5:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/tls-1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.2.2
+SRC_URI=mirror://hackage/packages/archive/http-client-tls/0.2.2/http-client-tls-0.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d6eaf0569007a910a4f12468b916166b
diff --git a/dev-haskell/http-client-tls-0.2.4 b/dev-haskell/http-client-tls-0.2.4
new file mode 100644
index 000000000000..0a64af97be85
--- /dev/null
+++ b/dev-haskell/http-client-tls-0.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/connection-0.2.2:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/http-client-0.3.5:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/tls-1.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hspec dev-haskell/http-types ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=http-client backend using the connection package and tls library
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/http-client
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/connection-0.2.2:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/http-client-0.3.5:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/tls-1.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.4
+SRC_URI=mirror://hackage/packages/archive/http-client-tls/0.2.4/http-client-tls-0.2.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4703a9eb88033eb7756b5cf9111fad32
diff --git a/dev-haskell/http-client-tls-0.3.3 b/dev-haskell/http-client-tls-0.3.3
new file mode 100644
index 000000000000..a58f80387f1c
--- /dev/null
+++ b/dev-haskell/http-client-tls-0.3.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/case-insensitive:=[profile?] >=dev-haskell/connection-0.2.2:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/http-client-0.5.0:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/tls-1.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=http-client backend using the connection package and tls library
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/http-client
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-haskell/case-insensitive:=[profile?] >=dev-haskell/connection-0.2.2:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/http-client-0.5.0:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/tls-1.2:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0/0.3.3
+SRC_URI=mirror://hackage/packages/archive/http-client-tls/0.3.3/http-client-tls-0.3.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=febb9ed5becd9d3dece51221f84ac865
diff --git a/dev-haskell/http-client-tls/Manifest b/dev-haskell/http-client-tls/Manifest
deleted file mode 100644
index e866ef6a9d6f..000000000000
--- a/dev-haskell/http-client-tls/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST http-client-tls-0.2.2.tar.gz 2962 BLAKE2B 40a3a5c03425fc26435de089c58426e25923ac4a14528e05b0b0d9e82867a9e3673a7d3db4bdb21a1838fc19f79acec8323d4341c8c8a63b415b2ad39bed7e66 SHA512 fe750f8c89efd6f65ff4f80ed2e56caadcbd6135fe4dbe500c763994773d91924cbd12073b84dc175ec617d76077febc790a45e293a2a4bb6ca840d0f223629e
-DIST http-client-tls-0.2.4.tar.gz 3555 BLAKE2B 0192b1aef91c4023692b0ecf2270e38a5b4edc0bb32526e993e8764d593b112e9d04b3f93d1b55c5eca6de1f6cb95b2d5c90a9f4b5307feb763cc49b992a38d8 SHA512 3394b4cc6d8d398c17b3f06f6e1183103fadea0527c4fdab963a7e7cefb3b22fd0f0c3dc285efc7a8a1a902edc30f52a2ee35596dc173769c7fb9be6d033b24c
-DIST http-client-tls-0.3.3.tar.gz 6154 BLAKE2B bf7558a56194a21ee4829a679ecbde612de7abd922cc83fd941948dbf4e9f80163942f9d564479af3e1f49e49e5c22476538c0d33ebfb7f0fbecdac1a2325007 SHA512 eb4b094ce8c70154554564651dbaf57db80338b3fc88938a67fc5d7425d9f1793e805aa62cc90c0eb2d8a168d89769b45963b0382729103850920eac5fcd267e
-EBUILD http-client-tls-0.2.2.ebuild 907 BLAKE2B 2c8c7355252cb9358a79d96788c3a21b64fba792e1aa1c79bc22beef3634c10344d468e15feae73ece363b7efc6382e982046b84f24d0884ab4ef7496db99e8f SHA512 cd18afd7fa7da8174b4e237d7dd700e95626d8c988601c9d4154cf4e3a931a0e92df6497c557a638c8f2fe51d451dd940c5e6570250080edccdfa7bf743c2f77
-EBUILD http-client-tls-0.2.4.ebuild 842 BLAKE2B d02c68871d63c7f7dd37a59702d3e3ff9c2c5516a3269ef4f0fe01d9351ed64052752b1cfc4c19255c9073e68dd2cf63c97f1d9d2b9f107d4b653cd78f1ec375 SHA512 c6e57eb49eae4c395647d4ea19442f5c40f0b21ee982fef4ef0758a49869d9d1d452f85bd344e5148d176b39d7e4be91fc8e7dc1d65261cf9e656678750e8906
-EBUILD http-client-tls-0.3.3.ebuild 1034 BLAKE2B 02b5a6fbcb3abc2a3acd9f8b0bc7ad7438fe84921e65785f3ede15789a07502ab6a1638a6663cb8bf45f848953eedc00e42f64ac9a5cf22304e3636f0d2e666c SHA512 9a4935992d16b61d7e60df4373003995dbe82bac4032c0cdcf714c78a9d75dea17e80b9cd9e72dffeed3feb073e70748424bbd0f83144ff7568b1b9451ea79ee
-MISC metadata.xml 441 BLAKE2B 33456ac8ae2845eed00ed66ca3d754b83e90c33a57f6e84dc0ce31dedd9f2fd2b711397759b8024629dd011e18b5942db3567093a3226bced39a8abcdd6c6d44 SHA512 dbea66c32c3fface3c17b221436091de83efa7368384bdfdc76acc36672e6d7afbb3c5ffd08afe627c43d0e891dac4fc8053ea6de6294e0d1a7a0eb87edf4988
diff --git a/dev-haskell/http-client-tls/http-client-tls-0.2.2.ebuild b/dev-haskell/http-client-tls/http-client-tls-0.2.2.ebuild
deleted file mode 100644
index 09520001a8f9..000000000000
--- a/dev-haskell/http-client-tls/http-client-tls-0.2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="http-client backend using the connection package and tls library"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/connection-0.2.2:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/http-client-0.3.5:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-haskell/tls-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hspec
-		dev-haskell/http-types )
-"
-
-# The only test in the suite requires internet access.
-RESTRICT="test"
diff --git a/dev-haskell/http-client-tls/http-client-tls-0.2.4.ebuild b/dev-haskell/http-client-tls/http-client-tls-0.2.4.ebuild
deleted file mode 100644
index e30272eb497d..000000000000
--- a/dev-haskell/http-client-tls/http-client-tls-0.2.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="http-client backend using the connection package and tls library"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/connection-0.2.2:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/http-client-0.3.5:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-haskell/tls-1.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hspec
-		dev-haskell/http-types )
-"
diff --git a/dev-haskell/http-client-tls/http-client-tls-0.3.3.ebuild b/dev-haskell/http-client-tls/http-client-tls-0.3.3.ebuild
deleted file mode 100644
index 5f93ec49933b..000000000000
--- a/dev-haskell/http-client-tls/http-client-tls-0.3.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="http-client backend using the connection package and tls library"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RESTRICT=test # needs network access
-
-RDEPEND="dev-haskell/case-insensitive:=[profile?]
-	>=dev-haskell/connection-0.2.2:=[profile?]
-	dev-haskell/cryptonite:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	>=dev-haskell/http-client-0.5.0:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	dev-haskell/memory:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-haskell/tls-1.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/http-client-tls/metadata.xml b/dev-haskell/http-client-tls/metadata.xml
deleted file mode 100644
index dabba697851d..000000000000
--- a/dev-haskell/http-client-tls/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Intended for use by higher-level libraries, such as http-conduit.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/http-client</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/http-client/Manifest b/dev-haskell/http-client/Manifest
deleted file mode 100644
index 4ae091888a85..000000000000
--- a/dev-haskell/http-client/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST http-client-0.4.18.1.tar.gz 75796 BLAKE2B 07e1f5dcd898e1e3c2f3d6d172d13256bdb3146d41f9434614cea6795e5ae5aab3694c917ae83d9728ee9b201c4819fdf44eb96618a87f1f2e91ae372811b0b6 SHA512 22b04e04edda5d0ae017acfd6b332acd9347d722245642f02caced4c60baa3b00d14e495c1b8f82e96e9c071acc045f0ab3f17b93706c95b81658a43489ac9f8
-DIST http-client-0.4.30.tar.gz 79327 BLAKE2B ed2819a51a888c0d09e71791b3eef1ac947138361b21a036810fe949c5a7368dec8f88b7dd86334c845777bc28b85fb78e50ad5813c48d7636e92c25afa509df SHA512 d8e9a2dc9a2f999d5d2ef313cebef9d3e88ee98225ceed64fc220c16d6ee1bf5174e1170bc1f3d02f8ca1dfd4d63631ed204c238cdc9e4a751aa232e5dc42224
-DIST http-client-0.5.5.tar.gz 81369 BLAKE2B 58a7fcb03ab193d08965242d3dd267f2e0de7b82b6d29868a77a52977846e78c9744c3a650e0373c60ff533d6fd5fe08ceb7b1f8921e5f04e62f47d77728b905 SHA512 3289f9e0efe3fa03a99885d12ceb0e2cf881c339f69cd0812ed65d47b00401ed4959fc19c27492de7616395a04b412cbe443af47cd82afdaafcf92e52fdffac2
-DIST http-client-0.5.7.0.tar.gz 86010 BLAKE2B 1e6f938c71d270a3f28457dad3e12000c08ef880f526db764bc06810f01440448a0071181582c3262953c2aa1dcd6d64929c7ae0ff297cce84b832db048433d4 SHA512 5a411fc6b709becdbdb727904851ff1348c39430d2358f780677fd00f154cc85d94f776f120f4435c2e9a89bb9f0a00858df0d5c7b250772c88c50179bd30275
-EBUILD http-client-0.4.18.1.ebuild 1671 BLAKE2B 93b3d95c85d3adbd352300957a120d724314369b29d5440bc2ccbf271f0dd90749225573964f75f80e0ae6ec9a82012b88b52dda2ee2bb2b8ef244361d61fa01 SHA512 52042d2268319c3469b2475a06e54a2e9705193fbd76dd0c8dc774ed201493c4158f91c1e10b114a21353477b07c9869628ec9e511d207bc3283a0922d3dd665
-EBUILD http-client-0.4.30.ebuild 1669 BLAKE2B 80c3ca84a2267feb429282a926965d888025e5dcf387765aa6864ba69603e40c301a76ab4471373924d9d7030db798dbe9673b88cd69994e3bdfadf0a947063a SHA512 e9c2e7d111116397e8ff39c86a606815d418e0e37ffdc566b419d1637705c31c79e46a37c087b72aca1917bb1b509b2c489ef030d6adf98e6664a0e307844ae3
-EBUILD http-client-0.5.5.ebuild 1537 BLAKE2B 4f33b50ba64da9e1224681587013deda446ee0353611668c24e4920ab37b9063b30cc50791f98635a9d2d9007370655f01cc0b29e05fcd379c0a06efb3ae124b SHA512 696fd1de22bef5859e313654bbd52142b3c509fd10f0c66ed60ed2e278e80bdadf5927ee0ee4d59fa0d851f6941536aeb9c7dafcf29b31b16fcab63df2b9a3e0
-EBUILD http-client-0.5.7.0.ebuild 1573 BLAKE2B da74214f818f89c9671857c966f728556651f3fe4ebfee188ccaf89b235ea7e9b2ff29e8b631be10b9cbf9ae478bea296ed42eafadaf750ab1c25d3cba807899 SHA512 3a6e3a10c1323fffedbf929f7ac14ff21436368667ad34ede63a4fbef946d996c6e004e7d010b4f85bb6fd895203ed3a84c61094df43a8c8bb1e8b36aa796d3b
-MISC metadata.xml 523 BLAKE2B 35c8929a44f77e2666f278d83984c519a93c21eff2a3f887dbcbba4068f6321e12514b03f6532f5c89c627543af431e2ff1888cc64084004d1ab150e74be5182 SHA512 ba4e9d6dee78cc9b803646be59d6c32b10bf13c5398305607722d4a3095e4e37fa6ef67d921544e34bc95e0348794d54178d5498f3c447998954db118e5eda8b
diff --git a/dev-haskell/http-client/http-client-0.4.18.1.ebuild b/dev-haskell/http-client/http-client-0.4.18.1.ebuild
deleted file mode 100644
index 8c0200ff7d9a..000000000000
--- a/dev-haskell/http-client/http-client-0.4.18.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An HTTP client engine, intended as a base layer for more user-friendly packages"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/case-insensitive-1.0:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/exceptions-0.4:=[profile?]
-	>=dev-haskell/http-types-0.8:=[profile?]
-	dev-haskell/mime-types:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/async
-		dev-haskell/hspec
-		dev-haskell/monad-control
-		>=dev-haskell/streaming-commons-0.1.1
-		dev-haskell/zlib
-		!network-uri? ( dev-haskell/network-uri ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/http-client/http-client-0.4.30.ebuild b/dev-haskell/http-client/http-client-0.4.30.ebuild
deleted file mode 100644
index 02df14d485c5..000000000000
--- a/dev-haskell/http-client/http-client-0.4.30.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An HTTP client engine, intended as a base layer for more user-friendly packages"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/case-insensitive-1.0:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/exceptions-0.4:=[profile?]
-	>=dev-haskell/http-types-0.8:=[profile?]
-	dev-haskell/mime-types:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/async
-		dev-haskell/hspec
-		dev-haskell/monad-control
-		>=dev-haskell/streaming-commons-0.1.1
-		dev-haskell/zlib
-		!network-uri? ( dev-haskell/network-uri ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/http-client/http-client-0.5.5.ebuild b/dev-haskell/http-client/http-client-0.5.5.ebuild
deleted file mode 100644
index b2d66b2b35fc..000000000000
--- a/dev-haskell/http-client/http-client-0.5.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An HTTP client engine"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/case-insensitive-1.0:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	>=dev-haskell/exceptions-0.4:=[profile?]
-	>=dev-haskell/http-types-0.8:=[profile?]
-	dev-haskell/mime-types:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/async
-		dev-haskell/hspec
-		dev-haskell/monad-control
-		>=dev-haskell/streaming-commons-0.1.1
-		dev-haskell/zlib
-		!network-uri? ( dev-haskell/network-uri ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/http-client/http-client-0.5.7.0.ebuild b/dev-haskell/http-client/http-client-0.5.7.0.ebuild
deleted file mode 100644
index c93852bec4a3..000000000000
--- a/dev-haskell/http-client/http-client-0.5.7.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An HTTP client engine"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+network-uri"
-
-RESTRICT=test # needs network access
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/case-insensitive-1.0:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	>=dev-haskell/exceptions-0.4:=[profile?]
-	>=dev-haskell/http-types-0.8:=[profile?]
-	dev-haskell/mime-types:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/async
-		dev-haskell/hspec
-		dev-haskell/monad-control
-		>=dev-haskell/streaming-commons-0.1.1
-		dev-haskell/zlib
-		!network-uri? ( dev-haskell/network-uri ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/http-client/metadata.xml b/dev-haskell/http-client/metadata.xml
deleted file mode 100644
index 561a62a9a785..000000000000
--- a/dev-haskell/http-client/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This codebase has been refactored from http-conduit.
-	</longdescription>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">snoyberg/http-client</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/http-common-0.8.2.0 b/dev-haskell/http-common-0.8.2.0
new file mode 100644
index 000000000000..313fde8c65de
--- /dev/null
+++ b/dev-haskell/http-common-0.8.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/base64-bytestring:=[profile?] dev-haskell/blaze-builder:=[profile?] dev-haskell/case-insensitive:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Common types for HTTP clients and servers
+EAPI=5
+HOMEPAGE=https://hackage.haskell.org/package/http-common
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/base64-bytestring:=[profile?] dev-haskell/blaze-builder:=[profile?] dev-haskell/case-insensitive:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.8.2.0
+SRC_URI=mirror://hackage/packages/archive/http-common/0.8.2.0/http-common-0.8.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5cf142a087445a79dcfb11b555cdc0a1
diff --git a/dev-haskell/http-common/Manifest b/dev-haskell/http-common/Manifest
deleted file mode 100644
index e753245997a1..000000000000
--- a/dev-haskell/http-common/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST http-common-0.8.2.0.tar.gz 9473 BLAKE2B 7c37f7b605f3014d15d7b89250ecad915acb79ee1c246f3410b2c206189a64fd29a6adfc1b57c05f3a10cf22b8edebf899cea71e37b5ffdeac1702be615644a6 SHA512 e02e9b08235483220856ed1cacebea1910ec41451d7ec68b86a2193f5c050f74ef3747a4a2c35c560795727d9f62ee6485cfd1ed5597fb7645ce6339f969851a
-EBUILD http-common-0.8.2.0.ebuild 859 BLAKE2B c88ef84af1a9be97155f5a00b465f95634dbabe8be98a9c5a9b1767a8acd8f60121d8bc6241785e614ec89ba8d347fb5e179e437f6d0c93330bd3907428eba79 SHA512 8baa8893b9bd881407b9b550b194fb166ab1735e981bc29b52e7fd97709983397c28ca250f0723e4dc1283abf5dd394a65b6cb436d1df1cc9bbc4b2edfb16b3f
-MISC metadata.xml 599 BLAKE2B 8087c1a7abe5ba1ed5b23d87425dcb196fdb6f19658d9c0bf26f9446176dfba35702ed3d3bf151562363422819ddafb044fee82a370b9eb45078ffe0c8657b5b SHA512 4feaa9c2215dd5d320a3c4dcd520487c0d5df34b0a1a3cd1fc0b5a8bd9333f6c5fcdcae385f854c0baaa058f3ab88a0a844f670bd8d339285e41d5f89016217b
diff --git a/dev-haskell/http-common/http-common-0.8.2.0.ebuild b/dev-haskell/http-common/http-common-0.8.2.0.ebuild
deleted file mode 100644
index c8f33d0217ac..000000000000
--- a/dev-haskell/http-common/http-common-0.8.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Common types for HTTP clients and servers"
-HOMEPAGE="https://hackage.haskell.org/package/http-common"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/base64-bytestring:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/case-insensitive:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/http-common/metadata.xml b/dev-haskell/http-common/metadata.xml
deleted file mode 100644
index 9b125c84e713..000000000000
--- a/dev-haskell/http-common/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		/Overview/
-		
-		Base types used by a variety of HTTP clients and servers. See http-streams
-		"Network.Http.Client" or pipes-http "Pipes.Http.Client" for full
-		documentation. You can import @Network.Http.Types@ if you like, but both
-		http-streams and pipes-http re-export this package's types and functions.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/http-conduit-2.1.10.1 b/dev-haskell/http-conduit-2.1.10.1
new file mode 100644
index 000000000000..17319800c91b
--- /dev/null
+++ b/dev-haskell/http-conduit-2.1.10.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1.5:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/http-client-0.4.28:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2.4:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/blaze-builder dev-haskell/case-insensitive >=dev-haskell/conduit-1.1 >=dev-haskell/connection-0.2 dev-haskell/cookie >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/network dev-haskell/streaming-commons dev-haskell/temporary dev-haskell/text dev-haskell/utf8-string >=dev-haskell/wai-3.0 <dev-haskell/wai-3.3 dev-haskell/wai-conduit >=dev-haskell/warp-3.0.0.2 <dev-haskell/warp-3.3 dev-haskell/warp-tls ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HTTP client package with conduit interface and HTTPS support
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/book/http-conduit
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1.5:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/http-client-0.4.28:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2.4:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.1.10.1
+SRC_URI=mirror://hackage/packages/archive/http-conduit/2.1.10.1/http-conduit-2.1.10.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=28cf1c7a1c4b6c87fbc47bfcb164d94a
diff --git a/dev-haskell/http-conduit-2.1.7.2 b/dev-haskell/http-conduit-2.1.7.2
new file mode 100644
index 000000000000..42259c508232
--- /dev/null
+++ b/dev-haskell/http-conduit-2.1.7.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/http-client-0.4.3:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/blaze-builder dev-haskell/case-insensitive >=dev-haskell/conduit-1.1 dev-haskell/conduit-extra >=dev-haskell/connection-0.2 dev-haskell/cookie dev-haskell/data-default-class >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/network dev-haskell/streaming-commons dev-haskell/text dev-haskell/utf8-string >=dev-haskell/wai-3.0 <dev-haskell/wai-3.1 dev-haskell/wai-conduit >=dev-haskell/warp-3.0.0.2 <dev-haskell/warp-3.2 dev-haskell/warp-tls ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HTTP client package with conduit interface and HTTPS support
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/http-conduit
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/http-client-0.4.3:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.1.7.2
+SRC_URI=mirror://hackage/packages/archive/http-conduit/2.1.7.2/http-conduit-2.1.7.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c7cafc51df203e2a1c7da4f4c85f3a7c
diff --git a/dev-haskell/http-conduit-2.1.8 b/dev-haskell/http-conduit-2.1.8
new file mode 100644
index 000000000000..8a8d29fe7244
--- /dev/null
+++ b/dev-haskell/http-conduit-2.1.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/http-client-0.4.19:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/blaze-builder dev-haskell/case-insensitive >=dev-haskell/conduit-1.1 dev-haskell/conduit-extra >=dev-haskell/connection-0.2 dev-haskell/cookie dev-haskell/data-default-class >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/network dev-haskell/streaming-commons dev-haskell/text dev-haskell/utf8-string >=dev-haskell/wai-3.0 <dev-haskell/wai-3.1 dev-haskell/wai-conduit >=dev-haskell/warp-3.0.0.2 <dev-haskell/warp-3.2 dev-haskell/warp-tls ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HTTP client package with conduit interface and HTTPS support
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/http-conduit
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/http-client-0.4.19:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.1.8
+SRC_URI=mirror://hackage/packages/archive/http-conduit/2.1.8/http-conduit-2.1.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=86418b355b20e10be3d6a80e02c5761e
diff --git a/dev-haskell/http-conduit-2.2.3 b/dev-haskell/http-conduit-2.2.3
new file mode 100644
index 000000000000..73a2ae327825
--- /dev/null
+++ b/dev-haskell/http-conduit-2.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1.5:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/http-client-0.5:=[profile?] <dev-haskell/http-client-0.6:=[profile?] >=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/blaze-builder dev-haskell/case-insensitive >=dev-haskell/conduit-1.1 >=dev-haskell/connection-0.2 dev-haskell/cookie dev-haskell/data-default-class >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/network dev-haskell/streaming-commons dev-haskell/temporary dev-haskell/text dev-haskell/utf8-string >=dev-haskell/wai-3.0 <dev-haskell/wai-3.3 dev-haskell/wai-conduit >=dev-haskell/warp-3.0.0.2 <dev-haskell/warp-3.3 dev-haskell/warp-tls ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HTTP client package with conduit interface and HTTPS support
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/book/http-conduit
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1.5:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/http-client-0.5:=[profile?] <dev-haskell/http-client-0.6:=[profile?] >=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/2.2.3
+SRC_URI=mirror://hackage/packages/archive/http-conduit/2.2.3/http-conduit-2.2.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=25413628b40099e80e49b5f1e4e5136d
diff --git a/dev-haskell/http-conduit/Manifest b/dev-haskell/http-conduit/Manifest
deleted file mode 100644
index f448b0a9bc09..000000000000
--- a/dev-haskell/http-conduit/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST http-conduit-2.1.10.1.tar.gz 26897 BLAKE2B ccce9e4848649fc53305acc51544b259b4df59c42e7eec45e69e78f8e43f1c93c1fce43f331c177053351b70d1f2795e5a5312d1b9afabf3eb894270d50a2045 SHA512 be9334d477effb5e691a3fb8faac40abd09a855205cefe0018315fbdca7de0fca00396e7fa66ca64c87ec2ee8d04177a4a2598349cfc3948f21000c4d23a0c72
-DIST http-conduit-2.1.7.2.tar.gz 23333 BLAKE2B 6346e1872ee339585d8b92d1b20cab06ed892c7fe861387ebf2f547400c991e792a4d87e570be93671fda9d261cde157d5015f4f833abc6138069534637b440b SHA512 020eae7a5846a880270b24d85ea4e7c2742c0f701e9e895b4dcaa1856f794fd00e09951e171104a173679d062789e5214ee24e0d63984e7d94d2cb2e5e7fb0ce
-DIST http-conduit-2.1.8.tar.gz 23331 BLAKE2B cf0c85991a8220f1cdb4bab34e42d58bc1fdf49a48048879efd22d6a1fb78a116edd2475c3165bd0cffb8cc5d9d9c92af2a60fb5ad28e330255daa99279018ec SHA512 a5791e9cc9a5d8a077a54286e163cf16b388e1c1a71f31989e731ad724de887d96bd985805380b3ad7ed8d0570c8577c38bd1a36567ee38924487c7a200d304d
-DIST http-conduit-2.2.3.tar.gz 27457 BLAKE2B 411dfa2858a6058baef12f8e120648df7dd7eef0880f8a5e6d3bbcafa879865b47ddc4b3c76b5b651d1c3d7629a35ff8316abce62b0e6d61f6754c96e953de7f SHA512 675e5d81130d670377d2597a583f2ea8185604f115317cd11493127086b837d0552014fb3feb53b7930ef3b063d6339d2556f7a8f3f5568dcc5332e3b504e659
-EBUILD http-conduit-2.1.10.1.ebuild 1706 BLAKE2B 3a9950d4a6756c920f7fb52cfb2bff6e3ab8538ef051cb912d5e4a0d15ff821112cdbf89da7a759ba98a559470313660bfdbe7f665bf3b707aa8b0707de24d70 SHA512 715b865afc8805921bde3dc916bb377e0ecb9e67b16f78f23a27482e813960c12da90e96d249ff27250f3922e49dab7b4ebf2f023c92560a47d24bed9c924ce9
-EBUILD http-conduit-2.1.7.2.ebuild 1572 BLAKE2B 1ca824b0161a18e7e0b37e5f6b792c7d98e7247a5ac25768337e4d71d25afd008acdfba17f0d94bf870e76a7746169378dd3c3702981dfbb692e35b5182b5232 SHA512 63fb3588a2ab623d576558213affd4f93c40ad5e0416b683f4ef225af2f422689303a802152a03eed0020f5c95a851e2857ffdd4e4ec3f7dd336eba1f1396947
-EBUILD http-conduit-2.1.8.ebuild 1575 BLAKE2B bd2677a23763c2de0db7a225388e461d63018c0f792be1a1d62a1806fecfadc3b562fb0738fde846995dba827090d97ad54c57c160c1b12edb83e0ea9d457c03 SHA512 d692d4c3da75b6a4459c0a704f841042198fb444c7b0fdb3015da29abba2e942b43a204fcb2aa38f1850b950ec17c3e6fb4e4621592e4f47c6f5aa3960c37eea
-EBUILD http-conduit-2.2.3.ebuild 1691 BLAKE2B 980ae7883dd8f27584da164dc69a1b5ef71c546ee4fa6f4228601db716cabf635d5770de13f43ab43f11656cbca56198c85b9daf6a77d1880a8e45407cf41ce6 SHA512 00bd3ecf0cab6ee676815a087ec1f7cb73b591f2593a976cbee5ee2eae38b44eaa3c0c181c6cdac272ffcf28125c33e4b4e9598c258cbdf7a206c2d845df3dee
-MISC metadata.xml 542 BLAKE2B cea164848b3bd81887d7602613e58d13d956e032e95c017a46afa50770080f3f6a7d2be6336b219f10f6ab4516891eb7999739fb6a776717d6fee3e6923357fe SHA512 9a41770d1e3ddc412628b81458d37ea70e716c849a5c8b14db1b8f4da810515217f856e3d17ca2156cc2eb9e6bd459b702cfd4da624bf3e2b0b50fa09d78dd14
diff --git a/dev-haskell/http-conduit/http-conduit-2.1.10.1.ebuild b/dev-haskell/http-conduit/http-conduit-2.1.10.1.ebuild
deleted file mode 100644
index 31c40e8f53ba..000000000000
--- a/dev-haskell/http-conduit/http-conduit-2.1.10.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP client package with conduit interface and HTTPS support"
-HOMEPAGE="https://www.yesodweb.com/book/http-conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
-	>=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.1.5:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/http-client-0.4.28:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
-	>=dev-haskell/http-client-tls-0.2.4:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/blaze-builder
-		dev-haskell/case-insensitive
-		>=dev-haskell/conduit-1.1
-		>=dev-haskell/connection-0.2
-		dev-haskell/cookie
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/network
-		dev-haskell/streaming-commons
-		dev-haskell/temporary
-		dev-haskell/text
-		dev-haskell/utf8-string
-		>=dev-haskell/wai-3.0 <dev-haskell/wai-3.3
-		dev-haskell/wai-conduit
-		>=dev-haskell/warp-3.0.0.2 <dev-haskell/warp-3.3
-		dev-haskell/warp-tls )
-"
diff --git a/dev-haskell/http-conduit/http-conduit-2.1.7.2.ebuild b/dev-haskell/http-conduit/http-conduit-2.1.7.2.ebuild
deleted file mode 100644
index 0bb5709bb087..000000000000
--- a/dev-haskell/http-conduit/http-conduit-2.1.7.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP client package with conduit interface and HTTPS support"
-HOMEPAGE="https://www.yesodweb.com/book/http-conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/http-client-0.4.3:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
-	>=dev-haskell/http-client-tls-0.2.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/blaze-builder
-		dev-haskell/case-insensitive
-		>=dev-haskell/conduit-1.1
-		dev-haskell/conduit-extra
-		>=dev-haskell/connection-0.2
-		dev-haskell/cookie
-		dev-haskell/data-default-class
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/network
-		dev-haskell/streaming-commons
-		dev-haskell/text
-		dev-haskell/utf8-string
-		>=dev-haskell/wai-3.0 <dev-haskell/wai-3.1
-		dev-haskell/wai-conduit
-		>=dev-haskell/warp-3.0.0.2 <dev-haskell/warp-3.2
-		dev-haskell/warp-tls )
-"
diff --git a/dev-haskell/http-conduit/http-conduit-2.1.8.ebuild b/dev-haskell/http-conduit/http-conduit-2.1.8.ebuild
deleted file mode 100644
index 2b549b0a945b..000000000000
--- a/dev-haskell/http-conduit/http-conduit-2.1.8.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP client package with conduit interface and HTTPS support"
-HOMEPAGE="https://www.yesodweb.com/book/http-conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/http-client-0.4.19:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
-	>=dev-haskell/http-client-tls-0.2.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/blaze-builder
-		dev-haskell/case-insensitive
-		>=dev-haskell/conduit-1.1
-		dev-haskell/conduit-extra
-		>=dev-haskell/connection-0.2
-		dev-haskell/cookie
-		dev-haskell/data-default-class
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/network
-		dev-haskell/streaming-commons
-		dev-haskell/text
-		dev-haskell/utf8-string
-		>=dev-haskell/wai-3.0 <dev-haskell/wai-3.1
-		dev-haskell/wai-conduit
-		>=dev-haskell/warp-3.0.0.2 <dev-haskell/warp-3.2
-		dev-haskell/warp-tls )
-"
diff --git a/dev-haskell/http-conduit/http-conduit-2.2.3.ebuild b/dev-haskell/http-conduit/http-conduit-2.2.3.ebuild
deleted file mode 100644
index 3b403df09506..000000000000
--- a/dev-haskell/http-conduit/http-conduit-2.2.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP client package with conduit interface and HTTPS support"
-HOMEPAGE="https://www.yesodweb.com/book/http-conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
-	>=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.1.5:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/http-client-0.5:=[profile?] <dev-haskell/http-client-0.6:=[profile?]
-	>=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/blaze-builder
-		dev-haskell/case-insensitive
-		>=dev-haskell/conduit-1.1
-		>=dev-haskell/connection-0.2
-		dev-haskell/cookie
-		dev-haskell/data-default-class
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/network
-		dev-haskell/streaming-commons
-		dev-haskell/temporary
-		dev-haskell/text
-		dev-haskell/utf8-string
-		>=dev-haskell/wai-3.0 <dev-haskell/wai-3.3
-		dev-haskell/wai-conduit
-		>=dev-haskell/warp-3.0.0.2 <dev-haskell/warp-3.3
-		dev-haskell/warp-tls )
-"
diff --git a/dev-haskell/http-conduit/metadata.xml b/dev-haskell/http-conduit/metadata.xml
deleted file mode 100644
index 2a09e00fdd3c..000000000000
--- a/dev-haskell/http-conduit/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package uses attoparsec for parsing the actual contents of the HTTP connection. It also provides higher-level functions which allow you to avoid direct usage of conduits. See &lt;http://www.yesodweb.com/book/http-conduit&gt; for more information.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/http-date-0.0.6.1 b/dev-haskell/http-date-0.0.6.1
new file mode 100644
index 000000000000..e1d1290441a0
--- /dev/null
+++ b/dev-haskell/http-date-0.0.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/attoparsec:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/doctest-0.8 dev-haskell/hspec dev-haskell/old-locale ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HTTP Date parser/formatter
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/http-date
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/attoparsec:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.0.6.1
+SRC_URI=mirror://hackage/packages/archive/http-date/0.0.6.1/http-date-0.0.6.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2259851cb082a5a83d6758931e553372
diff --git a/dev-haskell/http-date/Manifest b/dev-haskell/http-date/Manifest
deleted file mode 100644
index 0011e9eb932f..000000000000
--- a/dev-haskell/http-date/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST http-date-0.0.6.1.tar.gz 4989 BLAKE2B f1dd2f10a7ee01591d970e10128ef381b6764a121785a8b90608d486b2e5370ef0d529c3cc4995d661ca1aeccf698357b21433c8ba11baf8f667d97488c65ca8 SHA512 456d59bc9405578526ea458772ba8b01d1fe85607bc0e201efd6f0f080525205cbf8eba19dfd5f64ff520510a9a7ae3b7008fe43fee0e312b792476b965ba739
-EBUILD http-date-0.0.6.1.ebuild 669 BLAKE2B 8e8575ba588b8cadae0c4bea31ed70c207d569150f2738e252abc275231064a7910c1c03e60739d8ea54c4c932a7d22ca1d07b4e1eff4ef3ec6439f25a7d6fed SHA512 52067cb7006cb05cd7990d10c44d7f822a0fdd7e4d108437a7afa96f83953a9543edf415a1a24b33148acef573e56d422e2f528be51d3884f2e085910e60bb0c
-MISC metadata.xml 330 BLAKE2B 73ad89816b1c0c397c7be7ce3856776ab760ea8e1060907cedb5ee84fd2c2e4d925ef5ed5c934b75c0b62bfd3e2ed04725ebc02cb3c31176b973cd71a6615cfd SHA512 c9fdae694c19062e357717219a209dd12b94f4d2c381b0dbca58382382275a6dd99bfac7a8e4c13fe9155b585e7ad59e1864cc33fd270eec14906ab6e5342805
diff --git a/dev-haskell/http-date/http-date-0.0.6.1.ebuild b/dev-haskell/http-date/http-date-0.0.6.1.ebuild
deleted file mode 100644
index 1c99f93d163e..000000000000
--- a/dev-haskell/http-date/http-date-0.0.6.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP Date parser/formatter"
-HOMEPAGE="http://hackage.haskell.org/package/http-date"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/attoparsec:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.8
-		dev-haskell/hspec
-		dev-haskell/old-locale )
-"
diff --git a/dev-haskell/http-date/metadata.xml b/dev-haskell/http-date/metadata.xml
deleted file mode 100644
index deaf14cf2f5d..000000000000
--- a/dev-haskell/http-date/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Fast parser and formatter for HTTP Date
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/http-reverse-proxy-0.1.1.6 b/dev-haskell/http-reverse-proxy-0.1.1.6
new file mode 100644
index 000000000000..7e7efac79957
--- /dev/null
+++ b/dev-haskell/http-reverse-proxy-0.1.1.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/classy-prelude-0.3:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/http-conduit-1.6:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/network-conduit-0.6:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/warp-1.3.4:=[profile?] >=dev-haskell/word8-0.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/transformers ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Reverse proxy HTTP requests, either over raw sockets or with WAI
+EAPI=5
+HOMEPAGE=https://github.com/fpco/http-reverse-proxy
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/classy-prelude-0.3:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/http-conduit-1.6:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/network-conduit-0.6:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/warp-1.3.4:=[profile?] >=dev-haskell/word8-0.0:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.1.1.6
+SRC_URI=mirror://hackage/packages/archive/http-reverse-proxy/0.1.1.6/http-reverse-proxy-0.1.1.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=477474c10447a36bd169929dd95ea38c
diff --git a/dev-haskell/http-reverse-proxy-0.2.0 b/dev-haskell/http-reverse-proxy-0.2.0
new file mode 100644
index 000000000000..3480ae04ba52
--- /dev/null
+++ b/dev-haskell/http-reverse-proxy-0.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/classy-prelude-0.3:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/http-conduit-1.6:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/network-conduit-0.6:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/wai-1.3:=[profile?] dev-haskell/wai-logger:=[profile?] >=dev-haskell/warp-1.3.4:=[profile?] >=dev-haskell/word8-0.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/transformers ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Reverse proxy HTTP requests, either over raw sockets or with WAI
+EAPI=5
+HOMEPAGE=https://github.com/fpco/http-reverse-proxy
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/classy-prelude-0.3:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/http-conduit-1.6:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/network-conduit-0.6:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/wai-1.3:=[profile?] dev-haskell/wai-logger:=[profile?] >=dev-haskell/warp-1.3.4:=[profile?] >=dev-haskell/word8-0.0:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.2.0
+SRC_URI=mirror://hackage/packages/archive/http-reverse-proxy/0.2.0/http-reverse-proxy-0.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e7a349a2043da30122c54ad27be527e1
diff --git a/dev-haskell/http-reverse-proxy-0.4.3 b/dev-haskell/http-reverse-proxy-0.4.3
new file mode 100644
index 000000000000..c1a31bb07395
--- /dev/null
+++ b/dev-haskell/http-reverse-proxy-0.4.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/http-client-0.3:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] dev-haskell/network:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/wai-3.0:=[profile?] dev-haskell/wai-logger:=[profile?] >=dev-haskell/word8-0.0:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/hspec-1.3 dev-haskell/http-conduit >=dev-haskell/warp-2.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Reverse proxy HTTP requests, either over raw sockets or with WAI
+EAPI=5
+HOMEPAGE=https://github.com/fpco/http-reverse-proxy
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/http-client-0.3:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] dev-haskell/network:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/wai-3.0:=[profile?] dev-haskell/wai-logger:=[profile?] >=dev-haskell/word8-0.0:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/0.4.3
+SRC_URI=mirror://hackage/packages/archive/http-reverse-proxy/0.4.3/http-reverse-proxy-0.4.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b7f53d56488adce4d462477cda553a3e
diff --git a/dev-haskell/http-reverse-proxy-0.4.3.2 b/dev-haskell/http-reverse-proxy-0.4.3.2
new file mode 100644
index 000000000000..62b3fa478af0
--- /dev/null
+++ b/dev-haskell/http-reverse-proxy-0.4.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/http-client-0.3:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] dev-haskell/network:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/wai-3.0:=[profile?] dev-haskell/wai-logger:=[profile?] >=dev-haskell/word8-0.0:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.3 dev-haskell/http-conduit >=dev-haskell/warp-2.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Reverse proxy HTTP requests, either over raw sockets or with WAI
+EAPI=6
+HOMEPAGE=https://github.com/fpco/http-reverse-proxy
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/http-client-0.3:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] dev-haskell/network:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/wai-3.0:=[profile?] dev-haskell/wai-logger:=[profile?] >=dev-haskell/word8-0.0:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.4.3.2
+SRC_URI=mirror://hackage/packages/archive/http-reverse-proxy/0.4.3.2/http-reverse-proxy-0.4.3.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=52e7011fee90033e1a8a17e5d2eeafa1
diff --git a/dev-haskell/http-reverse-proxy/Manifest b/dev-haskell/http-reverse-proxy/Manifest
deleted file mode 100644
index 325ac0e9a32b..000000000000
--- a/dev-haskell/http-reverse-proxy/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST http-reverse-proxy-0.1.1.6.tar.gz 6786 BLAKE2B b7a86207dc320bbabd56edeed7571821b24fb7e7650790152a380cfc5ac241e62d8af392eb2f967affa08ba86109a960b6d8a2809a48a936f9bf0d2314937ffc SHA512 e8d9b79abcf7d8c2af4256dda385d93c9f0f4eacaf4b1227a9356de261edf5fe8ea110595753b57965072e6e96b1019455a5d3d935791a35eaef086cf18dcc94
-DIST http-reverse-proxy-0.2.0.tar.gz 7478 BLAKE2B 502c4e9ffff07b1da3efabf03c9eeda38b3b89dd38e62d519e9d392f29406a4236ec1d36687318641c0d6d4c8feca4048f7bd2b3a97caaeae6794ca06f496e7d SHA512 fa667f83603c43f22529da4fd0a7202e3d9b540e563c1ab345cf3b3701932174b3cced3d7761570a9939b84e7b503906dcc84b9c39b639663a8a0483a37fb6b0
-DIST http-reverse-proxy-0.4.3.2.tar.gz 9870 BLAKE2B a08031110810950f769c0706cb3c4875403c9de9c9427715e9cefc4dc0856b753e0000b6a0c6340126e3687a1efc1369e988e04d0a8f61453fe6732ee61ddafb SHA512 303b826b1be5a5f34703eaf865dd238973f2ff59a97a4f0810d6551f2db339d5b37a60eab75f091347e9269812d09fe3026bd8f1bfe71660ada19b3ade8865b6
-DIST http-reverse-proxy-0.4.3.tar.gz 9742 BLAKE2B a2fc4e9be455e3ef72a2e220e4b0f55d6eae8c06054e64d939eb7a2611e5a363ae310cfc413e6a2fbbe6c480d49e2c18b1f843d802dce77ebdf1693d32776476 SHA512 72326d46c0f307a1b9f31115aa7286ee4a562f0c8f513b87533a74c59df482dac3c3ce87c50dd86fdbeb1f31b13da8218f1455f6f9585ad4763651e8037a9d8f
-EBUILD http-reverse-proxy-0.1.1.6.ebuild 1287 BLAKE2B a5bcf45836400c73e81b907cc88565f2a758f208e48f47dbd195655f537d749a1a86c63905fa3d7ab81247c794511d696c9a2fe610865ef79b62c4d6f45d9196 SHA512 b1cb44411efcd1d44338e7bfc10c6fceedddc74f10f5db4955ed33b857ff2d7dd30f2c5ff4a95cbad5d73dc5e2423f0fa8837753673254b7c53119015cd74c4d
-EBUILD http-reverse-proxy-0.2.0.ebuild 1324 BLAKE2B 15cbd56f591d2ea4fb5a83d0dc54e14d9e6c83862a36efcce8e3dfc13abda8f3e12ab3d1fc3a34630f52c59349f5c1716c678b7d1bce08be0ce894a74bd8e393 SHA512 7c0c2eee0c79516e79a0f88313a694400dc6c78f7271a42c8da42772f4d7f1ed248cf1b0991bd8598a033b215635bac554fbccdbbcf4d08a3b33b2b06e624899
-EBUILD http-reverse-proxy-0.4.3.2.ebuild 1354 BLAKE2B a2495396360e6f5b1a96849e0c521b5459890f6d53839dff78de54ffc926a54a9741542a63e67aab98462fa0fce6e6d5bcae8087807ae931ff3f397a2afa8bec SHA512 612ae48cec0de5088e41b626fa1b612f086929b412e440598cddf0be116945832dba8f36a93adf1168e134e223eee042b23922f29130a98950bc33ecd7d26f69
-EBUILD http-reverse-proxy-0.4.3.ebuild 1392 BLAKE2B 4970944c8fdfb77a90adbe85c081db6565960fad6c8e13c120a10f0ff1503c0165021295ea4005df9fd5f9d3275c76643c2b4c86b2edd26100e8a4f154d18825 SHA512 0b74ed418ccdd3dd445c2bd19ee0695d5c5f9a7b2f630aa197fd3513f678083a40650ec0ecd89a212816d489f15a03fd1ef0253a5a961b670a428ebc74e4ba5e
-MISC metadata.xml 591 BLAKE2B e8fa90680dc7f814397f5f58dbc7231d5de3db8caaff5d2c2b72555401dbc8d02dec22e1cc052389af500f9a1dc1a565bf38a38ae40c87997cac09d1bf42d351 SHA512 55ca51b46acb7a09bb50876fdcf295635d92d5faea267d33f116f776898c9dac623fd51f200e3c5699a92cacd7eae6783aa8f9bf476628d13198a8ce5a725889
diff --git a/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.1.1.6.ebuild b/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.1.1.6.ebuild
deleted file mode 100644
index 637c8655d70d..000000000000
--- a/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.1.1.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Reverse proxy HTTP requests, either over raw sockets or with WAI"
-HOMEPAGE="https://github.com/fpco/http-reverse-proxy"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?]
-		>=dev-haskell/case-insensitive-0.4:=[profile?]
-		>=dev-haskell/classy-prelude-0.3:=[profile?]
-		>=dev-haskell/conduit-0.5:=[profile?]
-		dev-haskell/data-default:=[profile?]
-		>=dev-haskell/http-conduit-1.6:=[profile?]
-		>=dev-haskell/http-types-0.6:=[profile?]
-		>=dev-haskell/lifted-base-0.1:=[profile?]
-		>=dev-haskell/monad-control-0.3:=[profile?]
-		dev-haskell/network:=[profile?]
-		>=dev-haskell/network-conduit-0.6:=[profile?]
-		>=dev-haskell/text-0.11:=[profile?]
-		>=dev-haskell/wai-1.3:=[profile?]
-		>=dev-haskell/warp-1.3.4:=[profile?]
-		>=dev-haskell/word8-0.0:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/transformers
-		)"
diff --git a/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.2.0.ebuild b/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.2.0.ebuild
deleted file mode 100644
index b6a18974a7e7..000000000000
--- a/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Reverse proxy HTTP requests, either over raw sockets or with WAI"
-HOMEPAGE="https://github.com/fpco/http-reverse-proxy"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?]
-		>=dev-haskell/case-insensitive-0.4:=[profile?]
-		>=dev-haskell/classy-prelude-0.3:=[profile?]
-		>=dev-haskell/conduit-0.5:=[profile?]
-		dev-haskell/data-default:=[profile?]
-		>=dev-haskell/http-conduit-1.6:=[profile?]
-		>=dev-haskell/http-types-0.6:=[profile?]
-		>=dev-haskell/lifted-base-0.1:=[profile?]
-		>=dev-haskell/monad-control-0.3:=[profile?]
-		dev-haskell/network:=[profile?]
-		>=dev-haskell/network-conduit-0.6:=[profile?]
-		>=dev-haskell/text-0.11:=[profile?]
-		>=dev-haskell/wai-1.3:=[profile?]
-		dev-haskell/wai-logger:=[profile?]
-		>=dev-haskell/warp-1.3.4:=[profile?]
-		>=dev-haskell/word8-0.0:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/transformers
-		)"
diff --git a/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.4.3.2.ebuild b/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.4.3.2.ebuild
deleted file mode 100644
index 7edb0495d62d..000000000000
--- a/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.4.3.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Reverse proxy HTTP requests, either over raw sockets or with WAI"
-HOMEPAGE="https://github.com/fpco/http-reverse-proxy"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/case-insensitive-0.4:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/http-client-0.3:=[profile?]
-	>=dev-haskell/http-types-0.6:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?]
-	dev-haskell/wai-logger:=[profile?]
-	>=dev-haskell/word8-0.0:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/http-conduit
-		>=dev-haskell/warp-2.1 )
-"
diff --git a/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.4.3.ebuild b/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.4.3.ebuild
deleted file mode 100644
index a88b590e054e..000000000000
--- a/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.4.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Reverse proxy HTTP requests, either over raw sockets or with WAI"
-HOMEPAGE="https://github.com/fpco/http-reverse-proxy"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/case-insensitive-0.4:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/http-client-0.3:=[profile?]
-	>=dev-haskell/http-types-0.6:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?]
-	dev-haskell/wai-logger:=[profile?]
-	>=dev-haskell/word8-0.0:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/http-conduit
-		>=dev-haskell/warp-2.1 )
-"
diff --git a/dev-haskell/http-reverse-proxy/metadata.xml b/dev-haskell/http-reverse-proxy/metadata.xml
deleted file mode 100644
index 3b7a6a0d440a..000000000000
--- a/dev-haskell/http-reverse-proxy/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Provides a simple means of reverse-proxying HTTP requests. The raw approach uses the same technique as leveraged by keter, whereas the WAI approach performs full request/response parsing via WAI and http-conduit.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">fpco/http-reverse-proxy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/http-streams-0.8.4.0 b/dev-haskell/http-streams-0.8.4.0
new file mode 100644
index 000000000000..4f967db83f2c
--- /dev/null
+++ b/dev-haskell/http-streams-0.8.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-builder-0.4:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/hsopenssl-0.10.3.5:=[profile?] >=dev-haskell/http-common-0.8.2:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.4:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] <dev-haskell/network-uri-2.6:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/aeson-pretty dev-haskell/hspec dev-haskell/hspec-expectations dev-haskell/hunit dev-haskell/lifted-base >=dev-haskell/snap-core-1.0 <dev-haskell/snap-core-1.1 >=dev-haskell/snap-server-1.0 <dev-haskell/snap-server-1.1 >=dev-haskell/system-fileio-0.3.10 <dev-haskell/system-fileio-0.4 >=dev-haskell/system-filepath-0.4.1 <dev-haskell/system-filepath-0.5 !network-uri? ( >=dev-haskell/network-2.6 >=dev-haskell/network-uri-2.6 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An HTTP client using io-streams
+EAPI=6
+HOMEPAGE=https://github.com/afcowie/http-streams/
+IUSE=+network-uri doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-builder-0.4:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/hsopenssl-0.10.3.5:=[profile?] >=dev-haskell/http-common-0.8.2:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.4:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] <dev-haskell/network-uri-2.6:=[profile?] )
+RESTRICT=test
+SLOT=0/0.8.4.0
+SRC_URI=mirror://hackage/packages/archive/http-streams/0.8.4.0/http-streams-0.8.4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d093ed8299d0cd3b76eeabe9e70b0e2d
diff --git a/dev-haskell/http-streams/Manifest b/dev-haskell/http-streams/Manifest
deleted file mode 100644
index 6a6d0a64eab6..000000000000
--- a/dev-haskell/http-streams/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST http-streams-0.8.4.0.tar.gz 35330 BLAKE2B 6e6c0fbd9a61c6ea587d7140fb0219c5a415c798ee55b47f45642c19cc67f67a6c1098d74c8451bb6285fdc001d6cac389459a3dbd5ba9409a59e47e4bf4c9a5 SHA512 763287042b37eca43941369dd2b7a7693f545ef37d87bdadb0b5ee686648bc0c3e7d2a8edee37648bb61ebc1dfefb029ca3ce22a44519a16775eab98de0b0a1a
-EBUILD http-streams-0.8.4.0.ebuild 1974 BLAKE2B 6a9c124c4a1eea4331fdff3f107bfb698fe6e5d28bc1254c72bcdbc4b7cb517dc6f631659c69e7f331a8cc53c7a457fe961eb6557fdb78ecc6abab1663af6ec5 SHA512 4955a867406f757a4986f6e1ba93770dd60cf7dd15046d781786594d33564b5ebaaaecc838b101197a6483ac012f55526a332a61673fce8b0fc229873f7f15e7
-MISC metadata.xml 727 BLAKE2B 8fcc9f3a679e00960165b0ffe29c0a7a2f3cd17876593de0bf58ba767b3d8190e5a01d1a0132c4d1328ef4d753d908bbf448b95a5b05de5faf98e311138b594b SHA512 d3f4b4bd4d4e5e60ad7044fc662ac3577dd4e7bdfc95ac3b5b6bb16ae8cf5626e3e1c2aecdcfa1a3de4920eebac18f0a75894469cf04d72eb1f6970aff12bc5d
diff --git a/dev-haskell/http-streams/http-streams-0.8.4.0.ebuild b/dev-haskell/http-streams/http-streams-0.8.4.0.ebuild
deleted file mode 100644
index ddd5fd36a4d1..000000000000
--- a/dev-haskell/http-streams/http-streams-0.8.4.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An HTTP client using io-streams"
-HOMEPAGE="https://github.com/afcowie/http-streams/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+network-uri"
-
-RESTRICT=test # cyclic dep: http-streams[test]->snap-server->http-streams
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/blaze-builder-0.4:=[profile?]
-	dev-haskell/case-insensitive:=[profile?]
-	>=dev-haskell/hsopenssl-0.10.3.5:=[profile?]
-	>=dev-haskell/http-common-0.8.2:=[profile?]
-	>=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.4:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?]
-			<dev-haskell/network-uri-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/aeson-pretty
-		dev-haskell/hspec
-		dev-haskell/hspec-expectations
-		dev-haskell/hunit
-		dev-haskell/lifted-base
-		>=dev-haskell/snap-core-1.0 <dev-haskell/snap-core-1.1
-		>=dev-haskell/snap-server-1.0 <dev-haskell/snap-server-1.1
-		>=dev-haskell/system-fileio-0.3.10 <dev-haskell/system-fileio-0.4
-		>=dev-haskell/system-filepath-0.4.1 <dev-haskell/system-filepath-0.5
-		!network-uri? ( >=dev-haskell/network-2.6
-				>=dev-haskell/network-uri-2.6 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/http-streams/metadata.xml b/dev-haskell/http-streams/metadata.xml
deleted file mode 100644
index 3e1a4d23211f..000000000000
--- a/dev-haskell/http-streams/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		/Overview/
-		
-		An HTTP client, using the Snap Framework's 'io-streams' library to
-		hande the streaming IO. The API is optimized for ease of use for the
-		rather common case of code needing to query web services and deal with
-		the result.
-		
-		The library is exported in a single module; see "Network.Http.Client"
-		for full documentation.
-	</longdescription>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/http-types-0.8.6 b/dev-haskell/http-types-0.8.6
new file mode 100644
index 000000000000..aed1d3fd5e72
--- /dev/null
+++ b/dev-haskell/http-types-0.8.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/text-0.11.0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/doctest-0.9.3 >=dev-haskell/hspec-1.3 dev-haskell/quickcheck dev-haskell/quickcheck-instances ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generic HTTP types for Haskell (for both client and server code)
+EAPI=5
+HOMEPAGE=https://github.com/aristidb/http-types
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/text-0.11.0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.8.6
+SRC_URI=mirror://hackage/packages/archive/http-types/0.8.6/http-types-0.8.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=29f75f5c76c91635bce2f7a55d2cee8d
diff --git a/dev-haskell/http-types-0.9.1 b/dev-haskell/http-types-0.9.1
new file mode 100644
index 000000000000..2695eed8641e
--- /dev/null
+++ b/dev-haskell/http-types-0.9.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/text-0.11.0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/doctest-0.9.3 >=dev-haskell/hspec-1.3 dev-haskell/quickcheck dev-haskell/quickcheck-instances ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generic HTTP types for Haskell (for both client and server code)
+EAPI=5
+HOMEPAGE=https://github.com/aristidb/http-types
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/text-0.11.0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.9.1
+SRC_URI=mirror://hackage/packages/archive/http-types/0.9.1/http-types-0.9.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6e15226dba9ece341d5d01d9f15f8eeb
diff --git a/dev-haskell/http-types/Manifest b/dev-haskell/http-types/Manifest
deleted file mode 100644
index 29b6094d67fd..000000000000
--- a/dev-haskell/http-types/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST http-types-0.8.6.tar.gz 10796 BLAKE2B cae66579a8aff76c97e4663ac1aece38c9fd0de72df7581febffd8db0c77e30e3659139aee4eb4812f0fa7011c5be89397657c82bcb3c0af563bb8470d7baf07 SHA512 c31dbc3e61afe42e6b279463b6c156dc343d1ca163a0c0b3f7e9afc0eee55cba31e655cbf7e615a62f32fa7ca1a52da288310c3b749e2d11b9c27268191cb8d1
-DIST http-types-0.9.1.tar.gz 12284 BLAKE2B 8e724b4abf896678a495fc21d942c93287e11480785730a8b79b4d158cf01ab9710c6cddb5e5287ad327f627d4eb7c1478d22c537fd9455aca5e14a0adebd18f SHA512 b51c0f6946d1952fa0e91db1164d77ab12e0709fdf9555b53f5c25ed7c55365b433733a933dd2765ce14d0ca2685edce7573c9dbfb75ae49443b4f177d170c40
-EBUILD http-types-0.8.6.ebuild 935 BLAKE2B c41534a13eb5662f09bd1389f430ce59fbdb89332e3f08b22d9c2e9d7c2600184ad2c1ee61158e91d6edc0cbe78c727b593bb21d9c86464435784824e6bbce85 SHA512 09635b76aee6f93c1ac0546f0109044ebcd23482a2d24b0d27d70554bd3c5dbf46dcb8e5d3c754862c4afa8a47757f49190018d6fbe61dfe44669104b43b7705
-EBUILD http-types-0.9.1.ebuild 937 BLAKE2B 92bc0b44ccca241ac705a63cdbc80fede85daf37ec5880346dacc32ad5c7143a803553387cba93471db24e655bb01030731d58149dd387ba0d4c91a4fc773d58 SHA512 c4a1bcd33634b2959a9d8f718f47926de72ff4efb290b62745150ea50287023e4a5a25540f281a1e8dba5397a11082f39de92154504ac4ce7e1ae1b8d593e4af
-MISC metadata.xml 440 BLAKE2B 9fdb72e1574ff398f9d96b4cfb8b08a65dddca263a16b21de2452bb63fbba0e642a131558b1781ba80b72b6ac8fd3f0be45ed0f03571c885c7462024ad50a5ca SHA512 02b64578c5df0d78fbe83d5f8fdaba84cfca92d267e220b559fc2b3f0341a2d1978b4f0a16f32c596d2a1aa31407206b96e802d6041830a8d3b5551c2141c3c2
diff --git a/dev-haskell/http-types/http-types-0.8.6.ebuild b/dev-haskell/http-types/http-types-0.8.6.ebuild
deleted file mode 100644
index 870d52a5714b..000000000000
--- a/dev-haskell/http-types/http-types-0.8.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Generic HTTP types for Haskell (for both client and server code)"
-HOMEPAGE="https://github.com/aristidb/http-types"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/text-0.11.0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.9.3
-		>=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck
-		dev-haskell/quickcheck-instances )
-"
diff --git a/dev-haskell/http-types/http-types-0.9.1.ebuild b/dev-haskell/http-types/http-types-0.9.1.ebuild
deleted file mode 100644
index 63febfdc6ce2..000000000000
--- a/dev-haskell/http-types/http-types-0.9.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Generic HTTP types for Haskell (for both client and server code)"
-HOMEPAGE="https://github.com/aristidb/http-types"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/text-0.11.0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.9.3
-		>=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck
-		dev-haskell/quickcheck-instances )
-"
diff --git a/dev-haskell/http-types/metadata.xml b/dev-haskell/http-types/metadata.xml
deleted file mode 100644
index 2bca572a7264..000000000000
--- a/dev-haskell/http-types/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Generic HTTP types for Haskell (for both client and server code).
-	</longdescription>
-	<upstream>
-		<remote-id type="github">aristidb/http-types</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/http/Manifest b/dev-haskell/http/Manifest
deleted file mode 100644
index f21e0efac0e5..000000000000
--- a/dev-haskell/http/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST HTTP-4000.2.17.tar.gz 69706 BLAKE2B a4fa206ceb7742b3f6420d880fa2938d90b850102b4561e705cf406e3d3143fffc5306b43ce08b939b84e61e28590ae17f2ed18ec41e06eaea6080c7a917cbdf SHA512 0c72f2f78aaa6da64c734f70e1c7e5454d0041eb0354a63b25a534614671df21433c30451ef8a54ed3e303fa105b7d0d998a4a55658933749fc77ec08d6ff8c2
-DIST HTTP-4000.2.20.tar.gz 71475 BLAKE2B fbf5619ad38c2b01e62173682e34c0eb88fc5b8a87a8eb63e19e0787fc5f0672c4bc22c869b14339db8f76fc7c6052c2f5c9f14ef0c9891c6b6eee01943c8aaa SHA512 0f5927f0cfbc638c7ebce738c4f7b460b2c0b40f28dc137909c47f05dfea04e975482dcf626425f23f90f131689f1c03d9f8dc7d834e61b9e389a92f6c64f8f0
-DIST HTTP-4000.2.22.tar.gz 71609 BLAKE2B 06bee2b2d43f1dd088fc0ab528bb0009890b257378db3cd2fbba713fa83b99145d0e82b79e8a28927c4e661452cdd027151f7c1f97cc88aaedb92e59eda071d1 SHA512 20ff5dfc5c0ba752395c187f66b0dd0859d5fd199522fb60b8b81c8f219fe1a03c1112929917ce7305e76e4a9e6228632837b13815f68c3f6f2d8abcace0f9d8
-DIST HTTP-4000.2.8.tar.gz 67903 BLAKE2B f94713b1a7e6f5bca23b0c59a86b6c6672d2f49bb527f30da631b3fb8521fcf772244e2277f8389853f62c040d9d3a80cc0824d294afb420eac92a29f530608d SHA512 f7ada9000837a06ce06f9d6aaf83158d48fa5bb4fea812d093eece3b36e9bd4b25df205948c66a4e4b60df3ceb41181f4bdf13415e86ec805239f43421518872
-DIST HTTP-4000.3.5.tar.gz 71718 BLAKE2B 3838c286001bef88fe4b1834bf9e924ab84057fdef1906735e5049123c3694fded687099c7c4e6cd1ad71a1193f301ee0ffec59141ee7a6997abe8efacc9ae35 SHA512 9abfbac7796c21a01828c686500ec0fa81d0ad23b8139e3f64a41dfd62a3ecf345573831f5a304390dab057687d73e5cd49507a4efeb4bc9371558e8c1676653
-EBUILD http-4000.2.17.ebuild 1605 BLAKE2B 9642a031379a966844fdb797ad291a4955b63e2127d3968e949b6ab9c194e580de9ba074a28648ddcb2cb82ca550dc123c8e820af6b47cb8cff9f8ce444e01da SHA512 92fefb6cedcc69d0c94c56ca796ae055e0274deef3fc471bb7d59b15e6b7f026d9f4ffc4552ead337ac3f24df0ea40d00218971429b9af5fdf0525b7813c1d16
-EBUILD http-4000.2.20.ebuild 1829 BLAKE2B 8676cae4b3b415495808f4d1fca1c7ebed22c7a866910f3ba5fb031f779d8d8b9fbe80886a2a94ac02f777bba520819c514fe3f8b621df48ace818e38d49b10c SHA512 04a97a46a66ef0f435aa94221b23562e9a25ab3797fa12fc87acc41254a3cb65d6b747fababfaf3d782fd104280910706d01dcbba68faf9179a35bd1e5c1cf2d
-EBUILD http-4000.2.22.ebuild 1835 BLAKE2B 98531414bb3241d5b7f930c74dd86d20e1798b43950130bbac6dcfdaab4bf11c7ac8c9ca90eedf5e9ba6b9722bac3ecb5e3ca63bd859f33fc070cca418909ad7 SHA512 e1b8c402980e3d28f527586dc97cbca46aba7c65ba1aa66074232ecf9b9dd8c98ba8886a3f751eacc0eefa9095c9d016227f8e311ab16b8ed9def0636d70dbc9
-EBUILD http-4000.2.8.ebuild 1628 BLAKE2B a4b6800e259d5fc4412518c484f8bf535ab2c94b1287922055dd10d8e70ba35cf4b142fd85f91aa867dad22ff1b33708adb994a7806b8a5be12ab12425c697b1 SHA512 65c51c363f70fc5080ec1aeb8daa15e02f9d08e13e11e314ccdf7d495f8435b5a927f92f1c7dd4b482551827d41963ef6701d710e265ef603ce1ed9adfc7064d
-EBUILD http-4000.3.5.ebuild 1737 BLAKE2B 1b4d0f3fcd9be4bb8cd4e9d90f44a87e362942eb68506bbd103467d7724cba20a16102d9169388087d197dde0ef897f84ae904de117f8c7847123c59a766c965 SHA512 b4ff0796663bfb1db530cd4f53ff2b5357d9c4bd65f1a9aa5eec2fd4730e0e9bccbca20e148bde2cb983cfc2654678a41095682307be54ab94603bbaa61d92d4
-MISC metadata.xml 2129 BLAKE2B fcca60629e838303b2e2a690253d81709730e1b2db996f983e083079aa7beec30d0885d2b1066c335e5ed1032f9c11bddfd1d0de11014a9f1958a0c6b1d4c714 SHA512 f9571e122a4ba9ca247f51c7900621dae1831fe15f6dd298b8592291c53fbe4dab61caf975b3c4ff7d0e12991904d5eb298c5c5f3e1d2294a80ade4e93455af3
diff --git a/dev-haskell/http/http-4000.2.17.ebuild b/dev-haskell/http/http-4000.2.17.ebuild
deleted file mode 100644
index 5ecee6b08830..000000000000
--- a/dev-haskell/http/http-4000.2.17.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-#hackport: flags: -warp-tests,-mtl1,-warn-as-error,-old-base,-network23
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HTTP"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library for client-side HTTP"
-HOMEPAGE="https://github.com/haskell/HTTP"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
-IUSE=""
-RESTRICT=test # missing ia64 alpha keywords for dev-haskell/puremd5
-
-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:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	dev-lang/ghc
-"
-#	test? ( >=dev-haskell/httpd-shed-0.4 <dev-haskell/httpd-shed-0.5
-#		>=dev-haskell/hunit-1.2.0.1 <dev-haskell/hunit-1.3
-#		>=dev-haskell/puremd5-0.2.4 <dev-haskell/puremd5-2.2
-#		>=dev-haskell/split-0.1.3 <dev-haskell/split-0.3
-#		>=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9
-#		>=dev-haskell/test-framework-hunit-0.2.0 <dev-haskell/test-framework-hunit-0.4 )
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-mtl1 \
-		--flag=-network23 \
-		--flag=-old-base \
-		--flag=-warn-as-error \
-		--flag=-warp-tests
-}
diff --git a/dev-haskell/http/http-4000.2.20.ebuild b/dev-haskell/http/http-4000.2.20.ebuild
deleted file mode 100644
index 5f21525ea490..000000000000
--- a/dev-haskell/http/http-4000.2.20.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -warp-tests,-mtl1,-warn-as-error,-old-base,-network23
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HTTP"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library for client-side HTTP"
-HOMEPAGE="https://github.com/haskell/HTTP"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="conduit10 +network-uri"
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	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.2.1.5:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	dev-lang/ghc
-	test? ( >=dev-haskell/httpd-shed-0.4 <dev-haskell/httpd-shed-0.5
-		>=dev-haskell/hunit-1.2.0.1 <dev-haskell/hunit-1.3
-		>=dev-haskell/puremd5-0.2.4 <dev-haskell/puremd5-2.2
-		>=dev-haskell/split-0.1.3 <dev-haskell/split-0.3
-		>=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag conduit10 conduit10) \
-		--flag=-mtl1 \
-		$(cabal_flag network-uri network-uri) \
-		--flag=-network23 \
-		--flag=-old-base \
-		--flag=-warn-as-error \
-		--flag=-warp-tests
-}
diff --git a/dev-haskell/http/http-4000.2.22.ebuild b/dev-haskell/http/http-4000.2.22.ebuild
deleted file mode 100644
index 1c867514970b..000000000000
--- a/dev-haskell/http/http-4000.2.22.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -warp-tests,-mtl1,-warn-as-error,-old-base,-network23
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HTTP"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library for client-side HTTP"
-HOMEPAGE="https://github.com/haskell/HTTP"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="conduit10 +network-uri"
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/old-time-1.0.0.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[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.2.1.8:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	dev-lang/ghc
-	test? ( >=dev-haskell/httpd-shed-0.4 <dev-haskell/httpd-shed-0.5
-		>=dev-haskell/hunit-1.2.0.1 <dev-haskell/hunit-1.4
-		>=dev-haskell/puremd5-0.2.4 <dev-haskell/puremd5-2.2
-		>=dev-haskell/split-0.1.3 <dev-haskell/split-0.3
-		>=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag conduit10 conduit10) \
-		--flag=-mtl1 \
-		$(cabal_flag network-uri network-uri) \
-		--flag=-network23 \
-		--flag=-old-base \
-		--flag=-warn-as-error \
-		--flag=-warp-tests
-}
diff --git a/dev-haskell/http/http-4000.2.8.ebuild b/dev-haskell/http/http-4000.2.8.ebuild
deleted file mode 100644
index 48c50fa01fa9..000000000000
--- a/dev-haskell/http/http-4000.2.8.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HTTP"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library for client-side HTTP"
-HOMEPAGE="https://github.com/haskell/HTTP"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-fbsd ~ppc-macos ~x86-macos"
-# hackport-args: --always-disabled='mtl1 network23 old-base warn-as-error'
-IUSE=""
-
-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?]"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
-RESTRICT=test # missing modules: Could not find module `Httpd'
-#		test? ( =dev-haskell/case-insensitive-0.4*
-#			>=dev-haskell/conduit-0.4
-#			<dev-haskell/conduit-0.6
-#			=dev-haskell/deepseq-1.3*
-#			>=dev-haskell/http-types-0.6
-#			<dev-haskell/http-types-0.8
-#			dev-haskell/httpd-shed
-#			dev-haskell/hunit
-#			=dev-haskell/puremd5-2.1*
-#			>=dev-haskell/split-0.1
-#			<dev-haskell/split-0.3
-#			dev-haskell/test-framework
-#			dev-haskell/test-framework-hunit
-#			>=dev-haskell/wai-1.2
-#			<dev-haskell/wai-1.4
-#			>=dev-haskell/warp-1.2
-#			<dev-haskell/warp-1.4
-#		)
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-network23 \
-		--flag=-warn-as-error \
-		--flag=-mtl1 \
-		--flag=-old-base \
-		--disable-tests
-}
diff --git a/dev-haskell/http/http-4000.3.5.ebuild b/dev-haskell/http/http-4000.3.5.ebuild
deleted file mode 100644
index 1d66234f0d61..000000000000
--- a/dev-haskell/http/http-4000.3.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -warp-tests,-mtl1,-warn-as-error,-old-base,-network23
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HTTP"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library for client-side HTTP"
-HOMEPAGE="https://github.com/haskell/HTTP"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="conduit10 +network-uri"
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[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.2.1.8:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/httpd-shed-0.4 <dev-haskell/httpd-shed-0.5
-		>=dev-haskell/hunit-1.2.0.1 <dev-haskell/hunit-1.6
-		>=dev-haskell/puremd5-0.2.4 <dev-haskell/puremd5-2.2
-		>=dev-haskell/split-0.1.3 <dev-haskell/split-0.3
-		>=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag conduit10 conduit10) \
-		--flag=-mtl1 \
-		$(cabal_flag network-uri network-uri) \
-		--flag=-network23 \
-		--flag=-old-base \
-		--flag=-warn-as-error \
-		--flag=-warp-tests
-}
diff --git a/dev-haskell/http/metadata.xml b/dev-haskell/http/metadata.xml
deleted file mode 100644
index 530a8cd6df3e..000000000000
--- a/dev-haskell/http/metadata.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The HTTP package supports client-side web programming in Haskell. It lets you set up
-		HTTP connections, transmitting requests and processing the responses coming back, all
-		from within the comforts of Haskell. It's dependent on the network package to operate,
-		but other than that, the implementation is all written in Haskell.
-		
-		A basic API for issuing single HTTP requests + receiving responses is provided. On top
-		of that, a session-level abstraction is also on offer  (the @BrowserAction@ monad);
-		it taking care of handling the management of persistent connections, proxies,
-		state (cookies) and authentication credentials required to handle multi-step
-		interactions with a web server.
-		
-		The representation of the bytes flowing across is extensible via the use of a type class,
-		letting you pick the representation of requests and responses that best fits your use.
-		Some pre-packaged, common instances are provided for you (@ByteString@, @String@.)
-		
-		Here's an example use:
-		
-		&gt;
-		&gt;    do
-		&gt;      rsp &lt;- Network.HTTP.simpleHTTP (getRequest "http://www.haskell.org/")
-		&gt;              -- fetch document and return it (as a 'String'.)
-		&gt;      fmap (take 100) (getResponseBody rsp)
-		&gt;
-		&gt;    do
-		&gt;      rsp &lt;- Network.Browser.browse $ do
-		&gt;               setAllowRedirects True -- handle HTTP redirects
-		&gt;               request $ getRequest "https://google.com/"
-		&gt;      fmap (take 100) (getResponseBody rsp)
-		&gt;
-		
-		Git repository available at &lt;https://github.com/haskell/HTTP.git&gt;
-	</longdescription>
-	<use>
-		<flag name="conduit10">Use version 1.0.x or below of the conduit package (for the test suite).</flag>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">haskell/HTTP</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/http2-1.3.1 b/dev-haskell/http2-1.3.1
new file mode 100644
index 000000000000..db4bbc31831f
--- /dev/null
+++ b/dev-haskell/http2-1.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/aeson-pretty:=[profile?] dev-haskell/bytestring-builder:=[profile?] dev-haskell/hex:=[profile?] dev-haskell/psqueues:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/doctest-0.9.3 dev-haskell/glob >=dev-haskell/hspec-1.3 dev-haskell/mwc-random ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HTTP/2.0 library including frames and HPACK
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/http2
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/aeson-pretty:=[profile?] dev-haskell/bytestring-builder:=[profile?] dev-haskell/hex:=[profile?] dev-haskell/psqueues:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-7.6.1:=
+RESTRICT=test
+SLOT=0/1.3.1
+SRC_URI=mirror://hackage/packages/archive/http2/1.3.1/http2-1.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e4397f6ccdcd49984f06ebea1ca7effe
diff --git a/dev-haskell/http2-1.6.2 b/dev-haskell/http2-1.6.2
new file mode 100644
index 000000000000..89c595bcb6e1
--- /dev/null
+++ b/dev-haskell/http2-1.6.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/bytestring-builder:=[profile?] dev-haskell/case-insensitive:=[profile?] dev-haskell/psqueues:=[profile?] dev-haskell/stm:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( dev-haskell/aeson dev-haskell/aeson-pretty >=dev-haskell/doctest-0.9.3 dev-haskell/glob dev-haskell/hex >=dev-haskell/hspec-1.3 dev-haskell/text dev-haskell/unordered-containers dev-haskell/vector dev-haskell/word8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HTTP/2.0 library including frames and HPACK
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/http2
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/bytestring-builder:=[profile?] dev-haskell/case-insensitive:=[profile?] dev-haskell/psqueues:=[profile?] dev-haskell/stm:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/1.6.2
+SRC_URI=mirror://hackage/packages/archive/http2/1.6.2/http2-1.6.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a3634ca1cf93fe731408421957a95960
diff --git a/dev-haskell/http2/Manifest b/dev-haskell/http2/Manifest
deleted file mode 100644
index 087af30d0caf..000000000000
--- a/dev-haskell/http2/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX http2-1.6.0-even-less-deps.patch 527 BLAKE2B 0a86191247c3b88b6fb188dfb9a963a24c3ddecc2d4eb55fb6e097ed95a023fe7f211c152748f92ea14fff53d467dbd3ddc64520a9663f36f4e514ce30c854fb SHA512 665ff2ac35b518525d15f4f2f15d717e93cfb08fc723f6a909c481d94dfae80cf45f7cf4f828ea49b39802d8ef5559488f30027236109af0fb493107cac65273
-AUX http2-1.6.0-less-deps.patch 1584 BLAKE2B c4411d643e1dd44cd82373750d998b42f6ccb268b0864b4cd3be7be2e9b2262490f80fc3ba204cb7dc9e9aba4a0630102337b6e3090aba88e1ad68e516c29fb9 SHA512 6e626f5412e6e49462d3676e44f410e280e0f0c1b4458d9e400ad6c193620a4b939fd0e80517c503e16c68610c42429fd89761ea7ac88f8c124a7bdc62c61371
-DIST http2-1.3.1.tar.gz 39493 BLAKE2B a1a94de5d35510d02c9c43638c9193631c04277e1c53bc6d7ae2cfe93176eda72a700f61606220fcdf349d375c4e888380552193ff8a40b9ec3ca64de04123d1 SHA512 7d47cb35ce55743ecdc19ea52a1e230c8c3d608348f658ed7b3eb4f86a93ad4aa16eb23e4294dc1752bd99da8027e61a0b575ee9b89fe182d6582f6b5b402cee
-DIST http2-1.6.2.tar.gz 5138047 BLAKE2B 7febaa42b0c50cd89bfc5e9acba558bea9d7e0e8c791c5ea6e6de17ed938e431b3ba4a94375dcc5858881920b83a92491a5181a13d23420d586b13fd24222535 SHA512 c9df89cb073b57bc379857aedfba82097b805f8c9452b5a2b9cfff2ff096f185f9b8aa2dfaa5b0be7909a214a67d8ba8fb93ddc8a19f8afb43f9f5d5bf67f0da
-EBUILD http2-1.3.1.ebuild 1150 BLAKE2B 436ed1813fdb7a9e761a7334ba197f7bae8e41c37ebadc5c74b43d0e14b3aa2eb067610362b2b8acde774d7dd23e0c5fab42f601ba1b9bc20cad0fd35e265304 SHA512 ebd24c1a635aca53dc664e6db840724fedb6650d7d4307ca5b1ea6fb4d9209a34876a458b59a3291e62986cea59cb741bcbf401727e4bb48a9654310ce2e9ed8
-EBUILD http2-1.6.2.ebuild 1239 BLAKE2B f26acef521e634ca2b71db7a4ea51a5f1dbe7260831b4075ea078f5452056488095b7ef136a37e24e938bb3ae5f8a4e44787fb473c2507f406ae605c0336eff0 SHA512 1034cb044883ae665d1cba1c03653fb0cfd76437e3b3be757a3e94653569ed3fda0c942d7a21ad7f0331ac866eea5b9d0ffe640e08bd5bafbca86f76a0fc1563
-MISC metadata.xml 392 BLAKE2B 30170fe16036b33d7e8d83fe7bb3bc04ec51d2fe0598f34dfb8b8bc21727496c191e0178bb267018320eeaa9beedabd4463342f35ba9b98b682a1af9d3ec15d2 SHA512 5515590e5ff7b56f8ebd033611ce8d3164cf6c267ae26eb5b177ff47edee607d04208e123f982140b1b40438fc3b0b12f0fbe33788e4da448e316944ccf9a1ed
diff --git a/dev-haskell/http2/files/http2-1.6.0-even-less-deps.patch b/dev-haskell/http2/files/http2-1.6.0-even-less-deps.patch
deleted file mode 100644
index 07be024ee5e1..000000000000
--- a/dev-haskell/http2/files/http2-1.6.0-even-less-deps.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/http2.cabal b/http2.cabal
-index fe57a48..b28ad06 100644
---- a/http2.cabal
-+++ b/http2.cabal
-@@ -204,6 +204,3 @@ Executable hpack-debug
-     Buildable:          True
--  else
--    Buildable:          False
--  Main-Is:              hpack-debug.hs
--  Build-Depends:        base >= 4 && < 5
-+    Build-Depends:      base >= 4 && < 5
-                       , aeson
-@@ -219,2 +216,5 @@ Executable hpack-debug
-                       , word8
-+  else
-+    Buildable:          False
-+  Main-Is:              hpack-debug.hs
- 
diff --git a/dev-haskell/http2/files/http2-1.6.0-less-deps.patch b/dev-haskell/http2/files/http2-1.6.0-less-deps.patch
deleted file mode 100644
index 1ee62446d328..000000000000
--- a/dev-haskell/http2/files/http2-1.6.0-less-deps.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/http2.cabal b/http2.cabal
-index 7986d1c..fe57a48 100644
---- a/http2.cabal
-+++ b/http2.cabal
-@@ -180,7 +180,3 @@ Executable hpack-encode
-     Buildable:          True
--  else
--    Buildable:          False
--  Main-Is:              hpack-encode.hs
--  Other-Modules:        HPACKEncode
--  Build-Depends:        base >= 4 && < 5
-+    Build-Depends:      base >= 4 && < 5
-                       , aeson
-@@ -197,2 +193,6 @@ Executable hpack-encode
-                       , word8
-+  else
-+    Buildable:          False
-+  Main-Is:              hpack-encode.hs
-+  Other-Modules:        HPACKEncode
- 
-@@ -226,6 +226,3 @@ Executable hpack-stat
-     Buildable:          True
--  else
--    Buildable:          False
--  Main-Is:              hpack-stat.hs
--  Build-Depends:        base >= 4 && < 5
-+    Build-Depends:      base >= 4 && < 5
-                       , aeson
-@@ -243,2 +240,5 @@ Executable hpack-stat
-                       , word8
-+  else
-+    Buildable:          False
-+  Main-Is:              hpack-stat.hs
- 
-@@ -250,8 +250,3 @@ Executable frame-encode
-     Buildable:          True
--  else
--    Buildable:          False
--  Main-Is:              frame-encode.hs
--  Other-Modules:        Case
--                        JSON
--  Build-Depends:        base >= 4 && < 5
-+    Build-Depends:      base >= 4 && < 5
-                       , aeson
-@@ -263,2 +258,7 @@ Executable frame-encode
-                       , unordered-containers
-+  else
-+    Buildable:          False
-+  Main-Is:              frame-encode.hs
-+  Other-Modules:        Case
-+                        JSON
- 
diff --git a/dev-haskell/http2/http2-1.3.1.ebuild b/dev-haskell/http2/http2-1.3.1.ebuild
deleted file mode 100644
index f4f3933417b9..000000000000
--- a/dev-haskell/http2/http2-1.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -devel
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP/2.0 library including frames and HPACK"
-HOMEPAGE="http://hackage.haskell.org/package/http2"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # missing files
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/aeson-pretty:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	dev-haskell/hex:=[profile?]
-	dev-haskell/psqueues:=[profile?]
-	dev-haskell/stm:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/word8:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/doctest-0.9.3
-		dev-haskell/glob
-		>=dev-haskell/hspec-1.3
-		dev-haskell/mwc-random )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-devel
-}
diff --git a/dev-haskell/http2/http2-1.6.2.ebuild b/dev-haskell/http2/http2-1.6.2.ebuild
deleted file mode 100644
index 24d8f5492916..000000000000
--- a/dev-haskell/http2/http2-1.6.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -devel
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP/2.0 library including frames and HPACK"
-HOMEPAGE="http://hackage.haskell.org/package/http2"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/bytestring-builder:=[profile?]
-	dev-haskell/case-insensitive:=[profile?]
-	dev-haskell/psqueues:=[profile?]
-	dev-haskell/stm:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/aeson
-		dev-haskell/aeson-pretty
-		>=dev-haskell/doctest-0.9.3
-		dev-haskell/glob
-		dev-haskell/hex
-		>=dev-haskell/hspec-1.3
-		dev-haskell/text
-		dev-haskell/unordered-containers
-		dev-haskell/vector
-		dev-haskell/word8 )
-"
-
-src_prepare() {
-	# workaround Cabal bug at picking unused deps
-	eapply "${FILESDIR}"/${PN}-1.6.0-less-deps.patch
-	eapply "${FILESDIR}"/${PN}-1.6.0-even-less-deps.patch
-	eapply_user
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-devel
-}
diff --git a/dev-haskell/http2/metadata.xml b/dev-haskell/http2/metadata.xml
deleted file mode 100644
index 8d45638c29bf..000000000000
--- a/dev-haskell/http2/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		HTTP/2.0 library including frames and HPACK.
-		Currently HTTP/2 16 framing and HPACK 10 is supported.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/httpd-shed-0.4-r1 b/dev-haskell/httpd-shed-0.4-r1
new file mode 100644
index 000000000000..daa607efe4ab
--- /dev/null
+++ b/dev-haskell/httpd-shed-0.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=125983f15b8a730b6acf0b6d6d4880b2
diff --git a/dev-haskell/httpd-shed-0.4.0.3 b/dev-haskell/httpd-shed-0.4.0.3
new file mode 100644
index 000000000000..ec5631b16129
--- /dev/null
+++ b/dev-haskell/httpd-shed-0.4.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=57da7250562f0f44ab9f951324b0e9b6
diff --git a/dev-haskell/httpd-shed/Manifest b/dev-haskell/httpd-shed/Manifest
deleted file mode 100644
index 6971401fb310..000000000000
--- a/dev-haskell/httpd-shed/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX httpd-shed-0.4-network.patch 931 BLAKE2B 50e9423d10efffbf3dd01b3aeaa349f7f564527e81a20d76d8ce0808485e1dce83ad2bcf0cec97b828f1c997eb52bc1ad421a071a71f5d5e3272df9f4eb01599 SHA512 2d964bfd1d9f6bec763229c5fd7b04e01993e8dbffdfc6dd49f296aa78efaf26b556c3debb64d707553fd06ab9072ab8c2c69329dcb9bc5177dc8a68b2f04859
-DIST httpd-shed-0.4.0.3.tar.gz 4308 BLAKE2B a7218ce790ab3902b94a41c97bae27517ea4750ba80c59ae1eb38953b93606c604912f19327d0e5990c4aceb6f0d7c415a871916e560e0a32cfc6df6ac6ee3b9 SHA512 4fc4da5dd42194890e4201129c7217191cc1c8f82a366b84f42f9129c45fa5cb40211674608c84df420f8d8659fd60908880d14176a36f6aa0f89c01a8c1fa6c
-DIST httpd-shed-0.4.tar.gz 4065 BLAKE2B 1f5b3f2cdcc4e5bd2d6fd933dab625dbe8c4687cb1d53411531daa23d8427b263c8c26b992ef432165e943701ebd67f0ae8be363ace462713f3a451a0e0e77b8 SHA512 71b3fc8038e5245589aab99b9fa3eeef0ec13cc78bba33d88b8c7569f30b0ba18b645a939771b3d325d3e666b99c3c4428403ae016d14df55ce8dcba2e9d61e9
-EBUILD httpd-shed-0.4-r1.ebuild 711 BLAKE2B 44f1d121220327d8df338f342a2203716a3eaeff6fe8e3d1882eeb57967e8a2e6295ea5c07b2bc811f60751df5fbab66392a0a4d4db9e24717a2379748ee3abb SHA512 7a02daf09a3985c22461a76ab46afdc316afaa9c0257743836e522dada8e29075b81a0745d3110eb4ff9c412ac348233b13676175bdc732ffe5d7ae6047d92d9
-EBUILD httpd-shed-0.4.0.3.ebuild 1152 BLAKE2B 73b5df8129c18081ef67e3cdb534ac1404cb5f373ef95dfcbb264213339e742ce0ec2a56a43d61891fc3003f9d167e63c81a7c4624dca8e3816616c7a9dce688 SHA512 e5eceacc601c443664e0df7f067f061bbd6b08fac88c88d72c9c7e455392080cc186c136dbd99e83f46910ab3a21075b6f02ca2fb2e1c159ba4d5cb604eac3e2
-MISC metadata.xml 643 BLAKE2B da63b1c9b1c926a88d2208c9eb901cdb43e77495ee0d48ddee2509cbc64899302c37c0f0c0e71d54876774134c47042e65979ec59b765d8d1429bf3fc1ed38f2 SHA512 a77669c1625b85b0e4204f9f1212e96cf660214b44a1e31770bb088c053406537adb6d4568ba9e3eed3add5c8e9545035e24cf5ead0c8c1779ad903646bd5eb8
diff --git a/dev-haskell/httpd-shed/files/httpd-shed-0.4-network.patch b/dev-haskell/httpd-shed/files/httpd-shed-0.4-network.patch
deleted file mode 100644
index ca5a113b7014..000000000000
--- a/dev-haskell/httpd-shed/files/httpd-shed-0.4-network.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-[1 of 1] Compiling Network.Shed.Httpd ( Network/Shed/Httpd.hs, dist/build/Network/Shed/Httpd.o )
-
-Network/Shed/Httpd.hs:142:24:
-    Ambiguous occurrence `sClose'
-    It could refer to either `N.sClose',
-                             imported from `Network' at Network/Shed/Httpd.hs:38:1-14
-                          or `Network.Socket.sClose',
-                             imported from `Network.Socket' at Network/Shed/Httpd.hs:48:1-21
-diff --git a/Network/Shed/Httpd.hs b/Network/Shed/Httpd.hs
-index 9dbc2a2..f4f7d5e 100644
---- a/Network/Shed/Httpd.hs
-+++ b/Network/Shed/Httpd.hs
-@@ -139,7 +139,7 @@ initServerMain processBody sockAddr callOut = do
-                                  hClose h
-                    _                      -> hClose h
-                  return ()
--           ) `finally` sClose sock
-+           ) `finally` N.sClose sock
-   where 
-       loopIO m          = do m
-                              loopIO m
diff --git a/dev-haskell/httpd-shed/httpd-shed-0.4-r1.ebuild b/dev-haskell/httpd-shed/httpd-shed-0.4-r1.ebuild
deleted file mode 100644
index fade9d6a627c..000000000000
--- a/dev-haskell/httpd-shed/httpd-shed-0.4-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="A simple web-server with an interact style API"
-HOMEPAGE="http://hackage.haskell.org/package/httpd-shed"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="dev-haskell/network:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-PATCHES=("${FILESDIR}"/${P}-network.patch)
diff --git a/dev-haskell/httpd-shed/httpd-shed-0.4.0.3.ebuild b/dev-haskell/httpd-shed/httpd-shed-0.4.0.3.ebuild
deleted file mode 100644
index 29613f0789a1..000000000000
--- a/dev-haskell/httpd-shed/httpd-shed-0.4.0.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A simple web-server with an interact style API"
-HOMEPAGE="http://hackage.haskell.org/package/httpd-shed"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE="buildexamples +network-uri"
-
-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?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag buildexamples buildexamples) \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/httpd-shed/metadata.xml b/dev-haskell/httpd-shed/metadata.xml
deleted file mode 100644
index 3c478f3b1e1f..000000000000
--- a/dev-haskell/httpd-shed/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This web server promotes a Request to IO Response function
-		into a local web server. The user can decide how to interpret
-		the requests, and the library is intended for implementing Ajax APIs.
-	</longdescription>
-	<use>
-		<flag name="buildexamples">Build example executables.</flag>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/hunit-1.2.5.2 b/dev-haskell/hunit-1.2.5.2
new file mode 100644
index 000000000000..90455e931cc9
--- /dev/null
+++ b/dev-haskell/hunit-1.2.5.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0055702324c0d96405b8a937d2c990c3
diff --git a/dev-haskell/hunit-1.2.5.2-r1 b/dev-haskell/hunit-1.2.5.2-r1
new file mode 100644
index 000000000000..1f602533c1fb
--- /dev/null
+++ b/dev-haskell/hunit-1.2.5.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=52c802590a805bff52be4eb8efb232d6
diff --git a/dev-haskell/hunit/Manifest b/dev-haskell/hunit/Manifest
deleted file mode 100644
index b054e4d0ac28..000000000000
--- a/dev-haskell/hunit/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST HUnit-1.2.5.2.tar.gz 24889 BLAKE2B 7dcc49f58cde674a5555a064bcb16d73925f31cde251acc245e5c288f536550e44c465c5bff778413db180aeba62e5f1d05df25bda193e2523264d2de33e4659 SHA512 ee16c33faacc1c26e242095823ae8df47889946a6a161affab3789d7f40b423d2f002526f6cad018084dc7b151a911cf28b37b2aeef91d186bb765e940534fc4
-EBUILD hunit-1.2.5.2-r1.ebuild 681 BLAKE2B 2447f54f2f422ffd24b039e549b833a81a32b30c81ee89782ca9cc36d70e0ee8a9400338bb6d19d45adeafedb185d67a693e9479a479cec5764d1eae928eed30 SHA512 5cf2e4610b0a5586d94eedc8e88af3dac05fa66955fd1d86b9ac1a24055e58acfe57bc6fe8913ec01a05f6668315ff70f5b731e496edcae9680547b7fbf02d5c
-EBUILD hunit-1.2.5.2.ebuild 673 BLAKE2B 0aed1bebb986f641a3b40e4031a20128d6976cd5076807d653abb2e0ff595b383b878d40e007a9e1a658c7ef4ac0049100aa563ab900db665900cf27710580d1 SHA512 ac00d953d016f9ca397ae94e2024637db349bc6dc05f64b1f1eaf52862bd3ce17c5d620536523b39020a117c6a3acd404f2e51c37b70587542b2b95dbd2a6bd6
-MISC metadata.xml 486 BLAKE2B 18f74bcd495eefbadc28cd818bc80f712da01f0380894f098bd6ef646c79e478f99656e83e5e5e0da503bd05e994fbd2dce8ee3c621b8684f059644f1302c340 SHA512 b26653c15af05b613bdd1b8a7743f6570800bcec2deedd3632d9d2bab3042c2ab5928a58fba2d355890f7250b4682c1a7122bae82207291d1d5792c114ea95bf
diff --git a/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild b/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild
deleted file mode 100644
index 3dba99be2d27..000000000000
--- a/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HUnit"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A unit testing framework for Haskell"
-HOMEPAGE="http://hunit.sourceforge.net/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hunit/hunit-1.2.5.2.ebuild b/dev-haskell/hunit/hunit-1.2.5.2.ebuild
deleted file mode 100644
index 89cdffe72cdd..000000000000
--- a/dev-haskell/hunit/hunit-1.2.5.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HUnit"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A unit testing framework for Haskell"
-HOMEPAGE="http://hunit.sourceforge.net/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hunit/metadata.xml b/dev-haskell/hunit/metadata.xml
deleted file mode 100644
index 4094d2fe0b11..000000000000
--- a/dev-haskell/hunit/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		HUnit is a unit testing framework for Haskell, inspired by the
-		JUnit tool for Java, see: &lt;http://www.junit.org&gt;.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">hunit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hxt-9.3.1.15 b/dev-haskell/hxt-9.3.1.15
new file mode 100644
index 000000000000..208022be2635
--- /dev/null
+++ b/dev-haskell/hxt-9.3.1.15
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-1:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?] >=dev-haskell/hxt-charproperties-9.1:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?] >=dev-haskell/hxt-regex-xmlschema-9.2:=[profile?] <dev-haskell/hxt-regex-xmlschema-10:=[profile?] >=dev-haskell/hxt-unicode-9.0.1:=[profile?] <dev-haskell/hxt-unicode-10:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A collection of tools for processing XML with Haskell
+EAPI=5
+HOMEPAGE=https://github.com/UweSchmidt/hxt
+IUSE=+network-uri doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-1:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?] >=dev-haskell/hxt-charproperties-9.1:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?] >=dev-haskell/hxt-regex-xmlschema-9.2:=[profile?] <dev-haskell/hxt-regex-xmlschema-10:=[profile?] >=dev-haskell/hxt-unicode-9.0.1:=[profile?] <dev-haskell/hxt-unicode-10:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/9.3.1.15
+SRC_URI=mirror://hackage/packages/archive/hxt/9.3.1.15/hxt-9.3.1.15.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b29b8fba8bdd59f0a043e0df88d8a62f
diff --git a/dev-haskell/hxt-9.3.1.16 b/dev-haskell/hxt-9.3.1.16
new file mode 100644
index 000000000000..97152cd03a7f
--- /dev/null
+++ b/dev-haskell/hxt-9.3.1.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hxt-charproperties-9.1:=[profile?] >=dev-haskell/hxt-regex-xmlschema-9.2:=[profile?] >=dev-haskell/hxt-unicode-9.0.1:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A collection of tools for processing XML with Haskell
+EAPI=6
+HOMEPAGE=https://github.com/UweSchmidt/hxt
+IUSE=+network-uri doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/hxt-charproperties-9.1:=[profile?] >=dev-haskell/hxt-regex-xmlschema-9.2:=[profile?] >=dev-haskell/hxt-unicode-9.0.1:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/9.3.1.16
+SRC_URI=mirror://hackage/packages/archive/hxt/9.3.1.16/hxt-9.3.1.16.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2c88a4dd52aa9787a77ee5430d468f70
diff --git a/dev-haskell/hxt-charproperties-9.1.1.1 b/dev-haskell/hxt-charproperties-9.1.1.1
new file mode 100644
index 000000000000..852a88b88e25
--- /dev/null
+++ b/dev-haskell/hxt-charproperties-9.1.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.4 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Character properties and classes for XML and Unicode
+EAPI=5
+HOMEPAGE=http://www.fh-wedel.de/~si/HXmlToolbox/index.html
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/9.1.1.1
+SRC_URI=mirror://hackage/packages/archive/hxt-charproperties/9.1.1.1/hxt-charproperties-9.1.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3bc87a1ec9dd4294f7bbf6098b649ff6
diff --git a/dev-haskell/hxt-charproperties-9.2.0.1 b/dev-haskell/hxt-charproperties-9.2.0.1
new file mode 100644
index 000000000000..4332f118d241
--- /dev/null
+++ b/dev-haskell/hxt-charproperties-9.2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Character properties and classes for XML and Unicode
+EAPI=5
+HOMEPAGE=https://github.com/UweSchmidt/hxt
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/9.2.0.1
+SRC_URI=mirror://hackage/packages/archive/hxt-charproperties/9.2.0.1/hxt-charproperties-9.2.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6156e8b575b6d14fabc18b0e159323bf
diff --git a/dev-haskell/hxt-charproperties/Manifest b/dev-haskell/hxt-charproperties/Manifest
deleted file mode 100644
index fa5b69716047..000000000000
--- a/dev-haskell/hxt-charproperties/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST hxt-charproperties-9.1.1.1.tar.gz 225230 BLAKE2B d3f022c10dbfad31eca1b0950996a898e577f4cc8e90704f8660fe3e07a1f400aef40afc79d0268e32594e9e4cbedd64cdf611cc3efb0d3f84ba9f29f6907d7c SHA512 c2dcfc9969f5651b79ca3dd3f4ba410a3389648182e7c7a7f1cd38b6adda64068b22086cedef60a7de87ff56693f4b5968aa2bdf17c2a08d6a6fe0a9073a9192
-DIST hxt-charproperties-9.2.0.1.tar.gz 270767 BLAKE2B dce70cb87f1fa09ade7a4b62a3d016a6030f6de13f090195c91c4f14fd0434a2a81742a345caaa0e36b5e62b2ca1e053df56d88abd6f36165646e29da7134bd2 SHA512 518d7c15b43a33432c402b839713e1d29a60d44286ca411bfb3d9a4b955b1181b8ec84615a131db0113280bea7973c70618f4204a32b21e627c452e05a18a7ef
-EBUILD hxt-charproperties-9.1.1.1.ebuild 571 BLAKE2B dfa93ef4276843e0992fb8fa3acfc4ce23132d71192c4e209a769a0cf57fffb98aceabd709c9c1c2c07c46963fbbf22e8e1f8afb7fb76d37aebc60923d3b35dd SHA512 d857a6746804b0195b3d64f1b8785d3342266bf7b1ab2d5f8cbda8f8d174fb552836e89fc8b60ccc0faecbae0447ff07c3b841db70895129a3f0d033fa816fa8
-EBUILD hxt-charproperties-9.2.0.1.ebuild 552 BLAKE2B 7ce72b3c794df5a95165622489605423f5363a98f15235cffe081cce4497e6789944d0b15181d684685207c22cc8f7ec13366e1615191797ae86b9c660d5cb21 SHA512 25be12831b88993f7a5e7c49f90ce30a5e81ae6bfe6da8ce41634b98b5483a30bd60a10e3fae1fcbbcef2204dc1318bee82cbed49326dde7a2bb7cbc6f2188d0
-MISC metadata.xml 581 BLAKE2B f4b8e35776feb9f8b8f694c85414f936eb16ba5cb43d57e018e12f25ebc29f87e8324cd6aec9811e63ec35defec9cf3d3e32918af0077012677551a2329c3954 SHA512 bf36ee1feade57b7b7d4426ef5f38d3773ce0fa36bc7bec3ec1a222d8ada450bdca1d6352be1f006b7e93ecc8108f7535a0e4bc9866715ac7f9b2db96a8c8739
diff --git a/dev-haskell/hxt-charproperties/hxt-charproperties-9.1.1.1.ebuild b/dev-haskell/hxt-charproperties/hxt-charproperties-9.1.1.1.ebuild
deleted file mode 100644
index e6b6cd074677..000000000000
--- a/dev-haskell/hxt-charproperties/hxt-charproperties-9.1.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Character properties and classes for XML and Unicode"
-HOMEPAGE="http://www.fh-wedel.de/~si/HXmlToolbox/index.html"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.4"
diff --git a/dev-haskell/hxt-charproperties/hxt-charproperties-9.2.0.1.ebuild b/dev-haskell/hxt-charproperties/hxt-charproperties-9.2.0.1.ebuild
deleted file mode 100644
index 664b4b86d2a3..000000000000
--- a/dev-haskell/hxt-charproperties/hxt-charproperties-9.2.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Character properties and classes for XML and Unicode"
-HOMEPAGE="https://github.com/UweSchmidt/hxt"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/hxt-charproperties/metadata.xml b/dev-haskell/hxt-charproperties/metadata.xml
deleted file mode 100644
index 24b0e65dc8d1..000000000000
--- a/dev-haskell/hxt-charproperties/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Character proprties defined by XML and Unicode standards.
-		These modules contain predicates for Unicode blocks and char proprties
-		and character predicates defined by XML.
-		Supported Unicode version is 5.2.0.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">UweSchmidt/hxt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hxt-regex-xmlschema-9.0.4 b/dev-haskell/hxt-regex-xmlschema-9.0.4
new file mode 100644
index 000000000000..01d9f179c408
--- /dev/null
+++ b/dev-haskell/hxt-regex-xmlschema-9.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND==dev-haskell/hxt-charproperties-9*[profile?] >=dev-haskell/parsec-2.1[profile?] <dev-haskell/parsec-4[profile?] >=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A regular expression library for W3C XML Schema regular expressions
+EAPI=4
+HOMEPAGE=http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND==dev-haskell/hxt-charproperties-9*[profile?] >=dev-haskell/parsec-2.1[profile?] <dev-haskell/parsec-4[profile?] >=dev-lang/ghc-6.10.1
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/hxt-regex-xmlschema/9.0.4/hxt-regex-xmlschema-9.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bc3b920a2feb87f239e02a13736cd1e2
diff --git a/dev-haskell/hxt-regex-xmlschema-9.1.0 b/dev-haskell/hxt-regex-xmlschema-9.1.0
new file mode 100644
index 000000000000..b24b2d1d943f
--- /dev/null
+++ b/dev-haskell/hxt-regex-xmlschema-9.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND==dev-haskell/hxt-charproperties-9*:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[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 regular expression library for W3C XML Schema regular expressions
+EAPI=5
+HOMEPAGE=http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND==dev-haskell/hxt-charproperties-9*:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/9.1.0
+SRC_URI=mirror://hackage/packages/archive/hxt-regex-xmlschema/9.1.0/hxt-regex-xmlschema-9.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a46f1fefefa54f74083daab13e55e41d
diff --git a/dev-haskell/hxt-regex-xmlschema-9.2.0.2 b/dev-haskell/hxt-regex-xmlschema-9.2.0.2
new file mode 100644
index 000000000000..735dc7ffe7c0
--- /dev/null
+++ b/dev-haskell/hxt-regex-xmlschema-9.2.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A regular expression library for W3C XML Schema regular expressions
+EAPI=5
+HOMEPAGE=http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-lang/ghc-7.6.1:=
+RESTRICT=test
+SLOT=0/9.2.0.2
+SRC_URI=mirror://hackage/packages/archive/hxt-regex-xmlschema/9.2.0.2/hxt-regex-xmlschema-9.2.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=48f591bcc60dc097c71390c51afcc0d9
diff --git a/dev-haskell/hxt-regex-xmlschema-9.2.0.3 b/dev-haskell/hxt-regex-xmlschema-9.2.0.3
new file mode 100644
index 000000000000..ea2bbd891ae9
--- /dev/null
+++ b/dev-haskell/hxt-regex-xmlschema-9.2.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A regular expression library for W3C XML Schema regular expressions
+EAPI=6
+HOMEPAGE=http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema
+IUSE=profile doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/9.2.0.3
+SRC_URI=mirror://hackage/packages/archive/hxt-regex-xmlschema/9.2.0.3/hxt-regex-xmlschema-9.2.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2706614bb13f4c1d484b835bf5403d7d
diff --git a/dev-haskell/hxt-regex-xmlschema/Manifest b/dev-haskell/hxt-regex-xmlschema/Manifest
deleted file mode 100644
index a859f87c345f..000000000000
--- a/dev-haskell/hxt-regex-xmlschema/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST hxt-regex-xmlschema-9.0.4.tar.gz 27212 BLAKE2B 02eebe5a2aa5c045735520d0038d07dee2434fdba09272da800fb327b2a0014be94d83a728302cd2751d1e28c3d966ae7e803e9cd655e5bd12b0d4ddfe5038a8 SHA512 6523fdab964c007b616e69a9d2d8be535b2a00aa8daa063c62303e932d3a841bcf8447ca85c828d9de01cc748a28db4554acee456f9804c8c257cd332debbe4d
-DIST hxt-regex-xmlschema-9.1.0.tar.gz 26675 BLAKE2B 515cadb11536101a2332e0fca909feb7cab2339c05ba0e1dd0854d192e52f3b42f215371ff050509ddc42b9a45518f84ff9c9b4557cbc65fe393f770d7f2db8c SHA512 c41fa5a685c441d07f39eb6806ab201aaf4328466b34e98e0f0c2cfa89bdbad4d510d5e68a2f73bf94d3079db87b1cf9716d68e52bab7638b6084e8aae70a94d
-DIST hxt-regex-xmlschema-9.2.0.2.tar.gz 35896 BLAKE2B 6333073f0ba758aca7bee4d4695b26f7337eb9a9eb2d50fd5ed5acf6fb0b0cff69bdd23d83fbacc9a825592f8ec7a4bfcc3cdc412005f3c81461f3d37a85f70c SHA512 4a8f1c9fe0f14e4ab7a64f24e3cc6f1d7c29cf67c5751352629f1f847e7cc062c86d4f90c7a10c35b9afdb44d4459f0fd74968ff2101f62848aa6b5e22b52cc9
-DIST hxt-regex-xmlschema-9.2.0.3.tar.gz 35781 BLAKE2B 0ab5c2042acf032e2709e6781457ec28f2bda3b9778947b08dafd7075c9422e0375574104fd06089f19192bebce3f3f3da5e1b515c8eb62bb7ce5c06c3e8680c SHA512 707ad7a4b5c32785fd89131279dd89a871f134a26ce1f98fd4ac8fec196c8960c2d39d18674967379b40508748fca3a34b9289500173075c54c1d6726191bbd8
-EBUILD hxt-regex-xmlschema-9.0.4.ebuild 719 BLAKE2B 9b694f36bc4bfd4bfcab86cb1934c674f91aa2a7005cc12d548efa3c46a837d226287123f687b76ce91a6f66d56d482fbd0bbe7c7f1a3ab8826fd999ab017dd1 SHA512 00da166cd70d8478f4c531d35be76c6ea5451d24e9497922d72c651a5788e8db4c6fba507497f7a99dbaf69e1961367fb9145f2bd47c92da38cc5c60149e397e
-EBUILD hxt-regex-xmlschema-9.1.0.ebuild 730 BLAKE2B 1c11b5c6fa53f43274f104b7df1d99a96dfb538962a8303bf5ac9ee167172a41389b800c9d85075c1805f2f4f1eab067797b4d213e137fa758110ae1a4021f9d SHA512 075c38f16b888a3f96958e2a5e8f0f8f37c88bbf0d1b41207d34c7a258821b8d2699d7dbcd07d117e3db1d1218de1542126c7f34d2f82c1b8de1f0455e75f9e8
-EBUILD hxt-regex-xmlschema-9.2.0.2.ebuild 881 BLAKE2B c0bef2816ddb9277133d87b255337b9551c2842c9c00de0b2eb08c230f2fe3bbac0772bf970b09102b59055011daef76d0c6fc75a28766b61b7f4a6acb021cf6 SHA512 7427b61939aba9648f19de9d6c6b97717f98a75661dd5da7ac963cd278d49a249e7daddf32e46b8017d7d315a912e492ee3cd79583e6415883cc67946f8ce43b
-EBUILD hxt-regex-xmlschema-9.2.0.3.ebuild 944 BLAKE2B 64cfa7bb2ef8391db9357a667159fe77b69c915fd1728aa5b554ad814f73e1ef3a869251552bc823d151d981ba61be62182811fc5536521cb76dec421f63ac75 SHA512 8f44715f3ef544eefb3bb2f21932c798c5e00201017fe3eebbadab7af9654fa0d0c843d7558b11864f9b3b6bfbff2ffd9b47fa98da4223ace7170bd40e2d23e4
-MISC metadata.xml 956 BLAKE2B a4d53a6bb43e4e239907e060c9c34f6ade20a82e396bce5e8eed591f6b9819ce2e15235c087401023039f0690264fffd1a59da3fbbbba3a41e6450438961c001 SHA512 4a6ea96367988b1b8bf30b2b66dfe4799c4d95c8a1d9ba8ce19cfc82dffc78ebe02ecba76bbbbb62175e3bf366cbffc6b5be363729f0c5a26272300b63fd6a00
diff --git a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.0.4.ebuild b/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.0.4.ebuild
deleted file mode 100644
index 84c0ef635479..000000000000
--- a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.0.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A regular expression library for W3C XML Schema regular expressions"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/hxt-charproperties-9*[profile?]
-		>=dev-haskell/parsec-2.1[profile?]
-		<dev-haskell/parsec-4[profile?]
-		>=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.1.0.ebuild b/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.1.0.ebuild
deleted file mode 100644
index f39a7b0f1136..000000000000
--- a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A regular expression library for W3C XML Schema regular expressions"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/hxt-charproperties-9*:=[profile?]
-		>=dev-haskell/parsec-2.1:=[profile?]
-		<dev-haskell/parsec-4:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.2.0.2.ebuild b/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.2.0.2.ebuild
deleted file mode 100644
index 3c2aca5d301b..000000000000
--- a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.2.0.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A regular expression library for W3C XML Schema regular expressions"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RESTRICT=test # slow tests
-
-RDEPEND=">=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?]
-	>=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/hunit )
-"
diff --git a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.2.0.3.ebuild b/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.2.0.3.ebuild
deleted file mode 100644
index d82a1e251628..000000000000
--- a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.2.0.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A regular expression library for W3C XML Schema regular expressions"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="profile"
-
-RDEPEND=">=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?]
-	>=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag profile profile)
-}
diff --git a/dev-haskell/hxt-regex-xmlschema/metadata.xml b/dev-haskell/hxt-regex-xmlschema/metadata.xml
deleted file mode 100644
index 1a338fdd07c1..000000000000
--- a/dev-haskell/hxt-regex-xmlschema/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library supports full W3C XML Schema regular expressions
-		inclusive all Unicode character sets and blocks.
-		The complete grammar can be found under &lt;http://www.w3.org/TR/xmlschema11-2/#regexs&gt;.
-		It is implemented by the technique of derivations of regular expressions.
-		The W3C syntax is extended to support not only union of regular sets,
-		but also intersection, set difference, exor.
-		Matching of subexpressions is also supported.
-		The library can be used for constricting lightweight scanners and tokenizers.
-		It is a standalone library, no external regex libraries are used.
-		This package is a substitute for the old regex-xmlschema package.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hxt-unicode-9.0.2.1 b/dev-haskell/hxt-unicode-9.0.2.1
new file mode 100644
index 000000000000..a1913c20d14d
--- /dev/null
+++ b/dev-haskell/hxt-unicode-9.0.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND==dev-haskell/hxt-charproperties-9*:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.4 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Unicode en-/decoding functions for utf8, iso-latin-* and other encodings
+EAPI=5
+HOMEPAGE=http://www.fh-wedel.de/~si/HXmlToolbox/index.html
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND==dev-haskell/hxt-charproperties-9*:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/9.0.2.1
+SRC_URI=mirror://hackage/packages/archive/hxt-unicode/9.0.2.1/hxt-unicode-9.0.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f847a95336ddd1d6d060fdbbcaaaae86
diff --git a/dev-haskell/hxt-unicode-9.0.2.4 b/dev-haskell/hxt-unicode-9.0.2.4
new file mode 100644
index 000000000000..c1fb41d43eda
--- /dev/null
+++ b/dev-haskell/hxt-unicode-9.0.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Unicode en-/decoding functions for utf8, iso-latin-* and other encodings
+EAPI=5
+HOMEPAGE=https://github.com/UweSchmidt/hxt
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/9.0.2.4
+SRC_URI=mirror://hackage/packages/archive/hxt-unicode/9.0.2.4/hxt-unicode-9.0.2.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bed4f851256e8ebb785d56dfeeadd9cd
diff --git a/dev-haskell/hxt-unicode/Manifest b/dev-haskell/hxt-unicode/Manifest
deleted file mode 100644
index 7787335094aa..000000000000
--- a/dev-haskell/hxt-unicode/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST hxt-unicode-9.0.2.1.tar.gz 13648 BLAKE2B 820d7835e2e554e6809b0f73e289f24daf4aabefa03f04eb958e00cd56709a04de7d2b803c23f6772b0773169d3caf518ace798d302c3a1321b5a94e82968eca SHA512 43d4c73120d29e1a8af3efc4158062b750c64c4722621ebb9c88ec77110475e7953758ad5c812b661fed740c6a043bef1b4a3925a1034aa68273105d919abdbe
-DIST hxt-unicode-9.0.2.4.tar.gz 14010 BLAKE2B cdec42564a1107f1a1d322cb22a1f5b74d2bed6e3aaa04ca2973ccc0d6b02b98c18faa86ce92881ad9229b60d2f29055e4cdaa2a2e7002fdb7b9e25133f35dc3 SHA512 4daab9c754e05e15bb0f32bce4ccc0c581c6d8dd4ca4d4868ca7b756a6e40cc9ae8890fc3c925b63bb419db0354229ca6e61fa96bec048f0c61b3ebb43d212bb
-EBUILD hxt-unicode-9.0.2.1.ebuild 640 BLAKE2B 996b0265bbf0f072f83158745fdb33d29217eaaed4c9eae1f79b6ba7cd4677b7f55239feaac1a995ed43b4ab792b76b50a5ef58a83b93aa68518c2c9a82c2af4 SHA512 45280ec74a96de730da07ab99fe7de7c482eb3be2ab0905429e8630a227a452f48edd3960d58809f75129634b0fc1af0792ef18886660e287401327e7c514801
-EBUILD hxt-unicode-9.0.2.4.ebuild 667 BLAKE2B 4bee19916b19e798b1643c004527038757c59e7e1dddfd3ec5e8a97cf20e33a21452aee50cb1ead2d15daf772a2fb57ae3b525e416ae46017729a127fe03b39d SHA512 9b70b81b05f3e0996a9a409914b8025e37b6ffb8abf08ef8711eed93e0aa13b41df0928367b5cf903e603c4bcf9d926e43ef690fd918cf195c71310ca261898f
-MISC metadata.xml 622 BLAKE2B 0cf09176e3b65b91ee8de08aaab63e5af30fddc38a5f1e8ba17558a4299675986cf206f47cce8942e73ef638e0d51cdd1ea722ed02141bcc831d78a20831a3d6 SHA512 243c6959ca0b2ec26f156f54f1fcd264de7c0aabc9a28f47660f3eb2f097229d41cf972ff6b065a74b094f2971155b90ca968d9941aab811a033109992bf3948
diff --git a/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.1.ebuild b/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.1.ebuild
deleted file mode 100644
index f70f7a68e276..000000000000
--- a/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Unicode en-/decoding functions for utf8, iso-latin-* and other encodings"
-HOMEPAGE="http://www.fh-wedel.de/~si/HXmlToolbox/index.html"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/hxt-charproperties-9*:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.4"
diff --git a/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.4.ebuild b/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.4.ebuild
deleted file mode 100644
index 12633a78d297..000000000000
--- a/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Unicode en-/decoding functions for utf8, iso-latin-* and other encodings"
-HOMEPAGE="https://github.com/UweSchmidt/hxt"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/hxt-unicode/metadata.xml b/dev-haskell/hxt-unicode/metadata.xml
deleted file mode 100644
index 73c4decb1fc1..000000000000
--- a/dev-haskell/hxt-unicode/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Unicode encoding and decoding functions for utf8, iso-latin-* and somes other encodings,
-		used in the Haskell XML Toolbox.
-		ISO Latin 1 - 16, utf8, utf16, ASCII are supported. Decoding
-		is done with lasy functions, errors may be detected or ignored.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">UweSchmidt/hxt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hxt/Manifest b/dev-haskell/hxt/Manifest
deleted file mode 100644
index 2bcd88967910..000000000000
--- a/dev-haskell/hxt/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST hxt-9.3.1.15.tar.gz 235096 BLAKE2B a6796bf8509b95c2a04d760e2cd3ca8d0f6315a5a9ce5c3a2d29e41a9503b6405a0f614b9b5f0b039936284cec4dc63c83b4dba0ce806e415497a1e486b86761 SHA512 f2d4d853811667b663d434671bc5743f7019fe435c9c39af359a0305e4c5bfdf53540b9cd33930bd13d07482cc583fd1f231fe33995b9a55b785af8d98f1fe24
-DIST hxt-9.3.1.16.tar.gz 223814 BLAKE2B acc0ada43249884c2da06adb8214827b626799d6ba4d4eb9de78dcfb4451c523a48b04e6f7c6cc41b4f6a708527bd824979d902452c77dabd8190d94a521bbb2 SHA512 6cc99a3b9d1ffe33002d35a5c0965919227835e0fb5b0b829b49232443dec175428dab66720a717f8a655e0de9ad4c77c501aa6d3982b43024cb3a866cd12846
-EBUILD hxt-9.3.1.15.ebuild 1372 BLAKE2B 548fc99f0a1e8cdb1e106f5f54786d90c65622acf4132d0089da1063f5043d63e53274eef653a02e0827e551185cac80660b6a53f806387377a01842154c8d10 SHA512 ae185524b94b1835d94abba02064e0d4d616f682ac4b36c68f203cd3a98b8bbe2a804ff5bc46a2a7bc57349886a76207d0ae24f5ac734fed042cc7c27fbb3b3c
-EBUILD hxt-9.3.1.16.ebuild 1100 BLAKE2B efb8f1021aec6e0bcbaf793b8bd56d10db3a1f2802442c89c155a8e4c253d5156b1dcdd658e5998b1e7d62a0668575f308ec853d32b710a60659689605439239 SHA512 00a7d3766dfa52651ac6a4e1af8c4b89b3edf8c37bbf151f4153ad7bdee2bc0d86ddfdcf86b62714339018ade4ff69969643c6698393b63a57ccc49ef6638446
-MISC metadata.xml 1388 BLAKE2B 7931219c94c280c4d205630f0fdfd0bcc6b41b74fa48ae4545878a19ba026ded8e5d41a7dda91a0cc5e2d8aa4bf114c2f434e42809c0950385a17660a6966662 SHA512 76f78e92e34cf2431c3c676ded65098f2be331cbd6aaf91c23314c9c037bd6d5981c39c41d47e82c47e709a3e7adaf475a1efac26e27f1022d2ea2815ffb236e
diff --git a/dev-haskell/hxt/hxt-9.3.1.15.ebuild b/dev-haskell/hxt/hxt-9.3.1.15.ebuild
deleted file mode 100644
index 2672c602b61b..000000000000
--- a/dev-haskell/hxt/hxt-9.3.1.15.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A collection of tools for processing XML with Haskell"
-HOMEPAGE="https://github.com/UweSchmidt/hxt"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-1:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?]
-	>=dev-haskell/hxt-charproperties-9.1:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?]
-	>=dev-haskell/hxt-regex-xmlschema-9.2:=[profile?] <dev-haskell/hxt-regex-xmlschema-10:=[profile?]
-	>=dev-haskell/hxt-unicode-9.0.1:=[profile?] <dev-haskell/hxt-unicode-10:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/hxt/hxt-9.3.1.16.ebuild b/dev-haskell/hxt/hxt-9.3.1.16.ebuild
deleted file mode 100644
index 29fc40aef1e8..000000000000
--- a/dev-haskell/hxt/hxt-9.3.1.16.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A collection of tools for processing XML with Haskell"
-HOMEPAGE="https://github.com/UweSchmidt/hxt"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/hxt-charproperties-9.1:=[profile?]
-	>=dev-haskell/hxt-regex-xmlschema-9.2:=[profile?]
-	>=dev-haskell/hxt-unicode-9.0.1:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/hxt/metadata.xml b/dev-haskell/hxt/metadata.xml
deleted file mode 100644
index e629e3d93946..000000000000
--- a/dev-haskell/hxt/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The Haskell XML Toolbox bases on the ideas of HaXml and HXML,
-		but introduces a more general approach for processing XML with Haskell.
-		The Haskell XML Toolbox uses a generic data model for representing XML documents,
-		including the DTD subset and the document subset, in Haskell.
-		It contains a validating XML parser, a HTML parser, namespace support,
-		an XPath expression evaluator, an XSLT library, a RelaxNG schema validator
-		and funtions for serialization and deserialization of user defined data.
-		The library makes extensive use of the arrow approach for processing XML.
-		Since version 9 the toolbox is partitioned into various (sub-)packages.
-		This package contains the core functionality,
-		hxt-curl, hxt-tagsoup, hxt-relaxng, hxt-xpath, hxt-xslt, hxt-regex-xmlschema contain the extensions.
-		hxt-unicode contains encoding and decoding functions,
-		hxt-charproperties char properties for unicode and XML.
-	</longdescription>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">UweSchmidt/hxt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/icalendar-0.4.0.3 b/dev-haskell/icalendar-0.4.0.3
new file mode 100644
index 000000000000..112bbe2be646
--- /dev/null
+++ b/dev-haskell/icalendar-0.4.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/data-default-0.3:=[profile?] >=dev-haskell/mime-0.4.0.2:=[profile?] >=dev-haskell/mtl-2.1.0:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.10.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.22.2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=iCalendar data types, parser, and printer
+EAPI=6
+HOMEPAGE=https://github.com/chrra/iCalendar
+IUSE=+network-uri doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/data-default-0.3:=[profile?] >=dev-haskell/mime-0.4.0.2:=[profile?] >=dev-haskell/mtl-2.1.0:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.10.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/0.4.0.3
+SRC_URI=mirror://hackage/packages/archive/iCalendar/0.4.0.3/iCalendar-0.4.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6cfa837273b6f9d1716fc6856db1b0e2
diff --git a/dev-haskell/icalendar/Manifest b/dev-haskell/icalendar/Manifest
deleted file mode 100644
index 1add38f4bbac..000000000000
--- a/dev-haskell/icalendar/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST iCalendar-0.4.0.3.tar.gz 29889 BLAKE2B 8cd635e5677b98b5aa2b96605a21407a9443c92a31b963aece597a1acb5d248764189fd277789c7a4d39a81760f4e5f00ec98992bbf1628086766775efb38346 SHA512 504c562a8213a899071941fc3ebce59354885a4d5b680950eb9eee8a0b1704475e91fbbffb8773d6ae5f9c124dd1fd3c39aae369f7305bf4d7ca9430984070c8
-EBUILD icalendar-0.4.0.3.ebuild 1329 BLAKE2B 16089fe1e493f0e77380e4b2dc5fded00349c54b9e3fc433ff37284423a9809e6116077d8c616bdec41e8ad889fbcfca8f0c6adfd4e4dbd788ef12a7408011bf SHA512 a8b513c98c7f205b10bdfda8357b512d30e0757603472c82c2c52272e3b2cfc9cba47e64181655435379b33cff9f4e59350a5fd0b23e39ff0248f9d713cac32e
-MISC metadata.xml 519 BLAKE2B 8011b4fd4c19e3aab29a03f1503cd5dbe5e8c93d4c9a9f770c8555a8ffc2ce5f80eee1a55bc7427d17520d462e2665dff43b2a626136664a1692eba667f04405 SHA512 0b2ad70f6f48a2d4041fa9575e93fa067777eaddb401bea31a2106a76c539370d514a25f0dda7c26f55900ddead6a2e194fc4a6d65d85568724ab0c9fedfccb5
diff --git a/dev-haskell/icalendar/icalendar-0.4.0.3.ebuild b/dev-haskell/icalendar/icalendar-0.4.0.3.ebuild
deleted file mode 100644
index cdd989cd25bf..000000000000
--- a/dev-haskell/icalendar/icalendar-0.4.0.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="iCalendar"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="iCalendar data types, parser, and printer"
-HOMEPAGE="https://github.com/chrra/iCalendar"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/case-insensitive-0.4:=[profile?]
-	>=dev-haskell/data-default-0.3:=[profile?]
-	>=dev-haskell/mime-0.4.0.2:=[profile?]
-	>=dev-haskell/mtl-2.1.0:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-haskell/parsec-3.1.0:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/icalendar/metadata.xml b/dev-haskell/icalendar/metadata.xml
deleted file mode 100644
index ce6e4ffec79e..000000000000
--- a/dev-haskell/icalendar/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="network-uri">use network-uri package</flag>
-	</use>
-	<longdescription>
-		Data definitions, parsing and printing of the iCalendar
-		format (RFC5545).
-	</longdescription>
-	<upstream>
-		<remote-id type="github">chrra/iCalendar</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/iconv-0.4.1.3 b/dev-haskell/iconv-0.4.1.3
new file mode 100644
index 000000000000..52535339499a
--- /dev/null
+++ b/dev-haskell/iconv-0.4.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=String encoding conversion
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/iconv
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.1.3
+SRC_URI=mirror://hackage/packages/archive/iconv/0.4.1.3/iconv-0.4.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ee76a70bb5bfc6ee41515f6f835171e5
diff --git a/dev-haskell/iconv/Manifest b/dev-haskell/iconv/Manifest
deleted file mode 100644
index cfe7f7c20f44..000000000000
--- a/dev-haskell/iconv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST iconv-0.4.1.3.tar.gz 12706 BLAKE2B 569b61bc426115feaf321cb52230460d1cc66472e2fa18678a16e5486a80b5df698e2fece746371268d7031d82268bee98f15ae1713b9589b42f54b4e9cdd0e5 SHA512 b5541bbf477572f7546fa804a33243f5d126c6eb57d0fc12abd85fb9fb19dbb10a79cca60054c585845c3b755d2d5d021413d9aca4db63f5b0eaa52bba87d588
-EBUILD iconv-0.4.1.3.ebuild 545 BLAKE2B c812071604bcb6452fb6672329d0b4b7e7a82aa953e53d0926e9ea26dd0cb22ad5eb8643256218b80c53add34e6897f5c06f2dac2d8a76918f61e2e919ad0f67 SHA512 9f61b4538aeac67eedfc32de235bb9133313cd2a5d5c412ac6569e6d33ae5c2d2eaf2b455eb4fe8d0f8a8bd25d50795a15882a28265fe6df567f398b954b06ff
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/iconv/iconv-0.4.1.3.ebuild b/dev-haskell/iconv/iconv-0.4.1.3.ebuild
deleted file mode 100644
index 3061a8aa78b4..000000000000
--- a/dev-haskell/iconv/iconv-0.4.1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="String encoding conversion"
-HOMEPAGE="http://hackage.haskell.org/package/iconv"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/iconv/metadata.xml b/dev-haskell/iconv/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/iconv/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/idiii-0.1.3.3 b/dev-haskell/idiii-0.1.3.3
new file mode 100644
index 000000000000..0d52c3b066e6
--- /dev/null
+++ b/dev-haskell/idiii-0.1.3.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/data-accessor:=[profile?] dev-haskell/missingh:=[profile?] dev-haskell/polyparse:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=ID3v2 (tagging standard for MP3 files) library
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/idiii
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/data-accessor:=[profile?] dev-haskell/missingh:=[profile?] dev-haskell/polyparse:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.1.3.3
+SRC_URI=mirror://hackage/packages/archive/idiii/0.1.3.3/idiii-0.1.3.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=43eefbf57a23c25cf01a97870758a55f
diff --git a/dev-haskell/idiii/Manifest b/dev-haskell/idiii/Manifest
deleted file mode 100644
index fad92f902887..000000000000
--- a/dev-haskell/idiii/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST idiii-0.1.3.3.tar.gz 103560 BLAKE2B cc0f89cbdc2eee4d2b50f48cd1c259af57a7846e38ad80214e8ca57d5ef6e8af1c0f4aac435a8092b4c2c21584c2dd9cc33d0afc5558494c76c93af6e5782ef7 SHA512 31d993aad1891d1d673bf4cebaf639cf20c4cbf9835eb808a5d241e9933a8b2e64a33465d8a77950d9aa2afe4ae6985e4d62d890b7a52701792e3f5c7bf70547
-EBUILD idiii-0.1.3.3.ebuild 805 BLAKE2B 8c77bd91a372eec01c721f4c934b0b7f50bf476e19d3147b41b6cde7367baf3c10c39f99ce9038e2d9a6221cdf4310f44c9ddce2edcea08fb24b9a9888cb2f14 SHA512 8f3adf58927565121c32a5ea0021a6b36f19fdaacc3a3fc3bcdaeeedbba4657869f527379c3bb979e119735d89506703b1878e19bf0d641cded410cf64b98c99
-MISC metadata.xml 337 BLAKE2B 91fae89351fae612a7b01175639eea6f75ee78872713041d6a8a2becfcf31d72bf468ddc2aae49e6bcfc78921547ffda27c0c22d564bee128d9ac2e1ae77b048 SHA512 d77ddc00473feb6b563c10c9c1261672d7b05d5a0b83546587413a779b4f1ee0f7207ffa1d03d28b5aef02505ffec8c293206dbe6fa896c699e3978f372e7a82
diff --git a/dev-haskell/idiii/idiii-0.1.3.3.ebuild b/dev-haskell/idiii/idiii-0.1.3.3.ebuild
deleted file mode 100644
index d547ab7d5cf8..000000000000
--- a/dev-haskell/idiii/idiii-0.1.3.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="ID3v2 (tagging standard for MP3 files) library"
-HOMEPAGE="http://hackage.haskell.org/package/idiii"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test #missing files
-
-RDEPEND="dev-haskell/data-accessor:=[profile?]
-	dev-haskell/missingh:=[profile?]
-	dev-haskell/polyparse:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit )
-"
diff --git a/dev-haskell/idiii/metadata.xml b/dev-haskell/idiii/metadata.xml
deleted file mode 100644
index 84a397179159..000000000000
--- a/dev-haskell/idiii/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		ID3v2 (tagging standard for MP3 files) library
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/idna-0.2 b/dev-haskell/idna-0.2
new file mode 100644
index 000000000000..db9064e43c19
--- /dev/null
+++ b/dev-haskell/idna-0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/punycode-2.0:=[profile?] >=dev-haskell/stringprep-0.1.2:=[profile?] >=dev-haskell/text-0.1:=[profile?] >=dev-lang/ghc-7.0.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Implements IDNA (RFC 3490)
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/idna
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/punycode-2.0:=[profile?] >=dev-haskell/stringprep-0.1.2:=[profile?] >=dev-haskell/text-0.1:=[profile?] >=dev-lang/ghc-7.0.1:=
+SLOT=0/0.2
+SRC_URI=mirror://hackage/packages/archive/idna/0.2/idna-0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7449cf82f0670f62d7370bc05c96632f
diff --git a/dev-haskell/idna-0.3.0 b/dev-haskell/idna-0.3.0
new file mode 100644
index 000000000000..83a473bfe367
--- /dev/null
+++ b/dev-haskell/idna-0.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/punycode-2.0:=[profile?] >=dev-haskell/stringprep-1:=[profile?] <dev-haskell/stringprep-2:=[profile?] >=dev-haskell/text-0.1:=[profile?] >=dev-lang/ghc-7.0.1:= >=dev-haskell/cabal-1.10.0.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Implements IDNA (RFC 3490)
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/idna
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/punycode-2.0:=[profile?] >=dev-haskell/stringprep-1:=[profile?] <dev-haskell/stringprep-2:=[profile?] >=dev-haskell/text-0.1:=[profile?] >=dev-lang/ghc-7.0.1:=
+SLOT=0/0.3.0
+SRC_URI=mirror://hackage/packages/archive/idna/0.3.0/idna-0.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6499a231fceaf90ada04f94ad5c614b2
diff --git a/dev-haskell/idna/Manifest b/dev-haskell/idna/Manifest
deleted file mode 100644
index 7aad79deb90c..000000000000
--- a/dev-haskell/idna/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST idna-0.2.tar.gz 2372 BLAKE2B 9efdb1fed1bb1da07a1031fb6f5616876398594049aba71ef2bc7764971ca785f12ed94535bde5ab9c51c435f1bc1d96072ab6830ceded8d4ec70dadaccd2471 SHA512 cfbe78f2b21059802e139420120a6bce8c09f58786258c874e73b0f01f953cd07d2cedf7c2d19677b0dbe327db7ce4b39a6569fd624cfcc02b6b249e07051b81
-DIST idna-0.3.0.tar.gz 2352 BLAKE2B d4b0441c22b14d5e87438d3e39594e44943aaccc70ee4c66eab70146067e7a1a0c358e94cd68251517fcdbbb2b14f896441a6ebfccd764b31c342d82b8e79b8f SHA512 c18bd9e4157abfde7fa30a16d0df432745f04ee784a2d2be3852750d989964a77bcfc8cc34ab8629a0bb25686adacc07f510150f9696a926559964e6a724f98f
-EBUILD idna-0.2.ebuild 657 BLAKE2B a4445a519a6cd5ec6f1a42a135ca07d65b32c9d8e1c44b99db724051690f9313e0ebdb1962c6ebf7db60b174cdba405323b0098cea9b5f02ca2f00bc9d4b76aa SHA512 875b7086f365c558cba462bfda6a3cc14f410c30567594af1c825e70148c358205c9bf8e314bcd91cd32166c4de52fcf1d335c1c3e3a152f3af1f7b199870843
-EBUILD idna-0.3.0.ebuild 696 BLAKE2B 0d8548ee31d20e4a8a90ce648ba2300aaf06cd840e4b51a93d108329681c942f7dc6716bd8eb177fb5eaf7e0240475b4aa8b6646fe7bcbb766947695c689e850 SHA512 d2ecf49ace06f593acb2cb6912c41bdb839ad18d4e06d5f971579007ab31d10bf251f3f082d245feee61e81f24fe5030f6db85bd00b82ff2f5ca599aa524de11
-MISC metadata.xml 367 BLAKE2B 413e211fa530c34cb24168246c0ceeb5114375d2c7ffdd64567602f3b7aafac26c4502f3306c8b47012f6e5f8fa68557a9f418fe441a7f86235a044aabe3cf8f SHA512 701a3a2baea3610559bc5e103a5374fb8876b7f878368616bd4dca0cf9eb47c1d6438eb244bd5566e2d5e46013c2119b427f93cecd7eb8befa9cca6128774b19
diff --git a/dev-haskell/idna/idna-0.2.ebuild b/dev-haskell/idna/idna-0.2.ebuild
deleted file mode 100644
index b3d3bb7cb5ae..000000000000
--- a/dev-haskell/idna/idna-0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Implements IDNA (RFC 3490)"
-HOMEPAGE="http://hackage.haskell.org/package/idna"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/punycode-2.0:=[profile?]
-		>=dev-haskell/stringprep-0.1.2:=[profile?]
-		>=dev-haskell/text-0.1:=[profile?]
-		>=dev-lang/ghc-7.0.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/idna/idna-0.3.0.ebuild b/dev-haskell/idna/idna-0.3.0.ebuild
deleted file mode 100644
index b682c251f72b..000000000000
--- a/dev-haskell/idna/idna-0.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Implements IDNA (RFC 3490)"
-HOMEPAGE="http://hackage.haskell.org/package/idna"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/punycode-2.0:=[profile?]
-	>=dev-haskell/stringprep-1:=[profile?] <dev-haskell/stringprep-2:=[profile?]
-	>=dev-haskell/text-0.1:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-"
diff --git a/dev-haskell/idna/metadata.xml b/dev-haskell/idna/metadata.xml
deleted file mode 100644
index 2bc68ef0b1cc..000000000000
--- a/dev-haskell/idna/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Implements IDNA - Internationalized Domain Names in Applications (RFC 3490).
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/ieee754-0.7.8 b/dev-haskell/ieee754-0.7.8
new file mode 100644
index 000000000000..07c270e1da91
--- /dev/null
+++ b/dev-haskell/ieee754-0.7.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Utilities for dealing with IEEE floating point numbers
+EAPI=5
+HOMEPAGE=https://github.com/patperry/hs-ieee754
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.8
+SRC_URI=mirror://hackage/packages/archive/ieee754/0.7.8/ieee754-0.7.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0e03389e9d83e861e6da47725b0b188f
diff --git a/dev-haskell/ieee754/Manifest b/dev-haskell/ieee754/Manifest
deleted file mode 100644
index 41261e155ffc..000000000000
--- a/dev-haskell/ieee754/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ieee754-0.7.8.tar.gz 17290 BLAKE2B befc4e9f5f1b69a6ad29a2bde915a6f9115a307419d903db6f4cb4108f3556d5475805f997e31212f580ed859c45e3019c55c0fd1ce8ec3bbf0d1892b04fc091 SHA512 662ed7c68797164ee5f0cd3132da96d8d9032aa23037d57636281fdc4952a7c276f92deb032db60663ab1c71311fd8d3088265fc03f772f271dcb659f3e9b866
-EBUILD ieee754-0.7.8.ebuild 566 BLAKE2B aa5b43d630d5e09b482b8f95abcf95f454363ddb4e15374fb79c4c609f7e88cfb9d62e953f210157c1742fc9331ad302b8a0865418b16205b96c361d19900195 SHA512 bfa933363a6e877961746f0751f0b2644a548b25dc49ac62148beb197ee70ad6549c881db3f463f1cb67653a20232efe8e0ac85766edd02db25847c940f9b52e
-MISC metadata.xml 530 BLAKE2B c282b2c29c47cfafb543d0ec17d0bdc2d8890f148212e270457bbab8cfbc09dedf76f8ef8cd303b1db0c27eb2c2341d66c1209de50f6fa4d390c68ea8cf5ce2e SHA512 308fa2e606307ae9c8d10b5424b533e4a99046cc2f3d51acbc9322de9049bca5ac97597e535b02d2c6e7d329202ebfe26cd614994f2f9a31a92e2755134b1fbb
diff --git a/dev-haskell/ieee754/ieee754-0.7.8.ebuild b/dev-haskell/ieee754/ieee754-0.7.8.ebuild
deleted file mode 100644
index ae9e5afbfdac..000000000000
--- a/dev-haskell/ieee754/ieee754-0.7.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities for dealing with IEEE floating point numbers"
-HOMEPAGE="https://github.com/patperry/hs-ieee754"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.0
-"
diff --git a/dev-haskell/ieee754/metadata.xml b/dev-haskell/ieee754/metadata.xml
deleted file mode 100644
index 9d2d16b6418a..000000000000
--- a/dev-haskell/ieee754/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-	Utilities for dealing with IEEE floating point numbers, ported from the Tangoi
-	math library; approximate and exact equality comparisons for general types. 
-	</longdescription>
-	<upstream>
-		<remote-id type="github">patperry/hs-ieee754</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/ifelse-0.85 b/dev-haskell/ifelse-0.85
new file mode 100644
index 000000000000..47cfc4ccb8b3
--- /dev/null
+++ b/dev-haskell/ifelse-0.85
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl[profile?] >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Anaphoric and miscellaneous useful control-flow
+EAPI=4
+HOMEPAGE=http://hackage.haskell.org/package/IfElse
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl[profile?] >=dev-lang/ghc-6.8.2
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/IfElse/0.85/IfElse-0.85.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4ac62b506cb1ed36c21245f997e8d72f
diff --git a/dev-haskell/ifelse/Manifest b/dev-haskell/ifelse/Manifest
deleted file mode 100644
index d3abba3a8bae..000000000000
--- a/dev-haskell/ifelse/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST IfElse-0.85.tar.gz 2865 BLAKE2B 620522dd255b30d28dd1ffe93591ceff0191845731e4a717bcd92dbf746f363fa37b1eb6694af55fc9f4fe56add4fb9b82bdb17d0b0263cf82feb2bf76cc4c39 SHA512 5378b0f98d3a14dbc5b297a01a5c48aed4825f4ab2192e35b3a6aee932cce5b740e5ea44cbbd69dc3e74ff38415d77df43136e2a8ddf9bc6fd9fe1497a6dcd1c
-EBUILD ifelse-0.85.ebuild 661 BLAKE2B b27cca764d0709735b59847ccf6f40663a236df9c7023a485f7a4cc367e2c27f19298ea308c03bd2d4d42efa241b220572d5efcb7e97a4dddb609ac0acbd5b0f SHA512 b8738b3dfe290f027df421c4ed72b81e0d284a4ce87e289269a48d5458092d06effb7aea223f323bff3e5c92d378765a2ae5305029f876d15c1e03e33a04edad
-MISC metadata.xml 338 BLAKE2B b967eb99be919c60c3849806900de1b7cd5aa4c4c9e546169054fc6e3f868e608af33851b3fe7a462fe15c8c3d8a68182cab1a16723bedfaf70ad99e578e9bc6 SHA512 3d3ba29cee849c5df537b91d74061ee101f6db16b8efd79ab8fc81ef0599023b0b21fd2cdac7633c8ffaea2614989edc2fbbf4e539afffe7cff74ddb3c67a8df
diff --git a/dev-haskell/ifelse/ifelse-0.85.ebuild b/dev-haskell/ifelse/ifelse-0.85.ebuild
deleted file mode 100644
index 118efe481117..000000000000
--- a/dev-haskell/ifelse/ifelse-0.85.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.17.9999
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="IfElse"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Anaphoric and miscellaneous useful control-flow"
-HOMEPAGE="http://hackage.haskell.org/package/IfElse"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl[profile?]
-		>=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/ifelse/metadata.xml b/dev-haskell/ifelse/metadata.xml
deleted file mode 100644
index 4e6e943e5365..000000000000
--- a/dev-haskell/ifelse/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Anaphoric and miscellaneous useful control-flow
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/interpolate-0.1.0 b/dev-haskell/interpolate-0.1.0
new file mode 100644
index 000000000000..728660a39e79
--- /dev/null
+++ b/dev-haskell/interpolate-0.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/haskell-src-meta:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.5 dev-haskell/quickcheck dev-haskell/quickcheck-instances dev-haskell/text ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=String interpolation done right
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/interpolate
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/haskell-src-meta:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0
+SRC_URI=mirror://hackage/packages/archive/interpolate/0.1.0/interpolate-0.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=75470624156cf0a53ccbd2dbb41d4009
diff --git a/dev-haskell/interpolate/Manifest b/dev-haskell/interpolate/Manifest
deleted file mode 100644
index 6d52c2aab5b5..000000000000
--- a/dev-haskell/interpolate/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST interpolate-0.1.0.tar.gz 4894 BLAKE2B 1b8438ae6e466fddf66161314e5046dcab862bea29fe136e0c4f7b374c8c337b310d546ff714aec4adb00ed63385a600f04f6f3d6b8313f068299ee2a827c032 SHA512 5273195c77ef22919dfcb8df9e6db4a1ee186ca0d218f24e94a53236b0af20897d01273e027307a7164bf15a66ebf47afcc9ecc35f6e867c3c2a0e1572eaf435
-EBUILD interpolate-0.1.0.ebuild 714 BLAKE2B f1266b922359638436c376329a86818774d133ba40beec000370346661bc5824f6d265b806bb64b0f8110facaec734e1dd2daf54121b080268d731bbe7bd50fd SHA512 3902ceeeb566fcaec8aeb2abf6c4ebb27d2c297264f78e58f7e32024a41223d3a433a4ab5c6ad5c3f20e79c2c2d344efc881e957165ee275fdb78675bb5a7f5a
-MISC metadata.xml 322 BLAKE2B 144c22e9f15b4a7be4c12a279997aff47a750e714d5988759d3a707b46f452d01e130d73a50acb389181f522b03a14b1b68ea68e316f3cea81bad8ee640a91bb SHA512 8a4f5a1abff94cb57030095f6efa0ae7ebcd842c6f9e4403cfc440f10ca6dbb1f7d3a9c67e8261eedc005c7aacc1aa0126ec24b0a84dd89c73daf5ea0bf66c9e
diff --git a/dev-haskell/interpolate/interpolate-0.1.0.ebuild b/dev-haskell/interpolate/interpolate-0.1.0.ebuild
deleted file mode 100644
index c634e9b50195..000000000000
--- a/dev-haskell/interpolate/interpolate-0.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="String interpolation done right"
-HOMEPAGE="http://hackage.haskell.org/package/interpolate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/haskell-src-meta:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.5
-		dev-haskell/quickcheck
-		dev-haskell/quickcheck-instances
-		dev-haskell/text )
-"
diff --git a/dev-haskell/interpolate/metadata.xml b/dev-haskell/interpolate/metadata.xml
deleted file mode 100644
index 62fee7cb97ec..000000000000
--- a/dev-haskell/interpolate/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		String interpolation done right
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/io-streams-1.3.6.0 b/dev-haskell/io-streams-1.3.6.0
new file mode 100644
index 000000000000..260a7d490af4
--- /dev/null
+++ b/dev-haskell/io-streams-1.3.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/bytestring-builder-0.10:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/primitive-0.2:=[profile?] <dev-haskell/primitive-0.7:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/mtl-2 <dev-haskell/mtl-3 >=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3 >=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4 >=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple, composable, and easy-to-use stream I/O
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/io-streams
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/bytestring-builder-0.10:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/primitive-0.2:=[profile?] <dev-haskell/primitive-0.7:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.3.6.0
+SRC_URI=mirror://hackage/packages/archive/io-streams/1.3.6.0/io-streams-1.3.6.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ff25a2812f6a4504b633adf4f682b985
diff --git a/dev-haskell/io-streams-haproxy-1.0.0.1 b/dev-haskell/io-streams-haproxy-1.0.0.1
new file mode 100644
index 000000000000..ec1f698c0b69
--- /dev/null
+++ b/dev-haskell/io-streams-haproxy-1.0.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.7:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.4:=[profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HAProxy protocol 1.5 support for io-streams
+EAPI=6
+HOMEPAGE=http://snapframework.com/
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.7:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.4:=[profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.0.0.1
+SRC_URI=mirror://hackage/packages/archive/io-streams-haproxy/1.0.0.1/io-streams-haproxy-1.0.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=646b69a8eb0ad04e65bf4e72d3c09703
diff --git a/dev-haskell/io-streams-haproxy/Manifest b/dev-haskell/io-streams-haproxy/Manifest
deleted file mode 100644
index 61c4c8d95cd3..000000000000
--- a/dev-haskell/io-streams-haproxy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST io-streams-haproxy-1.0.0.1.tar.gz 9892 BLAKE2B 0d96c42328bdc12a637b47f50cb9938abe658cebf075896c1e834850a4e9a97b2aa22f71977b5af6e9c080af4aead1febb7c56370df9b2a580557869e391cdb7 SHA512 03818b65765dd575bba5d9eaf508bac8251a34f64f861fb9d2b3029f8923b22e2eb5e835dd8de7c346682c26587d4f5b2086647713c6bd897ab888b81eb95fb1
-EBUILD io-streams-haproxy-1.0.0.1.ebuild 1001 BLAKE2B 8ff244f58aa2594c9c5f5c8aa36c1f393e014c2eb0087a8c5a6ed4767f6fd2e9796fff24ad3e6601977629f997bfd7f5829ec32c52a0d4a50d6782316f194470 SHA512 c747d917d2a54c84137a6dd0e675230dfd5e4b2c0b824033f17fe927d9bb15ff2302d823afcb262853d70a93a9391a66f9aa79a0eaa60d7e7997f9967233e0d3
-MISC metadata.xml 621 BLAKE2B a39ada4118a2fd463c4d1cd1871875255790fe7f9f9da5e161e0b299e4cbac35c4f8a5b66ff1aafa4eb1904a98b0e4eea92f9cffe7f74382b8f61a3243540cbb SHA512 86647fb9be75e60db2537ec88e1bde25269a084f62656a5461a50793556536c13e47070e298eed297dc446ba41d534de1783c03d14f51f70df441b655409842c
diff --git a/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.0.1.ebuild b/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.0.1.ebuild
deleted file mode 100644
index ba5a9034d51d..000000000000
--- a/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HAProxy protocol 1.5 support for io-streams"
-HOMEPAGE="http://snapframework.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.7:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.4:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 )
-"
diff --git a/dev-haskell/io-streams-haproxy/metadata.xml b/dev-haskell/io-streams-haproxy/metadata.xml
deleted file mode 100644
index 83e8ec3de1d8..000000000000
--- a/dev-haskell/io-streams-haproxy/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		HAProxy protocol version 1.5 support (see
-		&lt;http://haproxy.1wt.eu/download/1.5/doc/proxy-protocol.txt&gt;) for applications
-		using io-streams. The proxy protocol allows information about a networked
-		peer (like remote address and port) to be propagated through a forwarding
-		proxy that is configured to speak this protocol.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/io-streams/Manifest b/dev-haskell/io-streams/Manifest
deleted file mode 100644
index a3146b3a1b0b..000000000000
--- a/dev-haskell/io-streams/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST io-streams-1.3.6.0.tar.gz 61651 BLAKE2B d71a5ba3d264b98d3284470021fc1d9622700b37ef1a67142d12d4d6321233eb28ad5274925e08f9d0c251ee77e25e2187c811d197a9f7b68e33479d8ea602ab SHA512 9ef5a2daa43600796b48104771c71d698f40e29def536e785421b53a310683e7db202b254310a0a5f2d1fa507dcad27c25f328c64fffe796c06d4c0d98ca982d
-EBUILD io-streams-1.3.6.0.ebuild 1718 BLAKE2B 83a41c60b60fdeffc8fede753800f7d208fc2d3005557700961822c853a1b2241cec9737fe00c1b909904cbb3a04951de793c8081fa98aa3c128a48fb5486bd1 SHA512 ea631391a74987a522b63c2cf7d7c3cc08277337b91b2ec91038c17c5b45b3217ceacc3f035df7873a01af097b4afb1bdb976b2810c066543f3fd70c12633cf7
-MISC metadata.xml 5034 BLAKE2B 515f93d8822e032ad27d2ffb5e4184724b243e5b0184c6433e4079a7197bc9790bf89fca700c407039a02e4dfd7992a102271d4d7b6adb22d54e9f1cf80fbaf0 SHA512 38f37bee11128d6b53680e8ece7b87dc98d43ddbb910bd3823c38a81de2d9b2746f9089bd5d3ebbbd9b9d19f7fcb759ef0c667ce17a240affe60f3a73de34325
diff --git a/dev-haskell/io-streams/io-streams-1.3.6.0.ebuild b/dev-haskell/io-streams/io-streams-1.3.6.0.ebuild
deleted file mode 100644
index 105563e921e3..000000000000
--- a/dev-haskell/io-streams/io-streams-1.3.6.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: +nointeractivetests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Simple, composable, and easy-to-use stream I/O"
-HOMEPAGE="http://hackage.haskell.org/package/io-streams"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/bytestring-builder-0.10:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.7:=[profile?]
-	>=dev-haskell/primitive-0.2:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/mtl-2 <dev-haskell/mtl-3
-		>=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3
-		>=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4
-		>=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=nointeractivetests
-}
diff --git a/dev-haskell/io-streams/metadata.xml b/dev-haskell/io-streams/metadata.xml
deleted file mode 100644
index 7852149c9343..000000000000
--- a/dev-haskell/io-streams/metadata.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		/Overview/
-		
-		The io-streams library contains simple and easy-to-use primitives for I/O
-		using streams. Most users will want to import the top-level convenience
-		module "System.IO.Streams", which re-exports most of the library:
-		
-		@
-		import           "System.IO.Streams" (InputStream, OutputStream)
-		import qualified "System.IO.Streams" as Streams
-		@
-		
-		For first-time users, @io-streams@ comes with an included tutorial, which can
-		be found in the "System.IO.Streams.Tutorial" module.
-		
-		/Features/
-		
-		The @io-streams@ user API has two basic types: @InputStream a@ and
-		@OutputStream a@, and three fundamental I/O primitives:
-		
-		@
-		\-\- read an item from an input stream
-		Streams.'System.IO.Streams.read' :: 'System.IO.Streams.InputStream' a -&gt; IO (Maybe a)
-		
-		\-\- push an item back to an input stream
-		Streams.'System.IO.Streams.unRead' :: a -&gt; 'System.IO.Streams.InputStream' a -&gt; IO ()
-		
-		\-\- write to an output stream
-		Streams.'System.IO.Streams.write' :: Maybe a -&gt; 'System.IO.Streams.OutputStream' a -&gt; IO ()
-		@
-		
-		Streams can be transformed by composition and hooked together with provided combinators:
-		
-		@
-		ghci&gt; Streams.fromList [1,2,3::Int] &gt;&gt;= Streams.map (*10) &gt;&gt;= Streams.toList
-		[10,20,30]
-		@
-		
-		Stream composition leaves the original stream accessible:
-		
-		@
-		ghci&gt; input \&lt;- Streams.fromByteString \"long string\"
-		ghci&gt; wrapped \&lt;- Streams.takeBytes 4 input
-		ghci&gt; Streams.read wrapped
-		Just \"long\"
-		ghci&gt; Streams.read wrapped
-		Nothing
-		ghci&gt; Streams.read input
-		Just \" string\"
-		@
-		
-		Simple types and operations in the IO monad mean straightforward and simple
-		exception handling and resource cleanup using Haskell standard library
-		facilities like 'Control.Exception.bracket'.
-		
-		@io-streams@ comes with:
-		
-		* functions to use files, handles, concurrent channels, sockets, lists,
-		vectors, and more as streams.
-		
-		* a variety of combinators for wrapping and transforming streams, including
-		compression and decompression using zlib, controlling precisely how many
-		bytes are read from or written to a stream, buffering output using
-		bytestring builders, folds, maps, filters, zips, etc.
-		
-		* support for parsing from streams using @attoparsec@.
-		
-		* support for spawning processes and communicating with them using streams.
-		
-		/ChangeLog/
-		
-		[@1.1.4.2@] Fixed a build error with network versions older than 2.4.
-		
-		[@1.1.4.1@] @System.IO.Streams.Network@: scalability improvement: buffers
-		for socket reads are now allocated by system malloc rather than
-		by pinned pointers in GHC (currently pinned pointer allocation
-		takes a global lock).
-		
-		[@1.1.4.0@] Widened @attoparsec@ and @text@ library dependencies to allow
-		the latest versions.
-		
-		[@1.1.3.0@] Added @System.IO.Streams.ByteString.takeExactly@. Widened
-		@network@ dependency to include 2.3. Added a
-		@NoInteractiveTests@ flag to selectively disable some tests for
-		environments where spawning interactive processes is
-		impossible.
-		
-		[@1.1.2.2@] Allowed newest versions of the @process@, @test-framework@,
-		and @text@ libraries.
-		
-		[@1.1.2.1@] Fixed build error when compiled against attoparsec-0.10.0.x.
-		
-		[@1.1.2.0@] Added @System.IO.Streams.Concurrent.makeChanPipe@, to create a
-		simple concurrent pipe between an @InputStream@/@OutputStream@
-		pair.
-		
-		[@1.1.1.0@] Added @System.IO.Streams.Network.socketToStreamsWithBufferSize@,
-		allowing control over the size of the receive buffers used when
-		reading from sockets.
-		
-		[@1.1.0.3@] Fixed an inconsistent version upper bound in the test suite.
-		
-		[@1.1.0.2@] Fixed a typo in the tutorial.
-		
-		[@1.1.0.1@] A couple of Haddock markup fixes.
-		
-		[@1.1.0.0@] Reworked, simplified, and streamlined the internals of the
-		library. Exports from "System.IO.Streams.Internal" relying on
-		Sources and Sinks were deleted because they are no longer
-		necessary: Source(..), Sink(..), defaultPushback,
-		withDefaultPushback, nullSource, nullSink, singletonSource,
-		simpleSource, sourceToStream, sinkToStream, generatorToSource,
-		and consumerToSink.
-		
-		[@1.0.2.2@] Fixed a bug in which \"takeBytes 0\" was erroneously requesting
-		input from the wrapped stream.
-		
-		[@1.0.2.1@] Fixed a compile error on GHC 7.0.x.
-		
-		[@1.0.2.0@] Added "System.IO.Streams.Process" (support for communicating
-		with system processes using streams), added new functions to
-		"System.IO.Streams.Handle" for converting @io-streams@ types to
-		'System.IO.Handle's. (Now you can pass streams from this
-		library to places that expect Handles and everything will
-		work.)
-		
-		[@1.0.1.0@] Added 'System.IO.Streams.Combinators.ignoreEof'.
-		
-		[@1.0.0.1@] Fixed some haddock markup.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/iproute-1.2.12 b/dev-haskell/iproute-1.2.12
new file mode 100644
index 000000000000..0059c6f91c07
--- /dev/null
+++ b/dev-haskell/iproute-1.2.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/appar:=[profile?] dev-haskell/byteorder:=[profile?] dev-haskell/network:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/doctest-0.9.3 dev-haskell/hspec dev-haskell/quickcheck dev-haskell/safe ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=IP Routing Table
+EAPI=5
+HOMEPAGE=http://www.mew.org/~kazu/proj/iproute/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/appar:=[profile?] dev-haskell/byteorder:=[profile?] dev-haskell/network:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.2.12
+SRC_URI=mirror://hackage/packages/archive/iproute/1.2.12/iproute-1.2.12.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=46daf11530b1babdf96834059aeb0d6a
diff --git a/dev-haskell/iproute-1.3.1 b/dev-haskell/iproute-1.3.1
new file mode 100644
index 000000000000..f7c85ae2be5f
--- /dev/null
+++ b/dev-haskell/iproute-1.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/appar:=[profile?] dev-haskell/byteorder:=[profile?] dev-haskell/network:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/doctest-0.9.3 dev-haskell/hspec dev-haskell/quickcheck dev-haskell/safe ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=IP Routing Table
+EAPI=5
+HOMEPAGE=http://www.mew.org/~kazu/proj/iproute/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/appar:=[profile?] dev-haskell/byteorder:=[profile?] dev-haskell/network:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.3.1
+SRC_URI=mirror://hackage/packages/archive/iproute/1.3.1/iproute-1.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4a3e277ccd46f466c06fb8970ce1cab4
diff --git a/dev-haskell/iproute-1.4.0 b/dev-haskell/iproute-1.4.0
new file mode 100644
index 000000000000..bce34a103ece
--- /dev/null
+++ b/dev-haskell/iproute-1.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/appar:=[profile?] dev-haskell/byteorder:=[profile?] dev-haskell/network:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/doctest-0.9.3 dev-haskell/hspec dev-haskell/quickcheck dev-haskell/safe ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=IP Routing Table
+EAPI=5
+HOMEPAGE=http://www.mew.org/~kazu/proj/iproute/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/appar:=[profile?] dev-haskell/byteorder:=[profile?] dev-haskell/network:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/1.4.0
+SRC_URI=mirror://hackage/packages/archive/iproute/1.4.0/iproute-1.4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=59a0441e99f322f3e3455af69fabc2e0
diff --git a/dev-haskell/iproute-1.5.0 b/dev-haskell/iproute-1.5.0
new file mode 100644
index 000000000000..a764e641d413
--- /dev/null
+++ b/dev-haskell/iproute-1.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/appar:=[profile?] dev-haskell/byteorder:=[profile?] dev-haskell/network:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/doctest-0.9.3 dev-haskell/hspec dev-haskell/quickcheck dev-haskell/safe ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=IP Routing Table
+EAPI=5
+HOMEPAGE=http://www.mew.org/~kazu/proj/iproute/
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/appar:=[profile?] dev-haskell/byteorder:=[profile?] dev-haskell/network:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/1.5.0
+SRC_URI=mirror://hackage/packages/archive/iproute/1.5.0/iproute-1.5.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=74352210445ec5c32af55830da44017d
diff --git a/dev-haskell/iproute/Manifest b/dev-haskell/iproute/Manifest
deleted file mode 100644
index 6d6cf4b0c3f9..000000000000
--- a/dev-haskell/iproute/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST iproute-1.2.12.tar.gz 9365 BLAKE2B 1d24512b3754f3d3c184f50696a076efee21b7fbccaa02929d77ffb4477fb214201be587d3f63284cdee4426138eeaa6ea483439d12add8db5cbca20e6120eea SHA512 a8a86a04c271c58c91a969a327799737691d553b4e703469ec2f3cacd0d90c48f6c657e626b01f32a86d3c53bf10a0d2c8518ae56a8c8935c4d899eb7b17928f
-DIST iproute-1.3.1.tar.gz 9897 BLAKE2B 5ab83cc490bed7e670b8dd7f89ab11d36da2059fdb1e6fed53d306b54a076cd41885825ecade6fca9bc6b51131ea59eb501d5472354da7d8d26b600222052f7b SHA512 55452f469f16f5c2503e13ab80c3bf252e3e58a12ace961603291be4cd013471fdb4671cd338c15f77ba8a3c82a9d1545fc2901af9c1d0bf52c2ede5b0d9e23d
-DIST iproute-1.4.0.tar.gz 11468 BLAKE2B ec2094c9458ec884eb3af8b57a38bdd2218183652b7bbee78d5ae73d2a5af556ae35a5e9e3acb0e36f9f47994c25da754e3cbb8d0cf270d3c8683707d16ec8e5 SHA512 dedeeeacb057908c4269410ae0a6e4f548dd3f007ac576cbe7119aaac966638f8a965fa6b8f237d14e07b202ece2cecd573d0881f73789517278ea56284c27a1
-DIST iproute-1.5.0.tar.gz 11570 BLAKE2B 19cf5c0ba07e9f4a8dca79c60ce651ee3a3d30060c0be7bf56e34102a73e83726986a5c3998a637a29be8ca4ae5e414547c355fc3c36a5c74662f73bcb9e17e9 SHA512 bd7b7cd04229920c39e874bf0a76d8628930fa37ba3d68803275bd9ca30eedacc85d76dd7bfa0536fcf1b84185270da0f6d3ab5b0be26cc5c6606b4199c07845
-EBUILD iproute-1.2.12.ebuild 741 BLAKE2B 2f7e99bd33d510b09a010ffebe59ac5ae05a64c3d55d59daeb466f082f8c56fb8084a301453dabb4c93ec1c0ff661ef235edd474596e4e31d8502bea36a5963a SHA512 3339981fb1fee097acec2655c44c8a0c322c4604f78168cfad6e27732445233f13bdcdc202284afe84535f259ef3f3489327c26ae6c5a06403364702a637518f
-EBUILD iproute-1.3.1.ebuild 740 BLAKE2B fed49c34e33548d979646441d02478f2906fb166cca17d3c9607742ab772791e0d1ed8b0374e37d55c97a0676735aeb527d7a45988bb1ab19d945b8a2bf0ca0f SHA512 f69e4084580a1d77e986d40adc7e9bf13dfc67ddb58134792d065930b50cee4c7677db1f26032cc56f3076aa864730a31000fec8b0210eb4f1c84183f9e4c119
-EBUILD iproute-1.4.0.ebuild 735 BLAKE2B d61f5b937438eb8091d9ffd1ff483243b6039c382e88a14a83270b497d8bb791582e55b22777192f772f6c502c45253f38832b7ffdc145161723b152da9fcad4 SHA512 da29bf138a9b8467984c7d914a82d2a4ceeb7723b55dd921ba17db8fab59e7145c97c8488d46a7f0d5f5104ecdabfd3938158545736ccaa771cd8a8372bcc9d4
-EBUILD iproute-1.5.0.ebuild 733 BLAKE2B 2a160edb1ffe8b256830d03f8add8e2673ff382e0b6155e210baa4c7cb23f779ae8f8653834e3dc188ca2d707d5ce3aa784e7c12c11797138b3d698bb3b62bac SHA512 d751ac7e2c1cba541b7a9ded09194769a9907ac2916a613b5fb275ad7921d72505e2b94e235ad457328eeb8bac83534b9fd01c6e8f092c18e4723c4137b0245b
-MISC metadata.xml 474 BLAKE2B 47e855ebc75d9d58cbe8fa1d8eef3d6fc4a201b2fab9573d0e82f13bd84e3ec30272fbc3b8be3b9df1a43c67a2534d0812ebbd4ae6fd95d81edc12d94c963c8c SHA512 ebd8a344867c198db4fa9e1f52f7cd3969a003ece03878cc91f331fe84a1a63f39cf3b3793d57850eaff92a5d97b772e0c00c443022edb08f2b118c84869eab6
diff --git a/dev-haskell/iproute/iproute-1.2.12.ebuild b/dev-haskell/iproute/iproute-1.2.12.ebuild
deleted file mode 100644
index d5b76a37be9b..000000000000
--- a/dev-haskell/iproute/iproute-1.2.12.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="IP Routing Table"
-HOMEPAGE="http://www.mew.org/~kazu/proj/iproute/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/appar:=[profile?]
-	dev-haskell/byteorder:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/doctest-0.9.3
-		dev-haskell/hspec
-		dev-haskell/quickcheck
-		dev-haskell/safe )
-"
diff --git a/dev-haskell/iproute/iproute-1.3.1.ebuild b/dev-haskell/iproute/iproute-1.3.1.ebuild
deleted file mode 100644
index 4129e589a2c0..000000000000
--- a/dev-haskell/iproute/iproute-1.3.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="IP Routing Table"
-HOMEPAGE="http://www.mew.org/~kazu/proj/iproute/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/appar:=[profile?]
-	dev-haskell/byteorder:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/doctest-0.9.3
-		dev-haskell/hspec
-		dev-haskell/quickcheck
-		dev-haskell/safe )
-"
diff --git a/dev-haskell/iproute/iproute-1.4.0.ebuild b/dev-haskell/iproute/iproute-1.4.0.ebuild
deleted file mode 100644
index 1ce71acb5eff..000000000000
--- a/dev-haskell/iproute/iproute-1.4.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="IP Routing Table"
-HOMEPAGE="http://www.mew.org/~kazu/proj/iproute/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/appar:=[profile?]
-	dev-haskell/byteorder:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/doctest-0.9.3
-		dev-haskell/hspec
-		dev-haskell/quickcheck
-		dev-haskell/safe )
-"
diff --git a/dev-haskell/iproute/iproute-1.5.0.ebuild b/dev-haskell/iproute/iproute-1.5.0.ebuild
deleted file mode 100644
index 9ea4dc9c2550..000000000000
--- a/dev-haskell/iproute/iproute-1.5.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="IP Routing Table"
-HOMEPAGE="http://www.mew.org/~kazu/proj/iproute/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/appar:=[profile?]
-	dev-haskell/byteorder:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/doctest-0.9.3
-		dev-haskell/hspec
-		dev-haskell/quickcheck
-		dev-haskell/safe )
-"
diff --git a/dev-haskell/iproute/metadata.xml b/dev-haskell/iproute/metadata.xml
deleted file mode 100644
index 8e75bbfd5885..000000000000
--- a/dev-haskell/iproute/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		IP Routing Table is a tree of IP ranges
-		to search one of them on the longest
-		match base. It is a kind of TRIE with one
-		way branching removed. Both IPv4 and IPv6
-		are supported.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/js-flot-0.8.3 b/dev-haskell/js-flot-0.8.3
new file mode 100644
index 000000000000..ab1e673e58b3
--- /dev/null
+++ b/dev-haskell/js-flot-0.8.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/http ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Obtain minified flot code
+EAPI=5
+HOMEPAGE=https://github.com/ndmitchell/js-flot#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.8.3
+SRC_URI=mirror://hackage/packages/archive/js-flot/0.8.3/js-flot-0.8.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=362e8c570dd0798b9b1ae517618ec3d7
diff --git a/dev-haskell/js-flot/Manifest b/dev-haskell/js-flot/Manifest
deleted file mode 100644
index 28ea973b5438..000000000000
--- a/dev-haskell/js-flot/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST js-flot-0.8.3.tar.gz 662691 BLAKE2B d7a8abca7eb8a45fa28da783139f6e672f5557dfc75c1a2b1f41254a3b0e09500f0f1c179b41f76fed456485d4c1db716e51306260c84c090a8779f23b86b791 SHA512 5732938b37e9036156528c0d34cd99b45405db81d1e70b6651b056075ea8d9b616da1ae709c2de1f2f5be044236a3b81fc358d973769fca26993500ff9d0dabf
-EBUILD js-flot-0.8.3.ebuild 581 BLAKE2B 7bb77ad743afa2357b57084a3bc752175de9c35bb766bf09aa1a09280840a5e09b062b11aa29604bfc041943ede923e929bd01d59098a74eef76572199786fdf SHA512 70299be90c424ec5f1587e34968cda6276ade4d5368291685f3cad513bf8c170f82874ef60ad0b6358093fb06e13688b5f3e66fcbb4a823e6c50446186ffdfbd
-MISC metadata.xml 739 BLAKE2B c2fd38348a54f2004fd3df62afee01dbf9a2977a5fabe58800a77f7b10f3f4762cd04091201a222a2b74b889096a44602211c6f009296206aeca79226da42e0a SHA512 b9b57f50057023e236765794202c089e9c4b39a3c84c41c6f6b6907af55d9e90b66d85a451570cf7b30ac1c2cb115c31f49872a490beae339815afb7d3f51dac
diff --git a/dev-haskell/js-flot/js-flot-0.8.3.ebuild b/dev-haskell/js-flot/js-flot-0.8.3.ebuild
deleted file mode 100644
index 94c31c7e854c..000000000000
--- a/dev-haskell/js-flot/js-flot-0.8.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Obtain minified flot code"
-HOMEPAGE="https://github.com/ndmitchell/js-flot#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/http )
-"
diff --git a/dev-haskell/js-flot/metadata.xml b/dev-haskell/js-flot/metadata.xml
deleted file mode 100644
index 81dc91bb8ff0..000000000000
--- a/dev-haskell/js-flot/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package bundles the minified &lt;http://www.flotcharts.org/ Flot&gt; code
-		(a jQuery plotting library) into a Haskell package,
-		so it can be depended upon by Cabal packages. The first three components of
-		the version number match the upstream flot version. The package is designed
-		to meet the redistribution requirements of downstream users (e.g. Debian).
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ndmitchell/js-flot</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/js-jquery-3.1.1 b/dev-haskell/js-jquery-3.1.1
new file mode 100644
index 000000000000..58abdbcbb4ef
--- /dev/null
+++ b/dev-haskell/js-jquery-3.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18 test? ( dev-haskell/http ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Obtain minified jQuery code
+EAPI=6
+HOMEPAGE=https://github.com/ndmitchell/js-jquery#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/3.1.1
+SRC_URI=mirror://hackage/packages/archive/js-jquery/3.1.1/js-jquery-3.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bb38aa51a5dd5b153eca006db35a47b7
diff --git a/dev-haskell/js-jquery-3.2.1 b/dev-haskell/js-jquery-3.2.1
new file mode 100644
index 000000000000..fd877b1bf75e
--- /dev/null
+++ b/dev-haskell/js-jquery-3.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18 test? ( dev-haskell/http ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Obtain minified jQuery code
+EAPI=6
+HOMEPAGE=https://github.com/ndmitchell/js-jquery#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/3.2.1
+SRC_URI=mirror://hackage/packages/archive/js-jquery/3.2.1/js-jquery-3.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=06bc39569954a6226b05716905355497
diff --git a/dev-haskell/js-jquery/Manifest b/dev-haskell/js-jquery/Manifest
deleted file mode 100644
index 465a208285e6..000000000000
--- a/dev-haskell/js-jquery/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST js-jquery-3.1.1.tar.gz 111855 BLAKE2B f59c954d455594c323d0968fc31ca8fa7b8463ca37a903f4b9cb63dee9d3ebb8790e79276e6f833bc21f5e09c02f42f66b891cc65f6c030e08dd034d8022d555 SHA512 cc95bdcf6fe2b45e7d585fcd7d83aee39b8dbed7c8e763c808a07a140203e58441896431920ee14b1861ee09a903cedca140c0a48405ffddaef2a71d11b21359
-DIST js-jquery-3.2.1.tar.gz 112319 BLAKE2B d56985f1cf202098f8fbefb1848bca0cdfe06dd74e3a2b8400542787a6a21a4d751a7b0f134972f48e8e5a8a8d8894ab88275395f4062c6149b618a2938bb14a SHA512 f3e8f1183d52c39cc456240f4e0e5cbfbab3216609cf06f3862fb512e31f72f34a100a3df920c8b55fb511db9a6cd92be2a3aeccd0a916bb455865622f213fcd
-EBUILD js-jquery-3.1.1.ebuild 585 BLAKE2B a50168a4e1bd9870742c98c8d7e8d7c163108a9440d82d5556ce27f4d843f0195f99fce58b12f1d0627413d32ba289b62aebff35ebe942f8400e7b353446b430 SHA512 692ba560ceba63a0e0dcfe3087b3f611cf1abb1f18043da4408a6ea0395e1a353d8afe0d40b53685b63fc0ffb12acc82b6706e2f5e7b52421a2c5b2f7183cd51
-EBUILD js-jquery-3.2.1.ebuild 623 BLAKE2B 29ac1fd37ead67ff9cda6cf8a55a744594e4811b5d11e98b9a50ef87d34f922b0d0b54d41d63210f3af7f3c3dcc97ab9d74d8cd7064a7fb45a7570ee615ed9fd SHA512 ca222475a2ce9f4e15b3ae0e93ee2f72b683bd40340ea56a5afdba78479b759cd961893d9c7b55c7e34c01387bb34cdc769e80f1a497e104b45f9e61dbb7c844
-MISC metadata.xml 707 BLAKE2B f3570e08e6209e6fdb6be46fc28cbafe316632654ada344598c47c73a02c43f5ec9d1094927bbb27f585de95ad6b4dce360d1883a3064e07c5600ea12f2b2dc0 SHA512 d316dd0a71dce3c8085510d8fb7eb55ea3e323fe0b484ae1b90301412eb7fcc49aa29f3f3d4b94f33fa4468985cad3fd456bfe89eafdcdc14b02e31bb59c4990
diff --git a/dev-haskell/js-jquery/js-jquery-3.1.1.ebuild b/dev-haskell/js-jquery/js-jquery-3.1.1.ebuild
deleted file mode 100644
index 0c013cd22fd0..000000000000
--- a/dev-haskell/js-jquery/js-jquery-3.1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Obtain minified jQuery code"
-HOMEPAGE="https://github.com/ndmitchell/js-jquery#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-	test? ( dev-haskell/http )
-"
diff --git a/dev-haskell/js-jquery/js-jquery-3.2.1.ebuild b/dev-haskell/js-jquery/js-jquery-3.2.1.ebuild
deleted file mode 100644
index f86610d36634..000000000000
--- a/dev-haskell/js-jquery/js-jquery-3.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Obtain minified jQuery code"
-HOMEPAGE="https://github.com/ndmitchell/js-jquery#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # needs network access
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-	test? ( dev-haskell/http )
-"
diff --git a/dev-haskell/js-jquery/metadata.xml b/dev-haskell/js-jquery/metadata.xml
deleted file mode 100644
index 9b1d6090b8d9..000000000000
--- a/dev-haskell/js-jquery/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package bundles the minified &lt;http://jquery.com/ jQuery&gt; code into a Haskell package,
-		so it can be depended upon by Cabal packages. The first three components of
-		the version number match the upstream jQuery version. The package is designed
-		to meet the redistribution requirements of downstream users (e.g. Debian).
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ndmitchell/js-jquery</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/json-0.9.1 b/dev-haskell/json-0.9.1
new file mode 100644
index 000000000000..f9a8b0faffa7
--- /dev/null
+++ b/dev-haskell/json-0.9.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= generic? ( >=dev-haskell/syb-0.3.3:=[profile?] ) parsec? ( dev-haskell/parsec:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Support for serialising Haskell to and from JSON
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/json
+IUSE=+generic mapdict +parsec +pretty doc hscolour profile
+KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= generic? ( >=dev-haskell/syb-0.3.3:=[profile?] ) parsec? ( dev-haskell/parsec:=[profile?] )
+SLOT=0/0.9.1
+SRC_URI=mirror://hackage/packages/archive/json/0.9.1/json-0.9.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4dae5ddd8cdefa973ad761d68484a6c5
diff --git a/dev-haskell/json/Manifest b/dev-haskell/json/Manifest
deleted file mode 100644
index a2a042aef530..000000000000
--- a/dev-haskell/json/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST json-0.9.1.tar.gz 22568 BLAKE2B b1c73771e24ccafb2019ffff61e392f2eec18768c4bdd09f1a5ee8275c92d8982cda3fab4d91222f726fae65324776c9e79ccd602dbd4ac9c435749d61a1015e SHA512 537257fed476683d0657c6474e465ca437e43e36b60ab132c0f584cece99a18d222ef9a33171543689ba5589434bc78cf2e0e5ff550804ff8969052d09430d57
-EBUILD json-0.9.1.ebuild 944 BLAKE2B 40f32a141903377f0c1784d0e873924858145db11cdbbd8269e8c16ec072fa5a4ff8934d13dc5bb6dfb26b8b056e6a41635b2e9cb98aa9530e64e6d241e9067e SHA512 1a189cef6f8949ee68dcc350002cae7862f26433044f7b62dae5fa0526214f90371c4156d8ce6be216fa82056d6908a289d0813faaaab5fe9d87e014da9aae94
-MISC metadata.xml 993 BLAKE2B 6cb77b20e36e3fb4aa09ed7f55f13b5199b4b152a2c7c625e7267b94016a2929b5064b6e38c3d0f6802cf5400dc802b4adc4e37d6de4823b2d02eea81459edbc SHA512 19724eb01ade1dac4b6e12271bfa698aab1ad16d4abc250114a4e17908ddf2bbbd788509ff5123745926bf229d0836e0046c3aa43b2ab6997088222c84a0b0a2
diff --git a/dev-haskell/json/json-0.9.1.ebuild b/dev-haskell/json/json-0.9.1.ebuild
deleted file mode 100644
index 613b26f8bb81..000000000000
--- a/dev-haskell/json/json-0.9.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Support for serialising Haskell to and from JSON"
-HOMEPAGE="http://hackage.haskell.org/package/json"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux"
-IUSE="+generic mapdict +parsec +pretty"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	generic? ( >=dev-haskell/syb-0.3.3:=[profile?] )
-	parsec? ( dev-haskell/parsec:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag generic generic) \
-		$(cabal_flag mapdict mapdict) \
-		$(cabal_flag parsec parsec) \
-		$(cabal_flag pretty pretty)
-}
diff --git a/dev-haskell/json/metadata.xml b/dev-haskell/json/metadata.xml
deleted file mode 100644
index 8bb7fe90bc27..000000000000
--- a/dev-haskell/json/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		JSON (JavaScript Object Notation) is a lightweight data-interchange
-		format. It is easy for humans to read and write. It is easy for
-		machines to parse and generate.  It is based on a subset of the
-		JavaScript Programming Language, Standard ECMA-262 3rd Edition -
-		December 1999.
-		
-		This library provides a parser and pretty printer for converting
-		between Haskell values and JSON.
-	</longdescription>
-	<use>
-		<flag name="generic">Add support for generic encoder (<pkg>dev-haskell/syb</pkg>)</flag>
-		<flag name="mapdict">Encode Haskell maps as JSON dicts</flag>
-		<flag name="parsec">Add support for parsing with Parsec</flag>
-		<flag name="pretty">Add support for using pretty printing combinators</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/juicypixels-3.2.5.3 b/dev-haskell/juicypixels-3.2.5.3
new file mode 100644
index 000000000000..3aed34a229f7
--- /dev/null
+++ b/dev-haskell/juicypixels-3.2.5.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/primitive-0.4:=[profile?] <dev-haskell/primitive-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/zlib-0.5.3.1:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= mmap? ( dev-haskell/mmap:=[profile?] ) >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and others)
+EAPI=5
+HOMEPAGE=https://github.com/Twinside/Juicy.Pixels
+IUSE=mmap doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/primitive-0.4:=[profile?] <dev-haskell/primitive-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/zlib-0.5.3.1:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= mmap? ( dev-haskell/mmap:=[profile?] )
+SLOT=0/3.2.5.3
+SRC_URI=mirror://hackage/packages/archive/JuicyPixels/3.2.5.3/JuicyPixels-3.2.5.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=78d66c6a31055417758e229de9682c95
diff --git a/dev-haskell/juicypixels-3.2.7 b/dev-haskell/juicypixels-3.2.7
new file mode 100644
index 000000000000..2c91adce2b2c
--- /dev/null
+++ b/dev-haskell/juicypixels-3.2.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/primitive-0.4:=[profile?] <dev-haskell/primitive-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/zlib-0.5.3.1:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= mmap? ( dev-haskell/mmap:=[profile?] ) >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and others)
+EAPI=5
+HOMEPAGE=https://github.com/Twinside/Juicy.Pixels
+IUSE=mmap doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/primitive-0.4:=[profile?] <dev-haskell/primitive-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/zlib-0.5.3.1:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= mmap? ( dev-haskell/mmap:=[profile?] )
+SLOT=0/3.2.7
+SRC_URI=mirror://hackage/packages/archive/JuicyPixels/3.2.7/JuicyPixels-3.2.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6616d3d363c176eab6f61240472bbe31
diff --git a/dev-haskell/juicypixels-3.2.8 b/dev-haskell/juicypixels-3.2.8
new file mode 100644
index 000000000000..ae8cbd190ca3
--- /dev/null
+++ b/dev-haskell/juicypixels-3.2.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/primitive-0.4:=[profile?] <dev-haskell/primitive-0.7:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/zlib-0.5.3.1:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= mmap? ( dev-haskell/mmap:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and others)
+EAPI=6
+HOMEPAGE=https://github.com/Twinside/Juicy.Pixels
+IUSE=mmap doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/primitive-0.4:=[profile?] <dev-haskell/primitive-0.7:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/zlib-0.5.3.1:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= mmap? ( dev-haskell/mmap:=[profile?] )
+SLOT=0/3.2.8
+SRC_URI=mirror://hackage/packages/archive/JuicyPixels/3.2.8/JuicyPixels-3.2.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2997501ef56f0525ac2fde43ed6d1802
diff --git a/dev-haskell/juicypixels/Manifest b/dev-haskell/juicypixels/Manifest
deleted file mode 100644
index d9b355c3b8fa..000000000000
--- a/dev-haskell/juicypixels/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST JuicyPixels-3.2.5.3.tar.gz 116074 BLAKE2B 19ea3ee666503bbf87ad8ff03df685cc7e3d1661f17904059ddec318be36f8ede53fe8aa531f7e9fc86bd48e773d525b7830b88975340f97883a190d1d1f2f34 SHA512 e5c0b0442b1b79aa751afed9a5df23b9fc1f3bfddd0d7b0f3751053018f4434331a0e0ecb16d2fc36a87d3edd3fc06727cfa9557607a02d7040ead623a5917bd
-DIST JuicyPixels-3.2.7.tar.gz 118647 BLAKE2B 5542e36f7b1a7e084457f9d18a4fb7647c8ffa854bd7a8ab09f9ca27b4d34f0edb47adfe42afe199ea5a99a71f2c96d8cfac7b28976cd0837afc989694f50cef SHA512 418d887a799fc46f4c73da1ebae0288e0f25e21c943f38dbf0b2519096e4ba145711a05d9da7bb1e588a5183e91ab09dfe3a209a6728c610eb5771a5d963ee6a
-DIST JuicyPixels-3.2.8.tar.gz 125254 BLAKE2B bf373e0c595b0501d0d871e55f61bcd62ca26fd6bdac288816af6d9eb52c53d8d70aded3b93ac782580505d549654250ce5b45e4761ddcbb956376513a962893 SHA512 e0800730660e087fc65d65872ff794600436cdc421ff8d578bb0833b885a988eb468b0b90ada0badd10439919199688a43ae51c42aa2552f9cf39184c60e60f1
-EBUILD juicypixels-3.2.5.3.ebuild 1200 BLAKE2B 212ee3f21d1392d28b7c7d95767855f6a6984244d897897f200e1dc662ffb2c6f4819e9439e99ff504c3ac6f7997b7b938165273ad2b91f9e5d5c5a8455d448b SHA512 38707e90a738c5019c9e8ae1d5e82b8db159e5c1c6d2b03eae640158d89b2ef55167f030fed2755bc9a720b834ed8d11527164631e38b3b8943562ee73dd3538
-EBUILD juicypixels-3.2.7.ebuild 1202 BLAKE2B b40402a3a960f640290e42e02cc38e36535fb013ca3ee2167cc15e907df9239e1769dfac6a10afd0a23046ea62e44372048ebef80c14d33748d988b6ac692824 SHA512 5777fb1847124a2b36ba011da35997737e01299621945a422a7bf5c0c10d1d57a615ed49368697193f61b09f4610ac9a1dccbf05ac8c9bb90184b9be7adeda94
-EBUILD juicypixels-3.2.8.ebuild 1087 BLAKE2B be221141f0cd19d2a3b208a7eff56629361e37b1e52ae7ae1355ff0a303e5a4fbc557ce51ed939ff96bfdaea439e9531c818ba69d3b66f97643edd973d30cb95 SHA512 9a8ca280fd1d375509387349ed1983d6dc6fd743026c63a44d9ed282f0a3d33d9ea3c0400137e493e4af98c72e17d46cc58d60e48bf1901b794c1640ddca95ce
-MISC metadata.xml 944 BLAKE2B ebb529c021a893b62eb25444d07a46badb5b035ec4df50dfc9a327e12e097e0870acd5fa5f9d79a659be7556895ea685ac724576cce8935e344270308c1ec117 SHA512 0d3e2bfbb46f7c691ef48ec9456da3acc2aac056f3beaddfcd952247df836e2eda429d12bcdad44c204b481cd7363c9d03764b83e367138137c1bd62a65448ba
diff --git a/dev-haskell/juicypixels/juicypixels-3.2.5.3.ebuild b/dev-haskell/juicypixels/juicypixels-3.2.5.3.ebuild
deleted file mode 100644
index 864d76a11877..000000000000
--- a/dev-haskell/juicypixels/juicypixels-3.2.5.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="JuicyPixels"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and others)"
-HOMEPAGE="https://github.com/Twinside/Juicy.Pixels"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="mmap"
-
-RDEPEND=">=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/primitive-0.4:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/zlib-0.5.3.1:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	mmap? ( dev-haskell/mmap:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag mmap mmap)
-}
diff --git a/dev-haskell/juicypixels/juicypixels-3.2.7.ebuild b/dev-haskell/juicypixels/juicypixels-3.2.7.ebuild
deleted file mode 100644
index 67f00822382a..000000000000
--- a/dev-haskell/juicypixels/juicypixels-3.2.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="JuicyPixels"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and others)"
-HOMEPAGE="https://github.com/Twinside/Juicy.Pixels"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="mmap"
-
-RDEPEND=">=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/primitive-0.4:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/zlib-0.5.3.1:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	mmap? ( dev-haskell/mmap:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag mmap mmap)
-}
diff --git a/dev-haskell/juicypixels/juicypixels-3.2.8.ebuild b/dev-haskell/juicypixels/juicypixels-3.2.8.ebuild
deleted file mode 100644
index 51747e8f6015..000000000000
--- a/dev-haskell/juicypixels/juicypixels-3.2.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="JuicyPixels"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and others)"
-HOMEPAGE="https://github.com/Twinside/Juicy.Pixels"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="mmap"
-
-RDEPEND=">=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/primitive-0.4:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/zlib-0.5.3.1:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	mmap? ( dev-haskell/mmap:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag mmap mmap)
-}
diff --git a/dev-haskell/juicypixels/metadata.xml b/dev-haskell/juicypixels/metadata.xml
deleted file mode 100644
index 33390b4bbc43..000000000000
--- a/dev-haskell/juicypixels/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		&lt;&lt;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMAAAADABAMAAACg8nE0AAAAElBMVEUAAABJqDSTWEL/qyb///8AAABH/1GTAAAAAXRSTlMAQObYZgAAAN5JREFUeF7s1sEJgFAQxFBbsAV72v5bEVYWPwT/XDxmCsi7zvHXavYREBDI3XP2GgICqBBYuwIC+/rVayPUAyAg0HvIXBcQoDFDGnUBgWQQ2Bx3AYFaRoBpAQHWb3bt2ARgGAiCYFFuwf3X5HA/McgGJWI2FdykCv4aBYzmKwDwvl6NVmUAAK2vlwEALK7fo88GANB6HQsAAAAAAAAA7P94AQCzswEAAAAAAAAAAAAAAAAAAICzh4UAO4zWAYBfRutHA4Bn5C69JhowAMGoBaMWDG0wCkbBKBgFo2AUAACPmegUST/IJAAAAABJRU5ErkJggg==&gt;&gt;
-		
-		This library can load and store images in PNG,Bitmap, Jpeg, Radiance and
-		read Gif images.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">Twinside/Juicy.Pixels</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/kan-extensions-4.2.3 b/dev-haskell/kan-extensions-4.2.3
new file mode 100644
index 000000000000..3f2b7610b1b9
--- /dev/null
+++ b/dev-haskell/kan-extensions-4.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/tagged-0.7.2:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Kan extensions, lifts, forms of the Yoneda lemma, and (co)density (co)monads
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/kan-extensions/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/tagged-0.7.2:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/4.2.3
+SRC_URI=mirror://hackage/packages/archive/kan-extensions/4.2.3/kan-extensions-4.2.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c169efae94d0eb2b4b5cfed5d0242c5e
diff --git a/dev-haskell/kan-extensions-5.0.1 b/dev-haskell/kan-extensions-5.0.1
new file mode 100644
index 000000000000..7490976593bf
--- /dev/null
+++ b/dev-haskell/kan-extensions-5.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/tagged-0.7.2:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Kan extensions, lifts, forms of the Yoneda lemma, and (co)density (co)monads
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/kan-extensions/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/tagged-0.7.2:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/5.0.1
+SRC_URI=mirror://hackage/packages/archive/kan-extensions/5.0.1/kan-extensions-5.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=125fc746ef596a380832c272badb2c69
diff --git a/dev-haskell/kan-extensions/Manifest b/dev-haskell/kan-extensions/Manifest
deleted file mode 100644
index 288c72d945ed..000000000000
--- a/dev-haskell/kan-extensions/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST kan-extensions-4.2.3.tar.gz 20604 BLAKE2B 5da1194f30de5a05be3e42b32abade6fde3717f9c8b3857011f830fe645e7128154ea82f29b513c4fba26e2b3b26c292481a41924e97fefb648046908cf2789d SHA512 a06103748320379f4182e3b268fa7015a1ee67c8e62cd8eb2ad2cb41f2fa7f820a8bb4f27a7393027bdca842d924d2a3be4ba141b572f548e6fac6befc5a1beb
-DIST kan-extensions-5.0.1.tar.gz 19306 BLAKE2B 020c87999a465523a903791542bd2da82411dbea516fa2ecc77efce6c75b542cffba99c6e87ce0e4bcc48bfcc09554278860d1f82db922564f8e7d2fad4c8456 SHA512 ae3c30cbf49307bbc9d0186894486427440435b92f1158d2f00791d693acb5db43beb83d44b82eb7c92e3221fe95b6a231d55dc818c573aeb0f00ecd4c0044b1
-EBUILD kan-extensions-4.2.3.ebuild 1291 BLAKE2B c31042d83d42a35bfb69ed0efa5c7d0baf5797e0c468eff64caa5b975f58f0b2a674ec1302c39c5bd61e80d045c42d629d4891003d0378b5af82e0128a1651ee SHA512 aa0b0672ec3154d470bba2eed21b307e34381a5671084973e43beac21d7e07c847f901888562af410fc784317cf9270427a3050e78c0d24681949d1cc9342685
-EBUILD kan-extensions-5.0.1.ebuild 1291 BLAKE2B 6083abbabc810a30dcda69d8d16c18246e6e824dbdb2d81638e15bdac514e577afded16cd713b8bc9a308775c4b5dd8012d7eb3cf3a8650eae6cb7920c8f6486 SHA512 8e7c8e1cf5159e6b8d527b52d0831019f5165665e6c723e58c8c5ee58edbe4e0143466cd10c62f7022e67548e64e1a5c69cfe78d67e2c9161fae9bd05dafa064
-MISC metadata.xml 437 BLAKE2B feb81adcd7f334bf078ebc3264271a5ce60914f5006726c43f405ce7aa1661c506ecc59a30efb298961ab427a2d939eac741912e136b182d1726050686205445 SHA512 29a3341b85b34272ac06f64ab048b36eeaf0bcf0c3bbf651f1c878a4266913adfc14d0f688651346037b620914470ddd75e646f7d3eae79f5bc2c5c8dd937ef4
diff --git a/dev-haskell/kan-extensions/kan-extensions-4.2.3.ebuild b/dev-haskell/kan-extensions/kan-extensions-4.2.3.ebuild
deleted file mode 100644
index 09475aaffb1c..000000000000
--- a/dev-haskell/kan-extensions/kan-extensions-4.2.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Kan extensions, lifts, forms of the Yoneda lemma, and (co)density (co)monads"
-HOMEPAGE="https://github.com/ekmett/kan-extensions/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/tagged-0.7.2:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/kan-extensions/kan-extensions-5.0.1.ebuild b/dev-haskell/kan-extensions/kan-extensions-5.0.1.ebuild
deleted file mode 100644
index d6f98db542c5..000000000000
--- a/dev-haskell/kan-extensions/kan-extensions-5.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Kan extensions, lifts, forms of the Yoneda lemma, and (co)density (co)monads"
-HOMEPAGE="https://github.com/ekmett/kan-extensions/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/tagged-0.7.2:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/kan-extensions/metadata.xml b/dev-haskell/kan-extensions/metadata.xml
deleted file mode 100644
index e2fca8a9f55c..000000000000
--- a/dev-haskell/kan-extensions/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Kan extensions, the Yoneda lemma, and (co)density (co)monads
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/kan-extensions</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/keys-3.10.2 b/dev-haskell/keys-3.10.2
new file mode 100644
index 000000000000..758579b3953b
--- /dev/null
+++ b/dev-haskell/keys-3.10.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Keyed functors and containers
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/keys/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/3.10.2
+SRC_URI=mirror://hackage/packages/archive/keys/3.10.2/keys-3.10.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=75bcd187c9148f7ebfaacbb073c3a96e
diff --git a/dev-haskell/keys-3.11 b/dev-haskell/keys-3.11
new file mode 100644
index 000000000000..1560f3652713
--- /dev/null
+++ b/dev-haskell/keys-3.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Keyed functors and containers
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/keys/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/3.11
+SRC_URI=mirror://hackage/packages/archive/keys/3.11/keys-3.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=610b59b900d66a10570caf25e7c3e902
diff --git a/dev-haskell/keys/Manifest b/dev-haskell/keys/Manifest
deleted file mode 100644
index 60279ecf17ce..000000000000
--- a/dev-haskell/keys/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST keys-3.10.2.tar.gz 8635 BLAKE2B dd664097549fd57c5956935d5790cdacbc51b58ed9fc6d2470f3b8b3ce5b6983ccf342a5fd2327a88a53f8590823a79c49a6adb740fc74c27552247d0fb5c109 SHA512 c595dc1201d194aca61e29aace7799f2e08459212a96b1b51922008b2dcd3dae77954ac706ef44aab05ade89933e273a4147a717a4c05bda19bd7ddbdec96eb5
-DIST keys-3.11.tar.gz 8674 BLAKE2B 27f5fb7f26631e54050bb90c04b1c6fd01e1a0798235fbb29de577b464c92602c2a802ed1ba2a369613e2545f71df092cdbd1c9b7350e059512efea2a99e4d8b SHA512 027080dcaa59f364ac5c043586f54ed42a69cf2c2fac7955ae11029e01d2fa0fa2805286e4bf70db68f1f22467cd98f68e942ec6210524c1cd71609e44f1a1a6
-EBUILD keys-3.10.2.ebuild 1108 BLAKE2B 15cd9c3815d135a25410d9d9c9294d21adc1e450be4f9552ca45a023baf094ec7e8c8088fd3dc6c10f5bff9bb4f284055f7867cc03c4cadace1e18b2f3e1c9e3 SHA512 0049317bb983acd6b5d374ff23eabccda0e67f9093d999855cac7e50f96fd79a3bddab377d3c2e2f610599aaafbd216de9618a2fd3162723206663625eeee1c1
-EBUILD keys-3.11.ebuild 1208 BLAKE2B 680655a9394ffc43db4b5edfecfdeb6e32a4b1bfc86b4f8ad4877db234261381d01eb637dafd272e1969b3b24ed354bc8381bdd300338596590e15903c5d1648 SHA512 5dd31367979fda4336084a4912a162d5aae6bf0decca7bef77dd0c9cfd5aa92525dac5c31ed16d2121435e9f3be92bfebff85b2454c022b2876bd752ec5fd0c2
-MISC metadata.xml 396 BLAKE2B a515485a38dd0c04dbeafbb2bc08e79d62f2311028428fc907af29f88c20bd236bcacb8ee519599f2e5182194483d849bf813f8de426e52e8b0cd0c2bf17fd04 SHA512 041a590c10a1b3549974f101ef9a597199bab1004ac468a8f9d9dc04b06bf16ac4d06bcbd54f0c8edf242b6a3d3a01077b660a98ad24026831119b9b57cd982d
diff --git a/dev-haskell/keys/keys-3.10.2.ebuild b/dev-haskell/keys/keys-3.10.2.ebuild
deleted file mode 100644
index d94c1a7276a0..000000000000
--- a/dev-haskell/keys/keys-3.10.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Keyed functors and containers"
-HOMEPAGE="https://github.com/ekmett/keys/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/keys/keys-3.11.ebuild b/dev-haskell/keys/keys-3.11.ebuild
deleted file mode 100644
index 516a0d30f4da..000000000000
--- a/dev-haskell/keys/keys-3.11.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Keyed functors and containers"
-HOMEPAGE="https://github.com/ekmett/keys/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/keys/metadata.xml b/dev-haskell/keys/metadata.xml
deleted file mode 100644
index 8f7809540aa8..000000000000
--- a/dev-haskell/keys/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Keyed functors and containers
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/keys</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/language-bash-0.6.1 b/dev-haskell/language-bash-0.6.1
new file mode 100644
index 000000000000..0cc08e38aa0e
--- /dev/null
+++ b/dev-haskell/language-bash-0.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-4.0:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parsing and pretty-printing Bash shell scripts
+EAPI=6
+HOMEPAGE=https://github.com/knrafto/language-bash/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-4.0:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.6.1
+SRC_URI=mirror://hackage/packages/archive/language-bash/0.6.1/language-bash-0.6.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0bb2b9625362e8627e6cf18244764073
diff --git a/dev-haskell/language-bash/Manifest b/dev-haskell/language-bash/Manifest
deleted file mode 100644
index 9419c08a210f..000000000000
--- a/dev-haskell/language-bash/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX language-bash-0.6.1-ghc-8.patch 236 BLAKE2B 9ecc1fe5eaf8c77715b3428a2543572e9c87701f4db85d63db8cb509cd8af62ea315e97ff3e4b4ad11b4bed4bc97ed46fdf54aec952f02feb7c7a35d44ab9c31 SHA512 b385de31560510bdaf1e5a7bd7e5bdcfd020ddfa9bf6f579b0f3bfd9b6532f228db998a0b0f64d663d8eefd6a99054d0f92988fc0b83c8e0492370e5f8b3b284
-DIST language-bash-0.6.1.tar.gz 20224 BLAKE2B 28f3fc67bf9df96bd22be997ee6cb3ece85651ca332b57f28f1212625517171dc8cccaaf3a31bfcf40d19a840e37d0d26bf432cdf08fb68bc772544c63248430 SHA512 2dfb3344a0bd15051f2d3f8bdb7185154b019141473e7f56b0decc1b840880bcccf69a910b16ef1958f149c5df5e90a4e7b6035b75b52c21d5829b018f66c143
-EBUILD language-bash-0.6.1.ebuild 874 BLAKE2B f557bca03529ed0d4d4ea7594d444ca43c0dae234b472b1133a93c9ed588c57f04a6d10a50f71c3ea7acd558c354590f737b797faeb1449c28308242c212932a SHA512 50aa697f0e5d29b1ca557d3bcb9b7fd1c56e74e51a8151b98a6b5a110bd00978cb4a335ac5f4c41a1bc5444fa7dea4ed8a2b87821b7a25fedae88be45d107f3b
-MISC metadata.xml 455 BLAKE2B 63a6d1bf0db1d635ce2cdaf1199e4676952cfae02529ac5346476c644b2d5d2f11234d0a49a5834ceef9667fbab5c007920a70dd6ca998e2f31cba7dd2423d1e SHA512 c396b56b4b9f30e4184a72b383271ad0a5051427ea9fd0432b1919e5c3b2b87218918843afb4d0d80e2591fc2f154b24e1e2e2e2f8bd9f1fa18f7e7f44469476
diff --git a/dev-haskell/language-bash/files/language-bash-0.6.1-ghc-8.patch b/dev-haskell/language-bash/files/language-bash-0.6.1-ghc-8.patch
deleted file mode 100644
index be5f6dc49a1e..000000000000
--- a/dev-haskell/language-bash/files/language-bash-0.6.1-ghc-8.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --git a/src/Language/Bash/Word.hs b/src/Language/Bash/Word.hs
-index ce36c4a..b9392a9 100644
---- a/src/Language/Bash/Word.hs
-+++ b/src/Language/Bash/Word.hs
-@@ -7,2 +7,3 @@
-   , TypeSynonymInstances
-+  , OverlappingInstances
-   #-}
diff --git a/dev-haskell/language-bash/language-bash-0.6.1.ebuild b/dev-haskell/language-bash/language-bash-0.6.1.ebuild
deleted file mode 100644
index dc9ab9586a9c..000000000000
--- a/dev-haskell/language-bash/language-bash-0.6.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Parsing and pretty-printing Bash shell scripts"
-HOMEPAGE="https://github.com/knrafto/language-bash/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-4.0:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/quickcheck
-		dev-haskell/tasty
-		dev-haskell/tasty-quickcheck )
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-8.patch)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'transformers >= 0.2 && < 0.5' 'transformers >= 0.2'
-}
diff --git a/dev-haskell/language-bash/metadata.xml b/dev-haskell/language-bash/metadata.xml
deleted file mode 100644
index 5db9409ff992..000000000000
--- a/dev-haskell/language-bash/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A library for parsing, pretty-printing, and manipulating
-		Bash shell scripts.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">knrafto/language-bash</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/language-c-0.4.2 b/dev-haskell/language-c-0.4.2
new file mode 100644
index 000000000000..1ae9cef93f4c
--- /dev/null
+++ b/dev-haskell/language-c-0.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/syb[profile?] >=dev-lang/ghc-6.10.1 dev-haskell/alex >=dev-haskell/cabal-1.6 dev-haskell/happy doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Analysis and generation of C code
+EAPI=4
+HOMEPAGE=https://visq.github.io/language-c/
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=dev-haskell/syb[profile?] >=dev-lang/ghc-6.10.1
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/language-c/0.4.2/language-c-0.4.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8070afb15397b23bb2836bff5d089e22
diff --git a/dev-haskell/language-c-0.4.7 b/dev-haskell/language-c-0.4.7
new file mode 100644
index 000000000000..0a915dfae5bb
--- /dev/null
+++ b/dev-haskell/language-c-0.4.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:= dev-haskell/alex >=dev-haskell/cabal-1.6 dev-haskell/happy doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Analysis and generation of C code
+EAPI=5
+HOMEPAGE=https://visq.github.io/language-c/
+IUSE=doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.7
+SRC_URI=mirror://hackage/packages/archive/language-c/0.4.7/language-c-0.4.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8f43ade4962218f43fc7f79387028b96
diff --git a/dev-haskell/language-c-0.7.1 b/dev-haskell/language-c-0.7.1
new file mode 100644
index 000000000000..47134f7667c7
--- /dev/null
+++ b/dev-haskell/language-c-0.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:= dev-haskell/alex >=dev-haskell/cabal-1.8 dev-haskell/happy doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Analysis and generation of C code
+EAPI=6
+HOMEPAGE=https://visq.github.io/language-c/
+IUSE=doc hscolour profile test
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.1
+SRC_URI=mirror://hackage/packages/archive/language-c/0.7.1/language-c-0.7.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0917fd91240a6b91f0237bfcba42f6fd
diff --git a/dev-haskell/language-c/Manifest b/dev-haskell/language-c/Manifest
deleted file mode 100644
index a3928d3ee0a3..000000000000
--- a/dev-haskell/language-c/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST language-c-0.4.2.tar.gz 167052 BLAKE2B 8f1b5192470a25eaad5be8c0a0f374163a91f840b6b184496d1adb45c1239a666214950fda939bddcd8617becc92eaf461b564ded29ebe3b852e16900700b772 SHA512 e2cd4c2871c04fecdcdf82026c79edf7681e00bf632fcff6c119cbd95e53905695bd8f08010d2662e10d883b2fdf6bb114a199b0eaf7be31ff65aaa29df6083b
-DIST language-c-0.4.7.tar.gz 112569 BLAKE2B e7a1333315f10ac3e8490b8dc3b5aa04e40b1a7e1f9c68615f549c82f7d02bf7de5b687dd9d4f04f82202b89e468b22833816346f53bb1cd075ed6386ee1142a SHA512 fb2602606b8c2e678e170d928c3dd023acccc079381a37b64624af658788c0dee982c2d53c2d3ba66b576aa75de350d12e35a94f867e1d714e89c27d26f2af6b
-DIST language-c-0.7.1.tar.gz 181648 BLAKE2B 6c5219698fbbe995d759a0bd6e629b9dbb29137c3dfa879cbdf139721f4acd341245172ccfb3f7d3cec58a831f72f03d092f29960f6dfcf190480df02a30e66a SHA512 c62dee86b70ead9c0795cabc6b1e0487ab3d4e1e4df693cec94c255aa96d21589d9161150073a5ec1d2ae168924dd8a11ae6ee0cd46730a25ccda009f7a45f58
-EBUILD language-c-0.4.2.ebuild 705 BLAKE2B b4b58a9ca9b4bfe60c68907d61fe0500da96bec4335ef3dcf3ab366ba82dffb74326103b1e0ce39f89244c437fc6df7e2b6f05b0683842af033124e7b41f136a SHA512 1cbf2cd95be2362fbcb32d7013f655687be6b0e49d74ed704d10172c9520c5478828c4cfbb1d6ccbae6dd39dae48a2dde64eb5a5d396681488eb711805ab99a8
-EBUILD language-c-0.4.7.ebuild 813 BLAKE2B 269208c93917ffde5f174259e8f9ca1c7ec3106f181f51d25dffec3a022661ecf09ff7297cf3978cee45a20674e9af31cbcb9809a20c677761b30fc936b426cb SHA512 80aa7e5404c510bdeeb0915d7a0b6bc27c5aaa030079ac3a4957d13429e0ee8616a9a2e9e4e83fb55623837e5ee947babc108a5bd0c3ce93b282a25189cd7682
-EBUILD language-c-0.7.1.ebuild 795 BLAKE2B aeeaf47c3278a3e52fac7bfe5ea131d56cd5351e3887d005b06c97822195e6a3cbe3ea175cfedaa57f57c070bcae340c2c2226ed45d9b1ed237fa6bc57b6182d SHA512 b90d6a46cef04d914972a0e4cb6a3e52934d002455e6d0e7aacae80a95ff2f2269d197e1b2124b0709f65087ca7ab405bbf221fa7e2bb1ba38bcc7d78fcce57f
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/language-c/language-c-0.4.2.ebuild b/dev-haskell/language-c/language-c-0.4.2.ebuild
deleted file mode 100644
index 3fc697b0ce7a..000000000000
--- a/dev-haskell/language-c/language-c-0.4.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.17.9999
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Analysis and generation of C code"
-HOMEPAGE="https://visq.github.io/language-c/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb[profile?]
-		>=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		dev-haskell/alex
-		>=dev-haskell/cabal-1.6
-		dev-haskell/happy"
-
-src_prepare() {
-	rm -vf "${S}"/dist/build/Language/C/Parser/{Lexer,Parser}.hs
-}
diff --git a/dev-haskell/language-c/language-c-0.4.7.ebuild b/dev-haskell/language-c/language-c-0.4.7.ebuild
deleted file mode 100644
index 6693b94eb1d4..000000000000
--- a/dev-haskell/language-c/language-c-0.4.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: +separatesyb,+usebytestrings,+splitbase
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Analysis and generation of C code"
-HOMEPAGE="https://visq.github.io/language-c/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.6
-	dev-haskell/happy
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=separatesyb \
-		--flag=splitbase \
-		--flag=usebytestrings
-}
diff --git a/dev-haskell/language-c/language-c-0.7.1.ebuild b/dev-haskell/language-c/language-c-0.7.1.ebuild
deleted file mode 100644
index 971deb35b6d6..000000000000
--- a/dev-haskell/language-c/language-c-0.7.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4.9999
-#hackport: flags: -allwarnings,+usebytestrings
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Analysis and generation of C code"
-HOMEPAGE="https://visq.github.io/language-c/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.8
-	dev-haskell/happy
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-allwarnings \
-		--flag=usebytestrings
-}
diff --git a/dev-haskell/language-c/metadata.xml b/dev-haskell/language-c/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/language-c/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/language-css-0.0.3 b/dev-haskell/language-css-0.0.3
new file mode 100644
index 000000000000..9989c1440795
--- /dev/null
+++ b/dev-haskell/language-css-0.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=CSS 2.1 syntax
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/language-css
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.0.3
+SRC_URI=mirror://hackage/packages/archive/language-css/0.0.3/language-css-0.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8b8567013c4265f5e8c8b793c72a7386
diff --git a/dev-haskell/language-css/Manifest b/dev-haskell/language-css/Manifest
deleted file mode 100644
index 8305aae43898..000000000000
--- a/dev-haskell/language-css/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST language-css-0.0.3.tar.gz 18953 BLAKE2B 388373ca490ab1bad5a5bec0316ae77dc36562b8348ea3765fee67381cbb223a1538c51235b31013aba8ee6a18880978a8520ce8a801e472bd699140b8d15ea1 SHA512 49e6223763f61892342b300b14ee372d27fb7fa4036965f026ca13f290ab6b949e1e2aa1fd679b479d004614a25d38da9bddd5b1f14af9e9c8e2211504880858
-EBUILD language-css-0.0.3.ebuild 531 BLAKE2B e4fafffee122dc18be53392f36aec61aa7382992c2bcb13c5f9be7eed160ed6cfa0e33c397a84c2eb221a5a2c747df0140ddf3ecc37cfef99a004e620139b507 SHA512 fc1ccef20045e4b37f068e24f67df0ab5f33c2efb08f3d907d7feb2d962f227fd16be2245ce9671fd994547c8997ce1f2877a1d6d314c988731ca2516af6ff36
-MISC metadata.xml 344 BLAKE2B b24206ba9e3e8f56e982ba0d19aeeadd256cf7fd8f2991e708f19ace0e3619be035ae578afbe9b5c3859486c7b46c4a56e4b9ef97bad3c22bd3d6f680281d556 SHA512 66ed41f83a20a24daee6f69bc3f3c9a4064ae9642611f5da0abeeb6446f28ace3203965babca24bfb038887301764f3b2bf89ff19eb1d2a0be8db23e47be1c60
diff --git a/dev-haskell/language-css/language-css-0.0.3.ebuild b/dev-haskell/language-css/language-css-0.0.3.ebuild
deleted file mode 100644
index 36835b1eeed7..000000000000
--- a/dev-haskell/language-css/language-css-0.0.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="CSS 2.1 syntax"
-HOMEPAGE="http://hackage.haskell.org/package/language-css"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
diff --git a/dev-haskell/language-css/metadata.xml b/dev-haskell/language-css/metadata.xml
deleted file mode 100644
index 0dbf5f82cad6..000000000000
--- a/dev-haskell/language-css/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		library for building and pretty printing CSS 2.1 code
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/language-docker-6.0.1 b/dev-haskell/language-docker-6.0.1
new file mode 100644
index 000000000000..72b93481d49b
--- /dev/null
+++ b/dev-haskell/language-docker-6.0.1
@@ -0,0 +1,13 @@
+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.1
+SRC_URI=mirror://hackage/packages/archive/language-docker/6.0.1/language-docker-6.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=50f787553510cf831c5f3096d9c83e6b
diff --git a/dev-haskell/language-docker-6.0.3 b/dev-haskell/language-docker-6.0.3
new file mode 100644
index 000000000000..50efe83041c8
--- /dev/null
+++ b/dev-haskell/language-docker-6.0.3
@@ -0,0 +1,13 @@
+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.3
+SRC_URI=mirror://hackage/packages/archive/language-docker/6.0.3/language-docker-6.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=50f787553510cf831c5f3096d9c83e6b
diff --git a/dev-haskell/language-docker/Manifest b/dev-haskell/language-docker/Manifest
deleted file mode 100644
index eae6cfd00851..000000000000
--- a/dev-haskell/language-docker/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST language-docker-6.0.1.tar.gz 33814 BLAKE2B eea7d16895774435ed4b6dee3df48acaf032a289b70d9ac00efa057cb3d947c6de64df5b8e60cb4ae4f876e26091d40df78469dcbb2e3e9d54969aa7280c3ef7 SHA512 a50675309b177d2e2ba305046ba60cb0f9a071cc27c1483d9d244ab89c747be5a7ba022579cca94689e623210e2f518df0e59c05ffca3a386a18e981f4971cf8
-DIST language-docker-6.0.3.tar.gz 34438 BLAKE2B 1d324b1519583c4feec1d9dd132c977e3fed1d6dd2d8fef7e4a9dc15dc1a294294eaa0831cb97bbb2d22d0bf178195ba0e834e262d1ed3fcd4d9b118a3b474db SHA512 912f24db37cc2f2feac74fe89205e4538d4bae6426cf626cd090a7d38e451331db43f69e87c58b9f168145a4b0f5d90b203fac2c5165c834729099d6b47bc242
-EBUILD language-docker-6.0.1.ebuild 925 BLAKE2B 7e2dd861432d37f7accf3970265ac64ea63a3e41ad9b97613175ba3385958da82c34ba26074ebb85e097946479f698aa76b8c6ec8a234d704ebd0a1dc3d7e771 SHA512 5e63984863f76640f96d332448c6b58c324d58d86fbc81f687e0fc4c3d8de63471331b99851abfe753a607df4d693e78f9587f9e4e21c62759c0e4b5ff4fe273
-EBUILD language-docker-6.0.3.ebuild 925 BLAKE2B 7e2dd861432d37f7accf3970265ac64ea63a3e41ad9b97613175ba3385958da82c34ba26074ebb85e097946479f698aa76b8c6ec8a234d704ebd0a1dc3d7e771 SHA512 5e63984863f76640f96d332448c6b58c324d58d86fbc81f687e0fc4c3d8de63471331b99851abfe753a607df4d693e78f9587f9e4e21c62759c0e4b5ff4fe273
-MISC metadata.xml 589 BLAKE2B a6e7a2c01fe4fa9b0c1b0b18e612e7a1b39459bafea5ff32139ef28e09079c22845de6123df9d1977942fa7d0e791807b118f8f7be4b763372c289370f8cd668 SHA512 e9062624fda6b6ee56e3343948ad43d54e3c294c78e6421a1ffb1761f9254234a7189520247f0e3a4875ddc7492307902f27adcc5f0686911b6d4698bd41330a
diff --git a/dev-haskell/language-docker/language-docker-6.0.1.ebuild b/dev-haskell/language-docker/language-docker-6.0.1.ebuild
deleted file mode 100644
index 2692f0261474..000000000000
--- a/dev-haskell/language-docker/language-docker-6.0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Dockerfile parser, pretty-printer and embedded DSL"
-HOMEPAGE="https://github.com/hadolint/language-docker#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-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:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( dev-haskell/glob
-		dev-haskell/hspec
-		>=dev-haskell/hunit-1.2
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/language-docker/language-docker-6.0.3.ebuild b/dev-haskell/language-docker/language-docker-6.0.3.ebuild
deleted file mode 100644
index 2692f0261474..000000000000
--- a/dev-haskell/language-docker/language-docker-6.0.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Dockerfile parser, pretty-printer and embedded DSL"
-HOMEPAGE="https://github.com/hadolint/language-docker#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-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:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( dev-haskell/glob
-		dev-haskell/hspec
-		>=dev-haskell/hunit-1.2
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/language-docker/metadata.xml b/dev-haskell/language-docker/metadata.xml
deleted file mode 100644
index aa5da45aea28..000000000000
--- a/dev-haskell/language-docker/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
-	<longdescription>
-		All functions for parsing, printing and writting Dockerfiles are exported through @Language.Docker@. For more fine-grained operations look for specific modules that implement a certain functionality.
-		See the https://github.com/hadolint/language-docker GitHub project for the source-code and examples.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/language-dot-0.1.0 b/dev-haskell/language-dot-0.1.0
new file mode 100644
index 000000000000..95bc202288b0
--- /dev/null
+++ b/dev-haskell/language-dot-0.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A library for the analysis and creation of Graphviz DOT files
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/language-dot
+IUSE=+executable doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?]
+SLOT=0/0.1.0
+SRC_URI=mirror://hackage/packages/archive/language-dot/0.1.0/language-dot-0.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cd78c3ceaffab0e4926e2fe83117b744
diff --git a/dev-haskell/language-dot/Manifest b/dev-haskell/language-dot/Manifest
deleted file mode 100644
index abb371320300..000000000000
--- a/dev-haskell/language-dot/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST language-dot-0.1.0.tar.gz 8042 BLAKE2B e83130172cc777126f54ea16b1ee0337b275a318b0ae66c2f9fb1485b04a56444e6db14e1a8738df170c0612e78dfefcb64cf0caf65c51d812ee4c6f5eee7e1a SHA512 4166a345a31d075f6492cd519dff19b5ec4fb4c4a953ef4ddaa92acdad618a2b61271d5eaa87920b6541d7f0d72611887ed2a68764d7fa446c31db66501b1467
-EBUILD language-dot-0.1.0.ebuild 828 BLAKE2B e2db76590420e4ead10864dc8f872f2bf7d70ef8d273991654aa8b54f591d9fef2bccd63a72f312bbeac624171d3065ca11391b173eb6be4d67455c54696ba40 SHA512 9981c810b4d36f22c956150cac2bb5b5d5077387eb083ba4604c393d530861e6ca9113e67fdf7e3cc56e65c7c8dc05122c564d4458b412248488d1802b3bbdb8
-MISC metadata.xml 430 BLAKE2B 07c3306651c4e8dc2cf99d65917c5dd2152aec3f38c43a0dff16fd0d27f757f92ae8571c68e1f7d6d959f2b7ca39b358929d3420dfbcec94e09d81ffbf0c23d7 SHA512 11be0e2640bf4f148f64d2a1b78d1323e9b7532ff3ddbcf5407a5baeaf336a9d6515a034a751bea8379bd95b9eefe6143e84257a4ebfd1818e69926fc2c050ad
diff --git a/dev-haskell/language-dot/language-dot-0.1.0.ebuild b/dev-haskell/language-dot/language-dot-0.1.0.ebuild
deleted file mode 100644
index 504c12b03aba..000000000000
--- a/dev-haskell/language-dot/language-dot-0.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A library for the analysis and creation of Graphviz DOT files"
-HOMEPAGE="http://hackage.haskell.org/package/language-dot"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+executable"
-
-RDEPEND=">=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable)
-}
diff --git a/dev-haskell/language-dot/metadata.xml b/dev-haskell/language-dot/metadata.xml
deleted file mode 100644
index 95a3923b92cc..000000000000
--- a/dev-haskell/language-dot/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="executable">Build the `ppdot' executable</flag>
-	</use>
-	<longdescription>
-		A library for the analysis and creation of Graphviz DOT files.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/language-ecmascript-0.17.1.0-r1 b/dev-haskell/language-ecmascript-0.17.1.0-r1
new file mode 100644
index 000000000000..4a5ae0b54556
--- /dev/null
+++ b/dev-haskell/language-ecmascript-0.17.1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/data-default-class-0.0.1:=[profile?] >=dev-haskell/diff-0.3:=[profile?] <dev-haskell/diff-0.4:=[profile?] >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-3.2.0:=[profile?] >=dev-haskell/quickcheck-2.5:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] >=dev-haskell/testing-feat-0.4.0.2:=[profile?] <dev-haskell/testing-feat-0.5:=[profile?] >=dev-haskell/uniplate-1.6:=[profile?] <dev-haskell/uniplate-1.7:=[profile?] >=dev-haskell/wl-pprint-1.2:=[profile?] <dev-haskell/wl-pprint-2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3.0.1 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=JavaScript parser and pretty-printer library
+EAPI=5
+HOMEPAGE=https://github.com/jswebtools/language-ecmascript
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/data-default-class-0.0.1:=[profile?] >=dev-haskell/diff-0.3:=[profile?] <dev-haskell/diff-0.4:=[profile?] >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-3.2.0:=[profile?] >=dev-haskell/quickcheck-2.5:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] >=dev-haskell/testing-feat-0.4.0.2:=[profile?] <dev-haskell/testing-feat-0.5:=[profile?] >=dev-haskell/uniplate-1.6:=[profile?] <dev-haskell/uniplate-1.7:=[profile?] >=dev-haskell/wl-pprint-1.2:=[profile?] <dev-haskell/wl-pprint-2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.17.1.0
+SRC_URI=mirror://hackage/packages/archive/language-ecmascript/0.17.1.0/language-ecmascript-0.17.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9140859717e3ad50dda686b6afe30374
diff --git a/dev-haskell/language-ecmascript/Manifest b/dev-haskell/language-ecmascript/Manifest
deleted file mode 100644
index ee1843336c24..000000000000
--- a/dev-haskell/language-ecmascript/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST language-ecmascript-0.17.1.0.tar.gz 55540 BLAKE2B 82589728b0b219759314326aa36053fa42f7465a475efd15bbdc6ef2c027c2159b932e970e9fee66c179ee7525eb99f2764aecc68c58a55ae102bc79d07662aa SHA512 20a007e2934fc1778cdc5cac123a08b534ec36bec0b6f789f7c4b68c46b548b1e898f123ff1b7512905e28a1dc78e19d6bf517ced28ffcfbafb539f82f073f91
-EBUILD language-ecmascript-0.17.1.0-r1.ebuild 1571 BLAKE2B 43820788760f05a310e9d0d36e00af52bf188c10ccb819887ec0e949edb78990ee329dd5bf369e23404412b2929256737c01d681fd04147939ec8840205d4f35 SHA512 6b7ad2f0cea96773a2b5eb1da59efc6feca1e43a8c6d7e75453c297b3e2f1cb734b6f7e742ad75b510cbe5106cbf349e382e8e63bed3613bebc2e81578e3c5e5
-MISC metadata.xml 596 BLAKE2B fc85e0172510fa01a8ff9ad7bc507031e82f71483535dc295f47bd041943b410e8fdaa104c3c3f765f19c5dc314689dd491c486f5feff9e202aa6799e0cd66ad SHA512 47cdb2d3fe83cb1e12a403aa455ff575169c2200b526cd0c04982b4e24f2e91b01c83ff7450e9c48c26f37c5f187478f1a0872b632aabf6be2d50627b44c7485
diff --git a/dev-haskell/language-ecmascript/language-ecmascript-0.17.1.0-r1.ebuild b/dev-haskell/language-ecmascript/language-ecmascript-0.17.1.0-r1.ebuild
deleted file mode 100644
index 58c79ac8e3a0..000000000000
--- a/dev-haskell/language-ecmascript/language-ecmascript-0.17.1.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="JavaScript parser and pretty-printer library"
-HOMEPAGE="https://github.com/jswebtools/language-ecmascript"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/data-default-class-0.0.1:=[profile?]
-	>=dev-haskell/diff-0.3:=[profile?] <dev-haskell/diff-0.4:=[profile?]
-	>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-3.2.0:=[profile?]
-	>=dev-haskell/quickcheck-2.5:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
-	>=dev-haskell/testing-feat-0.4.0.2:=[profile?] <dev-haskell/testing-feat-0.5:=[profile?]
-	>=dev-haskell/uniplate-1.6:=[profile?] <dev-haskell/uniplate-1.7:=[profile?]
-	>=dev-haskell/wl-pprint-1.2:=[profile?] <dev-haskell/wl-pprint-2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3.0.1 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'data-default-class >= 0.0.1 && < 0.1' 'data-default-class >= 0.0.1'
-}
diff --git a/dev-haskell/language-ecmascript/metadata.xml b/dev-haskell/language-ecmascript/metadata.xml
deleted file mode 100644
index d5b2ae80330e..000000000000
--- a/dev-haskell/language-ecmascript/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Some tools for working with ECMAScript 3 (popularly known as JavaScript).
-		Includes a parser, pretty-printer, and basic building blocks for more
-		sophisticated tools.
-		This package used to be called WebBits.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">jswebtools/language-ecmascript</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/language-glsl-0.2.0 b/dev-haskell/language-glsl-0.2.0
new file mode 100644
index 000000000000..b1b883016e63
--- /dev/null
+++ b/dev-haskell/language-glsl-0.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/parsec:=[profile?] dev-haskell/prettyclass:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=GLSL abstract syntax tree, parser, and pretty-printer
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/language-glsl
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/parsec:=[profile?] dev-haskell/prettyclass:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.0
+SRC_URI=mirror://hackage/packages/archive/language-glsl/0.2.0/language-glsl-0.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bdaa14e816e25ecc68b89f6066d3e1d1
diff --git a/dev-haskell/language-glsl/Manifest b/dev-haskell/language-glsl/Manifest
deleted file mode 100644
index 10977de1de9a..000000000000
--- a/dev-haskell/language-glsl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST language-glsl-0.2.0.tar.gz 16432 BLAKE2B 19d0de18cf95368fa60112f9e81962bf7e219d78b49029199c8f45b94cd424794cbea4cccd6603edef09734c446b62a40c4fb84f2b5cfb0b114fe69457aa2b27 SHA512 b7044d7ae11c8bdd63d38d7ee1c3e880a0201a7c72bb16596ecc2e32a61e37e973a8b2aa25342737f2d2133c679f479628ae78812ea773a53cd34eb941ea6d7e
-EBUILD language-glsl-0.2.0.ebuild 750 BLAKE2B 9e9d7f3d668041157b56ce813aedea99883391f5cd175b3bba853524fc1b44dd2d8dae004e3966e5da63541a72228d11133638eb5e20fd3124c2d67ea7a793b0 SHA512 4a3af051dc761b3f6605fc2d32704eb71d45cc10e32e752277a32dc3ef578c59d703aa50df5cee173e86d9883487137ec3e35c1e784ed5954aa517d5596ef581
-MISC metadata.xml 421 BLAKE2B f12bfbe97f359a551753c3c570925257fcbf4392803d762a5ffeb9e7e12d15bbad92a5ef563e3782bade10782cce6626262b01e9432424997b781046644328ff SHA512 6326a8fe1c918910b0c9df1b48e28b2f62d4f454bfdde7fbd9f3b503ac228057b8ac59f495ec12a4e2c52a4041bac7bd31db3f30d744b7b1af0ed6aac575043e
diff --git a/dev-haskell/language-glsl/language-glsl-0.2.0.ebuild b/dev-haskell/language-glsl/language-glsl-0.2.0.ebuild
deleted file mode 100644
index 5d4c7c73126b..000000000000
--- a/dev-haskell/language-glsl/language-glsl-0.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="GLSL abstract syntax tree, parser, and pretty-printer"
-HOMEPAGE="http://hackage.haskell.org/package/language-glsl"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/parsec:=[profile?]
-	dev-haskell/prettyclass:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
diff --git a/dev-haskell/language-glsl/metadata.xml b/dev-haskell/language-glsl/metadata.xml
deleted file mode 100644
index a4b3e69d46c1..000000000000
--- a/dev-haskell/language-glsl/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The package language-glsl is a Haskell library for the
-		representation, the parsing, and the pretty-printing of
-		GLSL 1.50 code.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/language-haskell-extract-0.2.4 b/dev-haskell/language-haskell-extract-0.2.4
new file mode 100644
index 000000000000..8d46fc2adef1
--- /dev/null
+++ b/dev-haskell/language-haskell-extract-0.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/regex-posix:=[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=Module to automatically extract functions from the local code
+EAPI=5
+HOMEPAGE=https://github.com/finnsson/template-helper
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/regex-posix:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.2.4
+SRC_URI=mirror://hackage/packages/archive/language-haskell-extract/0.2.4/language-haskell-extract-0.2.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=544e07beb170451601c01d7830cda692
diff --git a/dev-haskell/language-haskell-extract/Manifest b/dev-haskell/language-haskell-extract/Manifest
deleted file mode 100644
index c8dabc708c58..000000000000
--- a/dev-haskell/language-haskell-extract/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST language-haskell-extract-0.2.4.tar.gz 2458 BLAKE2B 9655707a3195c82d5eda9cfbba150d3a91e103155cb522b0d9e13456e833b5530c808435d915456c230f92c438d2989512cbff956c7fd87493e481d39a53fbd8 SHA512 6408459abf9d531ccbe7d65766d38fcb93f4d3f9c77db1a706231bf6d8ad6f845fcefc4fbb03833f45c74f21f324a44760f3c89ff093c69f1f9999e64344ab4d
-EBUILD language-haskell-extract-0.2.4.ebuild 612 BLAKE2B d2b35e62458098c8933214fae4f537010c99182126ac45dc89d9222449b5f405620bf19bae537d9ca77c956b41158175520ad49a479c99d5693f9c53695dc378 SHA512 8cf8c37531c5885524ad5c363dfa5a92222515b687ab2fa2aa7f3dc6d6e4ec3feffe289acf276e03fbe8ec7d591c9f2c6e7cf0ed2f766bd9b5cb51ec032772bf
-MISC metadata.xml 1475 BLAKE2B d0c31fb5b5c0220b46125212f7a40ab7c40f82cd58ab53d5f94931c6359178bd6b0dac93e4adeb8bf96162449cd79a106f4baac8ebbe784c6c088a20db60624a SHA512 bf65c32265a35a538f13bf8d4b2b89003077bdbc3f12ead1b6a8ee35e0d8a29da77bf37af7dfc1c2a2493b4e0d830b2664c6517c609128001065910964b75411
diff --git a/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4.ebuild b/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4.ebuild
deleted file mode 100644
index 254ba2620201..000000000000
--- a/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Module to automatically extract functions from the local code"
-HOMEPAGE="https://github.com/finnsson/template-helper"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/regex-posix:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/language-haskell-extract/metadata.xml b/dev-haskell/language-haskell-extract/metadata.xml
deleted file mode 100644
index 157ee542b0a1..000000000000
--- a/dev-haskell/language-haskell-extract/metadata.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		@language-haskell-extract@ contains some useful helper functions on top of Template Haskell.
-		
-		@functionExtractor@ extracts all functions after a regexp-pattern.
-		
-		&gt; foo = "test"
-		&gt; boo = "testing"
-		&gt; bar = $(functionExtractor "oo$")
-		
-		will automagically extract the functions ending with @oo@ such as
-		
-		&gt; bar = [("foo",foo), ("boo",boo)]
-		
-		This can be useful if you wish to extract all functions beginning with test (for a test-framework)
-		or all functions beginning with wc (for a web service).
-		
-		@functionExtractorMap@ works like @functionsExtractor@ but applies a function over all function-pairs.
-		
-		This functions is useful if the common return type of the functions is a type class.
-		
-		Example:
-		
-		&gt; secondTypeclassTest =
-		&gt;   do let expected = ["45", "88.8", "\"hej\""]
-		&gt;          actual = $(functionExtractorMap "^tc" [|\n f -&gt; show f|] )
-		&gt;      expected @=? actual
-		&gt;
-		&gt; tcInt :: Integer
-		&gt; tcInt = 45
-		&gt;
-		&gt; tcDouble :: Double
-		&gt; tcDouble = 88.8
-		&gt;
-		&gt; tcString :: String
-		&gt; tcString = "hej"
-	</longdescription>
-	<upstream>
-		<remote-id type="github">finnsson/template-helper</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/language-javascript-0.5.14.2 b/dev-haskell/language-javascript-0.5.14.2
new file mode 100644
index 000000000000..c023e58b9261
--- /dev/null
+++ b/dev-haskell/language-javascript-0.5.14.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] >=dev-haskell/utf8-string-0.3.7:=[profile?] <dev-haskell/utf8-string-2:=[profile?] >=dev-lang/ghc-7.4.1:= dev-haskell/alex >=dev-haskell/cabal-1.9.2 dev-haskell/happy test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2 dev-haskell/test-framework dev-haskell/test-framework-hunit >=dev-haskell/utf8-light-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parser for JavaScript
+EAPI=5
+HOMEPAGE=https://github.com/erikd/language-javascript
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] >=dev-haskell/utf8-string-0.3.7:=[profile?] <dev-haskell/utf8-string-2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.5.14.2
+SRC_URI=mirror://hackage/packages/archive/language-javascript/0.5.14.2/language-javascript-0.5.14.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=33793a91f88487ca9fc22f71fd62cb07
diff --git a/dev-haskell/language-javascript-0.6.0.9 b/dev-haskell/language-javascript-0.6.0.9
new file mode 100644
index 000000000000..625d65c2571b
--- /dev/null
+++ b/dev-haskell/language-javascript-0.6.0.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] >=dev-haskell/utf8-string-0.3.7:=[profile?] <dev-haskell/utf8-string-2:=[profile?] >=dev-lang/ghc-7.4.1:= dev-haskell/alex >=dev-haskell/cabal-1.9.2 dev-haskell/happy test? ( dev-haskell/hspec >=dev-haskell/quickcheck-2 >=dev-haskell/utf8-light-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parser for JavaScript
+EAPI=6
+HOMEPAGE=https://github.com/erikd/language-javascript
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] >=dev-haskell/utf8-string-0.3.7:=[profile?] <dev-haskell/utf8-string-2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.6.0.9
+SRC_URI=mirror://hackage/packages/archive/language-javascript/0.6.0.9/language-javascript-0.6.0.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=264d4e6d0496b1cd6d8d5c393ed32d9d
diff --git a/dev-haskell/language-javascript/Manifest b/dev-haskell/language-javascript/Manifest
deleted file mode 100644
index 0ad6f85c64df..000000000000
--- a/dev-haskell/language-javascript/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST language-javascript-0.5.14.2.tar.gz 48466 BLAKE2B 16fa3dd229634230e30f7bd1eea73a7c4d321699553c5008b2050ddc925eb48e5e923c09f080c3858f71a16197dfa2d6ae8ce03bf434547c971745d8fb25112f SHA512 f493572c33baa7f5632f211999dd367b4fa2801a9b99f52796935927493d49a81e215b6847fd6bb36078c527d872b6637362ce0c3998627e5ddcd8abc07f5c81
-DIST language-javascript-0.6.0.9.tar.gz 103168 BLAKE2B 80b7e95a9db9e1ee474a492dabb3423664bfcf22b5cdc4957e4834dc351e8825ae9e744b96a081e97cd6ea276e31deebd8d0a70e3c659a0b2bc20d66438c0f44 SHA512 ca5fc4f541ed2834ce492417f858593e2bb42677e787e8d91055e53a400f563ad940757bf2b341d490cd6d1c1feb07a304dacc79acbf5f731f20996acd1418f9
-EBUILD language-javascript-0.5.14.2.ebuild 904 BLAKE2B 8a247d2b2383f32c15cf8b2e3262c5f2966d62981b01c312ba3e31d8390e72e2da33780f10641fab46cb94df2d3b6b4e22d576f876790ba434a7b51846e1500b SHA512 b8a1e457b7379f6691de85d102dd2b1e432085c74af9ced9872706ee21f2149709dbf79ae09338c3170e9baa319e9fcc275ca730426314741a8110d884f03d65
-EBUILD language-javascript-0.6.0.9.ebuild 874 BLAKE2B 965675b5174c2f021df3e7632e9a79fc7902af921c9e0b62b210649d43ca6d150e65e750e056d45b36a6a52756c203690faa1a760a0094fa5cbaf761d6c931d9 SHA512 edc9f169160d07c69a6e0e123094a827a76bf424dcc1da62d315139a6584a4912fcc972d929090b135327432bc7e724f76c19538d5fb9938a9b81b1923208167
-MISC metadata.xml 477 BLAKE2B 881b6ca7702a8337971936193008870d6c8d0d39b9f30f12bdedaae28834c4ea73977b4c2379ea27a843e403260848c3059b4665209ccec992c9c38b45ade1a3 SHA512 3037f1e027cba2227010814d743afda935197fc1878411a9d9c8c116152377baca93cbafcf22ce33a6d719c1fce9f2928d31bcca6644f39dae796500ee4b9007
diff --git a/dev-haskell/language-javascript/language-javascript-0.5.14.2.ebuild b/dev-haskell/language-javascript/language-javascript-0.5.14.2.ebuild
deleted file mode 100644
index 420270d28ee0..000000000000
--- a/dev-haskell/language-javascript/language-javascript-0.5.14.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Parser for JavaScript"
-HOMEPAGE="https://github.com/erikd/language-javascript"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?]
-	>=dev-haskell/utf8-string-0.3.7:=[profile?] <dev-haskell/utf8-string-2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.9.2
-	dev-haskell/happy
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/utf8-light-0.4 )
-"
diff --git a/dev-haskell/language-javascript/language-javascript-0.6.0.9.ebuild b/dev-haskell/language-javascript/language-javascript-0.6.0.9.ebuild
deleted file mode 100644
index 78d202b0f3e6..000000000000
--- a/dev-haskell/language-javascript/language-javascript-0.6.0.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Parser for JavaScript"
-HOMEPAGE="https://github.com/erikd/language-javascript"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?]
-	>=dev-haskell/utf8-string-0.3.7:=[profile?] <dev-haskell/utf8-string-2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.9.2
-	dev-haskell/happy
-	test? ( dev-haskell/hspec
-		>=dev-haskell/quickcheck-2
-		>=dev-haskell/utf8-light-0.4 )
-"
diff --git a/dev-haskell/language-javascript/metadata.xml b/dev-haskell/language-javascript/metadata.xml
deleted file mode 100644
index 45c249230da2..000000000000
--- a/dev-haskell/language-javascript/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Parses Javascript into an Abstract Syntax Tree (AST).  Initially intended as frontend to hjsmin.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">alanz/language-javascript</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/language-lua-0.10.0 b/dev-haskell/language-lua-0.10.0
new file mode 100644
index 000000000000..13c2b5f443fb
--- /dev/null
+++ b/dev-haskell/language-lua-0.10.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.6.1:= dev-haskell/alex >=dev-haskell/cabal-1.16.0 dev-haskell/happy test? ( dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lua parser and pretty-printer
+EAPI=6
+HOMEPAGE=https://github.com/glguy/language-lua
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/0.10.0
+SRC_URI=mirror://hackage/packages/archive/language-lua/0.10.0/language-lua-0.10.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4ac348d266856f11c5fa532055227225
diff --git a/dev-haskell/language-lua/Manifest b/dev-haskell/language-lua/Manifest
deleted file mode 100644
index 9564c48ab877..000000000000
--- a/dev-haskell/language-lua/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST language-lua-0.10.0.tar.gz 145929 BLAKE2B 7d86971a44debfd371936de35f4071b49249f3121263379a29fd3d07a3ed9fb8d3d06572b7d9990a5c2a64e0e93e4fd9fe48aec071007a62f17e93b67a799377 SHA512 9b43e3e67f54e25e82c3f1fb9fa81be31509aab01084ef95e6eddbef71fb5df7d9e58816fa51db95f8febe66fa77c52d62b15a7060dfa6a845b662b0b16dac15
-EBUILD language-lua-0.10.0.ebuild 768 BLAKE2B f053773e78976799e073c8e3102903c82ccba0347aaccb6939f285f48e9bcfef7dda901de273fa1f3a8ea1e645172611f0986bf111b529848989d393b8121f39 SHA512 8de04da493533375121200dca20b187ef2d0b20e4f9e490000eec1a21aed71c4b7fe9edd5df4847abd33947bab471a183271a19d2ce00a6930019e834a1796a3
-MISC metadata.xml 415 BLAKE2B 887b1e08fa995aac29d5182d4ab7961df1e8706aa13bc55f4e8dfd605a5a57efec0d3fc26593bbfd52b4ba93d6036c5c95286ec4a0f69c6a9460d5cd5d23b36d SHA512 474756132f528159cd476467d01b758a54bd1b5afb281688be69de43610a0ec3cbf6f7e7c94293794736a32fff66ffa0a5dbdd9693fa276fd93a702f7f79181a
diff --git a/dev-haskell/language-lua/language-lua-0.10.0.ebuild b/dev-haskell/language-lua/language-lua-0.10.0.ebuild
deleted file mode 100644
index b63abd39f265..000000000000
--- a/dev-haskell/language-lua/language-lua-0.10.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lua parser and pretty-printer"
-HOMEPAGE="https://github.com/glguy/language-lua"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.16.0
-	dev-haskell/happy
-	test? ( dev-haskell/quickcheck
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/language-lua/metadata.xml b/dev-haskell/language-lua/metadata.xml
deleted file mode 100644
index 3384939fca31..000000000000
--- a/dev-haskell/language-lua/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Lua 5.3 lexer, parser and pretty-printer.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">glguy/language-lua</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/language-python-0.5.4 b/dev-haskell/language-python-0.5.4
new file mode 100644
index 000000000000..df2727ac11cd
--- /dev/null
+++ b/dev-haskell/language-python-0.5.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-haskell/utf8-string-1:=[profile?] <dev-haskell/utf8-string-2:=[profile?] >=dev-lang/ghc-7.8.2:= dev-haskell/alex >=dev-haskell/cabal-1.18.1.3 dev-haskell/happy doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parsing and pretty printing of Python code
+EAPI=6
+HOMEPAGE=https://github.com/bjpop/language-python
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-haskell/utf8-string-1:=[profile?] <dev-haskell/utf8-string-2:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.5.4
+SRC_URI=mirror://hackage/packages/archive/language-python/0.5.4/language-python-0.5.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=141fec140cb37dab37850af7f2fdebb4
diff --git a/dev-haskell/language-python/Manifest b/dev-haskell/language-python/Manifest
deleted file mode 100644
index 4fa9cbc63f41..000000000000
--- a/dev-haskell/language-python/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST language-python-0.5.4.tar.gz 153417 BLAKE2B 842fabf284a43e6b84623a6e608e95f790be2a970ff4173f601a245b44aa0fb00f307f68bc7822fac735c921f9b6f755d57bc051188f02efe449d59d423a9b41 SHA512 adbe81eeb4a161c8e685c3dacdee0924f1193fa291a753e1608f0c94effc90b77df60fee1e46e791516d01ea0153f243c13fb2fdd24d688cfe9ce8ac9ed44059
-EBUILD language-python-0.5.4.ebuild 754 BLAKE2B 992dbcc016233222be3c11ea983c1024f1e0333471feab3512ceeae84c31146566fed9f0485b84c91a9b341965dfdb645b1c885b5093e7686a13758a7878d4c6 SHA512 182aa576c2854f96e0fb1079df810eee7dfc4ff8b31cf59739909571774a000a165f876bc0a68fe6d99dfd3477c54e2cb9fc02cdb328c9ffc501f6b17ada99c2
-MISC metadata.xml 522 BLAKE2B 87ec77a302e28f15d6547231c98543e7c919ac2a358f875760f8f6814f12920484315f15a0482de83571180483ac4eeb34284894cfe8df55970056407e141084 SHA512 646c64774499fe411f4751bad544b7d489f12eff37a4afcfa3d96d952a8fbc7d4140cafdbad792ed27227f2752b403002844a49f3c4781ba0bbbb9939cf0a5d3
diff --git a/dev-haskell/language-python/language-python-0.5.4.ebuild b/dev-haskell/language-python/language-python-0.5.4.ebuild
deleted file mode 100644
index 2796623262f2..000000000000
--- a/dev-haskell/language-python/language-python-0.5.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parsing and pretty printing of Python code"
-HOMEPAGE="https://github.com/bjpop/language-python"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?]
-	>=dev-haskell/utf8-string-1:=[profile?] <dev-haskell/utf8-string-2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.18.1.3
-	dev-haskell/happy
-"
diff --git a/dev-haskell/language-python/metadata.xml b/dev-haskell/language-python/metadata.xml
deleted file mode 100644
index dc19c4cd973b..000000000000
--- a/dev-haskell/language-python/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		language-python is a Haskell library for lexical analysis, parsing
-		and pretty printing Python code. It supports versions 2.x and 3.x of Python.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bjpop/language-python</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/lazysmallcheck-0.6 b/dev-haskell/lazysmallcheck-0.6
new file mode 100644
index 000000000000..4305caddd3c5
--- /dev/null
+++ b/dev-haskell/lazysmallcheck-0.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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 demand-driven testing of Haskell programs
+EAPI=4
+HOMEPAGE=http://www.cs.york.ac.uk/~mfn/lazysmallcheck/
+IUSE=doc hscolour profile
+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/lazysmallcheck/0.6/lazysmallcheck-0.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3029de304226a51d1e22c8b00e072054
diff --git a/dev-haskell/lazysmallcheck/Manifest b/dev-haskell/lazysmallcheck/Manifest
deleted file mode 100644
index 28f8aca407d6..000000000000
--- a/dev-haskell/lazysmallcheck/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lazysmallcheck-0.6.tar.gz 16862 BLAKE2B 8099de24e51e19106da50d30e370ea71fea42da2d25641b7887d06e57a341ae10f5b440b7431ab50beffba97f9fc22cc517f7a1e8f12be4341769559ead19348 SHA512 cd9e7d53686587828b5be892bacbd902b4e916d01e65c56d7634717c00353f9d0b81f92fcae9fab5008361dc7257da50a1429568f8265136883d4cca942f954d
-EBUILD lazysmallcheck-0.6.ebuild 542 BLAKE2B ec4d38134d096bf51a22f741c0c9efd61dad2823c8a830f6b40b630b31494194343222e5adce9669e378892b35be41009b44b62d681e00b88bf6d67de93ffb3e SHA512 aa4110ab22f0214f656b4c78156744ef6923c680e8eeeddb4d187d459a20ec3a93b00165ba69f033bc585659e588967532e42d1a5381b8be8ae627c15c8f9501
-MISC metadata.xml 720 BLAKE2B 1282f2856d8a2425a2bbde2fdc80a614ca805f54154cb84f869e7a4803de3af4f01ada0f4ea4464bb8670c4cfeb3910993c55fd19d92c7026cd61e9296bdbd94 SHA512 14241f31672c4e24c60880919b2191da3daafdc2fecb7cc0d841ac32fe4a14d9695fadc05b43ade6f80890f65486412314308bf21689df93c7b8e0d0372bc71a
diff --git a/dev-haskell/lazysmallcheck/lazysmallcheck-0.6.ebuild b/dev-haskell/lazysmallcheck/lazysmallcheck-0.6.ebuild
deleted file mode 100644
index 98273cf4345f..000000000000
--- a/dev-haskell/lazysmallcheck/lazysmallcheck-0.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A library for demand-driven testing of Haskell programs"
-HOMEPAGE="http://www.cs.york.ac.uk/~mfn/lazysmallcheck/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ia64 ppc ~ppc64 sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		dev-haskell/cabal"
diff --git a/dev-haskell/lazysmallcheck/metadata.xml b/dev-haskell/lazysmallcheck/metadata.xml
deleted file mode 100644
index d8237d1cb4bc..000000000000
--- a/dev-haskell/lazysmallcheck/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Lazy SmallCheck is a library for exhaustive, demand-driven testing of
-		Haskell programs.  It is based on the idea that if a property holds
-		for a partially-defined input then it must also hold for all
-		fully-defined refinements of the that input.  Compared to ``eager''
-		input generation as in SmallCheck, Lazy SmallCheck may require
-		significantly fewer test-cases to verify a property for all inputs up
-		to a given depth.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/lcs-0.2-r1 b/dev-haskell/lcs-0.2-r1
new file mode 100644
index 000000000000..60cc60a8c310
--- /dev/null
+++ b/dev-haskell/lcs-0.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= dev-haskell/cabal doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Find longest common sublist of two lists
+EAPI=5
+HOMEPAGE=http://urchin.earth.li/~ian/cabal/lcs/
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=|| ( BSD GPL-2 )
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2
+SRC_URI=mirror://hackage/packages/archive/lcs/0.2/lcs-0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=38816d1f73ea5bd791554e6af45a8d82
diff --git a/dev-haskell/lcs/Manifest b/dev-haskell/lcs/Manifest
deleted file mode 100644
index 40b0e17ed939..000000000000
--- a/dev-haskell/lcs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX lcs-0.2-ghc-7.10.patch 313 BLAKE2B ac278030ef0c00d0d97d5660a078ddc188e38cceaca01a071c606e416a0292507d4880929192d383014870605ff38008923e1a15e79c08c3442dada640cb0b13 SHA512 d1b05ed47d0ce1bcb79af6e180b5955abc6f76ebce318ea8fa0b1195c3d44b8887ec4a4587b1de8b0e8f911f35153950e290654ebbdf407cfaa961d92b018456
-DIST lcs-0.2.tar.gz 11638 BLAKE2B e90201a50746416391156fadb05c67a4432d063294b751b8c48a71541e7567aaad8cc8cdad59c9a58633d8ab72fd917990cab14ef044f2ecb0f9012354add709 SHA512 ac5ac6d9a151be46054f2f56a5927182fe6942e518a04a8c484b02c8caec0506ddaf846f51f5575f1f30d6f0fca9b7b26f16e32675b322d014f8b68db76d5f5e
-EBUILD lcs-0.2-r1.ebuild 650 BLAKE2B 2d947d5d12f2c8a952ff739c0bfedaac7bd3d4bf85c6a685562d084bde2fb9fbb0c5dacf43771cd1bc6d7495a088603295d2be2942fcaba9de7ddde623fc1f93 SHA512 aa46f793542e94c789494307d5ca3a74384e154878c8c179c49430f9c87e9737f0be6fdbeda04e52bc22e575a4b9651f49d2a45cfece3a933be35ae4ce85c4a1
-MISC metadata.xml 1062 BLAKE2B 7f0e9f42997af8f7fe610f2cfb7532c6e5f9cbf578b4316937995e88140962bc2cd71d74fdd54d61190969f6239a35a56836d721a36360689ec81f2d7aceba12 SHA512 21990dc7fc022fe45ae02ca8f54d4a5dde60097da0b83660c4259a7258b824cd9b71ccffa7fa4c55e39a9bb0f492f5c5c79fcb6c0d0603bdd10e5cfa1aedf0fd
diff --git a/dev-haskell/lcs/files/lcs-0.2-ghc-7.10.patch b/dev-haskell/lcs/files/lcs-0.2-ghc-7.10.patch
deleted file mode 100644
index 24165ffb9104..000000000000
--- a/dev-haskell/lcs/files/lcs-0.2-ghc-7.10.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --git a/Data/List/LCS/HuntSzymanski.hs b/Data/List/LCS/HuntSzymanski.hs
-index 306368f..e9df4ef 100644
---- a/Data/List/LCS/HuntSzymanski.hs
-+++ b/Data/List/LCS/HuntSzymanski.hs
-@@ -1,2 +1,2 @@
--
-+{-# LANGUAGE FlexibleContexts #-}
- -----------------------------------------------------------------------------
diff --git a/dev-haskell/lcs/lcs-0.2-r1.ebuild b/dev-haskell/lcs/lcs-0.2-r1.ebuild
deleted file mode 100644
index 4aef464615dc..000000000000
--- a/dev-haskell/lcs/lcs-0.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Find longest common sublist of two lists"
-HOMEPAGE="http://urchin.earth.li/~ian/cabal/lcs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/cabal
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-}
diff --git a/dev-haskell/lcs/metadata.xml b/dev-haskell/lcs/metadata.xml
deleted file mode 100644
index 7a626927e1e6..000000000000
--- a/dev-haskell/lcs/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Provides a function lcs that takes two lists and returns a longest
-		common sublist. For example, lcs "abcd" "acbd" is either "abd" or
-		"acd".
-		
-		The package provides a simple, stupid and (most of all) slow
-		implementation that needs, for inputs of length m and n, O(m+n)
-		space and O((m+n)!) time in the worst case.
-		
-		It also provides an implementation of the Hunt-Szymanski LCS
-		algorithm, based on that in "String searching algorithms" by
-		Graham A Stephen, ISBN 981021829X.
-		
-		Given inputs xs and ys of length m and n respectively, where there
-		are r pairs (x, y) where x is in xs, y is in ys and x == y,
-		Hunt-Szymanski needs O(r+m+n) space and O((r+m+n)*log(m+n)) time.
-		Thus this is O((m+n)^2) space and O((m+n)^2*log(m+n)) time in the
-		worst case.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/lens-3.10.0.1 b/dev-haskell/lens-3.10.0.1
new file mode 100644
index 000000000000..94d59df70df1
--- /dev/null
+++ b/dev-haskell/lens-3.10.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-1:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/generic-deriving-1.4:=[profile?] <dev-haskell/generic-deriving-1.7:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/monadcatchio-transformers-0.3:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.0.1:= >=dev-haskell/cabal-1.10.0.0 test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1 dev-haskell/nats >=dev-haskell/simple-reflect-0.3.1 test-hunit? ( >=dev-haskell/hunit-1.2 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-hunit-0.2 >=dev-haskell/test-framework-th-0.2 test-properties? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-quickcheck2-0.2 ) ) !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-quickcheck2-0.2 >=dev-haskell/test-framework-th-0.2 ) ) ) !test-doctests? ( test-hunit? ( >=dev-haskell/hunit-1.2 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-hunit-0.2 >=dev-haskell/test-framework-th-0.2 test-properties? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-quickcheck2-0.2 ) ) !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-quickcheck2-0.2 >=dev-haskell/test-framework-th-0.2 ) ) ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lenses, Folds and Traversals
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/lens/
+IUSE=benchmark-uniplate dump-splices +inlining lib-werror old-inline-pragmas safe +test-doctests +test-hunit +test-properties +trustworthy doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-1:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/generic-deriving-1.4:=[profile?] <dev-haskell/generic-deriving-1.7:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/monadcatchio-transformers-0.3:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.0.1:=
+SLOT=0/3.10.0.1
+SRC_URI=mirror://hackage/packages/archive/lens/3.10.0.1/lens-3.10.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ee5bc3c784da10312c89a623da0752a1
diff --git a/dev-haskell/lens-3.9.2 b/dev-haskell/lens-3.9.2
new file mode 100644
index 000000000000..438ca6dd9fc7
--- /dev/null
+++ b/dev-haskell/lens-3.9.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bifunctors-3:=[profile?] <dev-haskell/bifunctors-4:=[profile?] >=dev-haskell/comonad-3:=[profile?] <dev-haskell/comonad-4:=[profile?] >=dev-haskell/comonad-transformers-3:=[profile?] <dev-haskell/comonad-transformers-4:=[profile?] >=dev-haskell/comonads-fd-3:=[profile?] <dev-haskell/comonads-fd-4:=[profile?] >=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-1:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/generic-deriving-1.4:=[profile?] <dev-haskell/generic-deriving-1.7:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/monadcatchio-transformers-0.3:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctor-extras-3.3:=[profile?] <dev-haskell/profunctor-extras-4:=[profile?] >=dev-haskell/profunctors-3.2:=[profile?] <dev-haskell/profunctors-4:=[profile?] >=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?] >=dev-haskell/semigroupoids-3.0.2:=[profile?] <dev-haskell/semigroupoids-4:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.0.1:= >=dev-haskell/cabal-1.10.0.0 test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1 dev-haskell/nats >=dev-haskell/simple-reflect-0.3.1 test-hunit? ( >=dev-haskell/hunit-1.2 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-hunit-0.2 >=dev-haskell/test-framework-th-0.2 test-properties? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-quickcheck2-0.2 ) ) !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-quickcheck2-0.2 >=dev-haskell/test-framework-th-0.2 ) ) ) !test-doctests? ( test-hunit? ( >=dev-haskell/hunit-1.2 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-hunit-0.2 >=dev-haskell/test-framework-th-0.2 test-properties? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-quickcheck2-0.2 ) ) !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-quickcheck2-0.2 >=dev-haskell/test-framework-th-0.2 ) ) ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lenses, Folds and Traversals
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/lens/
+IUSE=benchmark-uniplate dump-splices +inlining lib-werror old-inline-pragmas safe +test-doctests +test-hunit +test-properties +trustworthy doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bifunctors-3:=[profile?] <dev-haskell/bifunctors-4:=[profile?] >=dev-haskell/comonad-3:=[profile?] <dev-haskell/comonad-4:=[profile?] >=dev-haskell/comonad-transformers-3:=[profile?] <dev-haskell/comonad-transformers-4:=[profile?] >=dev-haskell/comonads-fd-3:=[profile?] <dev-haskell/comonads-fd-4:=[profile?] >=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-1:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/generic-deriving-1.4:=[profile?] <dev-haskell/generic-deriving-1.7:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/monadcatchio-transformers-0.3:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctor-extras-3.3:=[profile?] <dev-haskell/profunctor-extras-4:=[profile?] >=dev-haskell/profunctors-3.2:=[profile?] <dev-haskell/profunctors-4:=[profile?] >=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?] >=dev-haskell/semigroupoids-3.0.2:=[profile?] <dev-haskell/semigroupoids-4:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.0.1:=
+SLOT=0/3.9.2
+SRC_URI=mirror://hackage/packages/archive/lens/3.9.2/lens-3.9.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fe6875256581b191c565fc7cd1e998f6
diff --git a/dev-haskell/lens-4.11 b/dev-haskell/lens-4.11
new file mode 100644
index 000000000000..96c157364756
--- /dev/null
+++ b/dev-haskell/lens-4.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/kan-extensions-4.2.1:=[profile?] <dev-haskell/kan-extensions-5:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?] >=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1 dev-haskell/generic-deriving dev-haskell/nats >=dev-haskell/semigroups-0.9 >=dev-haskell/simple-reflect-0.3.1 test-properties? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-quickcheck2-0.2 >=dev-haskell/test-framework-th-0.2 ) ) test-hunit? ( >=dev-haskell/hunit-1.2 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-hunit-0.2 >=dev-haskell/test-framework-th-0.2 test-properties? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-quickcheck2-0.2 ) ) ) test-hlint? ( test-doctests? ( test? ( >=dev-haskell/hlint-1.7 ) ) !test-doctests? ( test-hunit? ( test? ( >=dev-haskell/hlint-1.7 ) ) !test-hunit? ( test-properties? ( test? ( >=dev-haskell/hlint-1.7 >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-quickcheck2-0.2 >=dev-haskell/test-framework-th-0.2 ) ) !test-properties? ( test? ( >=dev-haskell/hlint-1.7 ) ) ) ) ) !test-hlint? ( test? ( !test-doctests? ( !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-quickcheck2-0.2 >=dev-haskell/test-framework-th-0.2 ) ) ) ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lenses, Folds and Traversals
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/lens/
+IUSE=benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-hlint +test-hunit +test-properties +trustworthy doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/kan-extensions-4.2.1:=[profile?] <dev-haskell/kan-extensions-5:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?] >=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/4.11
+SRC_URI=mirror://hackage/packages/archive/lens/4.11/lens-4.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=540b2a911facba913783ba5cab9ce663
diff --git a/dev-haskell/lens-4.14 b/dev-haskell/lens-4.14
new file mode 100644
index 000000000000..21610902ee21
--- /dev/null
+++ b/dev-haskell/lens-4.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/reflection-2.1:=[profile?] <dev-haskell/reflection-3:=[profile?] >=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-hunit-0.2 >=dev-haskell/test-framework-quickcheck2-0.2 >=dev-haskell/test-framework-th-0.2 test-doctests? ( >=dev-haskell/doctest-0.9.1 dev-haskell/generic-deriving dev-haskell/nats >=dev-haskell/semigroups-0.9 >=dev-haskell/simple-reflect-0.3.1 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lenses, Folds and Traversals
+EAPI=6
+HOMEPAGE=https://github.com/ekmett/lens/
+IUSE=benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-templates +trustworthy doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/reflection-2.1:=[profile?] <dev-haskell/reflection-3:=[profile?] >=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/4.14
+SRC_URI=mirror://hackage/packages/archive/lens/4.14/lens-4.14.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dcb5942c7b4a5701b2199a1fe0bf9f2f
diff --git a/dev-haskell/lens-4.2 b/dev-haskell/lens-4.2
new file mode 100644
index 000000000000..d933bbfe4296
--- /dev/null
+++ b/dev-haskell/lens-4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?] >=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-1:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/primitive-0.4.0.1:=[profile?] <dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?] >=dev-haskell/scientific-0.3.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-haskell/zlib-0.5.4:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1 dev-haskell/generic-deriving dev-haskell/nats >=dev-haskell/semigroups-0.9 >=dev-haskell/simple-reflect-0.3.1 test-properties? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-quickcheck2-0.2 >=dev-haskell/test-framework-th-0.2 ) ) test-hunit? ( >=dev-haskell/hunit-1.2 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-hunit-0.2 >=dev-haskell/test-framework-th-0.2 test-properties? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-quickcheck2-0.2 ) ) ) test-hlint? ( test-doctests? ( test? ( >=dev-haskell/hlint-1.7 ) ) !test-doctests? ( test-hunit? ( test? ( >=dev-haskell/hlint-1.7 ) ) !test-hunit? ( test-properties? ( test? ( >=dev-haskell/hlint-1.7 >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-quickcheck2-0.2 >=dev-haskell/test-framework-th-0.2 ) ) !test-properties? ( test? ( >=dev-haskell/hlint-1.7 ) ) ) ) ) !test-hlint? ( test? ( !test-doctests? ( !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-quickcheck2-0.2 >=dev-haskell/test-framework-th-0.2 ) ) ) ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lenses, Folds and Traversals
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/lens/
+IUSE=benchmark-uniplate dump-splices +inlining j lib-werror old-inline-pragmas safe +test-doctests +test-hlint +test-hunit +test-properties +trustworthy doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?] >=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-1:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/primitive-0.4.0.1:=[profile?] <dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?] >=dev-haskell/scientific-0.3.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-haskell/zlib-0.5.4:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/4.2
+SRC_URI=mirror://hackage/packages/archive/lens/4.2/lens-4.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9f81e9861dca67808af279bc6ad6eaeb
diff --git a/dev-haskell/lens-4.6.0.1 b/dev-haskell/lens-4.6.0.1
new file mode 100644
index 000000000000..3e1a9507b738
--- /dev/null
+++ b/dev-haskell/lens-4.6.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/primitive-0.4.0.1:=[profile?] <dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1 dev-haskell/generic-deriving dev-haskell/nats >=dev-haskell/semigroups-0.9 >=dev-haskell/simple-reflect-0.3.1 test-properties? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-quickcheck2-0.2 >=dev-haskell/test-framework-th-0.2 ) ) test-hunit? ( >=dev-haskell/hunit-1.2 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-hunit-0.2 >=dev-haskell/test-framework-th-0.2 test-properties? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-quickcheck2-0.2 ) ) ) test-hlint? ( test-doctests? ( test? ( >=dev-haskell/hlint-1.7 ) ) !test-doctests? ( test-hunit? ( test? ( >=dev-haskell/hlint-1.7 ) ) !test-hunit? ( test-properties? ( test? ( >=dev-haskell/hlint-1.7 >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-quickcheck2-0.2 >=dev-haskell/test-framework-th-0.2 ) ) !test-properties? ( test? ( >=dev-haskell/hlint-1.7 ) ) ) ) ) !test-hlint? ( test? ( !test-doctests? ( !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-quickcheck2-0.2 >=dev-haskell/test-framework-th-0.2 ) ) ) ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lenses, Folds and Traversals
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/lens/
+IUSE=benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-hlint +test-hunit +test-properties +trustworthy doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/primitive-0.4.0.1:=[profile?] <dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/4.6.0.1
+SRC_URI=mirror://hackage/packages/archive/lens/4.6.0.1/lens-4.6.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7eed9a131a1215e08abf5f0585741b7e
diff --git a/dev-haskell/lens-4.9.1 b/dev-haskell/lens-4.9.1
new file mode 100644
index 000000000000..e6635272050e
--- /dev/null
+++ b/dev-haskell/lens-4.9.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/kan-extensions-4.2.1:=[profile?] <dev-haskell/kan-extensions-5:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1 dev-haskell/generic-deriving dev-haskell/nats >=dev-haskell/semigroups-0.9 >=dev-haskell/simple-reflect-0.3.1 test-properties? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-quickcheck2-0.2 >=dev-haskell/test-framework-th-0.2 ) ) test-hunit? ( >=dev-haskell/hunit-1.2 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-hunit-0.2 >=dev-haskell/test-framework-th-0.2 test-properties? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-quickcheck2-0.2 ) ) ) test-hlint? ( test-doctests? ( test? ( >=dev-haskell/hlint-1.7 ) ) !test-doctests? ( test-hunit? ( test? ( >=dev-haskell/hlint-1.7 ) ) !test-hunit? ( test-properties? ( test? ( >=dev-haskell/hlint-1.7 >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-quickcheck2-0.2 >=dev-haskell/test-framework-th-0.2 ) ) !test-properties? ( test? ( >=dev-haskell/hlint-1.7 ) ) ) ) ) !test-hlint? ( test? ( !test-doctests? ( !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-quickcheck2-0.2 >=dev-haskell/test-framework-th-0.2 ) ) ) ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lenses, Folds and Traversals
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/lens/
+IUSE=benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-hlint +test-hunit +test-properties +trustworthy doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/kan-extensions-4.2.1:=[profile?] <dev-haskell/kan-extensions-5:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/4.9.1
+SRC_URI=mirror://hackage/packages/archive/lens/4.9.1/lens-4.9.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c8a0e161c9fca93cede8f8d0b6f9e355
diff --git a/dev-haskell/lens-family-1.2.1 b/dev-haskell/lens-family-1.2.1
new file mode 100644
index 000000000000..6e3901ca5c19
--- /dev/null
+++ b/dev-haskell/lens-family-1.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/lens-family-core-1.2:=[profile?] <dev-haskell/lens-family-core-1.3:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lens Families
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/lens-family
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/lens-family-core-1.2:=[profile?] <dev-haskell/lens-family-core-1.3:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.1
+SRC_URI=mirror://hackage/packages/archive/lens-family/1.2.1/lens-family-1.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b8405fbf4b36e0e8081c375832a74f02
diff --git a/dev-haskell/lens-family-core-1.2.1 b/dev-haskell/lens-family-core-1.2.1
new file mode 100644
index 000000000000..152f4f75fac9
--- /dev/null
+++ b/dev-haskell/lens-family-core-1.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell 98 Lens Families
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/lens-family-core
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.1
+SRC_URI=mirror://hackage/packages/archive/lens-family-core/1.2.1/lens-family-core-1.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5323575e3feb6a907da83776cb4f9cfe
diff --git a/dev-haskell/lens-family-core/Manifest b/dev-haskell/lens-family-core/Manifest
deleted file mode 100644
index 5121cfa45bea..000000000000
--- a/dev-haskell/lens-family-core/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lens-family-core-1.2.1.tar.gz 11756 BLAKE2B b1810145ce45c5a445316aa44afaa11eeff6baaaa5b36a4f99d4465ceb41b30f65232aa4c5289ca038e04142a09ddfe89fcd61478ed93a42abc225a8f34b6329 SHA512 1bdb98da1b52d44c1c6d28b92eea4452253925b813b96b04c7d7b25d0e62e91be987106d41ed8bb298173577ad3b50a24508db5bf75d501828e33218b80497e1
-EBUILD lens-family-core-1.2.1.ebuild 633 BLAKE2B 8ce9d66e232a5f9ba0710ad53163aaf68bb1392057ee14d8c45b7ea2998f6209f45f693ab18baa68d70bf68c6d69b10607f5b39c9e1d131111803080f558a82a SHA512 0507f4d699b1e9282cc92867568e9ebec134bfffd25ae3a1c712b43a31b4de077e93c0efa3fd6394d24effd7402fa74b1dc11bfc63192ff53aa5b3aa7998e6c3
-MISC metadata.xml 949 BLAKE2B 3908aff37a9c1e0ff769b1e2eda0dbda6198866a0ec93c472aea2bac1b92c8ae8daf8f8c53a44cf17825a0c2657a9d340e90760940a6a6b06a70558242115d4a SHA512 125b1c7c480a277ce5ea36eb10284912614ca55dc88df27b442217395df5cc267e5c25caa6182ec30d896996e36e493207b933c8f33ca5ba73b24d965ab56123
diff --git a/dev-haskell/lens-family-core/lens-family-core-1.2.1.ebuild b/dev-haskell/lens-family-core/lens-family-core-1.2.1.ebuild
deleted file mode 100644
index c488001e2352..000000000000
--- a/dev-haskell/lens-family-core/lens-family-core-1.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 Lens Families"
-HOMEPAGE="http://hackage.haskell.org/package/lens-family-core"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/lens-family-core/metadata.xml b/dev-haskell/lens-family-core/metadata.xml
deleted file mode 100644
index 291ddcbcd4f3..000000000000
--- a/dev-haskell/lens-family-core/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides first class( ) functional references.
-		In addition to the usual operations of getting, setting and composition, plus integration with the state monad, lens families provide some unique features:
-		
-		* Polymorphic updating
-		
-		* Traversals
-		
-		* Cast projection functions to read-only lenses
-		
-		* Cast \"toList\" functions to read-only traversals
-		
-		* Cast semantic editor combinators to modify-only traversals.
-		
-		( ) For optimal first-class support use the @lens-family@ package with rank 2 / rank N polymorphism.
-		"Lens.Family.Clone" allows for first-class support of lenses and traversals for those who require Haskell 98.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/lens-family-th-0.4.1.0 b/dev-haskell/lens-family-th-0.4.1.0
new file mode 100644
index 000000000000..d4edfe439aa8
--- /dev/null
+++ b/dev-haskell/lens-family-th-0.4.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generate lens-family style lenses
+EAPI=5
+HOMEPAGE=https://github.com/DanBurton/lens-family-th#readme
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.1.0
+SRC_URI=mirror://hackage/packages/archive/lens-family-th/0.4.1.0/lens-family-th-0.4.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c2d70e78744c7baa6d31e5fccb7a2cac
diff --git a/dev-haskell/lens-family-th/Manifest b/dev-haskell/lens-family-th/Manifest
deleted file mode 100644
index e392c5ff226b..000000000000
--- a/dev-haskell/lens-family-th/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX lens-family-th-0.4.1.0-ghc-8.patch 1528 BLAKE2B f32cbeca8419edfe2172312c785f9b17123551028276e0a141aa8e649846660b22fba64781819062a255a711c12635a9e432d199011d63c12d52086e0828f82a SHA512 752aaae5a9a174a67329a16e999a4e1606da1ed11c1c3244d84b07171cfbcb2384f5015ad6f57b718733878a789c59da7e148ab3be015284c5703f2670708dd8
-DIST lens-family-th-0.4.1.0.tar.gz 4562 BLAKE2B 1affa13291e8e610018761b4174bc45ac8cfcc23bbece8e82844a6660e997c5ab1916762bd65d2befa1aa5b0f19cdce1023111d2d7a6d765ff158aa726de6fdd SHA512 ab4283fcb833c68a838f006a71d30ed129c1d5f8ba030c4cbec6443ebeedc83e09a707a609c3c30c4420675bf5187227ce11f39218a3afb7ee563ad26104b774
-EBUILD lens-family-th-0.4.1.0.ebuild 613 BLAKE2B a4b62cf67bcf78057cca9c634560f017273d6acef2a73729a1f842976e76abf4ca0fb0641a27a6ad981ab2978d496a3479136a81b009c12e477f62dcb86eff40 SHA512 bc5041d546d42df9e1456227812c5fd51b715b45db6ee87bd0e8f47eb127b610c338d6a97d63876d904300fd11996b5a4677ea77f733a8e316327fe545cb4e3e
-MISC metadata.xml 690 BLAKE2B d2cd7aa52cc8d336c744531618a66539841aa72e58678277937dafe5099c1a5ee827335cc65723df473c59ad72d71adbfd3873450f624eea158df7692a4be0f5 SHA512 55dc29a781ac230cf03c0d8f5907ddf60199804f9a37ceea31f361b3ce544b20a06c03b89615fe1076708ad76fe501c3dacf1907ba5f09ba345357ba68a80824
diff --git a/dev-haskell/lens-family-th/files/lens-family-th-0.4.1.0-ghc-8.patch b/dev-haskell/lens-family-th/files/lens-family-th-0.4.1.0-ghc-8.patch
deleted file mode 100644
index 06be29a8131b..000000000000
--- a/dev-haskell/lens-family-th/files/lens-family-th-0.4.1.0-ghc-8.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/Lens/Family/THCore.hs b/Lens/Family/THCore.hs
-index d4f2740..2f53db6 100644
---- a/Lens/Family/THCore.hs
-+++ b/Lens/Family/THCore.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE CPP #-}
- {-# LANGUAGE TemplateHaskell #-}
-@@ -52,4 +53,9 @@ extractLensTypeInfo datatype = do
-   return $ case i of
-+#if MIN_VERSION_template_haskell(2,11,0)
-+    TyConI (DataD    _ n ts _ _ _) -> (n, ts)
-+    TyConI (NewtypeD _ n ts _ _ _) -> (n, ts)
-+#else
-     TyConI (DataD    _ n ts _ _) -> (n, ts)
-     TyConI (NewtypeD _ n ts _ _) -> (n, ts)
-+#endif
-     _ -> error $ "Can't derive Lens for: "  ++ datatypeStr
-@@ -63,2 +69,8 @@ extractConstructorFields datatype = do
-   return $ case i of
-+#if MIN_VERSION_template_haskell(2,11,0)
-+    TyConI (DataD    _ _ _ _ [RecC _ fs] _) -> fs
-+    TyConI (NewtypeD _ _ _ _ (RecC _ fs) _) -> fs
-+    TyConI (DataD    _ _ _ _ [_]         _) ->
-+      error $ "Can't derive Lens without record selectors: " ++ datatypeStr
-+#else
-     TyConI (DataD    _ _ _ [RecC _ fs] _) -> fs
-@@ -67,2 +79,3 @@ extractConstructorFields datatype = do
-       error $ "Can't derive Lens without record selectors: " ++ datatypeStr
-+#endif
-     TyConI NewtypeD{} ->
-@@ -134,4 +147,9 @@ extractConstructorInfo datatype = do
-   return $ case i of
-+#if MIN_VERSION_template_haskell(2,11,0)
-+    TyConI (DataD    _ _ _ _ fs _) -> fs
-+    TyConI (NewtypeD _ _ _ _ f  _) -> [f]
-+#else
-     TyConI (DataD    _ _ _ fs _) -> fs
-     TyConI (NewtypeD _ _ _ f  _) -> [f]
-+#endif
-     _ -> error $ "Can't derive traversal for: " ++ datatypeStr
diff --git a/dev-haskell/lens-family-th/lens-family-th-0.4.1.0.ebuild b/dev-haskell/lens-family-th/lens-family-th-0.4.1.0.ebuild
deleted file mode 100644
index 29c2dee5065e..000000000000
--- a/dev-haskell/lens-family-th/lens-family-th-0.4.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate lens-family style lenses"
-HOMEPAGE="https://github.com/DanBurton/lens-family-th#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-8.patch
-}
diff --git a/dev-haskell/lens-family-th/metadata.xml b/dev-haskell/lens-family-th/metadata.xml
deleted file mode 100644
index 1651186a0a1f..000000000000
--- a/dev-haskell/lens-family-th/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Due to a cabal/hackage defect, curly braces cannot be
-		adequately displayed here. Please see
-		&lt;https://github.com/DanBurton/lens-family-th#readme&gt;
-		for a proper description of this package.
-		
-		(See &lt;https://github.com/haskell/cabal/issues/968&gt;
-		for the ticket I created regarding the defect.)
-	</longdescription>
-	<upstream>
-		<remote-id type="github">DanBurton/lens-family-th</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/lens-family/Manifest b/dev-haskell/lens-family/Manifest
deleted file mode 100644
index de0398581e02..000000000000
--- a/dev-haskell/lens-family/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lens-family-1.2.1.tar.gz 8192 BLAKE2B e402d520ded809890c311be9e5856367679a64adb490a2f3c70e6cce471bdfa9be311f7de4532216c32a48c17210dbebbea45bdd0d873ab4a014442c628e3f23 SHA512 5e8bd69631b5b4da489e7cb79ca91d0bacdd6ae943b2c599f837055c6589a0d0e19bfe3be427723b5775c088201237ee7cb0f2807a70aed0fbaf46293828c6fb
-EBUILD lens-family-1.2.1.ebuild 779 BLAKE2B 16fdb3f5bdf5cb8e221de380cbc5607f5ff9b621c2068274256ce4e6f0a7edf54a6c998d9e58c59c55f0bbacaabeb494ccf21d7af85aaee5eb5acb0226690f1f SHA512 4571dd591e2bcd0a74e234ed89b72b325da683344cff55e72792d11cf23fea5607d1c0cb54849020c316fee75c03182c93f71c48d3e586d0a674b3d56ba700d1
-MISC metadata.xml 734 BLAKE2B c45de814050d33189f54e59256c2c9b261e6a47bdcdfb383e15f4d2318fed41b9903da259078682f0c03ada42205283962857a1e2ab60e7e8a66e466f3993924 SHA512 23553989de8d413abc7a1c2061af33beda9ae0f161d0bbc1f8832dd587454c3a18932b6aa8fd6eb77717af2b649d0b1ebe3c0d9d52bb12b243918ebdbdc3a37d
diff --git a/dev-haskell/lens-family/lens-family-1.2.1.ebuild b/dev-haskell/lens-family/lens-family-1.2.1.ebuild
deleted file mode 100644
index 347af6436306..000000000000
--- a/dev-haskell/lens-family/lens-family-1.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lens Families"
-HOMEPAGE="http://hackage.haskell.org/package/lens-family"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/lens-family-core-1.2:=[profile?] <dev-haskell/lens-family-core-1.3:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/lens-family/metadata.xml b/dev-haskell/lens-family/metadata.xml
deleted file mode 100644
index 02358802aa05..000000000000
--- a/dev-haskell/lens-family/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides first class functional references.
-		In addition to the usual operations of getting, setting and composition, plus integration with monad state, lens families provide some unique features:
-		
-		* Polymorphic updating
-		
-		* Traversals
-		
-		* Cast projection functions to read-only lenses
-		
-		* Cast \&quot;toList\&quot; functions to read-only traversals
-		
-		* Cast semantic editor combinators to modify-only traversals.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/lens-simple-0.1.0.9 b/dev-haskell/lens-simple-0.1.0.9
new file mode 100644
index 000000000000..8d0bce85fe7f
--- /dev/null
+++ b/dev-haskell/lens-simple-0.1.0.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/lens-family-1.2:=[profile?] <dev-haskell/lens-family-1.3:=[profile?] >=dev-haskell/lens-family-core-1.2:=[profile?] <dev-haskell/lens-family-core-1.3:=[profile?] <dev-haskell/lens-family-th-0.6:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=simplified import of elementary lens-family combinators
+EAPI=6
+HOMEPAGE=https://github.com/michaelt/lens-simple
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/lens-family-1.2:=[profile?] <dev-haskell/lens-family-1.3:=[profile?] >=dev-haskell/lens-family-core-1.2:=[profile?] <dev-haskell/lens-family-core-1.3:=[profile?] <dev-haskell/lens-family-th-0.6:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0.9
+SRC_URI=mirror://hackage/packages/archive/lens-simple/0.1.0.9/lens-simple-0.1.0.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fb0456a5438ecd3ace5bfa1e721d0182
diff --git a/dev-haskell/lens-simple/Manifest b/dev-haskell/lens-simple/Manifest
deleted file mode 100644
index 2ed4d353f406..000000000000
--- a/dev-haskell/lens-simple/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lens-simple-0.1.0.9.tar.gz 4541 BLAKE2B d3967769ff693b5e1fd370a96753753e2bac502fce326e6266627f28c5ddfc3e29ec0d646c1dcda2ceeaf7ea88f6acd5fb031aaf976c42338a1e9c3190f578f6 SHA512 3bf1079f4525b534bca70f83073ebb8abbc84cd9320ef97a1fb137914fcb614f8d7c8ea7065a4484539dc6240ab1aa393ee22ed3b9e20bc421d25ce7adadbd0c
-EBUILD lens-simple-0.1.0.9.ebuild 942 BLAKE2B 13ae29426384f4569fd7fe04547a2658b59e7ec46c301ed302f0dd570b4dea854be97b89c87efad1bf0f2d69104a059c39f7435da20d61a1fd3d6532057e87c2 SHA512 69d123bfeb2e0a3115f05e445bb1af5ac1343760530414767cbb4a7ef979c471b303341471886b78822e6c5b3d3bb62083b0b6bb42b679bb5aa7e64fe1138331
-MISC metadata.xml 3832 BLAKE2B d7aacb03e4104637103d5fecc44027b51ad2dd1caef58e47f77e343c3e307df50363a61124408c9f64adcf2a7d0e8abdd99efbc5e92dfb489ff18f96a0e81b42 SHA512 fb425a74d1f97a963d35f9c34a522a9cd559ee960bcce274da4ffecfacf2d6c424bf9844eb4e662c3e888f1035ec954b6dc2d67df8f78d86705f9b2049b1301c
diff --git a/dev-haskell/lens-simple/lens-simple-0.1.0.9.ebuild b/dev-haskell/lens-simple/lens-simple-0.1.0.9.ebuild
deleted file mode 100644
index 02c9fece6e3a..000000000000
--- a/dev-haskell/lens-simple/lens-simple-0.1.0.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="simplified import of elementary lens-family combinators"
-HOMEPAGE="https://github.com/michaelt/lens-simple"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/lens-family-1.2:=[profile?] <dev-haskell/lens-family-1.3:=[profile?]
-	>=dev-haskell/lens-family-core-1.2:=[profile?] <dev-haskell/lens-family-core-1.3:=[profile?]
-	<dev-haskell/lens-family-th-0.6:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/lens-simple/metadata.xml b/dev-haskell/lens-simple/metadata.xml
deleted file mode 100644
index 743355961e37..000000000000
--- a/dev-haskell/lens-simple/metadata.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This module, &lt;http://hackage.haskell.org/package/lens-simple/docs/Lens-Simple.html Lens.Simple&gt;,
-		just re-exports the main modules from Russell O\'Connor's
-		&lt;http://hackage.haskell.org/package/lens-family lens-family&gt; package, the
-		original van Laarhoven-O'Connor lens library.
-		@lens-family@ is particularly remarkable for its minute number of dependencies:
-		(apart from &lt;http://hackage.haskell.org/package/mtl mtl&gt;
-		they are all ghc \'boot\' libraries); but more importantly for its
-		extreme conceptual simplicity and theoretical soundness. Much of
-		the material it contains is well-explained, from a tutorial point of view, by
-		&lt;http://hackage.haskell.org/package/lens-tutorial lens-tutorial&gt; It is independent,
-		self-standing and readily intelligible apart from any darker
-		more general system of combinators that might attempt to extend it. Much
-		of it ought to be in the Prelude.
-		
-		Convenient import of the elementary combinators from @lens-family@,
-		however, a little complicated. The idea of this trivial module, then, is just to make a sort of
-		low-powered, minimal-dependency, @lens-family@ equivalent of
-		the 800 lb gorilla of lens library imports:
-		
-		&gt; import Control.Lens
-		
-		namely, the light-weight and elegant:
-		
-		&gt; import Lens.Simple
-		
-		Check it out, it's even one character shorter!
-		
-		The material in &lt;http://hackage.haskell.org/package/lens-tutorial lens-tutorial&gt;
-		will work fine if you make this substitution in the underlying
-		&lt;http://hackage.haskell.org/package/lens-tutorial-1.0.0/docs/src/Control-Lens-Tutorial.html source&gt;
-		and follow along as prompted.
-		
-		As another illustration of the simplicity of the
-		fundamental van Laarhoven-O'Connor lens combinators - and their homogeneity with
-		@Control.Lens@ - note that the gloss
-		&lt;https://github.com/michaelt/lens-family-simple/blob/master/examples/Pong.hs pong example&gt;
-		from the @lens@ library examples directory - which continues to be
-		among the best introductory lens tutorials precisely by saying nothing -
-		requires only this abbreviating change of imports.
-		
-		If you make that program more complicated,
-		you might of course end up needing
-		the more sophisticated material in @Control.Lens@ and
-		its immense mass of dependencies. On the other hand,
-		you might just need some of the additional material
-		present in the similarly demystifying
-		&lt;http://hackage.haskell.org/package/microlens microlens&gt;
-		or &lt;http://hackage.haskell.org/package/microlens-th microlens-th&gt; and
-		the associated modules.
-		
-		This module was originally intended to simplify the use of packages that
-		follow the original promise of the van Laarhoven-O'Connor lenses.
-		/Correct practice is to export lenses without depending on a lens-library, where possible./
-		In basic cases these just use familiar @Prelude@ types, after all.
-		Examples of best practices in this respect are e.g. &lt;http://hackage.haskell.org/package/lens-family-th lens-family-th&gt; which
-		doesn't depend on @lens-family@ despite its name and pipes-related packages like
-		&lt;http://hackage.haskell.org/package/pipes-bytestring pipes-bytestring&gt;
-		and &lt;http://hackage.haskell.org/package/pipes-group pipes-group&gt;.
-		
-		@Lens.Simple@ also re-exports @makeLenses@ and
-		other convenient TH incantations from Dan Burton's associated
-		&lt;http://hackage.haskell.org/package/lens-family-th lens-family-th&gt;.
-		
-	</longdescription>
-	<upstream>
-		<remote-id type="github">michaelt/lens-simple</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/lens/Manifest b/dev-haskell/lens/Manifest
deleted file mode 100644
index bc37c0974ac2..000000000000
--- a/dev-haskell/lens/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-DIST lens-3.10.0.1.tar.gz 455039 BLAKE2B 8be7cb75d2576dd65be0f91ad0e7f0b56ef1ccbc6cac8383f0043a567e514f7c2fb1c6f6fcee7925b67e68db79503313b6577c482c96f9040230e30b6e9d9693 SHA512 3dbb1f547a63196bc37dc891e7cff63656a8f662404767bca53d4d722d1669034fada995518db1a4535e7e142552ee8ad9121db6029fe22509b7de8a44aea923
-DIST lens-3.9.2.tar.gz 454678 BLAKE2B 0c637a1a00279339a697b04d8204c14f598882e0cf222ab6d5e45cd096fe34f132cd0ab1133770ffcc857b4b02c7c1987d00b46ec0f6ef72c44801c78ff8b8af SHA512 63e3a39d0d0ad16d27a8e2319163f333b67bc9df2d89d1b7fbc4dd9944cd098f0ba4a571a66939a640143c86c2f3008d5db3619af14f11a8cbcc07c424349f7a
-DIST lens-4.11.tar.gz 964787 BLAKE2B a3fefd1dc8fa3667c28b35ecef29219dd299e103d1138aa888fe610c4c1fe9b90802dc1dd43c3d8b3df34aa30cb3b0c9994550c6c6d745b7336320b6f959275c SHA512 9dc49c7a4c5cde508a5021522b41cdbb3c32b9de4be706fed189d16435828c03382cd6f069b4a17d13bcd0af390787e9f3343eea14e98662c3de3bbd5333143a
-DIST lens-4.14.tar.gz 972873 BLAKE2B 4fdea38830b8d1c4b08f5818ef5a81e7534dc31e3a07a9dc64c91b6b1ecbca8b3fc3ce561abdb8a85bf57c63f4f092687d67780d6a48a0febbbd9ad1983ca2c1 SHA512 d27999472d281832bbf56c3dd762e1a6c310d07a21af4351e64a53d7cd197e538f30955aa108ba2f56bbfbe8612ba4b844a41667e36497f03c14797e23c9c01f
-DIST lens-4.2.tar.gz 767603 BLAKE2B 2ea1d21ba0f5a4f741869aa7aebab8999c28bf14339fbaf1ed493e8f2035217f0ca62502cd5b11d1c3bbb1e577ed45d807b61b6ac363a60cbaec04add64fa32b SHA512 b1e583d3400c076f1e3648aa758b0d30d6a4e3fd9776eb9e115fbd7372b990c3aa3e5d8119de827b132e0e69a255b3532f3f044e936ac4d320cc146a6d04f7bf
-DIST lens-4.6.0.1.tar.gz 767614 BLAKE2B 96e328e8b248de223cfda1df01d418aaf2e05edc2a70556805a408b32227c9246a69479e16085e7ac3abe632c702157cb31b07c94b4c92aae4346d855b06127a SHA512 0dd233ade1c5f0e3872711ecd378b69ff98353caa33cdbf1ec87bbf0356cd54842fc83870bb51b913abbb2dfd767414ebe79cec0e058cce16c29468a69880662
-DIST lens-4.9.1.tar.gz 964188 BLAKE2B 3efe4f86e592d997804c1976c7c3cfdde5cc52ef2379d531a7f4c4c43b6c834d4aaeec86309d73b5074d961d681aca36f8d0bb12f9953fd1f760a9bca72bd27c SHA512 f77d1c46a53b65e65bec4c993db087cee720e5a63f17d8beec38fe49b713bf36f4c4ff1564c6533044b8dfaaf5f5729ec98dbb55687f70fff1344e5112e8857b
-EBUILD lens-3.10.0.1.ebuild 4027 BLAKE2B 6932390df6c846a16123ee7f55ce2da152b5b5a07413e7bd82fcce89177125be96fcc07345373319bfbf3016b00b00b0598a76d59f0141ad53e21a3f2871bf7f SHA512 cbb8059cabce05f10e2f1eb1dbecba1bab09afd8fe3f7c9c35733deb10a85cc1b1ac82cb8382598d239f55f631ca94f37193c5cb2855e5f987385c0e0dc89e60
-EBUILD lens-3.9.2.ebuild 4306 BLAKE2B 20e7cfe872d7116b85ca7280143881409ab2a13a4a98a57da46378d2fc45c4eff6a45bb7bac0cad3b2c7def0555cec253457c67a290d3d17f87068e520dc24e6 SHA512 6b50bb0e8eadcbcff65e32f11be037c63d21fa9b6b5453ac9d2388628dcb247fbffa3e2d559036d840cd15c351b4ea02185acf7fe0636e6dc283796cde7667db
-EBUILD lens-4.11.ebuild 4306 BLAKE2B 390bc29680f15187d67983b233e7de98b841847af3826ac676bb8d858c889f5249574631597c6d37ae66202411cdf8bd947597519cfb204944cc715207c3793c SHA512 c5aaed22ad52faadb57387578801ebd09af7a5033d1662ab5f6e0dc2ddc0bd8261c889abab3d01cc5ea4a5c30dd3aa3e40191611a605c031c53efe14d53c74f0
-EBUILD lens-4.14.ebuild 3388 BLAKE2B 0dd145b085606efad2e88a14f4b2d55cb897b126b7b353452c6e940fb9cbf4fbdeac75ac66ab8ac5a947577227f3cfeff669e46915de8e3f7dbd44dc29e125e5 SHA512 20409c993cf7a989a1b64d785affa8d53c89ed07ffae0be79c526326b2c2c20142592fdbba2f65edff8abce851b6d955cb7089d9b08bfc5690b4d1be8b1c372c
-EBUILD lens-4.2.ebuild 4705 BLAKE2B 6429026254cd996839c80b04b6980640eeea9d43496a974e23b9f0265428de80edba3679b90751048e118697a2aa4a98ea3c23ccb017c65452ce863a6b51bd73 SHA512 b9ad5400b48ad07b29763d60f82aeb4bd85ed5c33219593c02d8acd5da20c665b4251714d324e0bf952838d473ddd64b951c4c52e63e48bee6798a5976979a55
-EBUILD lens-4.6.0.1.ebuild 4377 BLAKE2B c4539f4747069a31476099f811e9eaef41c35ace2a204927cac83e4eb71aaf3495efd492273837d55d59d8b43cd3fda9bee3abd31b3e9e7f36bb8eb472b9cd17 SHA512 45885aad6bb5be0a56ff3afc212cdced433d7194a40e1bcab1901ba0687dd11cff2dbd483f84e8566d598ec3dad0b4f8a9b7576cc89d5d787319d28d0747d9fd
-EBUILD lens-4.9.1.ebuild 4345 BLAKE2B 1dd85ae708f91e9b127085b60772bba79072f5040db1af4da45b966ecbf8281e422c81a5baf10cb7f786610eb75ce0b319cad63968a9622251f084669239e9f5 SHA512 3c75d0829a98ad1a8a6e883fb5c88e40bf08ed8a955e9186aef1795bf2485dc3ab30f88f413197505df9d0dde08bde81183fe0baa688e5fe1f7f71c0992a0555
-MISC metadata.xml 4924 BLAKE2B 0d937d25157349422abd09755aa6b90b31aab051e838188045fa774b5fa6c428c8ba1b5d6cf6d812441a59ac83ea46e467c21e097ea95ec420ef1c7fad3cef1f SHA512 54ee64d40c56b8ab2857b051ab8e1abf6dd7c68f3f5d539e636518f0c94bcaa34a3e5b038610b067a6473080a23cc2928b61c4405b0e3a2f0823313f6dbdb386
diff --git a/dev-haskell/lens/lens-3.10.0.1.ebuild b/dev-haskell/lens/lens-3.10.0.1.ebuild
deleted file mode 100644
index 263f83cb35a8..000000000000
--- a/dev-haskell/lens/lens-3.10.0.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="benchmark-uniplate dump-splices +inlining lib-werror old-inline-pragmas safe +test-doctests +test-hunit +test-properties +trustworthy"
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-1:=[profile?]
-	>=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/generic-deriving-1.4:=[profile?] <dev-haskell/generic-deriving-1.7:=[profile?]
-	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/monadcatchio-transformers-0.3:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?]
-	>=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?]
-	>=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1
-					dev-haskell/nats
-					>=dev-haskell/simple-reflect-0.3.1
-					test-hunit? ( >=dev-haskell/hunit-1.2
-						>=dev-haskell/test-framework-0.6
-						>=dev-haskell/test-framework-hunit-0.2
-						>=dev-haskell/test-framework-th-0.2
-						test-properties? ( >=dev-haskell/quickcheck-2.4
-									>=dev-haskell/test-framework-quickcheck2-0.2 ) )
-					!test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
-									>=dev-haskell/test-framework-0.6
-									>=dev-haskell/test-framework-quickcheck2-0.2
-									>=dev-haskell/test-framework-th-0.2 ) ) )
-		!test-doctests? ( test-hunit? ( >=dev-haskell/hunit-1.2
-						>=dev-haskell/test-framework-0.6
-						>=dev-haskell/test-framework-hunit-0.2
-						>=dev-haskell/test-framework-th-0.2
-						test-properties? ( >=dev-haskell/quickcheck-2.4
-									>=dev-haskell/test-framework-quickcheck2-0.2 ) )
-					!test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
-									>=dev-haskell/test-framework-0.6
-									>=dev-haskell/test-framework-quickcheck2-0.2
-									>=dev-haskell/test-framework-th-0.2 ) ) ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag benchmark-uniplate benchmark-uniplate) \
-		$(cabal_flag dump-splices dump-splices) \
-		$(cabal_flag inlining inlining) \
-		$(cabal_flag lib-werror lib-werror) \
-		$(cabal_flag old-inline-pragmas old-inline-pragmas) \
-		$(cabal_flag safe safe) \
-		$(cabal_flag test-doctests test-doctests) \
-		$(cabal_flag test-hunit test-hunit) \
-		$(cabal_flag test-properties test-properties) \
-		$(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/lens-3.9.2.ebuild b/dev-haskell/lens/lens-3.9.2.ebuild
deleted file mode 100644
index 57388654399b..000000000000
--- a/dev-haskell/lens/lens-3.9.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="benchmark-uniplate dump-splices +inlining lib-werror old-inline-pragmas safe +test-doctests +test-hunit +test-properties +trustworthy"
-
-RDEPEND=">=dev-haskell/bifunctors-3:=[profile?] <dev-haskell/bifunctors-4:=[profile?]
-	>=dev-haskell/comonad-3:=[profile?] <dev-haskell/comonad-4:=[profile?]
-	>=dev-haskell/comonad-transformers-3:=[profile?] <dev-haskell/comonad-transformers-4:=[profile?]
-	>=dev-haskell/comonads-fd-3:=[profile?] <dev-haskell/comonads-fd-4:=[profile?]
-	>=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-1:=[profile?]
-	>=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/generic-deriving-1.4:=[profile?] <dev-haskell/generic-deriving-1.7:=[profile?]
-	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/monadcatchio-transformers-0.3:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?]
-	>=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
-	>=dev-haskell/profunctor-extras-3.3:=[profile?] <dev-haskell/profunctor-extras-4:=[profile?]
-	>=dev-haskell/profunctors-3.2:=[profile?] <dev-haskell/profunctors-4:=[profile?]
-	>=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?]
-	>=dev-haskell/semigroupoids-3.0.2:=[profile?] <dev-haskell/semigroupoids-4:=[profile?]
-	>=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1
-					dev-haskell/nats
-					>=dev-haskell/simple-reflect-0.3.1
-					test-hunit? ( >=dev-haskell/hunit-1.2
-						>=dev-haskell/test-framework-0.6
-						>=dev-haskell/test-framework-hunit-0.2
-						>=dev-haskell/test-framework-th-0.2
-						test-properties? ( >=dev-haskell/quickcheck-2.4
-									>=dev-haskell/test-framework-quickcheck2-0.2 ) )
-					!test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
-									>=dev-haskell/test-framework-0.6
-									>=dev-haskell/test-framework-quickcheck2-0.2
-									>=dev-haskell/test-framework-th-0.2 ) ) )
-		!test-doctests? ( test-hunit? ( >=dev-haskell/hunit-1.2
-						>=dev-haskell/test-framework-0.6
-						>=dev-haskell/test-framework-hunit-0.2
-						>=dev-haskell/test-framework-th-0.2
-						test-properties? ( >=dev-haskell/quickcheck-2.4
-									>=dev-haskell/test-framework-quickcheck2-0.2 ) )
-					!test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
-									>=dev-haskell/test-framework-0.6
-									>=dev-haskell/test-framework-quickcheck2-0.2
-									>=dev-haskell/test-framework-th-0.2 ) ) ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag benchmark-uniplate benchmark-uniplate) \
-		$(cabal_flag dump-splices dump-splices) \
-		$(cabal_flag inlining inlining) \
-		$(cabal_flag lib-werror lib-werror) \
-		$(cabal_flag old-inline-pragmas old-inline-pragmas) \
-		$(cabal_flag safe safe) \
-		$(cabal_flag test-doctests test-doctests) \
-		$(cabal_flag test-hunit test-hunit) \
-		$(cabal_flag test-properties test-properties) \
-		$(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/lens-4.11.ebuild b/dev-haskell/lens/lens-4.11.ebuild
deleted file mode 100644
index d2414e10eb74..000000000000
--- a/dev-haskell/lens/lens-4.11.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-#hackport: flags: -lib-werror
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-hlint +test-hunit +test-properties +trustworthy"
-
-RDEPEND=">=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/kan-extensions-4.2.1:=[profile?] <dev-haskell/kan-extensions-5:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
-	>=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?]
-	>=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1
-					dev-haskell/generic-deriving
-					dev-haskell/nats
-					>=dev-haskell/semigroups-0.9
-					>=dev-haskell/simple-reflect-0.3.1
-					test-properties? ( >=dev-haskell/quickcheck-2.4
-							>=dev-haskell/test-framework-0.6
-							>=dev-haskell/test-framework-quickcheck2-0.2
-							>=dev-haskell/test-framework-th-0.2 ) )
-		test-hunit? ( >=dev-haskell/hunit-1.2
-				>=dev-haskell/test-framework-0.6
-				>=dev-haskell/test-framework-hunit-0.2
-				>=dev-haskell/test-framework-th-0.2
-				test-properties? ( >=dev-haskell/quickcheck-2.4
-							>=dev-haskell/test-framework-quickcheck2-0.2 ) ) )
-	test-hlint? ( test-doctests? ( test? ( >=dev-haskell/hlint-1.7 ) )
-			!test-doctests? ( test-hunit? ( test? ( >=dev-haskell/hlint-1.7 ) )
-					!test-hunit? ( test-properties? ( test? ( >=dev-haskell/hlint-1.7
-											>=dev-haskell/quickcheck-2.4
-											>=dev-haskell/test-framework-0.6
-											>=dev-haskell/test-framework-quickcheck2-0.2
-											>=dev-haskell/test-framework-th-0.2 ) )
-							!test-properties? ( test? ( >=dev-haskell/hlint-1.7 ) ) ) ) )
-	!test-hlint? ( test? ( !test-doctests? ( !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
-											>=dev-haskell/test-framework-0.6
-											>=dev-haskell/test-framework-quickcheck2-0.2
-											>=dev-haskell/test-framework-th-0.2 ) ) ) ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag benchmark-uniplate benchmark-uniplate) \
-		$(cabal_flag dump-splices dump-splices) \
-		$(cabal_flag inlining inlining) \
-		$(cabal_flag j j) \
-		--flag=-lib-werror \
-		$(cabal_flag old-inline-pragmas old-inline-pragmas) \
-		$(cabal_flag safe safe) \
-		$(cabal_flag test-doctests test-doctests) \
-		$(cabal_flag test-hlint test-hlint) \
-		$(cabal_flag test-hunit test-hunit) \
-		$(cabal_flag test-properties test-properties) \
-		$(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/lens-4.14.ebuild b/dev-haskell/lens/lens-4.14.ebuild
deleted file mode 100644
index 3fb375841c7e..000000000000
--- a/dev-haskell/lens/lens-4.14.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -test-hlint,+test-hunit,+test-properties
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-templates +trustworthy"
-
-RDEPEND=">=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
-	>=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/reflection-2.1:=[profile?] <dev-haskell/reflection-3:=[profile?]
-	>=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/test-framework-0.6
-		>=dev-haskell/test-framework-hunit-0.2
-		>=dev-haskell/test-framework-quickcheck2-0.2
-		>=dev-haskell/test-framework-th-0.2
-		test-doctests? ( >=dev-haskell/doctest-0.9.1
-					dev-haskell/generic-deriving
-					dev-haskell/nats
-					>=dev-haskell/semigroups-0.9
-					>=dev-haskell/simple-reflect-0.3.1 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag benchmark-uniplate benchmark-uniplate) \
-		$(cabal_flag dump-splices dump-splices) \
-		$(cabal_flag inlining inlining) \
-		$(cabal_flag j j) \
-		$(cabal_flag old-inline-pragmas old-inline-pragmas) \
-		$(cabal_flag safe safe) \
-		$(cabal_flag test-doctests test-doctests) \
-		--flag=-test-hlint \
-		--flag=test-hunit \
-		--flag=test-properties \
-		$(cabal_flag test-templates test-templates) \
-		$(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/lens-4.2.ebuild b/dev-haskell/lens/lens-4.2.ebuild
deleted file mode 100644
index c2a3203cf23b..000000000000
--- a/dev-haskell/lens/lens-4.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="benchmark-uniplate dump-splices +inlining j lib-werror old-inline-pragmas safe +test-doctests +test-hlint +test-hunit +test-properties +trustworthy"
-RESTRICT="test"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.8:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?]
-	>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-1:=[profile?]
-	>=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
-	>=dev-haskell/primitive-0.4.0.1:=[profile?] <dev-haskell/primitive-0.6:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?]
-	>=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?]
-	>=dev-haskell/scientific-0.3.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-haskell/zlib-0.5.4:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1
-					dev-haskell/generic-deriving
-					dev-haskell/nats
-					>=dev-haskell/semigroups-0.9
-					>=dev-haskell/simple-reflect-0.3.1
-					test-properties? ( >=dev-haskell/quickcheck-2.4
-							>=dev-haskell/test-framework-0.6
-							>=dev-haskell/test-framework-quickcheck2-0.2
-							>=dev-haskell/test-framework-th-0.2 ) )
-		test-hunit? ( >=dev-haskell/hunit-1.2
-				>=dev-haskell/test-framework-0.6
-				>=dev-haskell/test-framework-hunit-0.2
-				>=dev-haskell/test-framework-th-0.2
-				test-properties? ( >=dev-haskell/quickcheck-2.4
-							>=dev-haskell/test-framework-quickcheck2-0.2 ) ) )
-	test-hlint? ( test-doctests? ( test? ( >=dev-haskell/hlint-1.7 ) )
-			!test-doctests? ( test-hunit? ( test? ( >=dev-haskell/hlint-1.7 ) )
-					!test-hunit? ( test-properties? ( test? ( >=dev-haskell/hlint-1.7
-											>=dev-haskell/quickcheck-2.4
-											>=dev-haskell/test-framework-0.6
-											>=dev-haskell/test-framework-quickcheck2-0.2
-											>=dev-haskell/test-framework-th-0.2 ) )
-							!test-properties? ( test? ( >=dev-haskell/hlint-1.7 ) ) ) ) )
-	!test-hlint? ( test? ( !test-doctests? ( !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
-											>=dev-haskell/test-framework-0.6
-											>=dev-haskell/test-framework-quickcheck2-0.2
-											>=dev-haskell/test-framework-th-0.2 ) ) ) ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag benchmark-uniplate benchmark-uniplate) \
-		$(cabal_flag dump-splices dump-splices) \
-		$(cabal_flag inlining inlining) \
-		$(cabal_flag j j) \
-		$(cabal_flag lib-werror lib-werror) \
-		$(cabal_flag old-inline-pragmas old-inline-pragmas) \
-		$(cabal_flag safe safe) \
-		$(cabal_flag test-doctests test-doctests) \
-		$(cabal_flag test-hlint test-hlint) \
-		$(cabal_flag test-hunit test-hunit) \
-		$(cabal_flag test-properties test-properties) \
-		$(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/lens-4.6.0.1.ebuild b/dev-haskell/lens/lens-4.6.0.1.ebuild
deleted file mode 100644
index 98e7d18bcc97..000000000000
--- a/dev-haskell/lens/lens-4.6.0.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -lib-werror
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-hlint +test-hunit +test-properties +trustworthy"
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
-	>=dev-haskell/primitive-0.4.0.1:=[profile?] <dev-haskell/primitive-0.6:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?]
-	>=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1
-					dev-haskell/generic-deriving
-					dev-haskell/nats
-					>=dev-haskell/semigroups-0.9
-					>=dev-haskell/simple-reflect-0.3.1
-					test-properties? ( >=dev-haskell/quickcheck-2.4
-							>=dev-haskell/test-framework-0.6
-							>=dev-haskell/test-framework-quickcheck2-0.2
-							>=dev-haskell/test-framework-th-0.2 ) )
-		test-hunit? ( >=dev-haskell/hunit-1.2
-				>=dev-haskell/test-framework-0.6
-				>=dev-haskell/test-framework-hunit-0.2
-				>=dev-haskell/test-framework-th-0.2
-				test-properties? ( >=dev-haskell/quickcheck-2.4
-							>=dev-haskell/test-framework-quickcheck2-0.2 ) ) )
-	test-hlint? ( test-doctests? ( test? ( >=dev-haskell/hlint-1.7 ) )
-			!test-doctests? ( test-hunit? ( test? ( >=dev-haskell/hlint-1.7 ) )
-					!test-hunit? ( test-properties? ( test? ( >=dev-haskell/hlint-1.7
-											>=dev-haskell/quickcheck-2.4
-											>=dev-haskell/test-framework-0.6
-											>=dev-haskell/test-framework-quickcheck2-0.2
-											>=dev-haskell/test-framework-th-0.2 ) )
-							!test-properties? ( test? ( >=dev-haskell/hlint-1.7 ) ) ) ) )
-	!test-hlint? ( test? ( !test-doctests? ( !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
-											>=dev-haskell/test-framework-0.6
-											>=dev-haskell/test-framework-quickcheck2-0.2
-											>=dev-haskell/test-framework-th-0.2 ) ) ) ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag benchmark-uniplate benchmark-uniplate) \
-		$(cabal_flag dump-splices dump-splices) \
-		$(cabal_flag inlining inlining) \
-		$(cabal_flag j j) \
-		--flag=-lib-werror \
-		$(cabal_flag old-inline-pragmas old-inline-pragmas) \
-		$(cabal_flag safe safe) \
-		$(cabal_flag test-doctests test-doctests) \
-		$(cabal_flag test-hlint test-hlint) \
-		$(cabal_flag test-hunit test-hunit) \
-		$(cabal_flag test-properties test-properties) \
-		$(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/lens-4.9.1.ebuild b/dev-haskell/lens/lens-4.9.1.ebuild
deleted file mode 100644
index fcb962375b77..000000000000
--- a/dev-haskell/lens/lens-4.9.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -lib-werror
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-hlint +test-hunit +test-properties +trustworthy"
-
-RESTRICT=test # slooooooooooow
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/kan-extensions-4.2.1:=[profile?] <dev-haskell/kan-extensions-5:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?]
-	>=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1
-					dev-haskell/generic-deriving
-					dev-haskell/nats
-					>=dev-haskell/semigroups-0.9
-					>=dev-haskell/simple-reflect-0.3.1
-					test-properties? ( >=dev-haskell/quickcheck-2.4
-							>=dev-haskell/test-framework-0.6
-							>=dev-haskell/test-framework-quickcheck2-0.2
-							>=dev-haskell/test-framework-th-0.2 ) )
-		test-hunit? ( >=dev-haskell/hunit-1.2
-				>=dev-haskell/test-framework-0.6
-				>=dev-haskell/test-framework-hunit-0.2
-				>=dev-haskell/test-framework-th-0.2
-				test-properties? ( >=dev-haskell/quickcheck-2.4
-							>=dev-haskell/test-framework-quickcheck2-0.2 ) ) )
-	test-hlint? ( test-doctests? ( test? ( >=dev-haskell/hlint-1.7 ) )
-			!test-doctests? ( test-hunit? ( test? ( >=dev-haskell/hlint-1.7 ) )
-					!test-hunit? ( test-properties? ( test? ( >=dev-haskell/hlint-1.7
-											>=dev-haskell/quickcheck-2.4
-											>=dev-haskell/test-framework-0.6
-											>=dev-haskell/test-framework-quickcheck2-0.2
-											>=dev-haskell/test-framework-th-0.2 ) )
-							!test-properties? ( test? ( >=dev-haskell/hlint-1.7 ) ) ) ) )
-	!test-hlint? ( test? ( !test-doctests? ( !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
-											>=dev-haskell/test-framework-0.6
-											>=dev-haskell/test-framework-quickcheck2-0.2
-											>=dev-haskell/test-framework-th-0.2 ) ) ) ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag benchmark-uniplate benchmark-uniplate) \
-		$(cabal_flag dump-splices dump-splices) \
-		$(cabal_flag inlining inlining) \
-		$(cabal_flag j j) \
-		--flag=-lib-werror \
-		$(cabal_flag old-inline-pragmas old-inline-pragmas) \
-		$(cabal_flag safe safe) \
-		$(cabal_flag test-doctests test-doctests) \
-		$(cabal_flag test-hlint test-hlint) \
-		$(cabal_flag test-hunit test-hunit) \
-		$(cabal_flag test-properties test-properties) \
-		$(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/metadata.xml b/dev-haskell/lens/metadata.xml
deleted file mode 100644
index ffb64447adda..000000000000
--- a/dev-haskell/lens/metadata.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package comes \"Batteries Included\" with many useful lenses for the types
-		commonly used from the Haskell Platform, and with tools for automatically
-		generating lenses and isomorphisms for user-supplied data types.
-
-		The combinators in @Control.Lens@ provide a highly generic toolbox for composing
-		families of getters, folds, isomorphisms, traversals, setters and lenses and their
-		indexed variants.
-
-		An overview, with a large number of examples can be found in the @README@: &lt;https://github.com/ekmett/lens#lens-lenses-folds-and-traversals&gt;
-
-		A video on how to use lenses and how they are constructed is available from youtube: &lt;http://youtu.be/cefnmjtAolY?hd=1&gt;
-
-		Slides can be obtained here: &lt;http://comonad.com/haskell/Lenses-Folds-and-Traversals-NYC.pdf&gt;
-
-		More information on the care and feeding of lenses, including a brief tutorial and motivation
-		for their types can be found on the lens wiki: &lt;https://github.com/ekmett/lens/wiki&gt;
-
-		A small game of @pong@ and other more complex examples that manage their state using lenses can be found in the example folder: &lt;https://github.com/ekmett/lens/blob/master/examples/&gt;
-
-		/Lenses, Folds and Traversals/
-
-		The core of the hierarchy of lens-like constructions looks like:
-
-
-		&lt;&lt;http://i.imgur.com/4fHw3Fd.png&gt;&gt;
-
-		Local copy (&lt;Hierarchy.png&gt;)
-
-		You can compose any two elements of the hierarchy above using @(.)@ from the @Prelude@, and you can
-		use any element of the hierarchy as any type it linked to above it.
-
-		The result is their lowest upper bound in the hierarchy (or an error if that bound doesn't exist).
-
-		For instance:
-
-		* You can use any 'Traversal' as a 'Fold' or as a 'Setter'.
-
-		* The composition of a 'Traversal' and a 'Getter' yields a 'Fold'.
-
-		/Minimizing Dependencies/
-
-		If you want to provide lenses and traversals for your own types in your own libraries, then you
-		can do so without incurring a dependency on this (or any other) lens package at all.
-
-		/e.g./ for a data type:
-
-		&gt; data Foo a = Foo Int Int a
-
-		You can define lenses such as
-
-		&gt; -- bar :: Lens' (Foo a) Int
-		&gt; bar :: Functor f =&gt; (Int -&gt; f Int) -&gt; Foo a -&gt; f (Foo a)
-		&gt; bar f (Foo a b c) = fmap (\a' -&gt; Foo a' b c) (f a)
-
-		&gt; -- baz :: Lens (Foo a) (Foo b) a b
-		&gt; quux :: Functor f =&gt; (a -&gt; f b) -&gt; Foo a -&gt; f (Foo b)
-		&gt; quux f (Foo a b c) = fmap (Foo a b) (f c)
-
-		without the need to use any type that isn't already defined in the @Prelude@.
-
-		And you can define a traversal of multiple fields with 'Control.Applicative.Applicative':
-
-		&gt; -- traverseBarAndBaz :: Traversal' (Foo a) Int
-		&gt; traverseBarAndBaz :: Applicative f =&gt; (Int -&gt; f Int) -&gt; Foo a -&gt; f (Foo a)
-		&gt; traverseBarAndBaz f (Foo a b c) = Foo &lt;$&gt; f a &lt;*&gt; f b &lt;*&gt; pure c
-
-		What is provided in this library is a number of stock lenses and traversals for
-		common haskell types, a wide array of combinators for working them, and more
-		exotic functionality, (/e.g./ getters, setters, indexed folds, isomorphisms).
-	</longdescription>
-	<use>
-		<flag name="benchmark-uniplate">
-			Enable benchmarking against Neil Mitchell's
-			uniplate library for comparative performance analysis. Defaults to being
-			turned off to avoid the extra dependency.
-		</flag>
-		<flag name="inlining">
-			Generate inline pragmas when using
-			template-haskell. This defaults to enabled, but you can
-			to shut it off to benchmark the relative performance impact,
-			or as last ditch effort to address compile errors resulting
-			from the myriad versions of template-haskell that all purport to be 2.8.
-		</flag>
-		<flag name="old-inline-pragmas">Some 7.6.1-rc1 users report their TH still uses old style inline pragmas. This lets them turn on inlining.</flag>
-		<flag name="safe">Disallow unsafeCoerce</flag>
-		<flag name="dump-splices">Build and run the doctests test-suite.</flag>
-		<flag name="j">Attempt a parallel build with GHC 7.8.</flag>
-		<flag name="test-doctests">Build and run the doctests test-suite.</flag>
-		<flag name="test-hlint">You can disable the hlint test suite with -f-test-hlint</flag>
-		<flag name="test-hunit">You can disable the hunit test suite with -f-test-hunit</flag>
-		<flag name="test-properties">Build the properties test if we're building tests</flag>
-		<flag name="test-templates">Build the test templates if we're building tests</flag>
-		<flag name="trustworthy">Assert that we are trustworthy when we can</flag>
-		<flag name="lib-werror">Turn on ghc-options: -Werror</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ekmett/lens</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/lhs2tex-1.18.1-r1 b/dev-haskell/lhs2tex-1.18.1-r1
new file mode 100644
index 000000000000..ae761cbcf3f8
--- /dev/null
+++ b/dev-haskell/lhs2tex-1.18.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-tex/polytable-0.8.2 dev-texlive/texlive-mathscience >=dev-haskell/cabal-1.10 dev-haskell/mtl dev-haskell/regex-compat >=dev-lang/ghc-6.12.1
+DESCRIPTION=Preprocessor for typesetting Haskell sources with LaTeX
+EAPI=5
+HOMEPAGE=http://www.andres-loeh.de/lhs2tex/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-tex/polytable-0.8.2 dev-texlive/texlive-mathscience
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/lhs2tex/1.18.1/lhs2tex-1.18.1.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6553a3d96b77663dd50b71a5372d2b1d
diff --git a/dev-haskell/lhs2tex-1.19-r1 b/dev-haskell/lhs2tex-1.19-r1
new file mode 100644
index 000000000000..67fa9ade4978
--- /dev/null
+++ b/dev-haskell/lhs2tex-1.19-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-tex/polytable-0.8.2 dev-texlive/texlive-mathscience >=dev-haskell/cabal-1.10 dev-haskell/mtl dev-haskell/regex-compat >=dev-lang/ghc-6.12.1
+DESCRIPTION=Preprocessor for typesetting Haskell sources with LaTeX
+EAPI=5
+HOMEPAGE=http://www.andres-loeh.de/lhs2tex/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-tex/polytable-0.8.2 dev-texlive/texlive-mathscience
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/lhs2tex/1.19/lhs2tex-1.19.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6553a3d96b77663dd50b71a5372d2b1d
diff --git a/dev-haskell/lhs2tex/Manifest b/dev-haskell/lhs2tex/Manifest
deleted file mode 100644
index e846eb6f527e..000000000000
--- a/dev-haskell/lhs2tex/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX lhs2tex-1.18.1-mandir.patch 790 BLAKE2B b0de9a0630e6801c48484a172555cc29c9db2cd7df86a10c2cbf6479beeab338685428ecb4050029125d212d5406f4918e6ef901deb658aa8f7e2441f1cc3396 SHA512 2d97ce0015e9844f1b8954ae658807116293ebea07e12d3a8553c48c515e02625b6390c6640ae17e68394a00d908a821783fa5a063a7e6ad10a80f436f73c4ae
-DIST lhs2tex-1.18.1.tar.gz 661053 BLAKE2B 64dbefde30d3a6a00c47d5b3397b6f7b4cb44bdf272768ed84f66db1d3e99e95df99f16e537d3959ef0566424151a44fdd70e975ac156abd2a5907bed8044520 SHA512 c44b4c5972b833ae41921d86e13c71ea60ac876a9996fb9a4e8d69ba25d000bbddb85f82d223b8a73381e3a4453c2757154a866fbbb48473f121dd88efb917d7
-DIST lhs2tex-1.19.tar.gz 658353 BLAKE2B 2a6d0ca1bc23fce29579d1f020ad9db178801177d1b0c171771d24470bf604359b85f5afab6aacc6a566fecca1d0edd26ddb01d97d8e9bc3c8bc98e042d47690 SHA512 63d4cb626c14dccc6e0989b358299078427d0c22ab726fd3d933bfef3b0d072a35113d132c87b61b7b8ac2c259c856e192d04e04d3eb744b958fc0df54c80abf
-EBUILD lhs2tex-1.18.1-r1.ebuild 921 BLAKE2B 009f9bbf623b8f345da7ee798c58e3d930e5d7d40e5965efb3c0897b2d9f9e77571c0306e6ab889fa45664d34f0319aa837fc5f4612748e3bfa29bafc716d19d SHA512 a5599202decf9f9b90808689601224bb8821720d4a9cb29edc4e11a706d7fcb2dbebbf9f5946c245e456243af3c876eae738de64b68537c026f8aa207073cbe5
-EBUILD lhs2tex-1.19-r1.ebuild 921 BLAKE2B 009f9bbf623b8f345da7ee798c58e3d930e5d7d40e5965efb3c0897b2d9f9e77571c0306e6ab889fa45664d34f0319aa837fc5f4612748e3bfa29bafc716d19d SHA512 a5599202decf9f9b90808689601224bb8821720d4a9cb29edc4e11a706d7fcb2dbebbf9f5946c245e456243af3c876eae738de64b68537c026f8aa207073cbe5
-MISC metadata.xml 358 BLAKE2B 3f5e83a9b333d6c597ffa57ca34c74186b48789ca4fbfb10087d31740e53ec215052d9a10b659d5f7006641a34fb47d83179f93b1eba92fa19514a238a38ae88 SHA512 dbc254e5e7925c09f99e64a91fba2f8f63d4b7a12c41a5c13bf315352885f24058cec0becc6e25e98153d2a82f49772f4bc61d1cb21ae5e9ad061b58771fb7fb
diff --git a/dev-haskell/lhs2tex/files/lhs2tex-1.18.1-mandir.patch b/dev-haskell/lhs2tex/files/lhs2tex-1.18.1-mandir.patch
deleted file mode 100644
index 1a3c922723e1..000000000000
--- a/dev-haskell/lhs2tex/files/lhs2tex-1.18.1-mandir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Setup.hs.orig	2014-11-03 00:57:44.033467328 +0530
-+++ Setup.hs	2014-11-03 00:58:05.775218672 +0530
-@@ -205,7 +205,7 @@
-                        else docdir (absoluteInstallDirs pd lbi cd) `joinFileName` "doc"
-         let manDir = if isWindows
-                        then dataPref `joinFileName` "Documentation"
--                       else datadir (absoluteInstallDirs pd lbi cd) `joinFileName` ".." `joinFileName` "man" `joinFileName` "man1"
-+                       else datadir (absoluteInstallDirs pd lbi cd) `joinFileName` ".." `joinFileName` ".." `joinFileName` "man" `joinFileName` "man1"
-         createDirectoryIfMissing True docDir
-         installOrdinaryFile v (lhs2texDocDir `joinFileName` "Guide2.pdf") (docDir `joinFileName` "Guide2.pdf")
-         when (not isWindows) $
diff --git a/dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild b/dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild
deleted file mode 100644
index c3128315fe16..000000000000
--- a/dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CABAL_FEATURES="bin"
-inherit base haskell-cabal
-
-DESCRIPTION="Preprocessor for typesetting Haskell sources with LaTeX"
-HOMEPAGE="http://www.andres-loeh.de/lhs2tex/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# dev-texlive/texlive-mathscience contains 'stmaryrd' font used
-# for guide generation
-RDEPEND=">=dev-tex/polytable-0.8.2
-	dev-texlive/texlive-mathscience"
-
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10
-		dev-haskell/mtl
-		dev-haskell/regex-compat
-		>=dev-lang/ghc-6.12.1"
-
-# Setup.hs uses 'Text.Regex' available in both 'r-c' and 'r-c-tdfa'
-HCFLAGS+=" -ignore-package=regex-compat-tdfa"
-
-# datadir is /usr/share/${PN}/${GHC_VER} so mandir is ${DATADIR}/../../man
-PATCHES=("${FILESDIR}/${PN}-1.18.1-mandir.patch")
diff --git a/dev-haskell/lhs2tex/lhs2tex-1.19-r1.ebuild b/dev-haskell/lhs2tex/lhs2tex-1.19-r1.ebuild
deleted file mode 100644
index c3128315fe16..000000000000
--- a/dev-haskell/lhs2tex/lhs2tex-1.19-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CABAL_FEATURES="bin"
-inherit base haskell-cabal
-
-DESCRIPTION="Preprocessor for typesetting Haskell sources with LaTeX"
-HOMEPAGE="http://www.andres-loeh.de/lhs2tex/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# dev-texlive/texlive-mathscience contains 'stmaryrd' font used
-# for guide generation
-RDEPEND=">=dev-tex/polytable-0.8.2
-	dev-texlive/texlive-mathscience"
-
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10
-		dev-haskell/mtl
-		dev-haskell/regex-compat
-		>=dev-lang/ghc-6.12.1"
-
-# Setup.hs uses 'Text.Regex' available in both 'r-c' and 'r-c-tdfa'
-HCFLAGS+=" -ignore-package=regex-compat-tdfa"
-
-# datadir is /usr/share/${PN}/${GHC_VER} so mandir is ${DATADIR}/../../man
-PATCHES=("${FILESDIR}/${PN}-1.18.1-mandir.patch")
diff --git a/dev-haskell/lhs2tex/metadata.xml b/dev-haskell/lhs2tex/metadata.xml
deleted file mode 100644
index 5523851d5d80..000000000000
--- a/dev-haskell/lhs2tex/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-<maintainer type="project">
-		<email>tex@gentoo.org</email>
-		<name>Gentoo TeX Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/libmpd-0.8.0.4-r1 b/dev-haskell/libmpd-0.8.0.4-r1
new file mode 100644
index 000000000000..e9ceb404bdc0
--- /dev/null
+++ b/dev-haskell/libmpd-0.8.0.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?] >=dev-haskell/data-default-0.4.0:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-2.6:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/utf8-string-0.3.1:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/data-default dev-haskell/hspec dev-haskell/hunit dev-haskell/mtl dev-haskell/network >=dev-haskell/quickcheck-2.1 dev-haskell/text dev-haskell/utf8-string ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An MPD client library
+EAPI=5
+HOMEPAGE=https://github.com/joachifm/libmpd-haskell#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?] >=dev-haskell/data-default-0.4.0:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-2.6:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/utf8-string-0.3.1:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.8.0.4
+SRC_URI=mirror://hackage/packages/archive/libmpd/0.8.0.4/libmpd-0.8.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=21fc77ba28a48bc8638a17540895701a
diff --git a/dev-haskell/libmpd-0.9.0.2 b/dev-haskell/libmpd-0.9.0.2
new file mode 100644
index 000000000000..31819df02560
--- /dev/null
+++ b/dev-haskell/libmpd-0.9.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/utf8-string-0.3.1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-1.3 >=dev-haskell/quickcheck-2.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An MPD client library
+EAPI=5
+HOMEPAGE=https://github.com/vimus/libmpd-haskell#readme
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/utf8-string-0.3.1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.9.0.2
+SRC_URI=mirror://hackage/packages/archive/libmpd/0.9.0.2/libmpd-0.9.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c78c0cfdb2e39d34ab635888746453af
diff --git a/dev-haskell/libmpd-0.9.0.4 b/dev-haskell/libmpd-0.9.0.4
new file mode 100644
index 000000000000..5ea7b300b11c
--- /dev/null
+++ b/dev-haskell/libmpd-0.9.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/utf8-string-0.3.1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-1.3 >=dev-haskell/quickcheck-2.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An MPD client library
+EAPI=5
+HOMEPAGE=https://github.com/vimus/libmpd-haskell#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/utf8-string-0.3.1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.9.0.4
+SRC_URI=mirror://hackage/packages/archive/libmpd/0.9.0.4/libmpd-0.9.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d0701fc7228b6cbb80e326ea9e5356a0
diff --git a/dev-haskell/libmpd-0.9.0.6 b/dev-haskell/libmpd-0.9.0.6
new file mode 100644
index 000000000000..8b83ee3511d9
--- /dev/null
+++ b/dev-haskell/libmpd-0.9.0.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/utf8-string-0.3.1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-1.3 >=dev-haskell/quickcheck-2.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An MPD client library
+EAPI=6
+HOMEPAGE=https://github.com/vimus/libmpd-haskell#readme
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/utf8-string-0.3.1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.9.0.6
+SRC_URI=mirror://hackage/packages/archive/libmpd/0.9.0.6/libmpd-0.9.0.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4e29eca104f78e2df8430b091d225377
diff --git a/dev-haskell/libmpd/Manifest b/dev-haskell/libmpd/Manifest
deleted file mode 100644
index 59b4157382c7..000000000000
--- a/dev-haskell/libmpd/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST libmpd-0.8.0.4.tar.gz 39996 BLAKE2B b35dd8ef91bbde333c64ed904701bade2541b191121871306cc1ab196b39ce7a490ed80c948831e36abc26540bc4f89c25ebbae4b34c6ff85a73a57168ae3bee SHA512 57e06fcd9b4c1beefa95c3ff7d15bf9aea7ec92978c36ab2387f8724054ef8dd0ce6f8d9fbb437fd4b0e22b31daadf487463b95393564f8aff049d55084fe3c9
-DIST libmpd-0.9.0.2.tar.gz 38392 BLAKE2B 80b3afb64eeb5b2ff242991388c25c1581c066b7fd4700487b1b472692f1890b3299fc2e0fdbf27c035e464ee2f28314d034da8dc31db862ca47783f9042fd59 SHA512 0dcafb2085e833608c68b83bcb08177ecb68f08110c1d25e8ea7b2f69ff9fbb85e581280528d1c5a4f3a6c9077ec70105ba9d28bce4276863e91db776c698d1e
-DIST libmpd-0.9.0.4.tar.gz 38421 BLAKE2B 5679d556f0c3324225da80bbf9c6d44a928c9218fd4119b9b09a8896ea3b7f26437757bd0757cce3c831a367dc057a651d282f04c189a5a22d78cb4da4a56fbf SHA512 f2c5d300f26d9101cf248c73791f45b26803d13f39472c47109921c82c941138804a80237f359629419001f1d228c2ea199c69cb4421aaca23012d5871b796c4
-DIST libmpd-0.9.0.6.tar.gz 38707 BLAKE2B f6d11eaf7c260d375c949c0cbeed17af95397d99141a0b879d7f00e00a06dac6de302b0918f3d64ee16de740f418be22ce84fbc6ffbb56af3b1688b411a3d4e3 SHA512 87601afb3ea71675793087277c8dbd02cac596df19d8e665ccae4111f87c3f5d39fff33f7c26dba9be22d6569cce9bcb039aa6f56e8542f26c699d8f0930371b
-EBUILD libmpd-0.8.0.4-r1.ebuild 1350 BLAKE2B 065e462e24cf9b63a86e61023d882583363224a90768b265512ebcb22ac16f23db0439766976fb87961b3231a34206338750f7bcedb3998fdd81b0c719d2f7f3 SHA512 37975ac849796719d97ef1c423b66f42eb8b587530aaf8b2a46710d167f990a2378bd69cfade982d1cc01398a4bbf32825a5075ef2e2d741d13bb772986c428d
-EBUILD libmpd-0.9.0.2.ebuild 1216 BLAKE2B 66d737cefd2b8ac42cf86888a901449d590351f563695801bdf3f443da46753494a4963acf9ce45ef2978fe1561b3f3d6f29300b7fe776693c1405bee019e738 SHA512 903c3888a6a4138049ada06bf347d3e6753d3bd5a94acae2f130b10ddb2ddb88e0a5d1639db6ed899f404e803083651f31c011b1882956f155bf6a3d143db016
-EBUILD libmpd-0.9.0.4.ebuild 1286 BLAKE2B 9023d4e50545ec2c23475e10cbfacca537768835f95c35966039db208cfceb6eb644d64cb681607151bd04ac71e44ba810d4fc7b7a60551577d40d114e2ec0eb SHA512 29add7855abc981f3eded02aa68ca00c75837a47ae3861a85fea50018cea9a741b1343eed6eed9a4e1359904077b1cb35f9b8ea0a4d826cba64feb8406013037
-EBUILD libmpd-0.9.0.6.ebuild 1167 BLAKE2B ccace38f7f1b82ebaa8a84be494959662f8055e79a358fba35c9795307e91d8a67acfb6b9ed878ccb0dd06bed36fcde41e3bc6b1dda9572c53d3a7517c238a49 SHA512 b40e7904ad14c9a6281012587ee8d94a27b0f217c505dc913012945448fba70574bc1fe4c84a6c44f6903b4d848d154c1cc870a7369d0a145a399a45569e0790
-MISC metadata.xml 470 BLAKE2B 36a2e27afa2db06d05ff99bfde367a0189395b11bd73bb0f7db3a28132f1a6b678839059ddb85d8defcf6c1d720c2726390dba07d6fdee539c900ca2e5d5ffef SHA512 0dbd8d050cbf5c5f9db61997b1f637c6d8197a99dd92deed7da9919f738f35747fa8265d270724bc9a2af16325f9c71eef29decc81de80f3846f34c430bab708
diff --git a/dev-haskell/libmpd/libmpd-0.8.0.4-r1.ebuild b/dev-haskell/libmpd/libmpd-0.8.0.4-r1.ebuild
deleted file mode 100644
index 58d392dcbf79..000000000000
--- a/dev-haskell/libmpd/libmpd-0.8.0.4-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An MPD client library"
-HOMEPAGE="https://github.com/joachifm/libmpd-haskell#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test" # Could not find module Test.Hspec.Monadic
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?]
-	>=dev-haskell/data-default-0.4.0:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-2.6:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/utf8-string-0.3.1:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/data-default
-		dev-haskell/hspec
-		dev-haskell/hunit
-		dev-haskell/mtl
-		dev-haskell/network
-		>=dev-haskell/quickcheck-2.1
-		dev-haskell/text
-		dev-haskell/utf8-string )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'attoparsec >= 0.10.1 && < 0.12' 'attoparsec >= 0.10.1 && < 0.13'
-}
diff --git a/dev-haskell/libmpd/libmpd-0.9.0.2.ebuild b/dev-haskell/libmpd/libmpd-0.9.0.2.ebuild
deleted file mode 100644
index d652dbadf217..000000000000
--- a/dev-haskell/libmpd/libmpd-0.9.0.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An MPD client library"
-HOMEPAGE="https://github.com/vimus/libmpd-haskell#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RESTRICT=test # needs slight port to ghc-7.10
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?]
-	>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-1:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-3:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?]
-	>=dev-haskell/utf8-string-0.3.1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/quickcheck-2.1 )
-"
diff --git a/dev-haskell/libmpd/libmpd-0.9.0.4.ebuild b/dev-haskell/libmpd/libmpd-0.9.0.4.ebuild
deleted file mode 100644
index 652f75c773bd..000000000000
--- a/dev-haskell/libmpd/libmpd-0.9.0.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An MPD client library"
-HOMEPAGE="https://github.com/vimus/libmpd-haskell#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # needs a port to QC-2.8.2
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?]
-	>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-1:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-3:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?]
-	>=dev-haskell/utf8-string-0.3.1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/quickcheck-2.1 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'time >= 1.5 && <1.6' 'time >= 1.5'
-}
diff --git a/dev-haskell/libmpd/libmpd-0.9.0.6.ebuild b/dev-haskell/libmpd/libmpd-0.9.0.6.ebuild
deleted file mode 100644
index 59779beabee7..000000000000
--- a/dev-haskell/libmpd/libmpd-0.9.0.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An MPD client library"
-HOMEPAGE="https://github.com/vimus/libmpd-haskell#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?]
-	>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-1:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-3:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?]
-	>=dev-haskell/utf8-string-0.3.1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/quickcheck-2.1 )
-"
diff --git a/dev-haskell/libmpd/metadata.xml b/dev-haskell/libmpd/metadata.xml
deleted file mode 100644
index 6c9830eddc95..000000000000
--- a/dev-haskell/libmpd/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A client library for MPD, the Music Player Daemon
-		(&lt;https://www.musicpd.org/&gt;).
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vimus/libmpd-haskell#readme</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/libxml-0.1.1 b/dev-haskell/libxml-0.1.1
new file mode 100644
index 000000000000..d77eaa76d16d
--- /dev/null
+++ b/dev-haskell/libxml-0.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/libxml2 >=dev-haskell/cabal-1.6.0.3 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=748d5a031f49d808daed807b13c7e740
diff --git a/dev-haskell/libxml-sax-0.7.5 b/dev-haskell/libxml-sax-0.7.5
new file mode 100644
index 000000000000..48625529e39a
--- /dev/null
+++ b/dev-haskell/libxml-sax-0.7.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-0.7:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/libxml2 >=dev-haskell/cabal-1.6.0.3 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Bindings for the libXML2 SAX interface
+EAPI=5
+HOMEPAGE=https://john-millikin.com/software/haskell-libxml/
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/text-0.7:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/libxml2
+SLOT=0/0.7.5
+SRC_URI=mirror://hackage/packages/archive/libxml-sax/0.7.5/libxml-sax-0.7.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d0620f1fa8a5193babe4dcd8c18eb6cc
diff --git a/dev-haskell/libxml-sax/Manifest b/dev-haskell/libxml-sax/Manifest
deleted file mode 100644
index f6e9b234bd4d..000000000000
--- a/dev-haskell/libxml-sax/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libxml-sax-0.7.5.tar.gz 8916 BLAKE2B d6d08951825a154e1d983097bb85f2007ed68d25a5fd2dfbe545f0db6f99d3fc8a7721599fee43a9b4f94327f8546d4ff3466be21ab1933bc5658e525d9586cc SHA512 8a7345610de1fa7fdbe0c251c5e3675f980731f3c4212e87243aec606457a152ef36d78c777428a8b879aa8662f75b6cd878fd5a9e48d283def24c853be43c28
-EBUILD libxml-sax-0.7.5.ebuild 743 BLAKE2B a4e53000ac94d92ecf98a9106bf40721c02f14c816ffae7c2dfc9e139664d9a3f0dd101f0a5210de2eed4c97dd19fe009837c52be30d84610bb94c289e7dcf5a SHA512 a31157229ce908f72303e6bdf069355803ae59583e922e41e5bf302f140ade3c974abc1b37b5330bd71c4e222dc85b9736540e4359603e0eba20e865e0502f2b
-MISC metadata.xml 329 BLAKE2B ddb8efaebc4515def822e6cc42c1e991358c6b0326bbf2e1288c200567a55fae659c292d1b938a910ddbea332c629e3311eb0029b304198a0f5eba2d6ed88c1f SHA512 5f56a4ef1247cd02c23e2688d0800396336510599db9fc5c85258d35d2e2163c7dd8658fd66fd98851ecb30c6c6dc9399a3f3a9df4e1a13cdfd41c3b40e665fa
diff --git a/dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild b/dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild
deleted file mode 100644
index cda1b886d886..000000000000
--- a/dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings for the libXML2 SAX interface"
-HOMEPAGE="https://john-millikin.com/software/haskell-libxml/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	dev-libs/libxml2
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/libxml-sax/metadata.xml b/dev-haskell/libxml-sax/metadata.xml
deleted file mode 100644
index 746e917f70c8..000000000000
--- a/dev-haskell/libxml-sax/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Bindings for the libXML2 SAX interface
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/libxml/Manifest b/dev-haskell/libxml/Manifest
deleted file mode 100644
index f7cc7e9cc62c..000000000000
--- a/dev-haskell/libxml/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libxml-0.1.1.tar.gz 3959 BLAKE2B 938bf1b309696574e47b4128dba8824ed9b756416980fa367269730051ff319c68ea8e49b9f4e63ab2da358f9a2ed9adc2f5a1f12cf729fbdd3b3ea48beedd10 SHA512 59a52200e7c7ab17a60a89e4a3aefdf6356e868be6be53696e5708a4d30863ae879834404ccfecb91b6d4b93a7ce0e147a3cc04bc4d5838c2aa990a290af5c5c
-EBUILD libxml-0.1.1.ebuild 840 BLAKE2B 406a0f50a64aba8cca8e1464bc52083bd265d4acd46d74ae6212ebde9b8cdb692036bf8df8a689ee4138bad387ef59e47e49c3208bcbd92694150b06452e7008 SHA512 a889413d67d2260180d27ad1b3ce3711a9b0da4e88160340effd5492225d92e75e1836db3f900eddeab41d529f49d724d97b222ac34d7e7bc494f109d357327f
-MISC metadata.xml 366 BLAKE2B cf690c286c302711b07f5cb346b0eaf848956797ac98040b21aefb53d10adb2c9bfd4ee37eecc5317f5c4b1bed79d7e896de919b566acf56a1bd2a99c46bd3e4 SHA512 45a7291c361e1689284f34e6b6321503ece79b7104cade450f688a88971563f36337ffb7bd54d576f0c5df974d68b907e386a9a4313f9948e82aab4c3b55e6f8
diff --git a/dev-haskell/libxml/libxml-0.1.1.ebuild b/dev-haskell/libxml/libxml-0.1.1.ebuild
deleted file mode 100644
index fba273ef96c5..000000000000
--- a/dev-haskell/libxml/libxml-0.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to libxml2"
-HOMEPAGE="http://hackage.haskell.org/package/libxml"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	dev-libs/libxml2
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed -e 's@includes: libxml/xmlIO.h libxml/xmlmemory.h@pkgconfig-depends: libxml-2.0@' \
-		-i "${S}/${PN}.cabal" \
-		|| die "Could not patch libxml2 configuration in ${PN}.cabal"
-}
diff --git a/dev-haskell/libxml/metadata.xml b/dev-haskell/libxml/metadata.xml
deleted file mode 100644
index 3f3a10dd69c5..000000000000
--- a/dev-haskell/libxml/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Minimal binding to libxml2. Additional functions will be added when needed.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/lifted-async-0.2.0.2-r1 b/dev-haskell/lifted-async-0.2.0.2-r1
new file mode 100644
index 000000000000..10eb40bdb558
--- /dev/null
+++ b/dev-haskell/lifted-async-0.2.0.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-haskell/async-2.0.1:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/mtl dev-haskell/tasty >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10 dev-haskell/tasty-th ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Run lifted IO operations asynchronously and wait for their results
+EAPI=5
+HOMEPAGE=https://github.com/maoe/lifted-async
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/async-2.0.1:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.2.0.2
+SRC_URI=mirror://hackage/packages/archive/lifted-async/0.2.0.2/lifted-async-0.2.0.2.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ac933de3f869c157c1c8e88bbffbe304
diff --git a/dev-haskell/lifted-async-0.6.0.1 b/dev-haskell/lifted-async-0.6.0.1
new file mode 100644
index 000000000000..3b8da1026f53
--- /dev/null
+++ b/dev-haskell/lifted-async-0.6.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.1:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= monad-control-1? ( >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.5:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] ) !monad-control-1? ( >=dev-haskell/monad-control-0:=[profile?] <dev-haskell/monad-control-1:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/mtl dev-haskell/tasty >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10 dev-haskell/tasty-th ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Run lifted IO operations asynchronously and wait for their results
+EAPI=5
+HOMEPAGE=https://github.com/maoe/lifted-async
+IUSE=+monad-control-1 doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.1:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= monad-control-1? ( >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.5:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] ) !monad-control-1? ( >=dev-haskell/monad-control-0:=[profile?] <dev-haskell/monad-control-1:=[profile?] )
+SLOT=0/0.6.0.1
+SRC_URI=mirror://hackage/packages/archive/lifted-async/0.6.0.1/lifted-async-0.6.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a17a1039ab54981262705b97cb9d2e47
diff --git a/dev-haskell/lifted-async-0.7.0.2 b/dev-haskell/lifted-async-0.7.0.2
new file mode 100644
index 000000000000..8a3d89de6589
--- /dev/null
+++ b/dev-haskell/lifted-async-0.7.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.1:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= monad-control-1? ( >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.6:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] ) !monad-control-1? ( >=dev-haskell/monad-control-0:=[profile?] <dev-haskell/monad-control-1:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/mtl dev-haskell/tasty >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10 dev-haskell/tasty-th ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Run lifted IO operations asynchronously and wait for their results
+EAPI=5
+HOMEPAGE=https://github.com/maoe/lifted-async
+IUSE=+monad-control-1 doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.1:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= monad-control-1? ( >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.6:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] ) !monad-control-1? ( >=dev-haskell/monad-control-0:=[profile?] <dev-haskell/monad-control-1:=[profile?] )
+SLOT=0/0.7.0.2
+SRC_URI=mirror://hackage/packages/archive/lifted-async/0.7.0.2/lifted-async-0.7.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=60d7e7228a87fcbf12aa5f716775a4ea
diff --git a/dev-haskell/lifted-async-0.8.0.1-r1 b/dev-haskell/lifted-async-0.8.0.1-r1
new file mode 100644
index 000000000000..ed5caaf928f3
--- /dev/null
+++ b/dev-haskell/lifted-async-0.8.0.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= monad-control-1? ( >=dev-haskell/constraints-0.2:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] ) !monad-control-1? ( >=dev-haskell/monad-control-0:=[profile?] <dev-haskell/monad-control-1:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/mtl dev-haskell/tasty >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10 dev-haskell/tasty-th ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Run lifted IO operations asynchronously and wait for their results
+EAPI=5
+HOMEPAGE=https://github.com/maoe/lifted-async
+IUSE=+monad-control-1 doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= monad-control-1? ( >=dev-haskell/constraints-0.2:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] ) !monad-control-1? ( >=dev-haskell/monad-control-0:=[profile?] <dev-haskell/monad-control-1:=[profile?] )
+SLOT=0/0.8.0.1
+SRC_URI=mirror://hackage/packages/archive/lifted-async/0.8.0.1/lifted-async-0.8.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7d5c8f056c1cd6ee197002d530e88f6e
diff --git a/dev-haskell/lifted-async-0.9.1.1-r1 b/dev-haskell/lifted-async-0.9.1.1-r1
new file mode 100644
index 000000000000..4660bda6b190
--- /dev/null
+++ b/dev-haskell/lifted-async-0.9.1.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= monad-control-1? ( >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.10:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] ) !monad-control-1? ( >=dev-haskell/monad-control-0:=[profile?] <dev-haskell/monad-control-1:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/mtl dev-haskell/tasty >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10 dev-haskell/tasty-th ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Run lifted IO operations asynchronously and wait for their results
+EAPI=6
+HOMEPAGE=https://github.com/maoe/lifted-async
+IUSE=+monad-control-1 doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= monad-control-1? ( >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.10:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] ) !monad-control-1? ( >=dev-haskell/monad-control-0:=[profile?] <dev-haskell/monad-control-1:=[profile?] )
+SLOT=0/0.9.1.1
+SRC_URI=mirror://hackage/packages/archive/lifted-async/0.9.1.1/lifted-async-0.9.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8f2a9d483b01bfca9f4f8ac2401495eb
diff --git a/dev-haskell/lifted-async/Manifest b/dev-haskell/lifted-async/Manifest
deleted file mode 100644
index d1803c6a39fb..000000000000
--- a/dev-haskell/lifted-async/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX lifted-async-0.2.0.2-monad-control-1.1.patch 2298 BLAKE2B 3a76cec4560fb618f7d68568d668e6baa8ed555befbfb9f0e778c9a2911b6a86d835ede634654e7665d292e23155e2234b6d5bd09c384cac4f66c3daa4d2aea3 SHA512 fbcd9e1c4dc34162fa928f4a528b16cc58d6b3a86ac3aea82dd33f448e5869a8d48add1c5b6c574dd588be6e68285fae98fccd8520adbc2e782210d70b4a8618
-DIST lifted-async-0.2.0.2.tar.gz 6907 BLAKE2B da3f85064197fe4dae8f54f28d040d05d4acb9d3bbc638d32af61edf0e361ad9b9398d858d808e8264caace4e88754aa75dab32fa60ae0837f8d9619f7dbf14b SHA512 a69e3f93c33ca76889afd894fcadb3f0d53fae05ff47bdbaa5d164deb756c60f7282671bdfa14d092b0a985f5cdf30746fcf847241aeda08be553f7c8d90bce3
-DIST lifted-async-0.6.0.1.tar.gz 8871 BLAKE2B d4629501d4696487a703b08216afd2baba298b100a4c1664e0dc43d29642b1b52fbf817a3582e3d9124d9bbfe896c18f399fa19877e10bad939941127ab9bc4b SHA512 afa436919bf50a343739ec9ca1e492cdac037df1e286812e77089c939303ce00a0f8681303eb41ea476df5d4013be6ef45c63c161ab0fa92b0ced4a0c4e57120
-DIST lifted-async-0.7.0.2.tar.gz 9096 BLAKE2B 48203cf7fb41108a37b236c827e5fcb623e3bd82b43df7a1ee6f8e47363bfcb08a8feb9c5908471e84df0cbb83480a2e1fb4fb4a94e906f8a63d71480a1601f0 SHA512 7dcbc10d0e5c055b3b1d3f4a2a69304b2b66413cb0ba99d1abb03f067b6f898b1aa0d9ed9deae0016fd1198717c048b8ba5b40e60ce3c1bf888c876dca15a222
-DIST lifted-async-0.8.0.1.tar.gz 9453 BLAKE2B f74d017f8afd51f08e48225b590d6b88899429214cc0a33fcac2bc5e1e67524d43e7d78830ff0be9258dbb333069331b18850968d1b896cd26abdf66943a472b SHA512 529a8c2c88f6277f5618d89f62d99318c9ae059c650f40e6cbc61f70621f073a10fff0ce3f27936d71a0dcd222afdbfa58d0922ae45075753d74c3e7bab5bcfa
-DIST lifted-async-0.9.1.1.tar.gz 10077 BLAKE2B 13132800149f014add45245ef3a2988fab4e1609b5f0cf05284d73f584e0a541d7eccc8e7a6ce5117fc374ab2c4c123adc9bc6fbdb52a5fc2662913b986a54f1 SHA512 c8e3d3e6bcfb361b5fe1bd948d21f8d2087e18b2f035557564e94fb444fae64baf0302d3938c5ca31f8a68a2fd5e7fb1389f1a318c3a2b447facee823511b5ad
-EBUILD lifted-async-0.2.0.2-r1.ebuild 1055 BLAKE2B 80908b8aecce7af8ac55b258a5fc788de6c0baab5879d2c220607ffa63eed6aebb4b54f168e575ff20a06c9d6ef4b7db9a39e63dc094e180a3ae54bc4fa34225 SHA512 ebd452a22f4e6ed488e55f306aa6db0f45c4de419f77103aa2a4a19c7ccebb89194932f4651fd94270bab40f5e8fe77f8f4332b53716505e72d3b29c4c9e43a5
-EBUILD lifted-async-0.6.0.1.ebuild 1404 BLAKE2B 231b90e53da46c003f8db491ee05b13923c3c47cd65d017d5ca30d26eb3d484534cf805f0ad9686d504e1e90e0921ede5b1cc44826e3dab6f4da2cea63aa5b2a SHA512 abb692a5490f5039aa276c9a5fb588d51929d21bf37040e5e3826e85b111abbac249c7acfaf0e9a232167826ace76ff514654bdfeee44267d3e229645e508935
-EBUILD lifted-async-0.7.0.2.ebuild 1409 BLAKE2B c2dfccc4c34c89756af1601fb835bd6fd6b5f34381ff131385ccbf7b2a441c0fbd5cc4a4967849ac532458b21f7658b0b9560e9d2f07e2f7533e23c035fec582 SHA512 f54be1a81aa528536d12dfe42444cd2c00d5ca694f0011844f4aeaefbf9d02c79927d369d4ee4080f37efd7677336cb912803147968656632c1d635ecbd0f69e
-EBUILD lifted-async-0.8.0.1-r1.ebuild 1366 BLAKE2B 974ebdbf385d0c8595cdc41815e9256fc4f9e66df93a217f8e6eb1724282a6bdb3f85be4d4926e58cfc8d0ab6fc91487416baf9e0bf6a1beea4b7afce1a999d4 SHA512 cc1dcb71a8892d4870c1ba82523f6cdfed0b5bec85a4341aac964f9f20634cc60046e132080b5d1b696bbacdfbf1eedf52639f919212630afdaaa6d7503aa72e
-EBUILD lifted-async-0.9.1.1-r1.ebuild 1410 BLAKE2B 683db3f1d31d87d27ffb5043b0b6bb3fa98b857b05e04e213718ffbc277e99cefa83c0b135f81159aa482c038416fb8da83cbf33fc99d0384eda14374cd62727 SHA512 9e8e45580c851f576510e88f7b7a95ac9d97e89e51530c29bb34f4d294e92ccbfb2ca1730e4cc0c3088c27eeecbfa0e88d43032e8830567b6ee248196f773da5
-MISC metadata.xml 570 BLAKE2B 93b0c1bf5eeb84c781fed4f7818ea6f14a0100145d795acb37f99bfea839d6127c20d314b801671145f168712b25c86a9c6ad8826cc6d2524c229cba7872460a SHA512 3ac2ac2a66816f8bcd8caa84499255edb7995bc0a8f58fa28e5aca88a36b7cbd4b87e6981632a2706bdea09b1c52252a6b98ca7bf60cf9895ec1dd3a692de0c3
diff --git a/dev-haskell/lifted-async/files/lifted-async-0.2.0.2-monad-control-1.1.patch b/dev-haskell/lifted-async/files/lifted-async-0.2.0.2-monad-control-1.1.patch
deleted file mode 100644
index 970d9842f770..000000000000
--- a/dev-haskell/lifted-async/files/lifted-async-0.2.0.2-monad-control-1.1.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-commit 448176aa98e03a31121501af004d8159e92b2f66
-Author: Roman Cheplyaka <roma@ro-che.info>
-Date:   Tue Dec 16 12:09:52 2014 +0200
-
-    Make lifted-async build with monad-control-1.0
-
-diff --git a/src/Control/Concurrent/Async/Lifted.hs b/src/Control/Concurrent/Async/Lifted.hs
-index fa5a158..e5034c1 100644
---- a/src/Control/Concurrent/Async/Lifted.hs
-+++ b/src/Control/Concurrent/Async/Lifted.hs
-@@ -2,6 +2,7 @@
- {-# LANGUAGE KindSignatures #-}
- {-# LANGUAGE RankNTypes #-}
- {-# LANGUAGE TypeFamilies #-}
-+{-# LANGUAGE ScopedTypeVariables #-}
- 
- {- |
- Module      : Control.Concurrent.Async.Lifted
-@@ -47,7 +48,7 @@ module Control.Concurrent.Async.Lifted
- 
- import Control.Applicative
- import Control.Concurrent (threadDelay)
--import Control.Monad ((>=>), forever, liftM, void)
-+import Control.Monad ((>=>), forever, liftM)
- import Data.Traversable (Traversable(..))
- import GHC.IO (unsafeUnmask)
- import Prelude hiding (mapM)
-@@ -180,11 +181,11 @@ waitCatch
- waitCatch a = liftBase (A.waitCatch a) >>= sequenceEither
- 
- -- | Generalized version of 'A.cancel'.
--cancel :: MonadBase IO m => Async (StM m a) -> m ()
-+cancel :: MonadBase IO m => Async a -> m ()
- cancel = liftBase . A.cancel
- 
- -- | Generalized version of 'A.cancelWith'.
--cancelWith :: (MonadBase IO m, Exception e) => Async (StM m a) -> e -> m ()
-+cancelWith :: (MonadBase IO m, Exception e) => Async a -> e -> m ()
- cancelWith = (liftBase .) . A.cancelWith
- 
- -- | Generalized version of 'A.waitAny'.
-@@ -261,10 +262,10 @@ waitEitherCatchCancel a b =
- -- | Generalized version of 'A.waitEither_'.
- waitEither_
-   :: MonadBaseControl IO m
--  => Async (StM m a)
--  -> Async (StM m b)
-+  => Async a
-+  -> Async b
-   -> m ()
--waitEither_ = (void .) . waitEither
-+waitEither_ a b = liftBase (A.waitEither_ a b)
- 
- -- | Generalized version of 'A.waitBoth'.
- waitBoth
-@@ -280,11 +281,11 @@ waitBoth a b = do
- {-# INLINABLE waitBoth #-}
- 
- -- | Generalized version of 'A.link'.
--link :: MonadBase IO m => Async (StM m a) -> m ()
-+link :: MonadBase IO m => Async a -> m ()
- link = liftBase . A.link
- 
- -- | Generalized version of 'A.link2'.
--link2 :: MonadBase IO m => Async (StM m a) -> Async (StM m b) -> m ()
-+link2 :: MonadBase IO m => Async a -> Async a -> m ()
- link2 = (liftBase .) . A.link2
- 
- -- | Generalized version of 'A.race'.
diff --git a/dev-haskell/lifted-async/lifted-async-0.2.0.2-r1.ebuild b/dev-haskell/lifted-async/lifted-async-0.2.0.2-r1.ebuild
deleted file mode 100644
index cc55f2a91d80..000000000000
--- a/dev-haskell/lifted-async/lifted-async-0.2.0.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit base haskell-cabal
-
-DESCRIPTION="Run lifted IO operations asynchronously and wait for their results"
-HOMEPAGE="https://github.com/maoe/lifted-async"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test" # patch has a test failure: withAsync waitEither : FAIL
-
-RDEPEND=">=dev-haskell/async-2.0.1:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?]
-	>=dev-haskell/monad-control-0.3.1:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/mtl
-		dev-haskell/tasty
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		dev-haskell/tasty-th )
-"
-
-PATCHES=("${FILESDIR}/${PN}-0.2.0.2-monad-control-1.1.patch")
diff --git a/dev-haskell/lifted-async/lifted-async-0.6.0.1.ebuild b/dev-haskell/lifted-async/lifted-async-0.6.0.1.ebuild
deleted file mode 100644
index bfc2abc09626..000000000000
--- a/dev-haskell/lifted-async/lifted-async-0.6.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Run lifted IO operations asynchronously and wait for their results"
-HOMEPAGE="https://github.com/maoe/lifted-async"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+monad-control-1"
-
-RDEPEND=">=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.1:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	monad-control-1? ( >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.5:=[profile?]
-				>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] )
-	!monad-control-1? ( >=dev-haskell/monad-control-0:=[profile?] <dev-haskell/monad-control-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/mtl
-		dev-haskell/tasty
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		dev-haskell/tasty-th )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag monad-control-1 monad-control-1)
-}
diff --git a/dev-haskell/lifted-async/lifted-async-0.7.0.2.ebuild b/dev-haskell/lifted-async/lifted-async-0.7.0.2.ebuild
deleted file mode 100644
index b92ba9f8833f..000000000000
--- a/dev-haskell/lifted-async/lifted-async-0.7.0.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Run lifted IO operations asynchronously and wait for their results"
-HOMEPAGE="https://github.com/maoe/lifted-async"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+monad-control-1"
-
-RDEPEND=">=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.1:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	monad-control-1? ( >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.6:=[profile?]
-				>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] )
-	!monad-control-1? ( >=dev-haskell/monad-control-0:=[profile?] <dev-haskell/monad-control-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/mtl
-		dev-haskell/tasty
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		dev-haskell/tasty-th )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag monad-control-1 monad-control-1)
-}
diff --git a/dev-haskell/lifted-async/lifted-async-0.8.0.1-r1.ebuild b/dev-haskell/lifted-async/lifted-async-0.8.0.1-r1.ebuild
deleted file mode 100644
index 202f79a16643..000000000000
--- a/dev-haskell/lifted-async/lifted-async-0.8.0.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Run lifted IO operations asynchronously and wait for their results"
-HOMEPAGE="https://github.com/maoe/lifted-async"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+monad-control-1"
-
-RDEPEND=">=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.2:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	monad-control-1? ( >=dev-haskell/constraints-0.2:=[profile?]
-				>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] )
-	!monad-control-1? ( >=dev-haskell/monad-control-0:=[profile?] <dev-haskell/monad-control-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/mtl
-		dev-haskell/tasty
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		dev-haskell/tasty-th )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag monad-control-1 monad-control-1)
-}
diff --git a/dev-haskell/lifted-async/lifted-async-0.9.1.1-r1.ebuild b/dev-haskell/lifted-async/lifted-async-0.9.1.1-r1.ebuild
deleted file mode 100644
index 01598835b9a7..000000000000
--- a/dev-haskell/lifted-async/lifted-async-0.9.1.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Run lifted IO operations asynchronously and wait for their results"
-HOMEPAGE="https://github.com/maoe/lifted-async"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+monad-control-1"
-
-RDEPEND=">=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.2:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	monad-control-1? ( >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.10:=[profile?]
-				>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] )
-	!monad-control-1? ( >=dev-haskell/monad-control-0:=[profile?] <dev-haskell/monad-control-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/mtl
-		dev-haskell/tasty
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		dev-haskell/tasty-th )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag monad-control-1 monad-control-1)
-}
diff --git a/dev-haskell/lifted-async/metadata.xml b/dev-haskell/lifted-async/metadata.xml
deleted file mode 100644
index 7fd3c230ac1d..000000000000
--- a/dev-haskell/lifted-async/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides IO operations from @async@ package lifted to any
-		instance of 'MonadBase' or 'MonadBaseControl'.
-	</longdescription>
-	<use>
-		<flag name="monad-control-1">Use moand-control == 1.*</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">maoe/lifted-async</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/lifted-base-0.2.3.10 b/dev-haskell/lifted-base-0.2.3.10
new file mode 100644
index 000000000000..911dd3be83a9
--- /dev/null
+++ b/dev-haskell/lifted-base-0.2.3.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.5 >=dev-haskell/monad-control-1.0.0.3 <dev-haskell/monad-control-1.1 >=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/transformers-0.3 <dev-haskell/transformers-0.6 >=dev-haskell/transformers-base-0.4.4 <dev-haskell/transformers-base-0.5 >=dev-haskell/transformers-compat-0.3 <dev-haskell/transformers-compat-0.6 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=lifted IO operations from the base library
+EAPI=6
+HOMEPAGE=https://github.com/basvandijk/lifted-base
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.3.10
+SRC_URI=mirror://hackage/packages/archive/lifted-base/0.2.3.10/lifted-base-0.2.3.10.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0d9b70a6d665532cd22d5e7c09eae2a5
diff --git a/dev-haskell/lifted-base-0.2.3.6-r2 b/dev-haskell/lifted-base-0.2.3.6-r2
new file mode 100644
index 000000000000..2709244b8702
--- /dev/null
+++ b/dev-haskell/lifted-base-0.2.3.6-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2.2 >=dev-haskell/monad-control-1.0.0.3 <dev-haskell/monad-control-1.1 >=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/transformers-0.3 >=dev-haskell/transformers-base-0.4.4 <dev-haskell/transformers-base-0.5 >=dev-haskell/transformers-compat-0.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=lifted IO operations from the base library
+EAPI=5
+HOMEPAGE=https://github.com/basvandijk/lifted-base
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.3.6
+SRC_URI=mirror://hackage/packages/archive/lifted-base/0.2.3.6/lifted-base-0.2.3.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2f08ac0c4128aed629fe42a4c93c4335
diff --git a/dev-haskell/lifted-base/Manifest b/dev-haskell/lifted-base/Manifest
deleted file mode 100644
index eb7e491c96e2..000000000000
--- a/dev-haskell/lifted-base/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST lifted-base-0.2.3.10.tar.gz 11779 BLAKE2B 786abee9094b999472586b01025d3fb72149f1dff3cea2b495d3e6e95e4edf0a30bf6b688d76320e511d5f77079b74b1f2aeca767d58ec34e1f9af1cf1628d94 SHA512 f4251e0322b2802c6eebf7ee2f1d7b0bc8cb89464e710373ef66868c657bcdf9a5ca9a1c0f0b1c9d397c60fa25dbfe78e925820acdd2520633877dadea9c6370
-DIST lifted-base-0.2.3.6.tar.gz 11613 BLAKE2B d013fd232fbb4afc1a335e775c14d5e7f258540643e14e221ac9a679c02fbc464b5ed511f8cb465416f144001e454481e0ebe262747cee857e7b15ff333315ef SHA512 7fee2208c9043cdeccbea87d0ad44bff82505c10f55a539220484fe09792cd61562a94c9f6fbc2c6f360dd25e8d39ed139972432dbdb748fc2e1f2d47be8a658
-EBUILD lifted-base-0.2.3.10.ebuild 1257 BLAKE2B d5c47faa9d5fc7bb73fc94ded14af4d310431fb834665d379c03090dfed8348260d87c5725c1873e259f43862c335cd3fcdf5fd1b40ec46d58375df9061eb2f8 SHA512 ce5c0736d75dd8b5b672119c4816e2202c7dbf8114ff3164d9b8e627c749fec566a487b42e35448e314d28f7205d16168b3834edd82556e67b07e49947cb6bc8
-EBUILD lifted-base-0.2.3.6-r2.ebuild 1490 BLAKE2B 1fe8630fb073edaf2f1ae6bba0cea71fda1ba45838a25e2cf54f15f9b833d47fd480dd03a338260522f418576bfc84aac617fa55ee0a82955a8638d3fd449819 SHA512 452d67af6210307479e072f8bd6d6942facffd44adafe8eefeaba2e3d98151f43bbe0f47d7a9cb44d3153397ac6b3fe22e882cb29427f4a3d52e4d31a21f32a5
-MISC metadata.xml 800 BLAKE2B 14585201ea8e30f102afbadbb0ed16cdd7a744e86e8c9e3e98cae7931da75d0e129226a95128d0fd6fa9774a4516c67a66c04a02371a1cbf53fad7b41d5cdcd1 SHA512 5f2f2b72b93eac28f68a672504de3ed30d0c0499618961963b8a45813b2bef2cd0d8e93e3f14c813fbee465b96900c0e6653b4da0111e55fb96b829b6f0af699
diff --git a/dev-haskell/lifted-base/lifted-base-0.2.3.10.ebuild b/dev-haskell/lifted-base/lifted-base-0.2.3.10.ebuild
deleted file mode 100644
index e0bbdc5a1c91..000000000000
--- a/dev-haskell/lifted-base/lifted-base-0.2.3.10.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="lifted IO operations from the base library"
-HOMEPAGE="https://github.com/basvandijk/lifted-base"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.5
-		>=dev-haskell/monad-control-1.0.0.3 <dev-haskell/monad-control-1.1
-		>=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/transformers-0.3 <dev-haskell/transformers-0.6
-		>=dev-haskell/transformers-base-0.4.4 <dev-haskell/transformers-base-0.5
-		>=dev-haskell/transformers-compat-0.3 <dev-haskell/transformers-compat-0.6 )
-"
diff --git a/dev-haskell/lifted-base/lifted-base-0.2.3.6-r2.ebuild b/dev-haskell/lifted-base/lifted-base-0.2.3.6-r2.ebuild
deleted file mode 100644
index f7c091502234..000000000000
--- a/dev-haskell/lifted-base/lifted-base-0.2.3.6-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="lifted IO operations from the base library"
-HOMEPAGE="https://github.com/basvandijk/lifted-base"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2.2
-		>=dev-haskell/monad-control-1.0.0.3 <dev-haskell/monad-control-1.1
-		>=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/transformers-0.3
-		>=dev-haskell/transformers-base-0.4.4 <dev-haskell/transformers-base-0.5
-		>=dev-haskell/transformers-compat-0.3 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'HUnit                >= 1.2.2   && < 1.3' 'HUnit                >= 1.2.2' \
-		'transformers         >= 0.3     && < 0.5' 'transformers         >= 0.3' \
-		'transformers  >= 0.2 && < 0.5' 'transformers  >= 0.2' \
-		'transformers-compat  >= 0.3     && < 0.5' 'transformers-compat  >= 0.3'
-}
diff --git a/dev-haskell/lifted-base/metadata.xml b/dev-haskell/lifted-base/metadata.xml
deleted file mode 100644
index d358812e1f66..000000000000
--- a/dev-haskell/lifted-base/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		@lifted-base@ exports IO operations from the base library lifted to
-		any instance of 'MonadBase' or 'MonadBaseControl'.
-		
-		Note that not all modules from @base@ are converted yet. If
-		you need a lifted version of a function from @base@, just
-		ask me to add it or send me a patch.
-		
-		The package includes a copy of the @monad-peel@ testsuite written
-		by Anders Kaseorg The tests can be performed using @cabal test@.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">basvandijk/lifted-base</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/linear-1.20.5 b/dev-haskell/linear-1.20.5
new file mode 100644
index 000000000000..86b335b66d1b
--- /dev/null
+++ b/dev-haskell/linear-1.20.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?] >=dev-haskell/base-orphans-0.5:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?] >=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/lens-4:=[profile?] <dev-haskell/lens-5:=[profile?] >=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?] >=dev-haskell/semigroupoids-3:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/doctest-0.8 <dev-haskell/doctest-0.12 >=dev-haskell/hunit-1.2.5 >=dev-haskell/simple-reflect-0.3.1 >=dev-haskell/test-framework-0.8 >=dev-haskell/test-framework-hunit-0.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Linear Algebra
+EAPI=6
+HOMEPAGE=https://github.com/ekmett/linear/
+IUSE=+template-haskell doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?] >=dev-haskell/base-orphans-0.5:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?] >=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/lens-4:=[profile?] <dev-haskell/lens-5:=[profile?] >=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?] >=dev-haskell/semigroupoids-3:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.20.5
+SRC_URI=mirror://hackage/packages/archive/linear/1.20.5/linear-1.20.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fbed8b399c7d6baf5ccfafb02510d4fd
diff --git a/dev-haskell/linear-1.20.6 b/dev-haskell/linear-1.20.6
new file mode 100644
index 000000000000..6cc6ad9ccfbd
--- /dev/null
+++ b/dev-haskell/linear-1.20.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?] >=dev-haskell/base-orphans-0.5:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?] >=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/lens-4:=[profile?] <dev-haskell/lens-5:=[profile?] >=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?] >=dev-haskell/semigroupoids-3:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1 test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.12 >=dev-haskell/hunit-1.2.5 >=dev-haskell/simple-reflect-0.3.1 >=dev-haskell/test-framework-0.8 >=dev-haskell/test-framework-hunit-0.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Linear Algebra
+EAPI=6
+HOMEPAGE=https://github.com/ekmett/linear/
+IUSE=+template-haskell doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?] >=dev-haskell/base-orphans-0.5:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?] >=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/lens-4:=[profile?] <dev-haskell/lens-5:=[profile?] >=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?] >=dev-haskell/semigroupoids-3:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.20.6
+SRC_URI=mirror://hackage/packages/archive/linear/1.20.6/linear-1.20.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d4f67fe3e5f3cea197b1bf4a7734a745
diff --git a/dev-haskell/linear/Manifest b/dev-haskell/linear/Manifest
deleted file mode 100644
index 7463f4972db2..000000000000
--- a/dev-haskell/linear/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST linear-1.20.5.tar.gz 44886 BLAKE2B 54b08c4c9997ebb60b4f46d9caeb9d8630a470cda04c8096428eafd6ecb3be1c3b052c59d4825d27199364f17b693feac64b4c6e0313fb4c37b889630703f9c3 SHA512 a45e38d5b25f53b809a67c17e0b532b96e9766d0e81d2da0265c93a9976cdbb183c60dce79eda17259d4169cc25884cc4831a24b93ccd43709df374ce5187600
-DIST linear-1.20.6.tar.gz 50036 BLAKE2B a81e762e43be22a8eb7f1ad0118275f8fadde206f60c1160eb40dabcd8674bb1217d73a4b67626e8392ddbd644cd4d88e55bb7038c17ceb4df5384053a175811 SHA512 40ca3f855664a86c9c70fbe398b2ceeceaefdc5c6d5d66c36c6fc60a8252c70fa0566d9eaef61b0559d0eab0d30cde207640d738a007dd5a0ee6cdc72c1c9690
-EBUILD linear-1.20.5.ebuild 2265 BLAKE2B 836c78140d98b403537da97599b9519f95afe3026b8a36ac64b08ac1dd124a5708b1916e3cd91200466fc4d8b2b654558bf3a6e95eb7dd53b8920233e4e682c1 SHA512 07261c9509c1c3fc78603f89882688c2d1a8373ce6608e17896deae0b2f9b3f2f0b85a8b893c4068278e6b7c306a8754f7aa963966e655f0ace186ae223cd6cd
-EBUILD linear-1.20.6.ebuild 2177 BLAKE2B dc214eef11a0d118f66df215803818bd6acf9f447608e84cf23977a60aebbac0fb8c01bbe90d9aa5db2876138cb96ba6ea17408cacf84ab693988a1b397757fd SHA512 e755026abeead1f5cbfe09a085ca254e832a3c3224c22b4d495dd9c3e5c57b42dba70181e3759cfc8d3fdffcfc09e0ad3d607afe47fcf8dd584aecadec436ee2
-MISC metadata.xml 712 BLAKE2B 0ff72ad30139d749ba6073cf8d1105adf62101843c31c5a1d6c0540b1988a0d0dfac05a3cbc842d204fc4f231987f20ea8b2a094440100fb3977a452e7889f15 SHA512 0c7f6f7a0420ef96e558a2a59a119781089aed365ffc60628e97d685b399731a967cdd35d7edfe03a6c5a2f3ba1b4b61582a88fee1cfa66a6f872e487cece39b
diff --git a/dev-haskell/linear/linear-1.20.5.ebuild b/dev-haskell/linear/linear-1.20.5.ebuild
deleted file mode 100644
index e1ff57667dba..000000000000
--- a/dev-haskell/linear/linear-1.20.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -herbie
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Linear Algebra"
-HOMEPAGE="https://github.com/ekmett/linear/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+template-haskell"
-
-RDEPEND=">=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
-	>=dev-haskell/base-orphans-0.5:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	>=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?]
-	>=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
-	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/lens-4:=[profile?] <dev-haskell/lens-5:=[profile?]
-	>=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?]
-	>=dev-haskell/semigroupoids-3:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.8 <dev-haskell/doctest-0.12
-		>=dev-haskell/hunit-1.2.5
-		>=dev-haskell/simple-reflect-0.3.1
-		>=dev-haskell/test-framework-0.8
-		>=dev-haskell/test-framework-hunit-0.3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-herbie \
-		$(cabal_flag template-haskell template-haskell)
-}
diff --git a/dev-haskell/linear/linear-1.20.6.ebuild b/dev-haskell/linear/linear-1.20.6.ebuild
deleted file mode 100644
index 2408f5add628..000000000000
--- a/dev-haskell/linear/linear-1.20.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-#hackport: flags: -herbie
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Linear Algebra"
-HOMEPAGE="https://github.com/ekmett/linear/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+template-haskell"
-
-RDEPEND=">=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
-	>=dev-haskell/base-orphans-0.5:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?]
-	>=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
-	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/lens-4:=[profile?] <dev-haskell/lens-5:=[profile?]
-	>=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?]
-	>=dev-haskell/semigroupoids-3:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
-	test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.12
-		>=dev-haskell/hunit-1.2.5
-		>=dev-haskell/simple-reflect-0.3.1
-		>=dev-haskell/test-framework-0.8
-		>=dev-haskell/test-framework-hunit-0.3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-herbie \
-		$(cabal_flag template-haskell template-haskell)
-}
diff --git a/dev-haskell/linear/metadata.xml b/dev-haskell/linear/metadata.xml
deleted file mode 100644
index ac6c35143387..000000000000
--- a/dev-haskell/linear/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Types and combinators for linear algebra on free vector spaces
-	</longdescription>
-	<use>
-		<flag name="template-haskell">
-			You can disable the use of the
-			`template-haskell` package using `-f-template-haskell`. Disabling this is an
-			unsupported configuration, but it may be useful for accelerating builds in
-			sandboxes for expert users.
-		</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ekmett/linear</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/list-0.5.2 b/dev-haskell/list-0.5.2
new file mode 100644
index 000000000000..41d21b59e578
--- /dev/null
+++ b/dev-haskell/list-0.5.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=List monad transformer and class
+EAPI=5
+HOMEPAGE=https://github.com/yairchu/generator/tree
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.5.2
+SRC_URI=mirror://hackage/packages/archive/List/0.5.2/List-0.5.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=158c87708cbbd1f10231aa52adadedf8
diff --git a/dev-haskell/list/Manifest b/dev-haskell/list/Manifest
deleted file mode 100644
index d748f348257c..000000000000
--- a/dev-haskell/list/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST List-0.5.2.tar.gz 6242 BLAKE2B 9ddac7229416a94b7e91d3c959d641a01bb14edbf0787b971790cc1e016fa59b78313254c156e2ba5ac78c0646f2f356144c0b2b4b8043fa2d0c9cb57a0a4055 SHA512 6bdeb8f8484b84ffc15ac933b37083dc2c76dc617242322a02ff20cbdbe44fc7201539bf3dae4d7afdcf899e625fff074e9df33b630ba1626419b6b8564817b2
-EBUILD list-0.5.2.ebuild 653 BLAKE2B 94775992b9b802a49c183b73e3a5f81a42bcdc66847f5e63aa876086f0fcc8e609588907b81c944270a87169f05475761386ab9c6528a5053d072fad2a6dee3b SHA512 5643e7fb613a8b361d0cd071292294e3a8f4918bd76c41c2fffaa5ea88db17dd35936e23c64ac84823548b4d4fce735cfa2f601f7702d57f684579c989b8d3b9
-MISC metadata.xml 457 BLAKE2B 020e90cfa6ddb15e5ba03dff9d96290c5d5635f227e8ff8b1b1359c2fadc2259464f8ccf4ea20112cbb88a6fe6f39534856457ec66db9f8d26ff348acbb0b34a SHA512 6e97b7b877df002615a4d5ce59e7a9a60d0b4c76604258bb16ff3cff32ccb7b828e64811b42467d9a24ea3662536bcbf65a99756983975bf24293a24e10a5723
diff --git a/dev-haskell/list/list-0.5.2.ebuild b/dev-haskell/list/list-0.5.2.ebuild
deleted file mode 100644
index 4c32b08d02a5..000000000000
--- a/dev-haskell/list/list-0.5.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="List"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="List monad transformer and class"
-HOMEPAGE="https://github.com/yairchu/generator/tree"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/list/metadata.xml b/dev-haskell/list/metadata.xml
deleted file mode 100644
index 7b3a0f6d7bcf..000000000000
--- a/dev-haskell/list/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A List monad transformer and a List class.
-		With standard list operations for Lists
-	</longdescription>
-	<upstream>
-		<remote-id type="github">yairchu/generator</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/listlike-4.2.1 b/dev-haskell/listlike-4.2.1
new file mode 100644
index 000000000000..6bc39abc4187
--- /dev/null
+++ b/dev-haskell/listlike-4.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/fmlist-0.8:=[profile?] <dev-haskell/fmlist-0.10:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-3 >=dev-haskell/random-1 <dev-haskell/random-2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generic support for list-like structures
+EAPI=5
+HOMEPAGE=http://software.complete.org/listlike
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/fmlist-0.8:=[profile?] <dev-haskell/fmlist-0.10:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/4.2.1
+SRC_URI=mirror://hackage/packages/archive/ListLike/4.2.1/ListLike-4.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=69e2933295b31fbb7ff947343ab84e11
diff --git a/dev-haskell/listlike-4.5.1 b/dev-haskell/listlike-4.5.1
new file mode 100644
index 000000000000..4096ddb49204
--- /dev/null
+++ b/dev-haskell/listlike-4.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/fmlist-0.8:=[profile?] <dev-haskell/fmlist-0.10:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-3 >=dev-haskell/random-1 <dev-haskell/random-2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generic support for list-like structures
+EAPI=6
+HOMEPAGE=https://github.com/JohnLato/listlike
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/fmlist-0.8:=[profile?] <dev-haskell/fmlist-0.10:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/4.5.1
+SRC_URI=mirror://hackage/packages/archive/ListLike/4.5.1/ListLike-4.5.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=be61d28d55ae803a6c6d089a465c46c6
diff --git a/dev-haskell/listlike/Manifest b/dev-haskell/listlike/Manifest
deleted file mode 100644
index 76f30ca70050..000000000000
--- a/dev-haskell/listlike/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX listlike-4.2.1-QC-2.8.2.patch 478 BLAKE2B 974c6b65457fbfd19802c6ba8190d85a80f0939636ef65d32ae0e684e62b919c5298682fbcca851103a3969f00042449ab53f44671f5bcca76cb37b9a80d6e6f SHA512 204905c3a34da9c1acbb2be70264304e54f2bc6e9f457217b1d8b5c93380b842189cabb8082e100878b06f6852e02875fc253185c4b1e6f8b6af47b1244b2bee
-DIST ListLike-4.2.1.tar.gz 26970 BLAKE2B bac409776f37ba43f1e1bfa06424ed823866735cbb7b05d30cb98a9620b05891d651e10fd0a1c2c10642ad6215e2de9554221ab3edc6060c7f7cef51b4561c67 SHA512 dc245b4c2bc4fa0ea24efe55434eb8c7b2f2ee1a078fef331997bb0311260732970255fc8a18c9a7f22d90f47f661e543d18e6ad60b8d46992a6e973ccd375ad
-DIST ListLike-4.5.1.tar.gz 29600 BLAKE2B bc6b54b91e95ea8340db305975ee3b5ab5239989db518930353fffb643d29a23d8634d2760cd39729389fe983b553a3a7816a939d583f9470cc56284150d1568 SHA512 4e59eb8cdade42ff63db9f90a7ec524dab674872960bd294da3195c280e0f488a3c0acb3827def8a071e5ecd820bb2bf0d5d68c22b8388adc933accbb0bcc630
-EBUILD listlike-4.2.1.ebuild 1147 BLAKE2B f355f02be1cbc5aaa5f78a33b56bff5a2fc7536d69929d4b7f08e0736523351fc8ddb4972461ff24a54988abe7db89a37f1573c07edc45e9ca2ffd22f2349ce2 SHA512 00791b93c4ec3670f19ba7bb79ae6938de3585e894db6748017c5d37700e766382bbd469c756afbc7659f9c0762ea4d995c298529140753a02cce4bda0b14120
-EBUILD listlike-4.5.1.ebuild 1122 BLAKE2B cf4f63ad25aa2e25bf0dc946657bac0e1f3874c72e509f9803c6b89538800ed4e41f244149905ac9fa5172bf88a9e93d41db8dc85ee4cd1676ef8ae129ce32e2 SHA512 236e7399aa7a771ad327aa699566f3b45ff2d4406a8983dc642c97372442d409dc06e1aa95a1dac076a7679eda5c61d1619b982f58356ca02379e4b7f5732458
-MISC metadata.xml 783 BLAKE2B 3c3966a1f248069416a91328590f1ab7f279f3c4d6749f6036fca194c012fe13688a9bbaa318cb26e538e7071d98e134f62db06d5c9f338e993d15b0af5f558c SHA512 379416d891112c98837e72159adf825753c340fdc0147e64acb7ab2b9c03052452124e7c1d2f3d585c545f0b92a0a8d4bc865c19256847b4bd0b702c72d20499
diff --git a/dev-haskell/listlike/files/listlike-4.2.1-QC-2.8.2.patch b/dev-haskell/listlike/files/listlike-4.2.1-QC-2.8.2.patch
deleted file mode 100644
index 1615c29047e2..000000000000
--- a/dev-haskell/listlike/files/listlike-4.2.1-QC-2.8.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/testsrc/TestInfrastructure.hs b/testsrc/TestInfrastructure.hs
-index f4d574e..d427495 100644
---- a/testsrc/TestInfrastructure.hs
-+++ b/testsrc/TestInfrastructure.hs
-@@ -76,2 +76,3 @@ instance (CoArbitrary i) => CoArbitrary (FM.FMList i) where
- 
-+#if ! MIN_VERSION_QuickCheck(2,8,2)
- instance (Arbitrary i) => Arbitrary (S.Seq i) where
-@@ -85,2 +86,3 @@ instance (CoArbitrary i) => CoArbitrary (S.Seq i) where
-     coarbitrary l = coarbitrary (LL.toList l)
-+#endif
- 
diff --git a/dev-haskell/listlike/listlike-4.2.1.ebuild b/dev-haskell/listlike/listlike-4.2.1.ebuild
deleted file mode 100644
index ff8f2b60b800..000000000000
--- a/dev-haskell/listlike/listlike-4.2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ListLike"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Generic support for list-like structures"
-HOMEPAGE="http://software.complete.org/listlike"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
-	>=dev-haskell/fmlist-0.8:=[profile?] <dev-haskell/fmlist-0.10:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-3
-		>=dev-haskell/random-1 <dev-haskell/random-2 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-QC-2.8.2.patch
-}
diff --git a/dev-haskell/listlike/listlike-4.5.1.ebuild b/dev-haskell/listlike/listlike-4.5.1.ebuild
deleted file mode 100644
index 6af494f5a943..000000000000
--- a/dev-haskell/listlike/listlike-4.5.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ListLike"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Generic support for list-like structures"
-HOMEPAGE="https://github.com/JohnLato/listlike"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
-	>=dev-haskell/fmlist-0.8:=[profile?] <dev-haskell/fmlist-0.10:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-3
-		>=dev-haskell/random-1 <dev-haskell/random-2 )
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/listlike/metadata.xml b/dev-haskell/listlike/metadata.xml
deleted file mode 100644
index 4651de9eac1d..000000000000
--- a/dev-haskell/listlike/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Generic support for list-like structures in Haskell.
-		
-		The ListLike module provides a common interface to the various Haskell
-		types that are list-like.  Predefined interfaces include standard
-		Haskell lists, Arrays, ByteStrings, and lazy ByteStrings.  Custom
-		types can easily be made ListLike instances as well.
-		
-		ListLike also provides for String-like types, such as String and
-		ByteString, for types that support input and output, and for types that can handle
-		infinite lists.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/logging-facade-0.0.0 b/dev-haskell/logging-facade-0.0.0
new file mode 100644
index 000000000000..030c044c7d5a
--- /dev/null
+++ b/dev-haskell/logging-facade-0.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple logging abstraction that allows multiple backends
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/logging-facade
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/0.0.0
+SRC_URI=mirror://hackage/packages/archive/logging-facade/0.0.0/logging-facade-0.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8633bef451aaaec6de5820d4be0d4624
diff --git a/dev-haskell/logging-facade/Manifest b/dev-haskell/logging-facade/Manifest
deleted file mode 100644
index cbbd11ddca56..000000000000
--- a/dev-haskell/logging-facade/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST logging-facade-0.0.0.tar.gz 3644 BLAKE2B cd199aa66f8b124f56ede02f1872f56f8f0613c969b1619f556077c9693f059bc37b10404e423d0be98c3768e0038d8c3383563929a1713af1866424a65ed5a1 SHA512 d666aa763a7e94a914e7542f1420f1f96a1923bd97532db5e114140d33cee5374de78bc73491b008985d4470cec61fba05bf16a2eb68198f917480e0fe1a680e
-EBUILD logging-facade-0.0.0.ebuild 683 BLAKE2B 63af477038689b673b4f6d47ec6003da2f3f2eb6e6415dea9e615eec9530f1cf45f10bc1afe776946b849616dd682963c6bfc4f0d3189bffd2a080ccd2769d0d SHA512 9d11b2d72a7729cf25b3c3fb0fcb995897b9a6f685ca7a1e2996dfa0f85862771cd8ab0bebd98008b1f34dd0695e43ece48176e463ad5f04bc9c389e580641ea
-MISC metadata.xml 347 BLAKE2B 61da64b725a82ae3b6cb39a3b0cc611b6e7c6430f2a5b78a2c87624237b6951d2ecf5a84aa19f0fd616d634b7001385020fa11f84f42a7222146516cab773748 SHA512 bad9f2d7110edfa43abea644c479e84b4d3cd8359e0b9b1086c4ae6ccca9289dff58bce0046001b08a465a2e34c0b8b9b42279812a644d5a3260e25c340c9b16
diff --git a/dev-haskell/logging-facade/logging-facade-0.0.0.ebuild b/dev-haskell/logging-facade/logging-facade-0.0.0.ebuild
deleted file mode 100644
index 0c15c0eebb01..000000000000
--- a/dev-haskell/logging-facade/logging-facade-0.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Simple logging abstraction that allows multiple backends"
-HOMEPAGE="http://hackage.haskell.org/package/logging-facade"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
-"
diff --git a/dev-haskell/logging-facade/metadata.xml b/dev-haskell/logging-facade/metadata.xml
deleted file mode 100644
index fe43f47ce5b9..000000000000
--- a/dev-haskell/logging-facade/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Simple logging abstraction that allows multiple backends
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/logict-0.6.0.2 b/dev-haskell/logict-0.6.0.2
new file mode 100644
index 000000000000..eca087f82923
--- /dev/null
+++ b/dev-haskell/logict-0.6.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.9.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A backtracking logic-programming monad
+EAPI=5
+HOMEPAGE=http://code.haskell.org/~dolio/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.6.0.2
+SRC_URI=mirror://hackage/packages/archive/logict/0.6.0.2/logict-0.6.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8ecb31c8f904ca7ca54ed1bb2a5445ec
diff --git a/dev-haskell/logict-state-0.1.0.2 b/dev-haskell/logict-state-0.1.0.2
new file mode 100644
index 000000000000..68503ec0dc9a
--- /dev/null
+++ b/dev-haskell/logict-state-0.1.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/logict-0.6.0.2:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/transformers-0.4.2:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Library for logic programming based on haskell package logict
+EAPI=6
+HOMEPAGE=https://github.com/atzedijkstra/logict-state
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/logict-0.6.0.2:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/transformers-0.4.2:=[profile?] >=dev-lang/ghc-7.10.1:=
+SLOT=0/0.1.0.2
+SRC_URI=mirror://hackage/packages/archive/logict-state/0.1.0.2/logict-state-0.1.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7c5afea1ab63fdce9b3f3ebe6d4ae143
diff --git a/dev-haskell/logict-state/Manifest b/dev-haskell/logict-state/Manifest
deleted file mode 100644
index 58321c0714ff..000000000000
--- a/dev-haskell/logict-state/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST logict-state-0.1.0.2.tar.gz 5669 BLAKE2B 4596ac415c48c14f7d1c74f6f8613756582405467779a1a185111861f3374842c02a56b6665311b6b6c0c7ce12d908682572dcaaf37a5c61e8f937d01996b5bc SHA512 b3e113c3f124ee6716a0532060e7ca9a5c4dcac2a4de565562f3aeff8884310bb84c2631c555c881e2cdf02ab73afb6323b1a5d33bc743eaece7e382c74298d6
-EBUILD logict-state-0.1.0.2.ebuild 704 BLAKE2B 98c3c611d3a7c64ed89b015dcd46cab49780c4029d723401012d9b980ff5d100d72ce9bc64ad1761723a767884736501ac0d9a32345e642c13eef0143e971981 SHA512 6405d5955ade0312ffbbdcb08f264fb7d0437b5b059e1f79d51f07702e17973c80fc87f3a13ce1acc2762ceef2d309a34c8c078c85b0928d50df469c15d808cd
-MISC metadata.xml 489 BLAKE2B 7155624f2570bd9e09434734cf702db4785da809af5f1a37d71c831109aeb4eb1d60db8fb9e12043fc7b564deb6255e076a47126d9bf5c82c1a73c14ffc71349 SHA512 a240b1ef1ef72e87f57d27217359e2f5e6494cc0884b25b605b66ba9ab06182be8e8f815e73fa49a44961b958e8d00e0d4daf3cf58f20e7210ea531f6ab848fa
diff --git a/dev-haskell/logict-state/logict-state-0.1.0.2.ebuild b/dev-haskell/logict-state/logict-state-0.1.0.2.ebuild
deleted file mode 100644
index f1b749dd8ed1..000000000000
--- a/dev-haskell/logict-state/logict-state-0.1.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Library for logic programming based on haskell package logict"
-HOMEPAGE="https://github.com/atzedijkstra/logict-state"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/logict-0.6.0.2:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?]
-	>=dev-haskell/transformers-0.4.2:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
diff --git a/dev-haskell/logict-state/metadata.xml b/dev-haskell/logict-state/metadata.xml
deleted file mode 100644
index 8419c5504031..000000000000
--- a/dev-haskell/logict-state/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Logic programming built on top of part of logict library, in particular for dealing with backtrackable state
-	</longdescription>
-	<upstream>
-		<remote-id type="github">atzedijkstra/logict-state</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/logict/Manifest b/dev-haskell/logict/Manifest
deleted file mode 100644
index 7060286935dc..000000000000
--- a/dev-haskell/logict/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST logict-0.6.0.2.tar.gz 5370 BLAKE2B c66d17f4595a27c83d9b2fddfb3c9e824d838ab353a8a71d6a78f436e20f529d7f408cf818b7034500bbfb5a14da7c6b8b2b067d36e4820898379f870922a3c7 SHA512 dfb72d006d9b7a5f0d7447d956ea0c3d083e200a616efc4b34fafa0582c2dc7e9369156cf4f51a472b97f7afb6167030edeb84e77c7bc410bfe58a44f0ac4fc4
-EBUILD logict-0.6.0.2.ebuild 627 BLAKE2B 624d92c0268d12c0bc7f62546135fc59f6d7530aa865e734abad25ecb10e0309c4ba136a0b044b57af7d3d8df81a434cd0ff813ebc32a9213b052f04b8085f7b SHA512 b12ce0538d6c55d5304dbe33eb50e0dbd74052a89d722267a39b4f441d8cacfc161022eca38f44652c63374a1a5a2801945ad1bc75721ef5eff6e20210f0717b
-MISC metadata.xml 559 BLAKE2B 0ea38e452c8db16455606726b757d22866c023836e39b651c600f7df645b6430c58566092e45afc6aaef3402185b19238b9c5d3f6f9eb01c391eabbe8988a320 SHA512 7ba71e85156efcbeeff2ab93657396d072a93f730de580b2e4ec75a31bd8be711bda636d610911462f320ecd0537219005caeafbe56730389dc225cb621eac9b
diff --git a/dev-haskell/logict/logict-0.6.0.2.ebuild b/dev-haskell/logict/logict-0.6.0.2.ebuild
deleted file mode 100644
index 5a3b271b356f..000000000000
--- a/dev-haskell/logict/logict-0.6.0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A backtracking logic-programming monad"
-HOMEPAGE="http://code.haskell.org/~dolio/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-"
diff --git a/dev-haskell/logict/metadata.xml b/dev-haskell/logict/metadata.xml
deleted file mode 100644
index 2075b4c3e438..000000000000
--- a/dev-haskell/logict/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A continuation-based, backtracking, logic programming monad.
-		An adaptation of the two-continuation implementation found
-		in the paper "Backtracking, Interleaving, and Terminating
-		Monad Transformers" available here:
-		&lt;http://okmij.org/ftp/papers/LogicT.pdf&gt;
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/lvmlib-1.1 b/dev-haskell/lvmlib-1.1
new file mode 100644
index 000000000000..47fa4352af60
--- /dev/null
+++ b/dev-haskell/lvmlib-1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/parsec:=[profile?] dev-haskell/wl-pprint:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10.1.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=The Lazy Virtual Machine (LVM)
+EAPI=5
+HOMEPAGE=http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/parsec:=[profile?] dev-haskell/wl-pprint:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1
+SRC_URI=mirror://hackage/packages/archive/lvmlib/1.1/lvmlib-1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f411c3fb8dd8a0ce50105ec70622f227
diff --git a/dev-haskell/lvmlib/Manifest b/dev-haskell/lvmlib/Manifest
deleted file mode 100644
index 24e2d9c20d3f..000000000000
--- a/dev-haskell/lvmlib/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX lvmlib-1.1-ghc-7.10.patch 2590 BLAKE2B 165938d0813dbf6806068ffa4e72c695d1a56eac4a7c2ba31a2dab12fca0549ff7210273eaa23039ad2f0d794727d541d0520609745e9bdcbcedcf8538c45931 SHA512 a645db9a37614752afa29d176133ee237511773e1d7c8d2f5959828264ad909360f441673b3e6bef5137bb0deb2f1eb108371032fafaa77a86d5a7be5fec2867
-DIST lvmlib-1.1.tar.gz 62388 BLAKE2B 9effe8b0b71ef36b3f73e792a9702d44efa5a7ed9f48f35825d75706a7dad2d5f5cac06d5941f60730c79216af5f3009110919dfa397343287e7359e702c5fbc SHA512 3f085f3ff8e53ab19de3b425c4c5a271111afcd334ec08fefd983838608ae436005c20c2d7c545650f0dd1b76d466f81661a14c8ce972df27d79a78c22023861
-EBUILD lvmlib-1.1.ebuild 699 BLAKE2B fd9a0a1d3b2f97a88bf183eacfd628659a6823c2e4649e07e475df22a7cf0ba9330e64d3e412c70412184d3f7eb59a597c32351898552af4f6b84e1341e83b38 SHA512 24c6d760a95b75f996a803d01099bf7a7c75edc07de5b5422f21d36db1825fc2e53fb082f79fec75764e99215b98a14fac089803eaa64445f4a526669022ce9b
-MISC metadata.xml 822 BLAKE2B 6c75a01261fb049e7b175c7f4b8de7da8978bca198f5a55581630087682920da280185d6c1512a81a0e05bbe02b8728b8261564c4d7d6a15db67218baa47f5b6 SHA512 95c53741b0af7d02006f5715e9468b01d984c5145a4f0582f268da5c3ef19c7902d7a9fe48a8b07c1825dbe9a8e09cc03c208a405218ec930b72ddd9e9d31219
diff --git a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-7.10.patch b/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-7.10.patch
deleted file mode 100644
index ad68d78f56e7..000000000000
--- a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-7.10.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git a/Lvm/Asm/Data.hs b/Lvm/Asm/Data.hs
-index 7939754..f3da0b7 100644
---- a/Lvm/Asm/Data.hs
-+++ b/Lvm/Asm/Data.hs
-@@ -17,2 +17,3 @@ import Lvm.Core.Module
- import Text.PrettyPrint.Leijen
-+import Prelude hiding ((<$>))
- 
-diff --git a/Lvm/Common/IdMap.hs b/Lvm/Common/IdMap.hs
-index a50bcb6..10758e6 100644
---- a/Lvm/Common/IdMap.hs
-+++ b/Lvm/Common/IdMap.hs
-@@ -24,2 +24,3 @@ import Lvm.Common.Id
- import Control.Arrow (first)
-+import Prelude hiding (foldMap)
- 
-diff --git a/Lvm/Core/Expr.hs b/Lvm/Core/Expr.hs
-index 8bc50d7..935e16a 100644
---- a/Lvm/Core/Expr.hs
-+++ b/Lvm/Core/Expr.hs
-@@ -17,2 +17,3 @@ import Lvm.Core.PrettyId
- import Text.PrettyPrint.Leijen
-+import Prelude hiding ((<$>))
- 
-diff --git a/Lvm/Core/Module.hs b/Lvm/Core/Module.hs
-index 923870e..ac52201 100644
---- a/Lvm/Core/Module.hs
-+++ b/Lvm/Core/Module.hs
-@@ -24,2 +24,3 @@ import Lvm.Instr.Data
- import Text.PrettyPrint.Leijen
-+import Prelude hiding ((<$>))
- 
-diff --git a/Lvm/Instr/Data.hs b/Lvm/Instr/Data.hs
-index 497a690..959cb5c 100644
---- a/Lvm/Instr/Data.hs
-+++ b/Lvm/Instr/Data.hs
-@@ -19,2 +19,3 @@ import Lvm.Common.Id
- import Text.PrettyPrint.Leijen
-+import Prelude hiding ((<$>))
- 
-diff --git a/Lvm/Instr/Resolve.hs b/Lvm/Instr/Resolve.hs
-index 6845f74..4172a74 100644
---- a/Lvm/Instr/Resolve.hs
-+++ b/Lvm/Instr/Resolve.hs
-@@ -10,2 +10,4 @@ module Lvm.Instr.Resolve (instrResolve) where
- import Control.Exception (assert)
-+import Control.Applicative
-+import Control.Monad
- import Data.Maybe
-@@ -32,2 +34,6 @@ instance Functor Resolve where
- 
-+instance Applicative Resolve where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad Resolve where
-diff --git a/Lvm/Read.hs b/Lvm/Read.hs
-index 7137331..25797f9 100644
---- a/Lvm/Read.hs
-+++ b/Lvm/Read.hs
-@@ -9,2 +9,3 @@ module Lvm.Read (lvmReadFile, lvmRead) where
- 
-+import Control.Applicative
- import Control.Monad
-@@ -390,2 +391,7 @@ instance Functor (Read v) where
-                                         Result x st2 -> Result (f x) st2)
-+
-+instance Applicative (Read v) where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad (Read v) where
-diff --git a/Lvm/Write.hs b/Lvm/Write.hs
-index 48570f8..37469bc 100644
---- a/Lvm/Write.hs
-+++ b/Lvm/Write.hs
-@@ -11,2 +11,3 @@ import qualified Control.Exception as CE (assert, catch, IOException)
- import Control.Monad
-+import Control.Applicative
- import Data.Maybe
-@@ -465,2 +466,6 @@ instance Functor Emit where
- 
-+instance Applicative Emit where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad Emit where
diff --git a/dev-haskell/lvmlib/lvmlib-1.1.ebuild b/dev-haskell/lvmlib/lvmlib-1.1.ebuild
deleted file mode 100644
index 0b49945b9a5b..000000000000
--- a/dev-haskell/lvmlib/lvmlib-1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-DESCRIPTION="The Lazy Virtual Machine (LVM)"
-HOMEPAGE="http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/parsec:=[profile?]
-	dev-haskell/wl-pprint:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.1.0
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1-ghc-7.10.patch
-}
diff --git a/dev-haskell/lvmlib/metadata.xml b/dev-haskell/lvmlib/metadata.xml
deleted file mode 100644
index 2d49cd8f1b3c..000000000000
--- a/dev-haskell/lvmlib/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The Lazy Virtual Machine (LVM) defines a portable instruction set and file
-		format. It is specifically designed to execute languages with non-strict (or
-		lazy) semantics. This cabal package defines the core assembler (coreasm) for
-		compiling core programs into LVM instructions and a library. The LVM is used
-		as a backend for the Helium compiler. At the moment, one LVM runtime
-		implementation is available (written in C). More information about LVM can be
-		found in Chapter 6 of Daan Leijen's PhD Thesis, The Lambda Abroad.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/maccatcher-2.1.5-r1 b/dev-haskell/maccatcher-2.1.5-r1
new file mode 100644
index 000000000000..7c958e566a6e
--- /dev/null
+++ b/dev-haskell/maccatcher-2.1.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/binary:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Obtain the host MAC address on *NIX and Windows
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/maccatcher
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/binary:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.1.5
+SRC_URI=mirror://hackage/packages/archive/maccatcher/2.1.5/maccatcher-2.1.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d058f6b84bbc02666a980f96d117db29
diff --git a/dev-haskell/maccatcher/Manifest b/dev-haskell/maccatcher/Manifest
deleted file mode 100644
index f57f9be05e85..000000000000
--- a/dev-haskell/maccatcher/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST maccatcher-2.1.5.tar.gz 4947 BLAKE2B 96a1a7a888e0340c3a69aae24aea102bc5cd361db6e35b2c5ee47902caa82c3910955739fe71c1dcfdea9e4c23b69f93238001a5c8a3a4fe1446fc93718c638a SHA512 a74c5c2e45168ded3319696e59f3f0ba6a5aec4a5316e02b4b1f8d012d8122faf564a059ef1f249d5a6e5f01f922d8e7fe05844b808e3b7673490494ed84adf4
-EBUILD maccatcher-2.1.5-r1.ebuild 754 BLAKE2B 17f333f0c8471ed3ec3d8317cc330cc31b373cca1e8758f71c63da0280637966fb41c57094f352c197c1beec73c0e64e7acd6b8b6ad764a2caff4c1b23ca7122 SHA512 87be3f74a9f2a71b1d1242f468adcd3be4d643a6a93f9df699f3088ed18bcb923ddf0ed218b47e3afa0a05934310f5a40bc20880486add8196dc348b2b714e65
-MISC metadata.xml 339 BLAKE2B dfa3c7a4df217cf01ebcb305a9ea8630e2d2e5688844e56cf0d5127292833f1006a61b142a263b012b1b9f1005f28f6387a388ad30327f034a717f41d40ba1bc SHA512 0648187c82f39010d3ef93f2d6e94d400ff8b6a2c876956676ecc7f2d6202b8298fdb6eb613a755442341726dc0836f884846a9ce0f44c28cd9151dec75db381
diff --git a/dev-haskell/maccatcher/maccatcher-2.1.5-r1.ebuild b/dev-haskell/maccatcher/maccatcher-2.1.5-r1.ebuild
deleted file mode 100644
index 0add068b2d4d..000000000000
--- a/dev-haskell/maccatcher/maccatcher-2.1.5-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: +split-base,+cli
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Obtain the host MAC address on *NIX and Windows"
-HOMEPAGE="http://hackage.haskell.org/package/maccatcher"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/binary:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=cli \
-		--flag=split-base
-}
diff --git a/dev-haskell/maccatcher/metadata.xml b/dev-haskell/maccatcher/metadata.xml
deleted file mode 100644
index 4f663119bdca..000000000000
--- a/dev-haskell/maccatcher/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Obtain the host MAC address on *NIX and Windows.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/magic-1.1 b/dev-haskell/magic-1.1
new file mode 100644
index 000000000000..587c1074d37d
--- /dev/null
+++ b/dev-haskell/magic-1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= sys-apps/file dev-haskell/cabal doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Interface to C file/magic library
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/magic
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:= sys-apps/file
+SLOT=0/1.1
+SRC_URI=mirror://hackage/packages/archive/magic/1.1/magic-1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8d2c936511de9322a2c1909ddf765c1b
diff --git a/dev-haskell/magic/Manifest b/dev-haskell/magic/Manifest
deleted file mode 100644
index 8fc5e977a947..000000000000
--- a/dev-haskell/magic/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST magic-1.1.tar.gz 4318 BLAKE2B 413c01af3bad4dd12cf4eda39d7de44a2126d2d250605b4d9054eb5b33f061d29dab0d2e244b662f451d7ddb907a6bb3e9c1a1dfa2d337af4464a2a0578391c7 SHA512 f400396b0f82f9655376ac72e721badcf60c356c8594b4b67922890f55bac8e15b7aa856fdf61942c40b2622bdc231914994968af3b98d353bf50aed09ebbef5
-EBUILD magic-1.1.ebuild 549 BLAKE2B f854693d397db704f5342dcf31529b7de46f6b0571c343500cdaccf93d06fee788a99b5d21105b646f687d5ba98690240554921acf346f342a7203feee36e3f2 SHA512 72d54ee812a857d8878d634ba8a6bea8c63595647995319856b626dce35331c9540e6e25321d6d69a14479181ba1f4c5fc34e086d8920198ce39b9c23687c42b
-MISC metadata.xml 516 BLAKE2B 0893cca3417eb9cf310d0ce52c76a88f55329030fa7d8531b7b1a161fcb0b142d9f2b9668a35e7d14dc82b091c155c2252d02614089b5ad48a76b0d544848a61 SHA512 173b01975e2e7d408ce1f4dce30bba11b8bd538d57fe5d9fb98dae688de262d9fe56402890776864f4c2b0c7b29ca1a1ca553789660a70f6aa253ed2a2a79977
diff --git a/dev-haskell/magic/magic-1.1.ebuild b/dev-haskell/magic/magic-1.1.ebuild
deleted file mode 100644
index 9a0d4c88e42a..000000000000
--- a/dev-haskell/magic/magic-1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Interface to C file/magic library"
-HOMEPAGE="http://hackage.haskell.org/package/magic"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	sys-apps/file
-"
-DEPEND="${RDEPEND}
-	dev-haskell/cabal
-"
diff --git a/dev-haskell/magic/metadata.xml b/dev-haskell/magic/metadata.xml
deleted file mode 100644
index 32e691a5478a..000000000000
--- a/dev-haskell/magic/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides a Haskell interface to the C libmagic library.
-		With it, you can determine the type of a file by examining its contents
-		rather than its name.  The Haskell interface provides a full-featured
-		binding.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/markdown-unlit-0.2.0.1 b/dev-haskell/markdown-unlit-0.2.0.1
new file mode 100644
index 000000000000..d1cdab4eac92
--- /dev/null
+++ b/dev-haskell/markdown-unlit-0.2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck dev-haskell/silently dev-haskell/stringbuilder ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Literate Haskell support for Markdown
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/markdown-unlit
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.2.0.1
+SRC_URI=mirror://hackage/packages/archive/markdown-unlit/0.2.0.1/markdown-unlit-0.2.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=033b9f6eb6264689bd94877ef541e7b4
diff --git a/dev-haskell/markdown-unlit/Manifest b/dev-haskell/markdown-unlit/Manifest
deleted file mode 100644
index 6a530ed75e55..000000000000
--- a/dev-haskell/markdown-unlit/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST markdown-unlit-0.2.0.1.tar.gz 2950 BLAKE2B 34d7dd34126c2a4e05b9c1b117e45dcc70fd3e4cd43640fdefdf036f865e39e927f11fa3f7b73a9b1b1c6b10cdaaf47aa9abe6f7ddac2ad99495479a39e1efeb SHA512 72098e14fd7c8abceb2001d0b180384b7e1e1ad180d41417841bef6c327a242cf1eec060e23137f46f766c4b15366c212f1dde9500647e504ebf6246f0e89072
-EBUILD markdown-unlit-0.2.0.1.ebuild 686 BLAKE2B 183480e540b0921ed675375585960494521803a52057975963ba040b5308902e1be56ecfd475d28fd3c966b3ae2ac971d67200676b41ba53d4b1f949957f725a SHA512 d715f52a5d6d1eff5a2ce318f9b09b0657ad9342c609fa5703e78a8d5cfb25ebd9ace410e4c5f90888db4299f1acedc2a71a577857c918267afd72f9080ff6f2
-MISC metadata.xml 366 BLAKE2B 379536d6043b0a2f1e2b794c634aae4e67461e0d0c8f04f880fb1d090c36c6016f9e1456c202ac6453de2452a0d15945c418d71ffbf981dd5e82f9c23ecf13d1 SHA512 5adb6ca454373cb9feaab19c4fd250305460e1a8412305e1ff5e38abfc393543756b4449b10de7d15cb2f71c55f8862228c5ca10461be9a45e073fc9d5766da7
diff --git a/dev-haskell/markdown-unlit/markdown-unlit-0.2.0.1.ebuild b/dev-haskell/markdown-unlit/markdown-unlit-0.2.0.1.ebuild
deleted file mode 100644
index 870e63886723..000000000000
--- a/dev-haskell/markdown-unlit/markdown-unlit-0.2.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Literate Haskell support for Markdown"
-HOMEPAGE="http://hackage.haskell.org/package/markdown-unlit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/quickcheck
-			dev-haskell/silently
-			dev-haskell/stringbuilder
-		)
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/markdown-unlit/metadata.xml b/dev-haskell/markdown-unlit/metadata.xml
deleted file mode 100644
index 117a1485cfc3..000000000000
--- a/dev-haskell/markdown-unlit/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Documentation is here: &lt;https://github.com/sol/markdown-unlit#readme&gt;
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/math-functions-0.1.5.2 b/dev-haskell/math-functions-0.1.5.2
new file mode 100644
index 000000000000..2becd77f87bd
--- /dev/null
+++ b/dev-haskell/math-functions-0.1.5.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/erf-2:=[profile?] >=dev-haskell/vector-0.7:=[profile?] dev-haskell/vector-th-unbox:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 >=dev-haskell/ieee754-0.7.3 >=dev-haskell/quickcheck-2.4 dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Special functions and Chebyshev polynomials
+EAPI=5
+HOMEPAGE=https://github.com/bos/math-functions
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/erf-2:=[profile?] >=dev-haskell/vector-0.7:=[profile?] dev-haskell/vector-th-unbox:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.5.2
+SRC_URI=mirror://hackage/packages/archive/math-functions/0.1.5.2/math-functions-0.1.5.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=30cd1f977323258a1d398ee9e77d6fc7
diff --git a/dev-haskell/math-functions-0.1.6.0 b/dev-haskell/math-functions-0.1.6.0
new file mode 100644
index 000000000000..ad48ad33f079
--- /dev/null
+++ b/dev-haskell/math-functions-0.1.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/erf-2:=[profile?] >=dev-haskell/vector-0.7:=[profile?] dev-haskell/vector-th-unbox:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 >=dev-haskell/ieee754-0.7.3 >=dev-haskell/quickcheck-2.4 dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Special functions and Chebyshev polynomials
+EAPI=6
+HOMEPAGE=https://github.com/bos/math-functions
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/erf-2:=[profile?] >=dev-haskell/vector-0.7:=[profile?] dev-haskell/vector-th-unbox:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.6.0
+SRC_URI=mirror://hackage/packages/archive/math-functions/0.1.6.0/math-functions-0.1.6.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7a9222651f54ce65a4c6329757ebd350
diff --git a/dev-haskell/math-functions/Manifest b/dev-haskell/math-functions/Manifest
deleted file mode 100644
index d4f20bb55f62..000000000000
--- a/dev-haskell/math-functions/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST math-functions-0.1.5.2.tar.gz 28490 BLAKE2B 70dbe8673442e0103311f913d486acd0953823d852b33c1dbbd2e3072c61e19c75366d48fd29346e33895cc038cf6deb7f995db927c41cee1e9c0cde9b8f7d80 SHA512 7723400ef7eaf3996babc4cacc1b02b7ee46837b8c4105abf0aa69f896e97ce3fc9fae6e527a0513688d66810a05ce2f5bef527d04b54bedd82c16fe2bbe342b
-DIST math-functions-0.1.6.0.tar.gz 30734 BLAKE2B 445bbfefa7e4a67922ad0fcdac65b1458115285ac5d7c38a0ea6f32ab3658a9720cce164bbb6473a608e7466e67dc9743e719b24c2b5f3e5755af9c3ba105f85 SHA512 b1f0df7b7b99bb41e6ca232bfabd0f0db07b98be1bb3d9c64235b283efd3a5441f02829e637e71cccf70917413e7145afd0dc23686732d4797ab7351c3d3e060
-EBUILD math-functions-0.1.5.2.ebuild 876 BLAKE2B 5f0622a06c0b70566c30cbe47c1cea86d088e08de74df40b5ffc0e1c37712373bd5cf582a1f6985c449ac49bb5c6cad07fd6fe6397e30fb6bba629177f6c7a7d SHA512 d3256ecb2e97fcdee65a64242b302c9b5fc89b7167da90a9249cc5e91e2be0cce0f3f16e4412436c589505f5dca9a177f1334e2e352520343ccd292b52942444
-EBUILD math-functions-0.1.6.0.ebuild 876 BLAKE2B 943dece9965eb054f23a62a1c91ae0e15d386cdc143406d197a3213e43626ab54c63a4e1e4a47d446088f364a93832099e03af596eda355fa3e31e7e4110ccd7 SHA512 3ebad981f187deb9c72bf0ec2d534fc5456926f52a7d2640959f8dabc8d64c64da64f6a1bca36aafaa7eef25522fbeec7ce83eb69d81fea1afdb4b87e170d440
-MISC metadata.xml 550 BLAKE2B f7003c6609e08895f2d6ad5c193147cd1bb98a101c1d594f98ec859a7295e8e03ba3057f42926d353cfade194709a6bd5a1ac48842493408ad86c764dc8e519f SHA512 355f4626c2c385acf0662d46deed375e41681f310cb79b8d0d84ca3c63cc65d14dde4d902968e00175e9276f43e604e98d0d1fd49b08d27ff09a8ed333dfadfb
diff --git a/dev-haskell/math-functions/math-functions-0.1.5.2.ebuild b/dev-haskell/math-functions/math-functions-0.1.5.2.ebuild
deleted file mode 100644
index 56772c540b7c..000000000000
--- a/dev-haskell/math-functions/math-functions-0.1.5.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Special functions and Chebyshev polynomials"
-HOMEPAGE="https://github.com/bos/math-functions"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/erf-2:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?]
-	dev-haskell/vector-th-unbox:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/ieee754-0.7.3
-		>=dev-haskell/quickcheck-2.4
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/math-functions/math-functions-0.1.6.0.ebuild b/dev-haskell/math-functions/math-functions-0.1.6.0.ebuild
deleted file mode 100644
index 0c3a51c1e67c..000000000000
--- a/dev-haskell/math-functions/math-functions-0.1.6.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Special functions and Chebyshev polynomials"
-HOMEPAGE="https://github.com/bos/math-functions"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/erf-2:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?]
-	dev-haskell/vector-th-unbox:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/ieee754-0.7.3
-		>=dev-haskell/quickcheck-2.4
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/math-functions/metadata.xml b/dev-haskell/math-functions/metadata.xml
deleted file mode 100644
index 4aec12451c4d..000000000000
--- a/dev-haskell/math-functions/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library provides implementations of special mathematical
-		functions and Chebyshev polynomials.  These functions are often
-		useful in statistical and numerical computing.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bos/math-functions</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/megaparsec-6.5.0-r1 b/dev-haskell/megaparsec-6.5.0-r1
new file mode 100644
index 000000000000..d1679ce70d2c
--- /dev/null
+++ b/dev-haskell/megaparsec-6.5.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3.0:=[profile?] >=dev-haskell/parser-combinators-0.4:=[profile?] >=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 >=dev-haskell/hspec-expectations-0.5 <dev-haskell/hspec-expectations-0.9 >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.12 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monadic parser combinators
+EAPI=6
+HOMEPAGE=https://github.com/mrkkrp/megaparsec
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3.0:=[profile?] >=dev-haskell/parser-combinators-0.4:=[profile?] >=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.10.1:=
+SLOT=0/6.5.0
+SRC_URI=mirror://hackage/packages/archive/megaparsec/6.5.0/megaparsec-6.5.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a8c5c983273358f78743a28304f8dc58
diff --git a/dev-haskell/megaparsec/Manifest b/dev-haskell/megaparsec/Manifest
deleted file mode 100644
index faa965f1594d..000000000000
--- a/dev-haskell/megaparsec/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST megaparsec-6.5.0.tar.gz 91498 BLAKE2B 339e68e211e871d77236770ab789523879a1a44286d5ff5567b75f32278826f79ee6a76a80309b07771703a415c252e92d8327e6a34b86f0670b1ac89c742d6c SHA512 4a8194909f2779bd82226a1f8fb6cce089820fa960249fdd723a4f54aa0c0d52436b4835431327be1164a7698d59059e866b694477407fae4d93c1ae42664011
-EBUILD megaparsec-6.5.0-r1.ebuild 1574 BLAKE2B e54b2569992b59f1cae243340272c64697ae711be84fecaf28eb336525f7f2c07df66975d73cc960a3d3a80d19241a57e645b3562b92d0da3ced373716c7c3d7 SHA512 733fbe13a154cec932e9ddab99dc3b6232c5c11792028c48f8ee1b1b4905fb94209433180db797211ad3c776f23bc37d58537c977ea01844931d71ac2e7702ea
-MISC metadata.xml 429 BLAKE2B 787fadd68a570c19f0b5d5bcce0c0e445203f20e1e9db00e79051b8431520539cd8419c2c5ad06a2c7c181bf8c7d0428481dbc84f74b052dbfa466d4a0011a51 SHA512 a153068626ebe4c90f592241f3a3529ef159d298ef846b8bc5ea11200100aa167c1277415ae22efdc225a424e0395e8b79ce530d1eea83b558d85b37709dcf10
diff --git a/dev-haskell/megaparsec/megaparsec-6.5.0-r1.ebuild b/dev-haskell/megaparsec/megaparsec-6.5.0-r1.ebuild
deleted file mode 100644
index 805cfacfc1ee..000000000000
--- a/dev-haskell/megaparsec/megaparsec-6.5.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5
-#hackport: flags: -dev
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Monadic parser combinators"
-HOMEPAGE="https://github.com/mrkkrp/megaparsec"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3.0:=[profile?]
-	>=dev-haskell/parser-combinators-0.4:=[profile?]
-	>=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0
-		>=dev-haskell/hspec-expectations-0.5 <dev-haskell/hspec-expectations-0.9
-		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.12 )
-"
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'parser-combinators >= 0.4 && < 1.0' 'parser-combinators >= 0.4' \
-		'build-tools:        hspec-discover >= 2.0 && < 3.0' 'build-depends:        hspec-discover >= 2.0 && < 3.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-dev
-}
diff --git a/dev-haskell/megaparsec/metadata.xml b/dev-haskell/megaparsec/metadata.xml
deleted file mode 100644
index 3d98afc09884..000000000000
--- a/dev-haskell/megaparsec/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This is industrial-strength monadic parser combinator library. Megaparsec is
-		a fork of Parsec library originally written by Daan Leijen.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/memory-0.10 b/dev-haskell/memory-0.10
new file mode 100644
index 000000000000..308cdab50c72
--- /dev/null
+++ b/dev-haskell/memory-0.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=memory and related abstraction stuff
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-memory
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.10
+SRC_URI=mirror://hackage/packages/archive/memory/0.10/memory-0.10.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2635dafded6b6689a373b964b84ae2a0
diff --git a/dev-haskell/memory-0.14.1 b/dev-haskell/memory-0.14.1
new file mode 100644
index 000000000000..cbfde8107c41
--- /dev/null
+++ b/dev-haskell/memory-0.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=memory and related abstraction stuff
+EAPI=6
+HOMEPAGE=https://github.com/vincenthz/hs-memory
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.14.1
+SRC_URI=mirror://hackage/packages/archive/memory/0.14.1/memory-0.14.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e1e8f27fc6e27293eda23167b718e282
diff --git a/dev-haskell/memory-0.7 b/dev-haskell/memory-0.7
new file mode 100644
index 000000000000..39e917ed00d1
--- /dev/null
+++ b/dev-haskell/memory-0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=memory and related abtraction stuff
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-memory
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7
+SRC_URI=mirror://hackage/packages/archive/memory/0.7/memory-0.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=54c74afeee872cc46001eafd70b35fea
diff --git a/dev-haskell/memory/Manifest b/dev-haskell/memory/Manifest
deleted file mode 100644
index 3cb89e3e4737..000000000000
--- a/dev-haskell/memory/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST memory-0.10.tar.gz 35039 BLAKE2B bca8342ebd866c53fa2fe476b11fa3ecb75ac8383a98baf86bb577f99d623828e5656b2a23b9f95f03044fefa97aea5fd1429c1df45e625eabca36b8b54dbbd2 SHA512 e548dddfe168f6094e066b7bbda165e842d1eab429b5d2ea978706acfd4b3a93a84f9ba56cc2830fecddadefe60efcfb474a791a72211f552fb223a6989dd55c
-DIST memory-0.14.1.tar.gz 35928 BLAKE2B 6ac85e5f9cd41ea4058abdc168bd094e7632582fb234c00aab9e6a3359a87e0695907e3821a684ca8c1ad6259c7343e8d0dd38a8fc3e4e85dd89efa09fcbabb5 SHA512 12f8d8f3d14dc060b5da9950ddef398ac55464cf79438c501ba8eaa222817d474c191463fd5f97ed460f5ca4af6d3b643363eb2cca278c583cc14e442fe669cf
-DIST memory-0.7.tar.gz 33072 BLAKE2B e29aac80f99121c2ae588b8b4e2db468a83e19583aabd524384b7aad43a210147746bbad3e05c682a5226dae163d39a9724fcd38b5b813889620ec7c918b9aa4 SHA512 5df9d3ff6ab1fad7760a34d22657af255d7ad57019e8b61bd81dbd09b5df6da83d93e667989c10ebea2910a3399be05ef33d298aca0b09764b0e3a855fba15a8
-EBUILD memory-0.10.ebuild 806 BLAKE2B 7fd0ee29a5548003a37370084e3a165fbcbfd7b812f403d9949bb35c77b35ccb2bdcfa69aab441c78d1aa1d9a9240e52a3f3069230e4832e2aa9812b2bd792ee SHA512 037aad607deb75f993d86abcc9c0d26bbd13d6ce0a7c7f695d55247e1e11fe6883c725cf81a1db9e82c50bb4eb66a7e710ce0ed8dd70c4ab9fb961baf4930c48
-EBUILD memory-0.14.1.ebuild 804 BLAKE2B ca1de0edde0f90fcd9bb554c2ab71143674728c97ad759c635f6685d683ba33d34cf3f6d8d18dcd87af3045d5cf7bf4fe32f25383bc6d1fdf10d5b46f0cd0be0 SHA512 8de9561031386551c6b155e1287e55b02dd2787678166ab11936240796f99fb072cb9d43556f1d601312438f65cd20ea69b993ba2b9e31cf3f9a6e0b03378759
-EBUILD memory-0.7.ebuild 805 BLAKE2B 77f09bb2e9c76e13cf763509c397a4b2b34cd4899e252e6df663b018a1008dbb926a1b5549b09c0b75d4262fb4a1bb11a2c5ca77c3a0634bac9b76ea39fda04b SHA512 c649475039a1657749ca84ca7daf8c3961474dde56b913ae301f27f01d1b85ae2171bb0124c95c5b7c9b48f5d02e5b215d30340f75be33c7d89a7f07206cf903
-MISC metadata.xml 681 BLAKE2B 6b8c4a5aeac640ecddecedc449873e35327c9162a9f36c64246dfd0cdb28741c953e75b46a61c182205da8b9bdadab3338954ac7eb2b4a77f5d71d7d3a1e589b SHA512 174440b555b9b8dba3344dc534ffac79a7c2d9863174315733f041db89c9f0e0a055dc5b15af7d2e1880b14584998749ed6906d1dacf0e30ac36d00ddeb8222d
diff --git a/dev-haskell/memory/memory-0.10.ebuild b/dev-haskell/memory/memory-0.10.ebuild
deleted file mode 100644
index 2d06e75ce449..000000000000
--- a/dev-haskell/memory/memory-0.10.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +support_bytestring,+support_deepseq
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="memory and related abstraction stuff"
-HOMEPAGE="https://github.com/vincenthz/hs-memory"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=support_bytestring \
-		--flag=support_deepseq
-}
diff --git a/dev-haskell/memory/memory-0.14.1.ebuild b/dev-haskell/memory/memory-0.14.1.ebuild
deleted file mode 100644
index e7e09c60911a..000000000000
--- a/dev-haskell/memory/memory-0.14.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: +support_bytestring,+support_deepseq
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="memory and related abstraction stuff"
-HOMEPAGE="https://github.com/vincenthz/hs-memory"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=support_bytestring \
-		--flag=support_deepseq
-}
diff --git a/dev-haskell/memory/memory-0.7.ebuild b/dev-haskell/memory/memory-0.7.ebuild
deleted file mode 100644
index 110a4befea8a..000000000000
--- a/dev-haskell/memory/memory-0.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: +support_bytestring,+support_deepseq
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="memory and related abtraction stuff"
-HOMEPAGE="https://github.com/vincenthz/hs-memory"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=support_bytestring \
-		--flag=support_deepseq
-}
diff --git a/dev-haskell/memory/metadata.xml b/dev-haskell/memory/metadata.xml
deleted file mode 100644
index 665d58e92c9f..000000000000
--- a/dev-haskell/memory/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Chunk of memory, polymorphic byte array management and manipulation
-		
-		* A polymorphic byte array abstraction and function similar to strict ByteString.
-		
-		* Different type of byte array abstraction.
-		
-		* Raw memory IO operations (memory set, memory copy, ..)
-		
-		* Aliasing with endianness support.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-memory</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/memotrie-0.6.4 b/dev-haskell/memotrie-0.6.4
new file mode 100644
index 000000000000..1b27f9817e37
--- /dev/null
+++ b/dev-haskell/memotrie-0.6.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/void:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10
+DESCRIPTION=Trie-based memo functions
+EAPI=5
+HOMEPAGE=https://github.com/conal/MemoTrie
+IUSE=examples profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/void:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.6.4
+SRC_URI=mirror://hackage/packages/archive/MemoTrie/0.6.4/MemoTrie-0.6.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cbb456c155d3017eea5755fdc99e8869
diff --git a/dev-haskell/memotrie/Manifest b/dev-haskell/memotrie/Manifest
deleted file mode 100644
index d13ab283051c..000000000000
--- a/dev-haskell/memotrie/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST MemoTrie-0.6.4.tar.gz 7695 BLAKE2B 4bd5ae0fa7b0ec6e95e221903e28367773d8cc310963d73cbba110f3d3285f2cf5a72a62d3a53f9b5cb46b86efab182089440bb142927eeccbbf4ed9b4765f29 SHA512 5700a36ae2a53e84bc31d80765afff3041972b4b64da359e16e7981009cc581d9c8aac019eb46d44d5dba7080dad494587ad1f4256f101387eb6de2959dd659f
-EBUILD memotrie-0.6.4.ebuild 747 BLAKE2B 903fbd4d5ba39fd4c31c82deddeb905607aa3061c13dd0511c71896813c769ecd0861c94de3605fd96d1bd965642d623e2b05f549e54686e965901eed387c013 SHA512 459350e5df324ed458e2d912a4ed65b642f3b95a48135968d5890f9db16b5424f67b721d6ab15b95153fa8c713c976767c69fee5f28072be66f0a1d2f36f0d32
-MISC metadata.xml 640 BLAKE2B dee8ca839f73f4be6933e30e23e4ae8a15fd428f652276fd3ffca8b9b715c3555b18ec8e05850a6b40babfa861afe889e1d3a21cac9a8d40269eb2e3a16cf46d SHA512 0691348e9a5c6a7370e272bbb12f0dfad0ba17fddb256df7b1cb9e5b38d059c2bab91562ed8c44a4f7aaf0a5dac4e9dd8adfcc2c91e3ec78dcad5d7d9c624b40
diff --git a/dev-haskell/memotrie/memotrie-0.6.4.ebuild b/dev-haskell/memotrie/memotrie-0.6.4.ebuild
deleted file mode 100644
index c3bbec137ef3..000000000000
--- a/dev-haskell/memotrie/memotrie-0.6.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile" #broken haddock: haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="MemoTrie"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Trie-based memo functions"
-HOMEPAGE="https://github.com/conal/MemoTrie"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="dev-haskell/void:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples examples)
-}
diff --git a/dev-haskell/memotrie/metadata.xml b/dev-haskell/memotrie/metadata.xml
deleted file mode 100644
index 2a3b094947a8..000000000000
--- a/dev-haskell/memotrie/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		MemoTrie provides a basis for memoized functions over some domains,
-		using tries.  It's based on some code I got from Spencer Janssen.
-		
-		Project wiki page: &lt;http://haskell.org/haskellwiki/MemoTrie&gt;
-		
-		&amp;#169; 2008,2009,2010 by Conal Elliott; BSD3 license.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">conal/MemoTrie</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/mersenne-random-pure64-0.2.0.5 b/dev-haskell/mersenne-random-pure64-0.2.0.5
new file mode 100644
index 000000000000..ceb3331ce734
--- /dev/null
+++ b/dev-haskell/mersenne-random-pure64-0.2.0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/old-time:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generate high quality pseudorandom numbers purely using a Mersenne Twister
+EAPI=5
+HOMEPAGE=http://code.haskell.org/~dons/code/mersenne-random-pure64/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/old-time:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.0.5
+SRC_URI=mirror://hackage/packages/archive/mersenne-random-pure64/0.2.0.5/mersenne-random-pure64-0.2.0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2994582c8c3d1b39c9d87c3d37fe9bcf
diff --git a/dev-haskell/mersenne-random-pure64-0.2.2.0 b/dev-haskell/mersenne-random-pure64-0.2.2.0
new file mode 100644
index 000000000000..7a57b249084f
--- /dev/null
+++ b/dev-haskell/mersenne-random-pure64-0.2.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generate high quality pseudorandom numbers purely using a Mersenne Twister
+EAPI=6
+HOMEPAGE=http://code.haskell.org/~dons/code/mersenne-random-pure64/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.2.0
+SRC_URI=mirror://hackage/packages/archive/mersenne-random-pure64/0.2.2.0/mersenne-random-pure64-0.2.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a7b827aa65d9c3f333ca7994dc503b0a
diff --git a/dev-haskell/mersenne-random-pure64/Manifest b/dev-haskell/mersenne-random-pure64/Manifest
deleted file mode 100644
index e5a011720379..000000000000
--- a/dev-haskell/mersenne-random-pure64/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST mersenne-random-pure64-0.2.0.5.tar.gz 7094 BLAKE2B 8a2793f575bc318e5296b3974b6eb0561c19a92b9c9dfdc5ba204f361110569027ab74261c092c620c6ef637e52cddaaf1e0c9037f8768eeceb51f18d3a3b70a SHA512 1dd09fc1bad2ce9c847f7815f6fbc60556bb10fa4a01b30d3ad53dacd560392a866f8f13b334f0bba8f87490ff3d4ab54a054300d7682d4b73d33f6c161cb022
-DIST mersenne-random-pure64-0.2.2.0.tar.gz 7190 BLAKE2B aaaa92b939f96bc5654694ff63e88c15a3de5b3e6c93607cbebcd0503680787220c84dc40980e85f0bcc2504e70489971f706ba4eaeb3ff86879c0e0e9f65bad SHA512 4329491b2f86dc256f24111ac7ae6ee527113e4fc32ecb3fb81563ca175296cf6fb3844147740845a9d7e6d09f48e2be338bd8e56468075b36c1f00d7c47e331
-EBUILD mersenne-random-pure64-0.2.0.5.ebuild 672 BLAKE2B fb3cf9f3eeb9f7d40a2a1ce427cd4710402c6978d97a2c2e3c1a9e9dd3948e165bfb49c3e8e9c43700cb674580a1c3d4a8cd029464adebeee162199b103135b7 SHA512 7e566278aa2ec6a40a0d523f10028622f00431804679c200330f2f322dbd10dd515f4edca775e917fa7433adaa1054bfe93e837914102136444e608109445d5c
-EBUILD mersenne-random-pure64-0.2.2.0.ebuild 636 BLAKE2B 2c22626b526e55935a0a1728f0d0f6f09d63f4a04d43db953617442e5fe9f2c7086766ffc4b24c51d84582ab96d5847b8dfd393946f32ba76e5c16a4708133b9 SHA512 4ffbb4e45a2bae49da941f51b4fefa10969c5e4e3735b5cfe198e4a4e123f538f1c1d21025ae4130c1dd468855cc4da9c7a7517c8eda798e947e3d095393465d
-MISC metadata.xml 1056 BLAKE2B 62ed7db25250939d6b79a63b941d099b4fd2e4bebc4969618f1cfd5bfe3db1b66aad52dc0ff333efb0503065be959872acff39aff7830810ddbd4f256a3865db SHA512 b87571ed30536db687c41be578098d47c4443454c43dfb803f1eb8a1d946704b6d37c1b3f823290860d574d31e21f7b1bf1bece6e42f5df2d5718a3191157afb
diff --git a/dev-haskell/mersenne-random-pure64/mersenne-random-pure64-0.2.0.5.ebuild b/dev-haskell/mersenne-random-pure64/mersenne-random-pure64-0.2.0.5.ebuild
deleted file mode 100644
index 9be3874e3049..000000000000
--- a/dev-haskell/mersenne-random-pure64/mersenne-random-pure64-0.2.0.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate high quality pseudorandom numbers purely using a Mersenne Twister"
-HOMEPAGE="http://code.haskell.org/~dons/code/mersenne-random-pure64/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/old-time:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0
-"
diff --git a/dev-haskell/mersenne-random-pure64/mersenne-random-pure64-0.2.2.0.ebuild b/dev-haskell/mersenne-random-pure64/mersenne-random-pure64-0.2.2.0.ebuild
deleted file mode 100644
index 678d97161a74..000000000000
--- a/dev-haskell/mersenne-random-pure64/mersenne-random-pure64-0.2.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate high quality pseudorandom numbers purely using a Mersenne Twister"
-HOMEPAGE="http://code.haskell.org/~dons/code/mersenne-random-pure64/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0
-"
diff --git a/dev-haskell/mersenne-random-pure64/metadata.xml b/dev-haskell/mersenne-random-pure64/metadata.xml
deleted file mode 100644
index e6e083ca3ffc..000000000000
--- a/dev-haskell/mersenne-random-pure64/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The Mersenne twister is a pseudorandom number generator developed by
-		Makoto Matsumoto and Takuji Nishimura that is based on a matrix linear
-		recurrence over a finite binary field. It provides for fast generation
-		of very high quality pseudorandom numbers. The source for the C code
-		can be found here:
-		
-		&lt;http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt64.html&gt;
-		
-		This library provides a purely functional binding to the 64 bit
-		classic mersenne twister, along with instances of RandomGen, so the
-		generator can be used with System.Random. The generator should
-		typically be a few times faster than the default StdGen (but a tad
-		slower than the impure 'mersenne-random' library based on SIMD
-		instructions and destructive state updates.
-		
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/metadata.xml b/dev-haskell/metadata.xml
deleted file mode 100644
index e6044576f941..000000000000
--- a/dev-haskell/metadata.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The dev-haskell category contains libraries and utilities relevant to the
-		Haskell programming language.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría dev-haskell contiene librerias y utilidades referentes
-		al lenguaje de programación Haskell.
-	</longdescription>
-	<longdescription lang="ja">
-		dev-haskell カテゴリーには Haskellプログラミング言語に関連したライブラリーと
-		ユーティリティが含まれます。
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie dev-haskell enthält Bibliotheken und Werkzeuge für die 
-		Programmiersprache Haskell.
-	</longdescription>
-	<longdescription lang="nl">
-		De dev-haskell categorie bevat bibliotheken en hulpmiddelen voor het gebruik
-		van de programmeertaal Haskell.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm dev-haskell chứa các thư viện và tiện ích liên quan
-		đến ngôn ngữ lập trình Haskell.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria dev-haskell contiene librerie ed utilità per il linguaggio Haskell.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria dev-haskell contém bibliotecas e utilitários
-		referentes à linguagem de programação Haskell.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria dev-haskell zawiera biblioteki i narzędzia związane z
-		językiem programowania Haskell.
-	</longdescription>
-</catmetadata>
-
diff --git a/dev-haskell/microlens-0.4.8.0 b/dev-haskell/microlens-0.4.8.0
new file mode 100644
index 000000000000..eb8fe615e0f9
--- /dev/null
+++ b/dev-haskell/microlens-0.4.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A tiny lens library with no dependencies
+EAPI=6
+HOMEPAGE=https://github.com/aelve/microlens
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.8.2:=
+SLOT=0/0.4.8.0
+SRC_URI=mirror://hackage/packages/archive/microlens/0.4.8.0/microlens-0.4.8.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e9ca2d46722ef92345abad1e3bfcae99
diff --git a/dev-haskell/microlens/Manifest b/dev-haskell/microlens/Manifest
deleted file mode 100644
index 3f12841d7a62..000000000000
--- a/dev-haskell/microlens/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST microlens-0.4.8.0.tar.gz 24766 BLAKE2B d033f58cd378d3c0c2274536b50ddcafa19f726a1eb7303032077bd232491b90eac0d277cdc6a73ee0fb06288c19aa2dd63dfc10acdec280baad01b9743f718f SHA512 472b4ef43161a21c2864d87d53e2e4138d4ee16d64cc9e96f43c2cdc11894df178189525be1c6e5c8e0db582f878d1d603696f0ace82986fcb42d888aee99ae2
-EBUILD microlens-0.4.8.0.ebuild 551 BLAKE2B 32d1d76d7d0f11095f4428db9fc599e9a6e890b8bf23451b2b128c69e25daefe24d2e3d3d6eee4c20d48e0abc8a29cda959f52a9d23136849deb0446a5675540 SHA512 bd268a565c28464994fc754da573934323db460c9a5baf506cf51f27475b37f8762e72507be2da8cfbdd1669b383621cffb243f8afb9f4fe90abacdd23c4e64e
-MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/microlens/metadata.xml b/dev-haskell/microlens/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/microlens/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/microlens/microlens-0.4.8.0.ebuild b/dev-haskell/microlens/microlens-0.4.8.0.ebuild
deleted file mode 100644
index 3d15c5a2fee6..000000000000
--- a/dev-haskell/microlens/microlens-0.4.8.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A tiny lens library with no dependencies"
-HOMEPAGE="https://github.com/aelve/microlens"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/mime-0.4.0.2 b/dev-haskell/mime-0.4.0.2
new file mode 100644
index 000000000000..ee0aa58b4445
--- /dev/null
+++ b/dev-haskell/mime-0.4.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-0.9:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Working with MIME types
+EAPI=5
+HOMEPAGE=https://github.com/GaloisInc/mime
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-0.9:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.0.2
+SRC_URI=mirror://hackage/packages/archive/mime/0.4.0.2/mime-0.4.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ac079ff0f874f9529d45e03ce9bf000b
diff --git a/dev-haskell/mime-mail-0.4.11 b/dev-haskell/mime-mail-0.4.11
new file mode 100644
index 000000000000..66cc50c1a088
--- /dev/null
+++ b/dev-haskell/mime-mail-0.4.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Compose MIME email messages
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/mime-mail
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.11
+SRC_URI=mirror://hackage/packages/archive/mime-mail/0.4.11/mime-mail-0.4.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=aaa9193ca5a3565869e55bcc6641da22
diff --git a/dev-haskell/mime-mail/Manifest b/dev-haskell/mime-mail/Manifest
deleted file mode 100644
index ecfb3a1fa7b0..000000000000
--- a/dev-haskell/mime-mail/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mime-mail-0.4.11.tar.gz 8918 BLAKE2B 9d335f1953584961e377bdf041b7e93cf6a6e09d8ad3d86410bc565628a4aa75ad93a0bcdd484a566d88b36e1708ae32fdaa8a18424bf5135b5e44c16e9fa46e SHA512 576390c99ebfb390a4e3b2c441add80923033d91160aa834ee8b4491e117645d5ce2936fee798370feda8c21c477c95a1984314b28235a3cfcb5f72b2fc52a54
-EBUILD mime-mail-0.4.11.ebuild 795 BLAKE2B a554a97ebae213d9c14ce494dd64e77218e0008496fb76d4a9058b9b697bccd94d6ed1bb3cf7a0e323949073611d2bc9825b111073deb5253bb130d9b58d8373 SHA512 934553c0d3533d083469901f11a2301647c8c1075911abd9b50be1b4bc4f7f2c4fed55641d8a60a85aca65c6580546a20b158b877e600bff39fa9a0309f95823
-MISC metadata.xml 679 BLAKE2B 28d9585da38bec4e07e2f7b1a758b29d7316479d1e3b87d2b2cf9a56e71bcb3f07560746859f1e2caeda4ed53eaf4b11f9b3ebcb6c1ecc587a69f7d44edc71e6 SHA512 69cc2fb2efbafbca17649f2342f25204a74bb68270fd34decb797a97c7cdac3057de79cf84e0e7e5b85986fa3bbca3b80771acdabeed25a85308eb0aa162f071
diff --git a/dev-haskell/mime-mail/metadata.xml b/dev-haskell/mime-mail/metadata.xml
deleted file mode 100644
index abcd14239f1e..000000000000
--- a/dev-haskell/mime-mail/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides some high-level datatypes for declaring MIME email messages, functions for automatically composing these into bytestrings, and the ability to send bytestrings via the sendmail executable. You can also use any other library you wish to send via different methods, eg directly to SMTP.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/mime-mail</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/mime-mail/mime-mail-0.4.11.ebuild b/dev-haskell/mime-mail/mime-mail-0.4.11.ebuild
deleted file mode 100644
index eb3d46a288bb..000000000000
--- a/dev-haskell/mime-mail/mime-mail-0.4.11.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Compose MIME email messages"
-HOMEPAGE="https://github.com/snoyberg/mime-mail"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/mime-types-0.1.0.3 b/dev-haskell/mime-types-0.1.0.3
new file mode 100644
index 000000000000..017eb727ed49
--- /dev/null
+++ b/dev-haskell/mime-types-0.1.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Basic mime-type handling types and functions
+EAPI=5
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.1.0.3
+SRC_URI=mirror://hackage/packages/archive/mime-types/0.1.0.3/mime-types-0.1.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cf80b14741be5a9e55d6892416ceb163
diff --git a/dev-haskell/mime-types-0.1.0.6 b/dev-haskell/mime-types-0.1.0.6
new file mode 100644
index 000000000000..7393cb4f083d
--- /dev/null
+++ b/dev-haskell/mime-types-0.1.0.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Basic mime-type handling types and functions
+EAPI=5
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0.6
+SRC_URI=mirror://hackage/packages/archive/mime-types/0.1.0.6/mime-types-0.1.0.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=83fc9a19dba710148004799492b6f1a0
diff --git a/dev-haskell/mime-types-0.1.0.7 b/dev-haskell/mime-types-0.1.0.7
new file mode 100644
index 000000000000..cc78537d92f8
--- /dev/null
+++ b/dev-haskell/mime-types-0.1.0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Basic mime-type handling types and functions
+EAPI=6
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0.7
+SRC_URI=mirror://hackage/packages/archive/mime-types/0.1.0.7/mime-types-0.1.0.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=91d1d19a932cc4141e5907f090699d96
diff --git a/dev-haskell/mime-types/Manifest b/dev-haskell/mime-types/Manifest
deleted file mode 100644
index 2920876710cf..000000000000
--- a/dev-haskell/mime-types/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST mime-types-0.1.0.3.tar.gz 10953 BLAKE2B 1bc690ee43d3ac77f07d2c69136efba7ee5778e97dab42afe86ad172106dbf6ed0ba1d00edf29d809cc07ab9f23d6178e17d45c7e73b65f6baf99cc38d06d4b6 SHA512 10bdd7ed39af89645bcc2daef6d234d571811cda51583e93df43039c09a5bd4b0d5a6f23e7ac8bc91e471c8bbe8b2124e4db48b88436f5c22b96a065f925b206
-DIST mime-types-0.1.0.6.tar.gz 11135 BLAKE2B 75d2ded069ef1a3b9daf435545eb900fc8829f5abe5c4ca949ec41455a4757c258f8afb40e5fcface0feb8adc0231c21f1aa061b4dd87367c326d19722782069 SHA512 ceed01578103e5a739c81dc87b76d72125fc6bd88e67ae34057a1ecbdd1fbca004295315a985eb0430e030104928fb4ae59c44ec6faa484b35c08116fb29b36c
-DIST mime-types-0.1.0.7.tar.gz 11363 BLAKE2B a946e97c6c051d1d0eeed52e6d2bb742909f289def220a35ee0c33e3e79a8b3559d2a684f01c2caa0b7c709a3b6e185f05b2e80d645e8448a4caa136996926d6 SHA512 411bc4cbb471a0f520413831e7613ede6a2f326120adba1f8acc92b12f2eb241e12323cc68d3ea829e26009b8d7728bf26b0a634b9c672c88345a6a2cc94cd8a
-EBUILD mime-types-0.1.0.3.ebuild 571 BLAKE2B 4af1addfbd162cc67e9007edf67ab7880fd2335baeed0b40ca873fa7a7247531e5ab08282ca672205c65bc0544878a9f0a20b0a614311a1826a3725058155554 SHA512 49e73e366cf6b2e93212e9df581e24311e7acdcc4c782003c365f82e8840a1564d91b1671f6d30c206c518b402144642beec700a906e9e28ca5c21bae217a672
-EBUILD mime-types-0.1.0.6.ebuild 572 BLAKE2B ac6c0186805a62860f64ec54061ed323352cf682be8bf237433b8bf657b7dfe0b60f3376f67127c92ba95341773aa75f9711b984892448c34b6d361e481174e6 SHA512 9be0eeb226c15b968524fdcd8af620f0db38e359a4a5bf237cae9215a6d40f4a9941b899a549d65d9a6f182b47f4ae24f5ca49f68abf603a80ec922e2be9981c
-EBUILD mime-types-0.1.0.7.ebuild 577 BLAKE2B 801486497910098af23051ec9c39e564b6968517f1345347e8f0698d32161c6e0d2a64fcb8c7122b1e04a02a0daa42f9c1cf1b66c4320ddb2e25bebec3c90ada SHA512 f5ee86ea4ebdde17ae851da51688c05c06e751d189c821c1d6d37a1debdda63db25f5dfd1ad844d4bedb4d30e74878a204a8ecafceb0b7052fd01cfca4e4a5cc
-MISC metadata.xml 412 BLAKE2B 93de8562b6afb74cb4b6f18ba574331a71c7a946809a2c28dac6437cad9d9975c09e866079a91fa5665446e15015af36c37fda988dc56d78a9a664f4a83fe5c4 SHA512 e04aa666daa52214c60f6e9515c15a0d8458d20fcd0f584c4ee230334892bff2292a0f655222d3a396703610aa6fb6b6f422ec9912c37fe6275db9b4ef2f3ea7
diff --git a/dev-haskell/mime-types/metadata.xml b/dev-haskell/mime-types/metadata.xml
deleted file mode 100644
index a9c34a421375..000000000000
--- a/dev-haskell/mime-types/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Basic mime-type handling types and functions
-	</longdescription>
-	<upstream>
-		<remote-id type="github">yesodweb/wai</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/mime-types/mime-types-0.1.0.3.ebuild b/dev-haskell/mime-types/mime-types-0.1.0.3.ebuild
deleted file mode 100644
index 6d2e51b886f3..000000000000
--- a/dev-haskell/mime-types/mime-types-0.1.0.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Basic mime-type handling types and functions"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/mime-types/mime-types-0.1.0.6.ebuild b/dev-haskell/mime-types/mime-types-0.1.0.6.ebuild
deleted file mode 100644
index 839d388c4a28..000000000000
--- a/dev-haskell/mime-types/mime-types-0.1.0.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Basic mime-type handling types and functions"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/mime-types/mime-types-0.1.0.7.ebuild b/dev-haskell/mime-types/mime-types-0.1.0.7.ebuild
deleted file mode 100644
index 1f1b661454a5..000000000000
--- a/dev-haskell/mime-types/mime-types-0.1.0.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Basic mime-type handling types and functions"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/mime/Manifest b/dev-haskell/mime/Manifest
deleted file mode 100644
index ceca5dd2111a..000000000000
--- a/dev-haskell/mime/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mime-0.4.0.2.tar.gz 9438 BLAKE2B 0aef0b6cb44aac122943654e05238616cd13d0b6431911e55df13634623922ed2bb8616ce09ca18d700ab4cd460f8dbde248b7cbb4f723609f4e50a02ade0af4 SHA512 03fad3792a6935ea5ea75cc9756760277ad005db106cf6aa4f951a23e32d170bcb09dea399d2ace5b4f44afc2c73ec1b377f86b8f70616320490cd690ae4ea15
-EBUILD mime-0.4.0.2.ebuild 564 BLAKE2B 89b27d06799b63d8f89361184be5e2db78a0b91f5e2b0d8c7bb80a1a7ec73a990af22b9d4c65c05155425ce6c5b513b689c92ac9a82d583caa2dd63b47c7d743 SHA512 154e695cfb60c1fc918ebaf2b37174a78ef93d9fc183e221fd26e2ddcde55ba32b08bb6150b05dc61ed8513942184a88ec382b46c6287b14a4727a458c81d2e6
-MISC metadata.xml 394 BLAKE2B 4a9f409701fda2ca25db878cac9ba5167a5d4161dcec92159a0581df2b57b23f4ae521042fd0c172a9c514ae74233ec92413d49f491385b0b5b360cf0edae7a6 SHA512 f764f937055c02b08284a858a5e1229e432ef1f9053618862d7033ae125ee7517dac193cc486ed2b0427c5041f35c9958265a0bcce1c951050a675a0ffdb0120
diff --git a/dev-haskell/mime/metadata.xml b/dev-haskell/mime/metadata.xml
deleted file mode 100644
index 24d6f7a179b0..000000000000
--- a/dev-haskell/mime/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Working with MIME types.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">GaloisInc/mime</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/mime/mime-0.4.0.2.ebuild b/dev-haskell/mime/mime-0.4.0.2.ebuild
deleted file mode 100644
index ea60b42a95b0..000000000000
--- a/dev-haskell/mime/mime-0.4.0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Working with MIME types"
-HOMEPAGE="https://github.com/GaloisInc/mime"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.9:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/minisat-0.1.2 b/dev-haskell/minisat-0.1.2
new file mode 100644
index 000000000000..141186d62d42
--- /dev/null
+++ b/dev-haskell/minisat-0.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-lang/ghc-7.4.1:= sys-devel/gcc[cxx] >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Haskell bundle of the Minisat SAT solver
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/minisat
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/async:=[profile?] >=dev-lang/ghc-7.4.1:= sys-devel/gcc[cxx]
+SLOT=0/0.1.2
+SRC_URI=mirror://hackage/packages/archive/minisat/0.1.2/minisat-0.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=68a2491225ea50e95d41bef48414e0be
diff --git a/dev-haskell/minisat/Manifest b/dev-haskell/minisat/Manifest
deleted file mode 100644
index 176599748ac3..000000000000
--- a/dev-haskell/minisat/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST minisat-0.1.2.tar.gz 45469 BLAKE2B 69a422874c40ec05f97af75ab63d263faafaa4623aa1fe9a40059d2285742ee11ee2fa14aca7ffb8b8503838f0612abea7e8c4b26826dd230abb422fe6c96731 SHA512 557f5f8412adb84784a1edab4981bf5029dea5b0ac731eca2e464f3573ba537c6696613bf494f08cfb7f1b53468f563f758138b60c00edaf046d7ce74f023a85
-EBUILD minisat-0.1.2.ebuild 607 BLAKE2B 45bf93999742f53621adc0ed1a5e7454b677f61b37fa8194b337d68eab214a777f990afd6bf26af3860a33d23573eee247b5c4a855c614808ae9e82fb3fe196a SHA512 1e75626db193cddfd07dc361cb16ae8e3f3e97f702caa79b08b3c2a764ea62ace3137876bee78651ffd569e7db39687ac53ba27b8756d67d4e282b013bb73ce4
-MISC metadata.xml 333 BLAKE2B dcac266d1f83e6cb24cad59bab7d13ceee049dcba5d646a760ed414ea002853776572932e2d5f719b318a38449013d94267d2eb3e871a5cdc83142c03e1682f5 SHA512 64be3fe72ce0fc005326ffa8d7c17f8512d5df3fef8aefb68413cbed051dd21a8271d9d856808b43c894e2b0de99f50f6b3b565dc7f260dc03e86bab23b8ca17
diff --git a/dev-haskell/minisat/metadata.xml b/dev-haskell/minisat/metadata.xml
deleted file mode 100644
index e14761e6d7da..000000000000
--- a/dev-haskell/minisat/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A Haskell bundle of the Minisat SAT solver
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/minisat/minisat-0.1.2.ebuild b/dev-haskell/minisat/minisat-0.1.2.ebuild
deleted file mode 100644
index 7136a0bf9a71..000000000000
--- a/dev-haskell/minisat/minisat-0.1.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Haskell bundle of the Minisat SAT solver"
-HOMEPAGE="http://hackage.haskell.org/package/minisat"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	sys-devel/gcc[cxx]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/missingh-1.2.0.2 b/dev-haskell/missingh-1.2.0.2
new file mode 100644
index 000000000000..5507d0c00d09
--- /dev/null
+++ b/dev-haskell/missingh-1.2.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=dev-haskell/hslogger:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/random:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-lang/ghc-6.12.1:= virtual/libiconv >=dev-haskell/cabal-1.8.0.2 test? ( dev-haskell/quickcheck dev-haskell/testpack ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Large utility library
+EAPI=5
+HOMEPAGE=http://software.complete.org/missingh
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=dev-haskell/hslogger:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/random:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/1.2.0.2
+SRC_URI=mirror://hackage/packages/archive/MissingH/1.2.0.2/MissingH-1.2.0.2.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=89059589712e23a2bb54062a18649a1f
diff --git a/dev-haskell/missingh-1.2.1.0 b/dev-haskell/missingh-1.2.1.0
new file mode 100644
index 000000000000..7d6d02c05fdb
--- /dev/null
+++ b/dev-haskell/missingh-1.2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/hslogger:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/random:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 test? ( dev-haskell/errorcall-eq-instance dev-haskell/quickcheck dev-haskell/testpack ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Large utility library
+EAPI=5
+HOMEPAGE=http://software.complete.org/missingh
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=dev-haskell/hslogger:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/random:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/1.2.1.0
+SRC_URI=mirror://hackage/packages/archive/MissingH/1.2.1.0/MissingH-1.2.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=edadf3bd2f04688afc1c66d1694e85bf
diff --git a/dev-haskell/missingh-1.3.0.1 b/dev-haskell/missingh-1.3.0.1
new file mode 100644
index 000000000000..89de04f24f5b
--- /dev/null
+++ b/dev-haskell/missingh-1.3.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/hslogger:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/random:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/errorcall-eq-instance dev-haskell/quickcheck dev-haskell/testpack ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Large utility library
+EAPI=5
+HOMEPAGE=https://github.com/jgoerzen/missingh/wiki
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=dev-haskell/hslogger:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/random:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.3.0.1
+SRC_URI=mirror://hackage/packages/archive/MissingH/1.3.0.1/MissingH-1.3.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7e71464bb880dfc91f7305db06d77387
diff --git a/dev-haskell/missingh/Manifest b/dev-haskell/missingh/Manifest
deleted file mode 100644
index 15055e7c69d4..000000000000
--- a/dev-haskell/missingh/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX missingh-1.2.0.2-ghc-7.7.patch 1713 BLAKE2B 210d5e03c921e3dd645144b5b82d8dd004aa202ff0b8d6807dedbfe6a1fdfdb141b5804bd7e2c847cedf8458e6324b9c5b9b837e8ed43138eb426b63c098e232 SHA512 a34f0a449a77b4e08e9198c5b58965bfdd3acf2e72fbea2ff8a6b0370254ce6f61cc5d012a2abcf33cba3d884a01b614ff96a69065ada0599fdd7613c100b613
-AUX missingh-1.3.0.1-ghc-8.0.patch 1293 BLAKE2B a7399a61fc8f2ddde96fd323b9193ec160de17b3b549d348a27ea75468f3e18ecc2cdc4ec0fa57f17554824771a3a354cbbde60018dca8cb71d4c522c8521f78 SHA512 7bcf4252f2d102c9aae8717cc5d389aebaaefff7382b7b93d48a54419a2b48d90d7f86d76f31d1f38c1d2ff3bd8e627eaf6c1155c61cd047600930e635ae5ca6
-DIST MissingH-1.2.0.2.tar.gz 115774 BLAKE2B ae1e4db5de9c9559f9687bfed16e52dba3fe782e6ce33e72bb60fe1cd5044cc70b0f839064144711c0f5863786c75ec34b17acd1449a8ca7387a5596185594e2 SHA512 148146468688d855af988874b28ec3e3ebafb99b8168d50734294ecc5400c832826e11c9714727f83381979f8f8a7c6e7bf6479e582e484ec0abcb741d22a0a9
-DIST MissingH-1.2.1.0.tar.gz 116445 BLAKE2B 66d319c3bdb883eb5a8349c6bf98cd119b143fb4180c3f3376f136d2fd398666ef92a47164516a33a7f7fe3a5da5ba41ffe1998b715168c27f0466dd042e09e6 SHA512 54ad72973ef20a2eb6a0e72ae8ff496ee48d359ba491bf094957737e02fce217fb00e950735f8c0b36a7fe48a7322a122e447b0c67e0205e8d1b6450ac4df3e3
-DIST MissingH-1.3.0.1.tar.gz 116812 BLAKE2B f2b17ed9df625558bf05719e490547f4fd605a494922d1b8daf0602fe913346a1e028940e63645de2c786339555b4480bce237f6ae613a2741d0d81acb75ec7c SHA512 e7c6f95d5437d86516f9aba79026b2abdd5131917a09da452623be68b2377067f8f093412c9919ebc904c4e61d43e755282d5bb333596de935c705958111dcf3
-EBUILD missingh-1.2.0.2.ebuild 1331 BLAKE2B 7d927b9a4a4a91db4ec32723a7cdb7174564065a6f0b36e7b8125dedec4cc4eb9a8eac77b2b734245aa03cb6dd6577f730633284759e52610f565cc6741134b1 SHA512 4eef3de5c52ba9b18ee20bf8a1674e840333b350de8c0b68b3077b1f2c8fc981d0abdc56050859a445df9de0145fad01d2d23f6a6225c841e566f30ec5681735
-EBUILD missingh-1.2.1.0.ebuild 951 BLAKE2B 3ed75737d40aa4f2ed750818c42505c36b7ad9a9a596f35fa65f165d93a67fd265364f2d5a7aad2940b334b5fc39f34a914a479953b3b2dc5b3d9f9e1d0eadaa SHA512 248854a1d2b3ade0530451bfe67030a1865cea99cf9f2805df12e68bb8e92e7ffdc146f5797e9236423ac9cc605b6e608801afc0ee72c80e430f5365b3581fe9
-EBUILD missingh-1.3.0.1.ebuild 1051 BLAKE2B e23b1b01f947228ffb572d46058291e2df94308b465037129e03b0c0ee49726b20cf7adddc88902956d7958f7ab1ecb05eb0297270f78dea0ba562ab4a725f5a SHA512 a5fbfca49a219cbb807641e763ec2c49ea9694c8e4651d0145c0db847f0a9664560d8c73ef1b8e611750d8463a9595eb15704f29feb45988e58a27bd46dfc0a7
-MISC metadata.xml 309 BLAKE2B 38a21e309ee9c95cb23ae88096df03c3d4abae37fe26b0ba4539ed254003ac1b1388d7b900ba38f8685133016edb3ea6b41c01b162d6310cc5d386e4e6d76dac SHA512 02afac1cf4005fbf51a79f989e031521fbb4860a96a70dab38f8821e8c7e18f15d54a6f856a93f628cea60f8493b06e3094bebac67a977477e66df0b89b8c8bc
diff --git a/dev-haskell/missingh/files/missingh-1.2.0.2-ghc-7.7.patch b/dev-haskell/missingh/files/missingh-1.2.0.2-ghc-7.7.patch
deleted file mode 100644
index 0b249462fa51..000000000000
--- a/dev-haskell/missingh/files/missingh-1.2.0.2-ghc-7.7.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- MissingH-1.2.0.2-orig/src/System/Cmd/Utils.hs	2013-08-22 00:35:27.000000000 +1000
-+++ MissingH-1.2.0.2/src/System/Cmd/Utils.hs	2013-09-28 01:17:29.697333968 +1000
-@@ -325,7 +325,11 @@
-                 Just (Exited (ExitSuccess)) -> return ()
-                 Just (Exited (ExitFailure fc)) ->
-                     cmdfailed funcname fp args fc
-+#if (__GLASGOW_HASKELL__ >= 707)
-+                Just (Terminated sig _) ->
-+#else
-                 Just (Terminated sig) ->
-+#endif
-                     warnfail fp args $ "Terminated by signal " ++ show sig
-                 Just (Stopped sig) ->
-                     warnfail fp args $ "Stopped by signal " ++ show sig
-@@ -351,7 +355,11 @@
-        case ec of
-             Exited ExitSuccess -> return ()
-             Exited (ExitFailure fc) -> cmdfailed "safeSystem" command args fc
-+#if (__GLASGOW_HASKELL__ >= 707)
-+            Terminated s _ -> cmdsignalled "safeSystem" command args s
-+#else
-             Terminated s -> cmdsignalled "safeSystem" command args s
-+#endif
-             Stopped s -> cmdsignalled "safeSystem" command args s
- #endif
- 
---- MissingH-1.2.0.2-orig/testsrc/Eithertest.hs	2013-08-22 00:35:27.000000000 +1000
-+++ MissingH-1.2.0.2/testsrc/Eithertest.hs	2013-09-28 01:19:32.177332800 +1000
-@@ -6,6 +6,7 @@
- For license and copyright information, see the file LICENSE
- 
- -}
-+{-# LANGUAGE CPP #-}
- 
- module Eithertest(tests) where
- import Test.HUnit
-@@ -13,8 +14,10 @@
- import Test.HUnit.Tools
- import Control.Exception
- 
-+#if (__GLASGOW_HASKELL__ < 707)
- instance Eq ErrorCall where
-     (ErrorCall x) == (ErrorCall y) = x == y
-+#endif
- 
- test_maybeToEither =
-     let f msg inp exp = TestLabel msg $ TestCase $ assertEqual "" exp inp in
diff --git a/dev-haskell/missingh/files/missingh-1.3.0.1-ghc-8.0.patch b/dev-haskell/missingh/files/missingh-1.3.0.1-ghc-8.0.patch
deleted file mode 100644
index ac4563960636..000000000000
--- a/dev-haskell/missingh/files/missingh-1.3.0.1-ghc-8.0.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- MissingH-1.3.0.1-orig/src/Data/BinPacking.hs	2014-10-28 23:46:24.000000000 +1100
-+++ MissingH-1.3.0.1/src/Data/BinPacking.hs	2016-04-20 10:23:16.403505044 +1000
-@@ -69,7 +69,7 @@
- > [(size, obj)] is the sizes and objects
- > result is Either error or results
- -}
--type BinPacker = (Num size, Ord size, Show size, Show obj) => 
-+type BinPacker = forall size obj . (Num size, Ord size, Show size, Show obj) => 
-                   [size]        -- The sizes of bins
-                -> [(size, obj)] -- The sizes and objects
-                -> Either (BinPackerError size obj) [[(size, obj)]] -- Either error or results
---- MissingH-1.3.0.1-orig/src/System/IO/HVFS.hs	2014-10-28 23:46:24.000000000 +1100
-+++ MissingH-1.3.0.1/src/System/IO/HVFS.hs	2016-04-24 18:50:36.893741944 +1000
-@@ -60,7 +60,10 @@
- import System.IO.PlafCompat
- import System.Posix.Types
- import System.Time
--import System.Directory
-+import System.Directory (createDirectory, doesDirectoryExist, doesFileExist,
-+                         getCurrentDirectory, getDirectoryContents, getModificationTime,
-+                         removeDirectory, removeFile, renameDirectory,
-+                         renameFile, setCurrentDirectory)
- 
- #if MIN_VERSION_directory(1,2,0)
- import Data.Time.Clock.POSIX ( utcTimeToPOSIXSeconds )
diff --git a/dev-haskell/missingh/metadata.xml b/dev-haskell/missingh/metadata.xml
deleted file mode 100644
index d3ff43ef4921..000000000000
--- a/dev-haskell/missingh/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">jgoerzen/missingh</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/missingh/missingh-1.2.0.2.ebuild b/dev-haskell/missingh/missingh-1.2.0.2.ebuild
deleted file mode 100644
index 8222382259b9..000000000000
--- a/dev-haskell/missingh/missingh-1.2.0.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit base haskell-cabal
-
-MY_PN="MissingH"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Large utility library"
-HOMEPAGE="http://software.complete.org/missingh"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS=" amd64 x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/hslogger:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/regex-compat:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	virtual/libiconv
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( dev-haskell/quickcheck
-		dev-haskell/testpack )
-"
-
-# libiconv is needed for the trick below to make it compile with ghc-6.12
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}/${PN}-1.2.0.2-ghc-7.7.patch")
-
-src_prepare() {
-	base_src_prepare
-	# (non-ASCII non-UTF-8 source breaks hscolour)
-	cd src/System/Time
-	mv ParseDate.hs ParseDate.hs.ISO-8859-1
-	iconv -f ISO-8859-1 -t UTF-8 -c ParseDate.hs.ISO-8859-1 > ParseDate.hs || die "unable to recode ParseDate.hs to UTF-8"
-}
diff --git a/dev-haskell/missingh/missingh-1.2.1.0.ebuild b/dev-haskell/missingh/missingh-1.2.1.0.ebuild
deleted file mode 100644
index 6040502fb559..000000000000
--- a/dev-haskell/missingh/missingh-1.2.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="MissingH"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Large utility library"
-HOMEPAGE="http://software.complete.org/missingh"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/hslogger:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/regex-compat:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( dev-haskell/errorcall-eq-instance
-		dev-haskell/quickcheck
-		dev-haskell/testpack )
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/missingh/missingh-1.3.0.1.ebuild b/dev-haskell/missingh/missingh-1.3.0.1.ebuild
deleted file mode 100644
index 544776dd24ff..000000000000
--- a/dev-haskell/missingh/missingh-1.3.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="MissingH"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Large utility library"
-HOMEPAGE="https://github.com/jgoerzen/missingh/wiki"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/hslogger:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/regex-compat:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/errorcall-eq-instance
-		dev-haskell/quickcheck
-		dev-haskell/testpack )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.0.1-ghc-8.0.patch"
-}
diff --git a/dev-haskell/mmap-0.5.8 b/dev-haskell/mmap-0.5.8
new file mode 100644
index 000000000000..9bac9c47ab77
--- /dev/null
+++ b/dev-haskell/mmap-0.5.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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=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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=872ef63c9992d385ef3ca6ca112b7cbc
diff --git a/dev-haskell/mmap-0.5.9 b/dev-haskell/mmap-0.5.9
new file mode 100644
index 000000000000..497996568091
--- /dev/null
+++ b/dev-haskell/mmap-0.5.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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=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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cf4269ea0fb5d5d17b7163fc6a7da8f3
diff --git a/dev-haskell/mmap/Manifest b/dev-haskell/mmap/Manifest
deleted file mode 100644
index a49f1ce6d758..000000000000
--- a/dev-haskell/mmap/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST mmap-0.5.8.tar.gz 11657 BLAKE2B 875557d3f28260028368a8979f398f13e501be507ebdb5bc098935c1ef3dff05fc7b7d7abbf29e632f0368e19b952b466ee7f192cb3cf4f4944009fa525ab7d9 SHA512 6c8b526ec9fedba195ce021f86eeb3fa35f7c95b9299d17503ad7d7e91b9485b3d9980e0ccbdc3876ec465ec8aa07cf9d0521c62e2c8a652a36df11b9badffb5
-DIST mmap-0.5.9.tar.gz 11731 BLAKE2B 1a2133f487f9b214c8a4be3aa91a38ee849b40649b77eec8e656fbd99d32c31761d1daeb474a56e9e0611db631a22828ab20171c6522f324e278ace0de0dac2e SHA512 3b9ac1150050ac9d8e7870610923c8303b5fc74a4fdd796d7b6b411e2ba836111ae8520e16ad345aaf93b4dbcd27abd4c359a89b27d854db8dbd252b90a5298d
-EBUILD mmap-0.5.8.ebuild 1154 BLAKE2B a168ed8c3c9567713b6844ec4b106295ad7e55af383c12e4f98bfcbe811537fc59c185cd576ad7b2d0e876e05f00b77ed8c11e525f611bd552bc8b0f609fa751 SHA512 7fad85981cdf441c8110fe9354c974b72634bf01a4de44d76cf507e5e79a1f5381efdfa4bb297704355162bc2bac820eb8b97fb2ca5d7ec741bfa4fb1405890f
-EBUILD mmap-0.5.9.ebuild 1161 BLAKE2B 7b63379bc5bda55de663645222666a926598d7c6699e673f91092f2892a07a4556e978b1f9db4fac1263d0dc766cb88e52606cc47bb323d8424ce4ffaf6bfa68 SHA512 d1051077bca0f907fa3c1b12e900082ba097092ea8da35ccc7181e7e4787fd4925f500ab7c9113e1486a9f2eeaa0c5fe06685ce6443f27daf597f182472da20e
-MISC metadata.xml 569 BLAKE2B 132fd4404bb9c963ca46ab92df1bd4bcff4bd33bb493f079154aaa44d9cce5b8accc3c44dca3605db23f2b92093ec4835dcd085a4f44d748280313e3df6c0409 SHA512 6e13722dae998496bbaafe7f1d9b93e041452d0adb0987ad52ab141923217f06e15430fe873041dfe247ba3d7bee6e4a0c2539e1f623dff4df75935fd8528c80
diff --git a/dev-haskell/mmap/metadata.xml b/dev-haskell/mmap/metadata.xml
deleted file mode 100644
index d6079ee99c4c..000000000000
--- a/dev-haskell/mmap/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library provides a wrapper to mmap(2) or MapViewOfFile,
-		allowing files or devices to be lazily loaded into memory as
-		strict or lazy ByteStrings, ForeignPtrs or plain Ptrs, using
-		the virtual memory subsystem to do on-demand loading.
-		Modifications are also supported.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/mmap/mmap-0.5.8.ebuild b/dev-haskell/mmap/mmap-0.5.8.ebuild
deleted file mode 100644
index d3fd5291728d..000000000000
--- a/dev-haskell/mmap/mmap-0.5.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Memory mapped files for POSIX and Windows"
-HOMEPAGE="http://hackage.haskell.org/package/mmap"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-# IUSE="test"
-IUSE=""
-
-RESTRICT="test" # the test suite compile fails: Not in scope: data constructor `Permissions'
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-#		test? ( dev-haskell/hunit[profile?] )" # pcheck dislikes useless depends
-
-src_configure() {
-	cabal_src_configure # $(cabal_flag test mmaptest)
-}
-
-src_test() {
-	# breaking the abstraction a bit, we're not supposed to know about ./setup
-	# and how it works...
-	./dist/build/mmaptest/mmaptest || die "tests failed"
-}
-
-src_install() {
-	cabal_src_install
-
-	rm "${D}/usr/bin/mmaptest"
-	rmdir "${D}/usr/bin" 2> /dev/null # only if empty
-}
diff --git a/dev-haskell/mmap/mmap-0.5.9.ebuild b/dev-haskell/mmap/mmap-0.5.9.ebuild
deleted file mode 100644
index 07394084092f..000000000000
--- a/dev-haskell/mmap/mmap-0.5.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Memory mapped files for POSIX and Windows"
-HOMEPAGE="http://hackage.haskell.org/package/mmap"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-# IUSE="test"
-IUSE=""
-
-RESTRICT="test" # the test suite compile fails: Not in scope: data constructor `Permissions'
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-#		test? ( dev-haskell/hunit[profile?] )" # pcheck dislikes useless depends
-
-src_configure() {
-	cabal_src_configure # $(cabal_flag test mmaptest)
-}
-
-src_test() {
-	# breaking the abstraction a bit, we're not supposed to know about ./setup
-	# and how it works...
-	./dist/build/mmaptest/mmaptest || die "tests failed"
-}
-
-src_install() {
-	cabal_src_install
-
-	rm "${D}/usr/bin/mmaptest"
-	rmdir "${D}/usr/bin" 2> /dev/null # only if empty
-}
diff --git a/dev-haskell/mmorph-1.0.0 b/dev-haskell/mmorph-1.0.0
new file mode 100644
index 000000000000..009da9b2bcdb
--- /dev/null
+++ b/dev-haskell/mmorph-1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monad morphisms
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/mmorph
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.0.0
+SRC_URI=mirror://hackage/packages/archive/mmorph/1.0.0/mmorph-1.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=77ec6f0c0d46a9e37777ab2ce79ef102
diff --git a/dev-haskell/mmorph-1.0.5 b/dev-haskell/mmorph-1.0.5
new file mode 100644
index 000000000000..177fe53de47a
--- /dev/null
+++ b/dev-haskell/mmorph-1.0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monad morphisms
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/mmorph
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.5
+SRC_URI=mirror://hackage/packages/archive/mmorph/1.0.5/mmorph-1.0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f7842219329a1bc703d2ffc79cff63b6
diff --git a/dev-haskell/mmorph-1.0.6 b/dev-haskell/mmorph-1.0.6
new file mode 100644
index 000000000000..cd61c7735951
--- /dev/null
+++ b/dev-haskell/mmorph-1.0.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monad morphisms
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/mmorph
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.6
+SRC_URI=mirror://hackage/packages/archive/mmorph/1.0.6/mmorph-1.0.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1a9205ace4bfa4fa958dbc2d14e0ab12
diff --git a/dev-haskell/mmorph-1.0.9 b/dev-haskell/mmorph-1.0.9
new file mode 100644
index 000000000000..262a1558a3fa
--- /dev/null
+++ b/dev-haskell/mmorph-1.0.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monad morphisms
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/mmorph
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.0.9
+SRC_URI=mirror://hackage/packages/archive/mmorph/1.0.9/mmorph-1.0.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=72488d69797c071c4c28780efcc739a2
diff --git a/dev-haskell/mmorph/Manifest b/dev-haskell/mmorph/Manifest
deleted file mode 100644
index e78a8bef4969..000000000000
--- a/dev-haskell/mmorph/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST mmorph-1.0.0.tar.gz 4989 BLAKE2B 75b47cb76d19588bc15d5da9e588edc056ae68b3465ae4e315e39593ba8818fe84138ea9ec2e0dbf82f7fc4568d0cb42d393d212cd5d382d9ed7976a43a18f5b SHA512 789e50edb576c8443003926c697bf977e858d9814704ba6279cbe67c179331fbeb8599bd9284caa4b68808acfd8d8053a006442e29b9e56376b1abfe463e7ad4
-DIST mmorph-1.0.5.tar.gz 6100 BLAKE2B ba8a10e10969fc799c3d4dae49eb2478c9c6b41a1f36e0c6ef265b6dc3aee9a101f323b0ed57666ab3626bcfecdace54948dab4b8a60bf054212b66497fbbde0 SHA512 e39d84cdddb7063a3f8528d0053815305079cc199b9cbab76d860f18a9cc40df8738fde603ea7e83fbf01d3227ec27c5898a67bbdf8fc4bf343f1f5c228a5de0
-DIST mmorph-1.0.6.tar.gz 6504 BLAKE2B 2dd92d3010fa39313d4b1ce8009c62fa23cd5470d8dfe877d52df8a3f2b4c551ec97f10d6a68e9b6cad1620cf7a608164c503dc051a496f314cc04348e8cd915 SHA512 d8d4ca5e017f1a94dc8f4ac02f18de8de201264311d5b7debd9ba405b63e25a63fa83385cc287eb07a31b3e00ec02ce75c2d83f6d354f025e87d24eee911da81
-DIST mmorph-1.0.9.tar.gz 6497 BLAKE2B f30af26a16c4a573cef8bd95301b481cf83f12f87c956cbf387541140c3b1b3eb7cb9a876ac040d6e6cb6e3363747e8d3845b780b9dcd1c990e8dee85377bca0 SHA512 7cabf68a886ddc8d4b4d7b5af528bd1c1d7ff957845eeb7a216dd2e79117d2828740199424ff38525ff825b77fdb5363ddc4a3907c6bc3677674e8d0f8b516bb
-EBUILD mmorph-1.0.0.ebuild 623 BLAKE2B 4d7c8425ace8abb13ffc23e68c5d65a7eb017a4cb9a0b65667c8baa664b7512c6f6b446f282e1d1cacf438e8f105fb42d94a6ead8f6a203004d84bd2366f9f3c SHA512 65054f8c9f0b2084a5c5af261c97237c080c72d80a8a9aa878193f49b01dd72a2139974364e3be47c37006ad421d364c774dc3283f8928a75a53a4511bb13967
-EBUILD mmorph-1.0.5.ebuild 622 BLAKE2B b01e3c82b34df61106b9a659364f1d85fbcbf62cdd0ce6ba2c97edbf5c8d80dff4c5b80295b64980b2f9ffc854a0b5b291bffd925ab538e62bc6d65e5fa0d39b SHA512 488019412d3c2a26b02bd5874f1a8eb30f2e8a59f923ba317c7e27227e78f3784d2015b73502c7f44ded8d1ef6aae794fd2b58078c9ccec3627e686771206a87
-EBUILD mmorph-1.0.6.ebuild 790 BLAKE2B 9d3ea32adc7d9256c4c403e61197884f939fb8dfc6f71a1f09df24433e7d00f768714f2573271cfde2b54b6d5bbecee1875e2ba13d68b3c36e500cf07044e1c0 SHA512 c1fab921056e790dbec412e2dc4dedff7b505dd414efdbfdfedfc0d1d6ef7388d91ed1fa8753f595b20ce2357ed3d88ed9e3b1740be4e56ccc21b7cf948b2b8c
-EBUILD mmorph-1.0.9.ebuild 703 BLAKE2B d94eb28aa2a070f70c7f993d3e792d48ef2c6f4ba8b2e1ffacf25cdc8310d1beb2be6be42bced070fb206a101bdf29e4272059b32e20226572921f4ee49929de SHA512 65448464925fe78571dce1b59616f577280eb7ff787313c6cd0ffc9df075e86af12054142d537d55eb8d942632bd68f4a3d9ba837e571ff9d96aa8f22981f0fb
-MISC metadata.xml 402 BLAKE2B f07de9bee342c7809272f9d3014293d11f02c8281c45ff7225114d243e2c082ea6885584ffc073c87e810ce9587c814aef28ea04cac4a4d9f48e6a2fd7d86e84 SHA512 e5025034e24baca4f12cc5b97bcf6b355b5e63a88796c0b0520c8f51b2a1cd5fb0f8f3363e04ecab17fd52989a66f2d7a5691b4c9aa54c32d0af2aa83c5ffc76
diff --git a/dev-haskell/mmorph/metadata.xml b/dev-haskell/mmorph/metadata.xml
deleted file mode 100644
index 07d736c44973..000000000000
--- a/dev-haskell/mmorph/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library provides monad morphism utilities, most commonly used
-		for manipulating monad transformer stacks.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/mmorph/mmorph-1.0.0.ebuild b/dev-haskell/mmorph/mmorph-1.0.0.ebuild
deleted file mode 100644
index 18d06d5b97ee..000000000000
--- a/dev-haskell/mmorph/mmorph-1.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monad morphisms"
-HOMEPAGE="http://hackage.haskell.org/package/mmorph"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2.0.0:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8.0.2"
diff --git a/dev-haskell/mmorph/mmorph-1.0.5.ebuild b/dev-haskell/mmorph/mmorph-1.0.5.ebuild
deleted file mode 100644
index 61d735408e42..000000000000
--- a/dev-haskell/mmorph/mmorph-1.0.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monad morphisms"
-HOMEPAGE="http://hackage.haskell.org/package/mmorph"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/mmorph/mmorph-1.0.6.ebuild b/dev-haskell/mmorph/mmorph-1.0.6.ebuild
deleted file mode 100644
index cfcc7b565ee2..000000000000
--- a/dev-haskell/mmorph/mmorph-1.0.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monad morphisms"
-HOMEPAGE="http://hackage.haskell.org/package/mmorph"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/mmorph/mmorph-1.0.9.ebuild b/dev-haskell/mmorph/mmorph-1.0.9.ebuild
deleted file mode 100644
index 428f2d788eaf..000000000000
--- a/dev-haskell/mmorph/mmorph-1.0.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monad morphisms"
-HOMEPAGE="http://hackage.haskell.org/package/mmorph"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/mockery-0.3.2 b/dev-haskell/mockery-0.3.2
new file mode 100644
index 000000000000..f4e2d0c03860
--- /dev/null
+++ b/dev-haskell/mockery-0.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/logging-facade:=[profile?] dev-haskell/temporary:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Support functions for automated testing
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/mockery
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/logging-facade:=[profile?] dev-haskell/temporary:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.2
+SRC_URI=mirror://hackage/packages/archive/mockery/0.3.2/mockery-0.3.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5b0dcf415db40940f02c36338aff6c05
diff --git a/dev-haskell/mockery-0.3.3 b/dev-haskell/mockery-0.3.3
new file mode 100644
index 000000000000..bf1cdbdbf7c6
--- /dev/null
+++ b/dev-haskell/mockery-0.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/base-compat:=[profile?] dev-haskell/logging-facade:=[profile?] dev-haskell/temporary:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Support functions for automated testing
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/mockery
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/base-compat:=[profile?] dev-haskell/logging-facade:=[profile?] dev-haskell/temporary:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.3
+SRC_URI=mirror://hackage/packages/archive/mockery/0.3.3/mockery-0.3.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fa90fe98954c70a08f162f62285a4824
diff --git a/dev-haskell/mockery/Manifest b/dev-haskell/mockery/Manifest
deleted file mode 100644
index 9e7c3622a523..000000000000
--- a/dev-haskell/mockery/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST mockery-0.3.2.tar.gz 3421 BLAKE2B 3f0a3a8f8dddc1b607e38922048abfa82bf77d1a96945f1ceb795d74c93aec5af6fcc61656c001be9ad99087b8689de8ab0cca7b90a415ce6e2ac8fb044626a4 SHA512 f9b94c205a1fa6c0da93b4859d0e541fdb887470213a1ef3e38468c7d2561803389b3497718936a3b79d20c78708b49d2f8941be4dde95d62ef335752c6f3626
-DIST mockery-0.3.3.tar.gz 3952 BLAKE2B 6bc93493b19e4b2a24c8a6ea4b75503ebc8c435d082f7805feb0f004e65ba7654bc4c12324c4b935272bfed082faa52f8b9a424495c07bf6eb7a813cce5ed5d1 SHA512 090f2a9400c958b6ae89a8ebfceff156da16588ad20e4da1c155db281bc40bbafc0335607ca3ab888d87b0da820cc5a3a1ba8bd7e231ab19d6ff3adf519b6be1
-EBUILD mockery-0.3.2.ebuild 694 BLAKE2B a18adb8ad0192f3fc664940dc1b707490d7faa8c78ce2814cd55a5422b0b2766ca06df8930c5a5f12bd6478a948d998f5e697192627b0ee1e8eaebb95b944e93 SHA512 640780fdfa5da4ea3af01caafc02728e74889de54d1007b918df4f0895483e764ce8512bb1ef76aecaf819149911d377c1127822964c9645b2b81d2c8377378a
-EBUILD mockery-0.3.3.ebuild 731 BLAKE2B 86c13bdefc0a83ebc5962c5d649d309ee8d5bb7baea1796e93ffbf3a65e4e00c9e05b7ae0cf1d42cec721fdb59e6ed8e3659d94b7bb76d5a0234098ed075a15c SHA512 432695874ab43fbc526f5dd86cd44b80cad9d93f1dd5bc0f1fe8f8ee0fe2f0ca8ef75e518a549c257cfac757646c04f467a1fbefbba2880bffcd4995f99e94cf
-MISC metadata.xml 330 BLAKE2B 6872f7c8818f3ff436da2d868f0785a352dc50b5da4e8cca738faf03bb6812c244420d04bdfcc3ff6a380931f990ee2f6ec142c470c6e186121bd7e2db95d0cf SHA512 c9599dc4a60a7e49a19d3aec97808a4838153afbe0c614cbdb7b9d78334c1535465b1f52de538f7e4abecf8518b801f90abd984a42e84a0a011c3546b3e37c23
diff --git a/dev-haskell/mockery/metadata.xml b/dev-haskell/mockery/metadata.xml
deleted file mode 100644
index 30af892f6ecf..000000000000
--- a/dev-haskell/mockery/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Support functions for automated testing
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/mockery/mockery-0.3.2.ebuild b/dev-haskell/mockery/mockery-0.3.2.ebuild
deleted file mode 100644
index ef52c2a3d1ea..000000000000
--- a/dev-haskell/mockery/mockery-0.3.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support functions for automated testing"
-HOMEPAGE="http://hackage.haskell.org/package/mockery"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/logging-facade:=[profile?]
-	dev-haskell/temporary:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
-"
diff --git a/dev-haskell/mockery/mockery-0.3.3.ebuild b/dev-haskell/mockery/mockery-0.3.3.ebuild
deleted file mode 100644
index 2e9b4607b96c..000000000000
--- a/dev-haskell/mockery/mockery-0.3.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support functions for automated testing"
-HOMEPAGE="http://hackage.haskell.org/package/mockery"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/base-compat:=[profile?]
-	dev-haskell/logging-facade:=[profile?]
-	dev-haskell/temporary:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
-"
diff --git a/dev-haskell/monad-control-0.3.2.2 b/dev-haskell/monad-control-0.3.2.2
new file mode 100644
index 000000000000..6bf3b789ffcf
--- /dev/null
+++ b/dev-haskell/monad-control-0.3.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-unicode-symbols-0.1.1:=[profile?] <dev-haskell/base-unicode-symbols-0.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lift control operations, like exception catching, through monad transformers
+EAPI=5
+HOMEPAGE=https://github.com/basvandijk/monad-control
+IUSE=+instancest doc hscolour profile
+KEYWORDS=amd64 x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-unicode-symbols-0.1.1:=[profile?] <dev-haskell/base-unicode-symbols-0.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.3.2.2
+SRC_URI=mirror://hackage/packages/archive/monad-control/0.3.2.2/monad-control-0.3.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9b90bd424479a48a3e84c9d28601b2a8
diff --git a/dev-haskell/monad-control-0.3.3.0 b/dev-haskell/monad-control-0.3.3.0
new file mode 100644
index 000000000000..f260903b122a
--- /dev/null
+++ b/dev-haskell/monad-control-0.3.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-base-0.4.2:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lift control operations, like exception catching, through monad transformers
+EAPI=5
+HOMEPAGE=https://github.com/basvandijk/monad-control
+IUSE=+instancest doc hscolour profile
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-base-0.4.2:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.3.3.0
+SRC_URI=mirror://hackage/packages/archive/monad-control/0.3.3.0/monad-control-0.3.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0c7f04761c4d9dfed462ca4d4e0f8d1c
diff --git a/dev-haskell/monad-control-1.0.0.4 b/dev-haskell/monad-control-1.0.0.4
new file mode 100644
index 000000000000..42b87a22a951
--- /dev/null
+++ b/dev-haskell/monad-control-1.0.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lift control operations, like exception catching, through monad transformers
+EAPI=5
+HOMEPAGE=https://github.com/basvandijk/monad-control
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.0.4
+SRC_URI=mirror://hackage/packages/archive/monad-control/1.0.0.4/monad-control-1.0.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4a61404acbf03bdd15ec89a5d9af45d4
diff --git a/dev-haskell/monad-control-1.0.1.0 b/dev-haskell/monad-control-1.0.1.0
new file mode 100644
index 000000000000..8f3c7f36dc8d
--- /dev/null
+++ b/dev-haskell/monad-control-1.0.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lift control operations, like exception catching, through monad transformers
+EAPI=5
+HOMEPAGE=https://github.com/basvandijk/monad-control
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.1.0
+SRC_URI=mirror://hackage/packages/archive/monad-control/1.0.1.0/monad-control-1.0.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e760442f1fcc94b75c2cf73bae9926fd
diff --git a/dev-haskell/monad-control/Manifest b/dev-haskell/monad-control/Manifest
deleted file mode 100644
index a9dfa492c11b..000000000000
--- a/dev-haskell/monad-control/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST monad-control-0.3.2.2.tar.gz 10684 BLAKE2B 4bb1e101a24f3d1209698dc99d53beaef40109f442d6c2690428cfb96f34a9b19138565974870fb0c24a2deeb4168cb127a9a426879dd829a78269a1071e2e9c SHA512 4ae7959347a83a781bef6275f4880b53d1c67a9ef5d1bc32c3337797bb991df71c4df71206073a12e46a1512e3290d474a03b0c4ae6496316f41f4248c0c8de9
-DIST monad-control-0.3.3.0.tar.gz 10518 BLAKE2B 8ef230a6cf1999c5549cf8a4889933a0f05cc07972ee6e40877435e42fcdfb7487942cf71775dfdf49b00e4461f1a26d52afedc840a8d2c1a3acc3e84b7fa96e SHA512 734ca14baea74f9bd6f3603dc84426bd6d79ae23998ffcce5c8b994dfa8d58b8a573e7b0f68f7eaab07163c8806d8d5f95160f0439cc5fbd07b9509c84e4ef8a
-DIST monad-control-1.0.0.4.tar.gz 10709 BLAKE2B c8c017ddcae0b7e6cc7647fcf0153fa28d525e1262798e2aebdef8ef027090f934636f633788e43d3b66ce822917278c1940e4093612110e2d7944c76c973606 SHA512 98a5448cf01a0310d2c16b648d02ea6643e30271046324d0f1bbea132e9f81a54fe6bb1700877b1ea4c8e291cefac81394bfaec089ea661fcbf4c04c9596bded
-DIST monad-control-1.0.1.0.tar.gz 11115 BLAKE2B f11ebe4f3dd1060ac9a852646c52ecbf15a4c022483ad030a43b4a78f00330545ca89c75f8d2d05652a6f662ed783f53a880c40d19c7740637344c3c3baf1f76 SHA512 f1dde1d46dac0a1aff8525729cc499f6aa7f5b0ddda37d120599b8b1925e653adfb2694aa24cfecd0da8b5dde95ec22fced0ecbb5dd600bc5b0c2b8da656224a
-EBUILD monad-control-0.3.2.2.ebuild 996 BLAKE2B 5a095d57aae3f144168d02ee51b3b2479c90c03d0f4dbb28d8dc55e2e458d3f9ac542260b0b2f3bd33c88388179c5278a1a3369bd2661381b692ffb3ece218a1 SHA512 e1bfa36871af616047520ba96e129b383df0873a933170015f197c30e99cc9642a176021f89ad14ccc4b88f4f2bd5dd6f0c729258e0d765ae3a3e411808b7e40
-EBUILD monad-control-0.3.3.0.ebuild 894 BLAKE2B a5de93a4e72ab331354fabfe9636e944274efb745deeb89dff6b2a074b70a2d88512e0a9aa3cd69d24dd2984368a520b73752eb527e265c1cc5aadbe2db8a323 SHA512 ea6190016c5a5f2bcd625930b303ae4bae66087f0a08357f4524aa6709f4ff3e1041173d3989e62b561f9c382703a469284884528c5e33661af5df16226d25d2
-EBUILD monad-control-1.0.0.4.ebuild 954 BLAKE2B 76d2d777ba0cbfc60a21c3af93c0674c317fdd17550fbbe3a9225068e595af08638d6b5f0693d0d6b2acd748cc05e44ed347b22401a9178dc065b8ed8b0854bd SHA512 313c36d8b20adf7f8b37bf2559e08e41b1bedbc0e36acd2af4db2b69d112fd97390b16aa17577a3ae641629c5691921043af2d9651ccb742853a3a8d46e2435f
-EBUILD monad-control-1.0.1.0.ebuild 952 BLAKE2B ea85b4d1846c221a0cc2e419965d79a04dc0601c4b246240a3344947709f60e72308f88ac56e73d29c283d6f8907179c0d5b14544cda7ced2970f79f238019b9 SHA512 9c3bc34434f7f9052c9071eea7183ed4beff0dd5ff48102898085d113870b0dd56704af10711e0c95ac707a01d675dbe2c21803a6522c66d714395f4f57c3175
-MISC metadata.xml 1773 BLAKE2B c4bfe6f561321644ba050f51897b3034f5fa6220327de82658ebee603965eb420cfb47180f89a512762f91e208da004813032125cfe1478a8b510cef3cb97b60 SHA512 40ad4d1ec82c40f655a3962b48bc53de5e2429102d5cfa2daf435a38e81a17f2e2d1a97b46cb1102ffe9f6c3799c232ffb0f758f0cdbafbab639a3a696dce373
diff --git a/dev-haskell/monad-control/metadata.xml b/dev-haskell/monad-control/metadata.xml
deleted file mode 100644
index 7edd4dbbacf6..000000000000
--- a/dev-haskell/monad-control/metadata.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package defines the type class @MonadControlIO@, a subset of
-		@MonadIO@ into which generic control operations such as @catch@ can
-		be lifted from @IO@.  Instances are based on monad transformers in
-		@MonadTransControl@, which includes all standard monad transformers
-		in the @transformers@ library except @ContT@.  For convenience, it
-		provides a wrapped version of @Control.Exception@ with types
-		generalized from @IO@ to all monads in @MonadControlIO@.
-
-		Note that this package is a rewrite of Anders Kaseorg's @monad-peel@ library.
-		The main difference is that this package provides CPS style
-		operators and exploits the @RankNTypes@ language extension to
-		simplify most definitions.
-
-		The package includes a copy of the @monad-peel@ testsuite written by Anders Kaseorg.
-		The tests can be performed by using @cabal test@.
-
-		The following @critertion@ based benchmark shows that @monad-control@
-		is on average about 2.5 times faster than @monad-peel@:
-
-		&lt;https://github.com/basvandijk/bench-monad-peel-control&gt;
-	</longdescription>
-	<use>
-		<flag name="instancest">
-			If enabled this package will export
-			MonadBaseControl instances for the lazy and strict ST monad. If disabled these
-			instances are only exported when base &gt;= 4.4. If enabled it is required that
-			the transformer-base package exports MonadBase instances for ST. It will do
-			this by default.
-		</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">basvandijk/monad-control</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/monad-control/monad-control-0.3.2.2.ebuild b/dev-haskell/monad-control/monad-control-0.3.2.2.ebuild
deleted file mode 100644
index 219ee3c96c51..000000000000
--- a/dev-haskell/monad-control/monad-control-0.3.2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lift control operations, like exception catching, through monad transformers"
-HOMEPAGE="https://github.com/basvandijk/monad-control"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="+instancest"
-
-RDEPEND=">=dev-haskell/base-unicode-symbols-0.1.1:=[profile?] <dev-haskell/base-unicode-symbols-0.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag instancest instancest)
-}
diff --git a/dev-haskell/monad-control/monad-control-0.3.3.0.ebuild b/dev-haskell/monad-control/monad-control-0.3.3.0.ebuild
deleted file mode 100644
index f761fa4be7c1..000000000000
--- a/dev-haskell/monad-control/monad-control-0.3.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lift control operations, like exception catching, through monad transformers"
-HOMEPAGE="https://github.com/basvandijk/monad-control"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+instancest"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-base-0.4.2:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag instancest instancest)
-}
diff --git a/dev-haskell/monad-control/monad-control-1.0.0.4.ebuild b/dev-haskell/monad-control/monad-control-1.0.0.4.ebuild
deleted file mode 100644
index 9dd12739600e..000000000000
--- a/dev-haskell/monad-control/monad-control-1.0.0.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lift control operations, like exception catching, through monad transformers"
-HOMEPAGE="https://github.com/basvandijk/monad-control"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/monad-control/monad-control-1.0.1.0.ebuild b/dev-haskell/monad-control/monad-control-1.0.1.0.ebuild
deleted file mode 100644
index 7552b509f020..000000000000
--- a/dev-haskell/monad-control/monad-control-1.0.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lift control operations, like exception catching, through monad transformers"
-HOMEPAGE="https://github.com/basvandijk/monad-control"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/monad-journal-0.7.1 b/dev-haskell/monad-journal-0.7.1
new file mode 100644
index 000000000000..b69e03aa8cbc
--- /dev/null
+++ b/dev-haskell/monad-journal-0.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/either-4.1:=[profile?] <dev-haskell/either-4.5:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pure logger typeclass and monad transformer
+EAPI=5
+HOMEPAGE=https://github.com/phaazon/monad-journal
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/either-4.1:=[profile?] <dev-haskell/either-4.5:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.1
+SRC_URI=mirror://hackage/packages/archive/monad-journal/0.7.1/monad-journal-0.7.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1b1718f7891db19c568c0859e02bdfed
diff --git a/dev-haskell/monad-journal-0.7.2 b/dev-haskell/monad-journal-0.7.2
new file mode 100644
index 000000000000..da7edaf81dde
--- /dev/null
+++ b/dev-haskell/monad-journal-0.7.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/either-4.1:=[profile?] <dev-haskell/either-4.5:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pure logger typeclass and monad transformer
+EAPI=6
+HOMEPAGE=https://github.com/phaazon/monad-journal
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/either-4.1:=[profile?] <dev-haskell/either-4.5:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.2
+SRC_URI=mirror://hackage/packages/archive/monad-journal/0.7.2/monad-journal-0.7.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f10c1b8af35d19f4f17b7ded27eefea5
diff --git a/dev-haskell/monad-journal/Manifest b/dev-haskell/monad-journal/Manifest
deleted file mode 100644
index aaf74aca2068..000000000000
--- a/dev-haskell/monad-journal/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST monad-journal-0.7.1.tar.gz 4582 BLAKE2B c1fc8f48cd961491676a418434879bb4e99218cbc400b6673c86756617a66281774bee11b77cd6545aa3187827696708b27479c2a77885ab384f2c64ef6a132b SHA512 5a19f49d05aa00e558b1a945c2064342bc265d8579767903d0080a5c8bc39ced8b871922d2e4b50dbbcc73d431b4784b1ec66ee1a53df97898eaf6c8ed23d7ab
-DIST monad-journal-0.7.2.tar.gz 4568 BLAKE2B d9a265d972c298ed2c8490b0c6508df8e51b9fe3b7daf585543ec5344cc29495bcfb95acb8ca264a6f4e4af91813f34162d57586792f965e751b4ebf3447ee5f SHA512 13ffe40a991d3862b14fca1d7fe7202eb70d0c13a2e3d1adff4aec68afab7ce44607ece28297a32f04e12620c2d414e0924aa8068ee9485d431885ce7effe8c9
-EBUILD monad-journal-0.7.1.ebuild 968 BLAKE2B b3193f7ecc381d75e1ba288605da7afff1bd715a3581522dc389cb914a105aaf17916ada12399cb41508ee37db3060dcd778d5217cc7297c6bff71706655cc27 SHA512 f6d83757ed27112e6ff0d8f75c336f2c1e8afe917135254ed4c1ca17dd325395e2203fad3a26d90ae1329a11392a6b78a4e94bc18dac74560708b0c1df5b5b6a
-EBUILD monad-journal-0.7.2.ebuild 966 BLAKE2B bf520a560a59502f682b99569df0337453cd6c1172ffd542c137fe6bbdfd2be478d7edc47a372b3f05bec8f143d672ea7651b445a800802fd341d68deb5ac8db SHA512 0edf54656c5c8cf00f620898607837fc6e2f4efed00621d64e72717fbca661dff493c8e0fbd055af4e08a7076bd978cc3b97cb954a3c3500474f14effbd2d23d
-MISC metadata.xml 636 BLAKE2B a000e14ce700d4925d8481553f77867dc093c28be7c58d259d9a11e758642b942e6ea3b844c3311c25b80f5ca7927430f9795f016affabd678aa421c4f801d08 SHA512 9592deaa42eea5193bb07937c00fe792197d62329571cff763af6c2716c2f7125aa7bd65358143801ef39b83c4d6b98ecbdd0b5172f2e80906a32e0403370271
diff --git a/dev-haskell/monad-journal/metadata.xml b/dev-haskell/monad-journal/metadata.xml
deleted file mode 100644
index a393bafd2d26..000000000000
--- a/dev-haskell/monad-journal/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides a typeclass for logging in
-		pure code, or more generally, in any kind of
-		context. You can do whatever you want with
-		logs, especially get them, clear them or even
-		sink them through `IO` if you're logging in
-		`(MonadIO m) =&gt; m`.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">phaazon/monad-journal</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/monad-journal/monad-journal-0.7.1.ebuild b/dev-haskell/monad-journal/monad-journal-0.7.1.ebuild
deleted file mode 100644
index 0957f2b6f7a8..000000000000
--- a/dev-haskell/monad-journal/monad-journal-0.7.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pure logger typeclass and monad transformer"
-HOMEPAGE="https://github.com/phaazon/monad-journal"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/either-4.1:=[profile?] <dev-haskell/either-4.5:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/monad-journal/monad-journal-0.7.2.ebuild b/dev-haskell/monad-journal/monad-journal-0.7.2.ebuild
deleted file mode 100644
index 01e0c55c8830..000000000000
--- a/dev-haskell/monad-journal/monad-journal-0.7.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pure logger typeclass and monad transformer"
-HOMEPAGE="https://github.com/phaazon/monad-journal"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/either-4.1:=[profile?] <dev-haskell/either-4.5:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/monad-logger-0.3.17 b/dev-haskell/monad-logger-0.3.17
new file mode 100644
index 000000000000..12981bddd793
--- /dev/null
+++ b/dev-haskell/monad-logger-0.3.17
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/blaze-builder:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.0:=[profile?] <dev-haskell/conduit-extra-1.3:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/fast-logger-2.0:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?] dev-haskell/lifted-base:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/monad-loops:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-0.4:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/stm-chans:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A class of monads which can log messages
+EAPI=5
+HOMEPAGE=https://github.com/kazu-yamamoto/logger
+IUSE=+template_haskell doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/blaze-builder:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.0:=[profile?] <dev-haskell/conduit-extra-1.3:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/fast-logger-2.0:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?] dev-haskell/lifted-base:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/monad-loops:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-0.4:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/stm-chans:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.17
+SRC_URI=mirror://hackage/packages/archive/monad-logger/0.3.17/monad-logger-0.3.17.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a17456b8b0b17611e2f34bab51ade1d4
diff --git a/dev-haskell/monad-logger-0.3.18 b/dev-haskell/monad-logger-0.3.18
new file mode 100644
index 000000000000..421efa0332bd
--- /dev/null
+++ b/dev-haskell/monad-logger-0.3.18
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/blaze-builder:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.0:=[profile?] <dev-haskell/conduit-extra-1.3:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/fast-logger-2.0:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?] dev-haskell/lifted-base:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/monad-loops:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-0.4:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/stm-chans:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A class of monads which can log messages
+EAPI=5
+HOMEPAGE=https://github.com/kazu-yamamoto/logger
+IUSE=+template_haskell doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/blaze-builder:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.0:=[profile?] <dev-haskell/conduit-extra-1.3:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/fast-logger-2.0:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?] dev-haskell/lifted-base:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/monad-loops:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-0.4:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/stm-chans:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.18
+SRC_URI=mirror://hackage/packages/archive/monad-logger/0.3.18/monad-logger-0.3.18.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a17456b8b0b17611e2f34bab51ade1d4
diff --git a/dev-haskell/monad-logger-0.3.20.1 b/dev-haskell/monad-logger-0.3.20.1
new file mode 100644
index 000000000000..664bc6377b62
--- /dev/null
+++ b/dev-haskell/monad-logger-0.3.20.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/blaze-builder:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.0:=[profile?] <dev-haskell/conduit-extra-1.3:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/fast-logger-2.0:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?] dev-haskell/lifted-base:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/monad-loops:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-0.4:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/stm-chans:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A class of monads which can log messages
+EAPI=6
+HOMEPAGE=https://github.com/kazu-yamamoto/logger
+IUSE=+template_haskell doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/blaze-builder:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.0:=[profile?] <dev-haskell/conduit-extra-1.3:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/fast-logger-2.0:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?] dev-haskell/lifted-base:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/monad-loops:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-0.4:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/stm-chans:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.3.20.1
+SRC_URI=mirror://hackage/packages/archive/monad-logger/0.3.20.1/monad-logger-0.3.20.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=171591aeff786497c2716af334dd99c4
diff --git a/dev-haskell/monad-logger/Manifest b/dev-haskell/monad-logger/Manifest
deleted file mode 100644
index dc73cb95917d..000000000000
--- a/dev-haskell/monad-logger/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST monad-logger-0.3.17.tar.gz 7871 BLAKE2B aaed5e4267d1b851bd632fae3627e2e43fdda8306c9dfc062c2cbd684b4964714c1128a378b53be2e04252c0344eed52d571f6bd297deff2be5d4b334b14ab69 SHA512 7905a9cec560e3fbe617e28d9a006d744ae6662a23c4f19807a11c0ca409cf4cf994175d528f000af53804b14ed1beceb8e4c7c4dd9b1a480d506e9455a6e6e0
-DIST monad-logger-0.3.18.tar.gz 8094 BLAKE2B 5c5025e936012773b2c6721af2ec8c81c16f23ece9a817f93425e31ed50d064db36a2917cdb49aefbc30bd14a4571da9e29d0ecbd04b6109d4c0d148ec84675e SHA512 30b309b441a3be81e209e7aabc9cf712d7a436e89833c84d74ae9b1011bb55bab77e728882670ef6877c32657b30b65c09997867ad0318fc4dced8751db90e9c
-DIST monad-logger-0.3.20.1.tar.gz 9034 BLAKE2B fda6ecb84b8df5f969c2c36daae32b36db36bf0365d28d3942de71da77f6ceb76fe9342f9e430c35d74f40cbccd713bc8e04c8e0bf4ce36289192998421ddb60 SHA512 f8d70d2620e5f24e283c484215ae1ef3ef7db854ba65b0e16938ab4589d0600543b1f06934e98ba374982433bb831613882280645cea5076f9a9da7bf6426faa
-EBUILD monad-logger-0.3.17.ebuild 1441 BLAKE2B 3ac1e6fa662bf3f784b0be86d47133e4db26d775008b9c625780745263bd085f972975abcaa16b5c4f7a152b56721404c71c91c726835aa6122681ce1d6a3b76 SHA512 b893682d1cc99f3282d861643cf787da5586d9f049baa6247a3b9d7ea2cf2cdf551f0b01786851d79c2fc2fa620d992dcdc73dd4e04c58fe22651a9db183a875
-EBUILD monad-logger-0.3.18.ebuild 1441 BLAKE2B 3ac1e6fa662bf3f784b0be86d47133e4db26d775008b9c625780745263bd085f972975abcaa16b5c4f7a152b56721404c71c91c726835aa6122681ce1d6a3b76 SHA512 b893682d1cc99f3282d861643cf787da5586d9f049baa6247a3b9d7ea2cf2cdf551f0b01786851d79c2fc2fa620d992dcdc73dd4e04c58fe22651a9db183a875
-EBUILD monad-logger-0.3.20.1.ebuild 1406 BLAKE2B 45856337c365331856df5d0d3ae6108eb748cfd61e46be0f5f9747be76bd5c8fc60e12fc365ceefd7a4a836f29b244225bab294b4dc4d4cdbfb1b4fd057849d6 SHA512 e85e57acd13741f87d5cf9c3ca45424a57068ca3a2e65d217d2f26f79cc8e80a96d6776dbe78d20e6dfa5045ad4bcf0cf2a387360bc368edfa476592d7857f2e
-MISC metadata.xml 548 BLAKE2B 113c5adc9210f407ed5df6e2fcdcf837b8806f59771e76339f79f5870f6c263fce02c5c6f937ba83afd7f8c110c79f4a985ff9739d7dac3f96d8a2131cdb4205 SHA512 1ac42af345000d406d48f3209554f4c45261a9844b79437c66dee0238df5e208316cdadb01235e2286a77b839cbe5e5eb66532f3e1fa667151cb7e39d2e9727f
diff --git a/dev-haskell/monad-logger/metadata.xml b/dev-haskell/monad-logger/metadata.xml
deleted file mode 100644
index b83f7e64803f..000000000000
--- a/dev-haskell/monad-logger/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="template_haskell">Enable Template Haskell support.</flag>
-	</use>
-	<longdescription>
-		This package uses template-haskell for determining source code locations of messages.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">kazu-yamamoto/logger</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/monad-logger/monad-logger-0.3.17.ebuild b/dev-haskell/monad-logger/monad-logger-0.3.17.ebuild
deleted file mode 100644
index ae088f8898f8..000000000000
--- a/dev-haskell/monad-logger/monad-logger-0.3.17.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A class of monads which can log messages"
-HOMEPAGE="https://github.com/kazu-yamamoto/logger"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+template_haskell"
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.0:=[profile?] <dev-haskell/conduit-extra-1.3:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	>=dev-haskell/fast-logger-2.0:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?]
-	dev-haskell/lifted-base:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/monad-loops:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-0.4:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/stm:=[profile?]
-	dev-haskell/stm-chans:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag template_haskell template_haskell)
-}
diff --git a/dev-haskell/monad-logger/monad-logger-0.3.18.ebuild b/dev-haskell/monad-logger/monad-logger-0.3.18.ebuild
deleted file mode 100644
index ae088f8898f8..000000000000
--- a/dev-haskell/monad-logger/monad-logger-0.3.18.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A class of monads which can log messages"
-HOMEPAGE="https://github.com/kazu-yamamoto/logger"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+template_haskell"
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.0:=[profile?] <dev-haskell/conduit-extra-1.3:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	>=dev-haskell/fast-logger-2.0:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?]
-	dev-haskell/lifted-base:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/monad-loops:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-0.4:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/stm:=[profile?]
-	dev-haskell/stm-chans:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag template_haskell template_haskell)
-}
diff --git a/dev-haskell/monad-logger/monad-logger-0.3.20.1.ebuild b/dev-haskell/monad-logger/monad-logger-0.3.20.1.ebuild
deleted file mode 100644
index 42ee80ded7b9..000000000000
--- a/dev-haskell/monad-logger/monad-logger-0.3.20.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A class of monads which can log messages"
-HOMEPAGE="https://github.com/kazu-yamamoto/logger"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+template_haskell"
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.0:=[profile?] <dev-haskell/conduit-extra-1.3:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	>=dev-haskell/fast-logger-2.0:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?]
-	dev-haskell/lifted-base:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/monad-loops:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-0.4:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/stm:=[profile?]
-	dev-haskell/stm-chans:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag template_haskell template_haskell)
-}
diff --git a/dev-haskell/monad-loops-0.4.3 b/dev-haskell/monad-loops-0.4.3
new file mode 100644
index 000000000000..44f1073008c3
--- /dev/null
+++ b/dev-haskell/monad-loops-0.4.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/tasty dev-haskell/tasty-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monadic loops
+EAPI=5
+HOMEPAGE=https://github.com/mokus0/monad-loops
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.3
+SRC_URI=mirror://hackage/packages/archive/monad-loops/0.4.3/monad-loops-0.4.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9c04b4b5b342d182a6cf4dd7e568006d
diff --git a/dev-haskell/monad-loops/Manifest b/dev-haskell/monad-loops/Manifest
deleted file mode 100644
index 3f4681909a6e..000000000000
--- a/dev-haskell/monad-loops/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST monad-loops-0.4.3.tar.gz 4996 BLAKE2B cbe025073cdf7ce193854de927ff34981709a206ee1061cd0dbf26b09a533fe5c3da961e9c5c77ec63bca9963eb4104399eb5d38eaef416df13138a4372dc562 SHA512 41a1314777661a411acf62dfa25cbb1a59fedd5d60d1a2b8566a3dd64dec361ab1fe35827320529a723a612e0443571ce38b17fa900eb8d5289bc52f653d47a5
-EBUILD monad-loops-0.4.3.ebuild 598 BLAKE2B 80331fdbe160c97b034644c461dcb64cd41865640cd0e14573b156c36dd6c92ea326040f2f54ff61d5fd4b981f8cd786891e64c968a0c1cd3c9d99cad48f1a21 SHA512 865444f59419a4afe0cbc308c5a0762217d36d1eaae11d05471118672617a5dcb04ab4ae412f6e6c705f5b40b8e51d334944f2e0925254d0d6831bb2c40e4420
-MISC metadata.xml 569 BLAKE2B 9a474ceee93931a469d0331c18c69c11d9ae4eba19a827c60c797c95521bcd8222909db352ba6ede8cc400c79375850a63f1afe4e60534a80e5f199c357bcb80 SHA512 57118fc45a4f8448e8943bc3b59b18c2b00e9f31297623a764ca88e715c6d6c273bdc953fa541747302fa4f2c24f96d62ae17f07b238df7e14a36d95f4cfbe4c
diff --git a/dev-haskell/monad-loops/metadata.xml b/dev-haskell/monad-loops/metadata.xml
deleted file mode 100644
index c766ee1f8714..000000000000
--- a/dev-haskell/monad-loops/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Some useful control operators for looping.
-		
-		New in 0.3.2.0: various functions for traversing lists and
-		computing minima/maxima using arbitrary procedures to compare
-		or score the elements.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">mokus0/monad-loops</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/monad-loops/monad-loops-0.4.3.ebuild b/dev-haskell/monad-loops/monad-loops-0.4.3.ebuild
deleted file mode 100644
index 7325375be662..000000000000
--- a/dev-haskell/monad-loops/monad-loops-0.4.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Monadic loops"
-HOMEPAGE="https://github.com/mokus0/monad-loops"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/monad-par-0.3.4.7 b/dev-haskell/monad-par-0.3.4.7
new file mode 100644
index 000000000000..7522082a146e
--- /dev/null
+++ b/dev-haskell/monad-par-0.3.4.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/abstract-deque-0.1.4:=[profile?] dev-haskell/abstract-par:=[profile?] >=dev-haskell/monad-par-extras-0.3:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] >=dev-haskell/mwc-random-0.11:=[profile?] >=dev-haskell/parallel-3.1:=[profile?] >=dev-lang/ghc-7.4.1:= chaselev? ( dev-haskell/chaselev-deque:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.3 dev-haskell/test-framework-th ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A library for parallel programming based on a monad
+EAPI=5
+HOMEPAGE=https://github.com/simonmar/monad-par
+IUSE=chaselev doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/abstract-deque-0.1.4:=[profile?] dev-haskell/abstract-par:=[profile?] >=dev-haskell/monad-par-extras-0.3:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] >=dev-haskell/mwc-random-0.11:=[profile?] >=dev-haskell/parallel-3.1:=[profile?] >=dev-lang/ghc-7.4.1:= chaselev? ( dev-haskell/chaselev-deque:=[profile?] )
+SLOT=0/0.3.4.7
+SRC_URI=mirror://hackage/packages/archive/monad-par/0.3.4.7/monad-par-0.3.4.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=03932e440e457bd84ab71a12e9d90aa0
diff --git a/dev-haskell/monad-par-0.3.4.8 b/dev-haskell/monad-par-0.3.4.8
new file mode 100644
index 000000000000..d00ac9c43d2f
--- /dev/null
+++ b/dev-haskell/monad-par-0.3.4.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/abstract-deque-0.1.4:=[profile?] dev-haskell/abstract-par:=[profile?] >=dev-haskell/monad-par-extras-0.3:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] >=dev-haskell/mwc-random-0.11:=[profile?] >=dev-haskell/parallel-3.1:=[profile?] >=dev-lang/ghc-7.4.1:= chaselev? ( dev-haskell/chaselev-deque:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.3 dev-haskell/test-framework-th ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A library for parallel programming based on a monad
+EAPI=6
+HOMEPAGE=https://github.com/simonmar/monad-par
+IUSE=chaselev doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/abstract-deque-0.1.4:=[profile?] dev-haskell/abstract-par:=[profile?] >=dev-haskell/monad-par-extras-0.3:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] >=dev-haskell/mwc-random-0.11:=[profile?] >=dev-haskell/parallel-3.1:=[profile?] >=dev-lang/ghc-7.4.1:= chaselev? ( dev-haskell/chaselev-deque:=[profile?] )
+SLOT=0/0.3.4.8
+SRC_URI=mirror://hackage/packages/archive/monad-par/0.3.4.8/monad-par-0.3.4.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bd2fd3524805be0afc6a329d9154dfaa
diff --git a/dev-haskell/monad-par-extras-0.3.3 b/dev-haskell/monad-par-extras-0.3.3
new file mode 100644
index 000000000000..b37677d8b177
--- /dev/null
+++ b/dev-haskell/monad-par-extras-0.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND==dev-haskell/abstract-par-0.3*:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Combinators and extra features for Par monads
+EAPI=5
+HOMEPAGE=https://github.com/simonmar/monad-par
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND==dev-haskell/abstract-par-0.3*:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.3.3
+SRC_URI=mirror://hackage/packages/archive/monad-par-extras/0.3.3/monad-par-extras-0.3.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d0e3082571b620880d2b928aaca3cb52
diff --git a/dev-haskell/monad-par-extras/Manifest b/dev-haskell/monad-par-extras/Manifest
deleted file mode 100644
index 7b685739ce08..000000000000
--- a/dev-haskell/monad-par-extras/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST monad-par-extras-0.3.3.tar.gz 9146 BLAKE2B 44c0bcb007086fb478d287e3ae53a7aab0d30a7b1769e5b553634fb9bdc043917c80f6889fd79d37447afe5210ea54d226b8b5b9272c09a3134c007525ad9730 SHA512 89811cbdb6ab6654f31a8c327b4d0299c27938b226e0e12b0917393b610d02ea5a62182bff513cdfd19c21165658f0f1ef1ea00bdae114fd84d524051dca4fe0
-EBUILD monad-par-extras-0.3.3.ebuild 758 BLAKE2B 68cfbd353862077d86fa1ad4f2137104cd24d4d6740be7a31913300429da9cb170c6431f75b05332386119181c32a76c73cab423ab9d32e54f94e7ba584c908d SHA512 46a8188d8800d86683f30fd8071329a4b6d7ab2a2883a200412ec84010f8b91dd261dde82b210240594de6b2c7518a505d3525c01e15e2082ab45411c7e80e06
-MISC metadata.xml 536 BLAKE2B 7f68693e099d7525470ef9afd38b483b2156733d8cb1aa6ad8164d0730a53b1a2d8566d9a70cbbadf584c9ff3a4fa6e23448476f123388b78f3dceeb7aae2ebc SHA512 b7e59189264ff5e0c04e14be9a48f9a8217b2fc8f466ffd57f29a772319dfe55cac17a1a487ea0dd1bf7778102c6ee9b59ff7c7ce445e1d42b161d8cb15993a1
diff --git a/dev-haskell/monad-par-extras/metadata.xml b/dev-haskell/monad-par-extras/metadata.xml
deleted file mode 100644
index 75de66f9460a..000000000000
--- a/dev-haskell/monad-par-extras/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The modules below provide additional
-		data structures, and other added capabilities
-		layered on top of the 'Par' monad.
-		* Finish These
-		* Module Descriptions
-	</longdescription>
-	<upstream>
-		<remote-id type="github">simonmar/monad-par</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/monad-par-extras/monad-par-extras-0.3.3.ebuild b/dev-haskell/monad-par-extras/monad-par-extras-0.3.3.ebuild
deleted file mode 100644
index dde2ecd7d8ff..000000000000
--- a/dev-haskell/monad-par-extras/monad-par-extras-0.3.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Combinators and extra features for Par monads"
-HOMEPAGE="https://github.com/simonmar/monad-par"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/abstract-par-0.3*:=[profile?]
-		>=dev-haskell/cereal-0.3:=[profile?]
-		>=dev-haskell/mtl-2.0:=[profile?]
-		>=dev-haskell/random-1.0:=[profile?]
-		>=dev-haskell/transformers-0.2:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/monad-par/Manifest b/dev-haskell/monad-par/Manifest
deleted file mode 100644
index 2a2d4aab9a04..000000000000
--- a/dev-haskell/monad-par/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST monad-par-0.3.4.7.tar.gz 30411 BLAKE2B b7ed0e6e10c992fb3c2cb75813f180b6124215902aa5decd66d96ada7fc14623a3a1b2c4cfe9cf863087643091ebe24da3099e4f4652a4d1fce17f5cd71eb2f0 SHA512 eb9bd155589e9e7aea51e8b79f7fca20cfc8ac0dabf9c475fbbb312139311d567e1f19779247fd331c8242c93c9cefc1d52fca599c6444f90194d2a193182772
-DIST monad-par-0.3.4.8.tar.gz 30583 BLAKE2B c0d31959d7f1b50eb763810e4199b2a7a27b8ca202f078d23b6ae5c62f94cadbf5f7169959e577d59d0bb85cfe450af06e71b85410573ec50f37d9c36b458411 SHA512 6d2f6f571a3eef804e69ca892cf865bb169863d4fa97cad94cfb740925861b827fef14595c2edf235a8a60babdb854eecb87ff09bb798a6912edb7c3c6fe7027
-EBUILD monad-par-0.3.4.7.ebuild 1225 BLAKE2B 426470c1ac5b4cda0fae6a9015caf74e54166314676e6e42aa07eec0657076a37cdd40fb089ffca8fa86db6d87b0774e4e11d135c946c0f912185d8bdb84c84f SHA512 6f7f939f637c7a907b4d012fa6ba1adf09bda4728cb5fb500a20525f4e03d088ba9ae12b14b1a134692fafbdd0a668ffb698c435fba4258813ebd34677cfc2f6
-EBUILD monad-par-0.3.4.8.ebuild 1223 BLAKE2B dfefddc149a4743cd5ad8826fbf9a03632011a98e939d848c99cbb1c1ae4232b636848e248581b8e6c9e33ace0b2e2755f5974357c06624471f111ba0b7bdeea SHA512 eefa9555182a83955e1a77583c51326d365bb2d628f2faa3a8e8276786672ed0845139c0a8c62a1519db3c2ee34c954291674c697a6379091a9537e11a1d60be
-MISC metadata.xml 1071 BLAKE2B bd9d53b00250f7af1fdb89c4853a3f06c09be12014bc887bbfb5d5d24984b992765b109833f350664bca345d16b7a1295c5f44513e11f86aaf5f28abb88a17ae SHA512 45e21f883fd57087d030acd80b6ef45538cc357f9b1572c2cfc080330e8a6a59226af9c3e8bd40a7a5ca3839aa427b03e5d7df88fdbd75daf928379531d88729
diff --git a/dev-haskell/monad-par/metadata.xml b/dev-haskell/monad-par/metadata.xml
deleted file mode 100644
index 42da13462ec1..000000000000
--- a/dev-haskell/monad-par/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library offers an alternative parallel programming
-		API to that provided by the @parallel@ package.
-		The 'Par' monad allows the simple description of
-		parallel computations, and can be used to add
-		parallelism to pure Haskell code.  The basic API
-		is straightforward: the monad supports forking
-		and simple communication in terms of 'IVar's.
-		The library comes with an efficient work-stealing
-		implementation, but the internals are also
-		exposed so that you can build your own scheduler
-		if necessary.
-		Examples of use can be found in the examples/ directory
-		of the source package.
-	</longdescription>
-	<use>
-		<flag name="chaselev">Use Chase-Lev Deques for higher-perf work-stealing.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">simonmar/monad-par</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/monad-par/monad-par-0.3.4.7.ebuild b/dev-haskell/monad-par/monad-par-0.3.4.7.ebuild
deleted file mode 100644
index 5f493ba60cc4..000000000000
--- a/dev-haskell/monad-par/monad-par-0.3.4.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -newgeneric
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A library for parallel programming based on a monad"
-HOMEPAGE="https://github.com/simonmar/monad-par"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="chaselev"
-
-RDEPEND=">=dev-haskell/abstract-deque-0.1.4:=[profile?]
-	dev-haskell/abstract-par:=[profile?]
-	>=dev-haskell/monad-par-extras-0.3:=[profile?]
-	>=dev-haskell/mtl-2.0.1.0:=[profile?]
-	>=dev-haskell/mwc-random-0.11:=[profile?]
-	>=dev-haskell/parallel-3.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	chaselev? ( dev-haskell/chaselev-deque:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.3
-		dev-haskell/test-framework-th )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag chaselev chaselev) \
-		--flag=-newgeneric
-}
diff --git a/dev-haskell/monad-par/monad-par-0.3.4.8.ebuild b/dev-haskell/monad-par/monad-par-0.3.4.8.ebuild
deleted file mode 100644
index 0ba679fe4206..000000000000
--- a/dev-haskell/monad-par/monad-par-0.3.4.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -newgeneric
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A library for parallel programming based on a monad"
-HOMEPAGE="https://github.com/simonmar/monad-par"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="chaselev"
-
-RDEPEND=">=dev-haskell/abstract-deque-0.1.4:=[profile?]
-	dev-haskell/abstract-par:=[profile?]
-	>=dev-haskell/monad-par-extras-0.3:=[profile?]
-	>=dev-haskell/mtl-2.0.1.0:=[profile?]
-	>=dev-haskell/mwc-random-0.11:=[profile?]
-	>=dev-haskell/parallel-3.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	chaselev? ( dev-haskell/chaselev-deque:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.3
-		dev-haskell/test-framework-th )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag chaselev chaselev) \
-		--flag=-newgeneric
-}
diff --git a/dev-haskell/monad-unlift-0.2.0 b/dev-haskell/monad-unlift-0.2.0
new file mode 100644
index 000000000000..02b95ea2cdbe
--- /dev/null
+++ b/dev-haskell/monad-unlift-0.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/constraints:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Typeclasses for representing monad transformer unlifting
+EAPI=6
+HOMEPAGE=https://github.com/fpco/monad-unlift
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/constraints:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/0.2.0
+SRC_URI=mirror://hackage/packages/archive/monad-unlift/0.2.0/monad-unlift-0.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ff2902d61f54e667196277598f887ec2
diff --git a/dev-haskell/monad-unlift/Manifest b/dev-haskell/monad-unlift/Manifest
deleted file mode 100644
index 97f9b76356a6..000000000000
--- a/dev-haskell/monad-unlift/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST monad-unlift-0.2.0.tar.gz 5845 BLAKE2B a5677a6356678b5bf508d4b06552d452c7d396bf48d9fa37969bdc50da91f0c1f0caacd294e01c1046a3b3930216263cfb7ba8a163d6a2299e843f8555828889 SHA512 4b9db8679532e89c05c63328603bc7e72131b79d31e35225e8655ddc4d32e761de58c6db70bfdde2c148f105daa57ff08976cb79bddbdc99f85f083f8183afb3
-EBUILD monad-unlift-0.2.0.ebuild 771 BLAKE2B b9fde2327d6db1e1b59ec7f6843efd2ab7eb6965c60342c25f2266d9e3c1d5852088b1794d13fa3523ff5bf37978c1c7fbcb625f60fa03e6760c53e91b8981db SHA512 669b7dc9378b2b828e60505a50bc3e1d3bed3963609b50022f8fd9b885bd05559bfdd028ad6c46d065f8464152f22dc3f4168941d54024d0176919447e2a37b0
-MISC metadata.xml 386 BLAKE2B aa4bace1494036da7aa74c0180acf9900afced6657cb053b85c97cec72ab5402059b121ea77c922b520eb1c77af551650a4fec9f4a2f496fccabf0de4b6614a9 SHA512 85af6aecc3a1d0c15934c7fd9c25d6e1a1fddd001f5cbe2575a80b71bca4d6faa256f281485094f15e3aaedca01e551460e78848125c9f034c1ffbf1c49f6d96
diff --git a/dev-haskell/monad-unlift/metadata.xml b/dev-haskell/monad-unlift/metadata.xml
deleted file mode 100644
index 40e23bd3fbfc..000000000000
--- a/dev-haskell/monad-unlift/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		See README.md
-	</longdescription>
-	<upstream>
-		<remote-id type="github">fpco/monad-unlift</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/monad-unlift/monad-unlift-0.2.0.ebuild b/dev-haskell/monad-unlift/monad-unlift-0.2.0.ebuild
deleted file mode 100644
index 0b4e2d667c14..000000000000
--- a/dev-haskell/monad-unlift/monad-unlift-0.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Typeclasses for representing monad transformer unlifting"
-HOMEPAGE="https://github.com/fpco/monad-unlift"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/constraints:=[profile?]
-	>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/monadcatchio-mtl-0.3.1.0-r1 b/dev-haskell/monadcatchio-mtl-0.3.1.0-r1
new file mode 100644
index 000000000000..2dc0e9c25f17
--- /dev/null
+++ b/dev-haskell/monadcatchio-mtl-0.3.1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/monadcatchio-transformers-0.3.1.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monad-transformer version of the Control.Exception module
+EAPI=5
+HOMEPAGE=http://darcsden.com/jcpetruzza/MonadCatchIO-mtl
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ppc sparc x86
+LICENSE=BSD
+RDEPEND=dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/monadcatchio-transformers-0.3.1.0:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.3.1.0
+SRC_URI=mirror://hackage/packages/archive/MonadCatchIO-mtl/0.3.1.0/MonadCatchIO-mtl-0.3.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5b47a0c7ffba02b00495759bfe854680
diff --git a/dev-haskell/monadcatchio-mtl/Manifest b/dev-haskell/monadcatchio-mtl/Manifest
deleted file mode 100644
index 4cc3d4aab16d..000000000000
--- a/dev-haskell/monadcatchio-mtl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST MonadCatchIO-mtl-0.3.1.0.tar.gz 1730 BLAKE2B 30d1b5d3f83fd09a1b3e78848d7c1a664374294cde8fca4c60546490adcf9fb14584d7ecf6fe5ec2033b76e0dddb6c367157595f87ac544ac5aaaae7db01bb97 SHA512 b39deb663e1f1aaed287fdcb52d3c452dae32b92ddac3a19e96d37fa7e4605b5631130d92759d28834f90a12e3eab2f0131cf72b2501b5ff1e36723cc0e19d02
-EBUILD monadcatchio-mtl-0.3.1.0-r1.ebuild 892 BLAKE2B be34215e2c8362d77edd2183f70935a6713ff9bee0d4b8b0e98ed30270047c59cf5e2bfbf7414ebba001b8a8cb34e44bb14910bda7714e84991458e799c29c13 SHA512 a25d6aacd9b69c6eeb73d7581f6516dd7bf8ccfc31fa9c3fa154d61a86d6262a19f857428fba53cf2caa7978834fa114bb0ae365dde58e86cd590bb0819a953a
-MISC metadata.xml 494 BLAKE2B b4c522a82adc731af073d9ab364ced0ee803bb0691aa95a028288cfbce04eda3c67d4c84fc52b3814bde1c485643cc457cd8db25496dd905626af6379a489040 SHA512 eb38fba13590afdc7d2c96e54b05286d6652ab9d0a7c31461758dd99c4d2602de690a913bea0173b9533617847e019d410938bd583d9e7d6b242230a46d8ce8c
diff --git a/dev-haskell/monadcatchio-mtl/metadata.xml b/dev-haskell/monadcatchio-mtl/metadata.xml
deleted file mode 100644
index 6428af9ccf7a..000000000000
--- a/dev-haskell/monadcatchio-mtl/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-	</maintainer>
-	<longdescription>
-		Provides a monad-transformer version of the @Control.Exception.catch@
-		function. For this, it defines the @MonadCatchIO@ class, a subset of
-		@MonadIO@. It defines proper instances for most monad transformers in
-		the 'mtl' library.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/monadcatchio-mtl/monadcatchio-mtl-0.3.1.0-r1.ebuild b/dev-haskell/monadcatchio-mtl/monadcatchio-mtl-0.3.1.0-r1.ebuild
deleted file mode 100644
index a7b48093eaca..000000000000
--- a/dev-haskell/monadcatchio-mtl/monadcatchio-mtl-0.3.1.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="MonadCatchIO-mtl"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Monad-transformer version of the Control.Exception module"
-HOMEPAGE="http://darcsden.com/jcpetruzza/MonadCatchIO-mtl"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
-	>=dev-haskell/monadcatchio-transformers-0.3.1.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cabal_chdeps \
-		'MonadCatchIO-transformers==0.3.1.0' 'MonadCatchIO-transformers>=0.3.1.0'
-}
diff --git a/dev-haskell/monadcatchio-transformers-0.3.1.3 b/dev-haskell/monadcatchio-transformers-0.3.1.3
new file mode 100644
index 000000000000..a239c30ce10b
--- /dev/null
+++ b/dev-haskell/monadcatchio-transformers-0.3.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monad-transformer compatible version of the Control.Exception module
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/MonadCatchIO-transformers
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ppc sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.1.3
+SRC_URI=mirror://hackage/packages/archive/MonadCatchIO-transformers/0.3.1.3/MonadCatchIO-transformers-0.3.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ca06a269aba3825ad4508809aa2f833a
diff --git a/dev-haskell/monadcatchio-transformers-0.3.1.3-r1 b/dev-haskell/monadcatchio-transformers-0.3.1.3-r1
new file mode 100644
index 000000000000..833c814efd76
--- /dev/null
+++ b/dev-haskell/monadcatchio-transformers-0.3.1.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monad-transformer compatible version of the Control.Exception module
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/MonadCatchIO-transformers
+IUSE=doc hscolour profile
+KEYWORDS=~alpha amd64 ~ppc ~sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.1.3
+SRC_URI=mirror://hackage/packages/archive/MonadCatchIO-transformers/0.3.1.3/MonadCatchIO-transformers-0.3.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ac5a12fb27db6f6b39a7a4234535387e
diff --git a/dev-haskell/monadcatchio-transformers/Manifest b/dev-haskell/monadcatchio-transformers/Manifest
deleted file mode 100644
index 90c20740745f..000000000000
--- a/dev-haskell/monadcatchio-transformers/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST MonadCatchIO-transformers-0.3.1.3.tar.gz 4526 BLAKE2B d7fd79bf3cb2ace84c969d2566cdd0bb2641452b159c064d4a4bec87deadb1533fae8978bc32e97c661a753ac225caa26eaf37250398306cccd15a8619a081b1 SHA512 7794596851f59bcf3cc60e69bbad7c32f2f35fb4c9b1f53455e92d38503539b06dc50d4a9633ed3b6855bdfd0d69d41c37805c727025a81e9841d0819fea684c
-EBUILD monadcatchio-transformers-0.3.1.3-r1.ebuild 1046 BLAKE2B 84d63b3b3eaa014914d0c6bb760d0cd630d17b3d45278a58e0748b92a03da9656eaf2c52bce879674d492b22648ddf88252edf8a1105c440f52fa40e3ad499d7 SHA512 4fa3631f33afb3ff5e9870537171c04db5cd7a8119f64c3312763d102250a16ec727395cd2eacca64a61ac2ec96f14e2c1e7ee9bf76fcfb066e1175c0d34fc37
-EBUILD monadcatchio-transformers-0.3.1.3.ebuild 971 BLAKE2B a1cd040cf85b8bf305689ced0189f3651bf048b5dd6e17887cca93278e5d36d1d63e339248cfa7fe1156f6cc7e41851c075781751e4b64f93477a7e59cf9ea83 SHA512 3ce957303704746a4a9a94b24ce21f4fd90d54a64aaa885abd5c18e5f34ff6103bafb922f288901b5327cf52357c598994a1c7594224ce0bc1e5bdc8249dc93f
-MISC metadata.xml 628 BLAKE2B 878af8ce41fd1f11753d7cdb9921bbf800c2a302ff0afa1f0ed9e117a73bed84069655638807be6a7d0c95f7caa17370fa20612a46b4d439b329f8d4dfe6f313 SHA512 201dc853a626607dbb414178009282cb8a6fc2a925742a591d97c240fd12783351dc78cb6856892cc59e4ae388dfaa8a941c15fdca06be82c202277fde2c046d
diff --git a/dev-haskell/monadcatchio-transformers/metadata.xml b/dev-haskell/monadcatchio-transformers/metadata.xml
deleted file mode 100644
index c5eb3035ebf1..000000000000
--- a/dev-haskell/monadcatchio-transformers/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Provides functions to throw and catch exceptions. Unlike the functions from
-		@Control.Exception@, which work in @IO@, these work in any stack of monad
-		transformers (from the 'transformers' package) with @IO@ as the base monad.
-		You can extend this functionality to other monads, by creating an instance
-		of the @MonadCatchIO@ class.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3-r1.ebuild b/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3-r1.ebuild
deleted file mode 100644
index d1e9c6bf1888..000000000000
--- a/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="MonadCatchIO-transformers"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Monad-transformer compatible version of the Control.Exception module"
-HOMEPAGE="http://hackage.haskell.org/package/MonadCatchIO-transformers"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
-	>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cabal_chdeps \
-		'base < 4.9' 'base' \
-		'transformers >= 0.2 && < 0.5' 'transformers >= 0.2'
-}
diff --git a/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3.ebuild b/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3.ebuild
deleted file mode 100644
index ff5153909e1d..000000000000
--- a/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="MonadCatchIO-transformers"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Monad-transformer compatible version of the Control.Exception module"
-HOMEPAGE="http://hackage.haskell.org/package/MonadCatchIO-transformers"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
-	>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/monadplus-1.4.2 b/dev-haskell/monadplus-1.4.2
new file mode 100644
index 000000000000..271ad1841b15
--- /dev/null
+++ b/dev-haskell/monadplus-1.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell98 partial maps and filters over MonadPlus
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/monadplus
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.4.2
+SRC_URI=mirror://hackage/packages/archive/monadplus/1.4.2/monadplus-1.4.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5ac03fed4c80984076df3eeaeca55155
diff --git a/dev-haskell/monadplus/Manifest b/dev-haskell/monadplus/Manifest
deleted file mode 100644
index 1cfda0e61165..000000000000
--- a/dev-haskell/monadplus/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST monadplus-1.4.2.tar.gz 3671 BLAKE2B b256d49436933b446d3aa74e23ea778a6cf092cb858eb8ad1024adc370caeec6a1153a7cba7a25507213f758c3393c9040f354ca5238f8950b3bab6153d8416e SHA512 839a35b3de1226e177c07e30b86e841ddd19075d3ce29fa7154fefb371d9bef8aa85847d7c139faad93713d5b7889979498097f69c6e3bccfcee2fbbf7bf6539
-EBUILD monadplus-1.4.2.ebuild 566 BLAKE2B b4d01db2822fcca2ad9b709d610dcf5cf84ec02605eef4f67b4aeffb4e34ac44a1016cab42cc67404ac51d0a02714bc2ea43dfea860b88bf28509f5236f9e1c2 SHA512 f812fa943d67aeb7838784ad4d979454443553fbab6acf4e5226ab5cfd3f2cbe95ee1fe40a02c2c7da0867db92e8954fa4dd1423798e054ab18143b4bc258a56
-MISC metadata.xml 444 BLAKE2B 354899572a25bfc7a82bbb961b49723aa03a185ca5085c1d0d9c5171494863ef2ac71728fbe726e106fb62a7b7b2c647b3874e31f1b2dee0126814d9e97c8aa6 SHA512 157161275158f6defcfaafe8da19e18ee8a7b045e96f11c0d82e7431f4398b9187bc3152c9d8e58736aa340530bd09acfd7227e0d2aebc917f8fee7e0ef6c60b
diff --git a/dev-haskell/monadplus/metadata.xml b/dev-haskell/monadplus/metadata.xml
deleted file mode 100644
index 493cefbbe2f9..000000000000
--- a/dev-haskell/monadplus/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Filtering and folding over arbitrary `MonadPlus` instances.
-		This package generalizes many common stream operations such as
-		`filter`, `catMaybes` etc.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/monadplus/monadplus-1.4.2.ebuild b/dev-haskell/monadplus/monadplus-1.4.2.ebuild
deleted file mode 100644
index 1d647e1fed89..000000000000
--- a/dev-haskell/monadplus/monadplus-1.4.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell98 partial maps and filters over MonadPlus"
-HOMEPAGE="http://hackage.haskell.org/package/monadplus"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/monadrandom-0.1.13 b/dev-haskell/monadrandom-0.1.13
new file mode 100644
index 000000000000..caa6755ecf8c
--- /dev/null
+++ b/dev-haskell/monadrandom-0.1.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/random:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Random-number generation monad
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/MonadRandom
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/random:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.1.13
+SRC_URI=mirror://hackage/packages/archive/MonadRandom/0.1.13/MonadRandom-0.1.13.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f6e2bd3ab9a02a78f4a79328381c94cf
diff --git a/dev-haskell/monadrandom-0.3.0.2 b/dev-haskell/monadrandom-0.3.0.2
new file mode 100644
index 000000000000..d7c627c0d45f
--- /dev/null
+++ b/dev-haskell/monadrandom-0.3.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Random-number generation monad
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/MonadRandom
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.0.2
+SRC_URI=mirror://hackage/packages/archive/MonadRandom/0.3.0.2/MonadRandom-0.3.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=44580b060240ea21a3fe0c2d7c6d1507
diff --git a/dev-haskell/monadrandom-0.4.2.1 b/dev-haskell/monadrandom-0.4.2.1
new file mode 100644
index 000000000000..14ee52325105
--- /dev/null
+++ b/dev-haskell/monadrandom-0.4.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Random-number generation monad
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/MonadRandom
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.2.1
+SRC_URI=mirror://hackage/packages/archive/MonadRandom/0.4.2.1/MonadRandom-0.4.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ea3db81c65ae81de1d4c60796b32c0bc
diff --git a/dev-haskell/monadrandom-0.4.2.3 b/dev-haskell/monadrandom-0.4.2.3
new file mode 100644
index 000000000000..4a2d41547826
--- /dev/null
+++ b/dev-haskell/monadrandom-0.4.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Random-number generation monad
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/MonadRandom
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.2.3
+SRC_URI=mirror://hackage/packages/archive/MonadRandom/0.4.2.3/MonadRandom-0.4.2.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=21eff0c2739acf13daae9fba474b0153
diff --git a/dev-haskell/monadrandom/Manifest b/dev-haskell/monadrandom/Manifest
deleted file mode 100644
index faa570d656f0..000000000000
--- a/dev-haskell/monadrandom/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST MonadRandom-0.1.13.tar.gz 4465 BLAKE2B a7a307d3b76bc763d96af6727f5a29704d895802f6e8ba9d37c9c109ebdc09f815722bbe7b6d1491ddb7fd4a39899f44dc9619757aed26b0b2352e1589230f91 SHA512 c9ceba1cfa28b222ad16329ec0b1e1c5becb255e76ac4d4ea03cc4309e95b7341bae5167d2ceb5a7c2567ed776ae375acd80b07449d88b4b9f89b8c78f958bee
-DIST MonadRandom-0.3.0.2.tar.gz 4971 BLAKE2B 1da515075ae6e9b83c3e0f39481490ed732fe2f352f9a16452192ab20c1a5dc902781e22ae85d6d0a7d8a491adb736b0b72d40ec771c5286cfc2ba21d4962938 SHA512 12bfa6ee3aa9c3f2bad4c341b57f383c4b03f3743b74e5646456839198c3479dc283ac00b1ce5638f043bb6b5281a49429220ba57ce722753a7dd9350c8ef003
-DIST MonadRandom-0.4.2.1.tar.gz 5297 BLAKE2B ebe2376049bcfeb1e41a21df45c1dc07e0249b790f6a8d948a3cdf3ed6524fca6f548551bcf67c77942406fbc0ce5554fb6ccae63179b1ea5bf0eec6f68bf49c SHA512 2b173dee59005e44d3106cafa1b194a027846cc2bcaac41f76197771516d7f181a9a53cb1507d586c30f37d9d6de4fe475d46cefd31a441d9cbe14703867d60b
-DIST MonadRandom-0.4.2.3.tar.gz 5379 BLAKE2B e3603f2f715a91d07945ef2653c722170896a7678e52804633e8b92ac41e09c2738e6f0f9db6837e7317ef497ddb4cf77aed496254db36c7d134b28f80bd4ff0 SHA512 4e378c73463ed65370067913c3c59ab05e73160251cfe4daae417186d75bfbaf2be790aeed70dfb51802906e0234ff67ec1bca45e90f82bf909be73751159f24
-EBUILD monadrandom-0.1.13.ebuild 723 BLAKE2B 2f6adebe161ed2300fb2724cb4c201f9d97009f395b18ec68c50cb6d2a5887e6b21cdc4b7717a233238b0b79a1a14bbf25e587fb48f24942a270c01253142a50 SHA512 c555994007dc1afcc46a3a8c7ff58173b1af33cc282d4f299dc6271b8f758fe910881f951725f322b79a3781adb76863dead1f64214d1f082a26ccac4a94958c
-EBUILD monadrandom-0.3.0.2.ebuild 866 BLAKE2B 0edf0878d8b1d48be2fba1412764d3d7b2e97cec03b9a58e15959dbf488d0206a7000afa45cb7d55c43914ac2bd00835a3c2358e8a8c097419189424d8b4baeb SHA512 9e7ec2e9ebe89a15afeaba0553b7b461ad15aec6d6df45809dbceb6fe7634a4a6b6194f2c15cf81784b1ca1cda3d0fcb38fddaf3e6de91ed2d7b74c262cb73e5
-EBUILD monadrandom-0.4.2.1.ebuild 910 BLAKE2B 29ae92e86b1bdddd457b47af3f583ddd07f8670b9f23042ba1c3a645009116ab903071514de7beecc27e4b28c20ad5be2c68dd7274ed98597385dbdf06d4cc04 SHA512 24a0625d178bb95189794cd7dd45afa93e28e205a1ba27cc7f6b0798a63ef1aacdeb648106305eb23f53d4dc6f11e83a7403ee454c9f844f3760ab73c5e2bb6a
-EBUILD monadrandom-0.4.2.3.ebuild 910 BLAKE2B 40a323eb21cbe6462050fa426957cd13a6d553811bf52822106f80b62653072a8ee12eaf031e9c54830f5a773bdc1ee03c6924ec8d3ef8bacbb390e48981ea6e SHA512 216a9dbe0f54ec335a7d52207fb521ce5bb07259be77fc3818da6a2974be09c0248084e1c4ae081b2a5b7a334c029a6b53019fa6d58d58ded6f2b1a5bfe2e9f5
-MISC metadata.xml 344 BLAKE2B d513916d80cfff2a118db3964075dd72567e9d3c30dc305379ea10ecc51d450df6b1b2af7c6ef8d845e4980d995c42660e87c1c05beda4cb6db8c52b158d5e92 SHA512 000a7efea5f6701f9aa4caf62a27c6fad3087ef85e5e76b7bb924eb638386b891bdb1ae858530cc9092fcb864befe35acb1fd7c06d18658dbcf31755d046c78f
diff --git a/dev-haskell/monadrandom/metadata.xml b/dev-haskell/monadrandom/metadata.xml
deleted file mode 100644
index 9a057c8fc4e2..000000000000
--- a/dev-haskell/monadrandom/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Support for computations which consume random values.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/monadrandom/monadrandom-0.1.13.ebuild b/dev-haskell/monadrandom/monadrandom-0.1.13.ebuild
deleted file mode 100644
index ed267603a7b7..000000000000
--- a/dev-haskell/monadrandom/monadrandom-0.1.13.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="MonadRandom"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Random-number generation monad"
-HOMEPAGE="http://hackage.haskell.org/package/MonadRandom"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/monadrandom/monadrandom-0.3.0.2.ebuild b/dev-haskell/monadrandom/monadrandom-0.3.0.2.ebuild
deleted file mode 100644
index 4e29adee1bb5..000000000000
--- a/dev-haskell/monadrandom/monadrandom-0.3.0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="MonadRandom"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Random-number generation monad"
-HOMEPAGE="http://hackage.haskell.org/package/MonadRandom"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/monadrandom/monadrandom-0.4.2.1.ebuild b/dev-haskell/monadrandom/monadrandom-0.4.2.1.ebuild
deleted file mode 100644
index 731d2238c0ee..000000000000
--- a/dev-haskell/monadrandom/monadrandom-0.4.2.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="MonadRandom"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Random-number generation monad"
-HOMEPAGE="http://hackage.haskell.org/package/MonadRandom"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/monadrandom/monadrandom-0.4.2.3.ebuild b/dev-haskell/monadrandom/monadrandom-0.4.2.3.ebuild
deleted file mode 100644
index 190e6a2e385f..000000000000
--- a/dev-haskell/monadrandom/monadrandom-0.4.2.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="MonadRandom"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Random-number generation monad"
-HOMEPAGE="http://hackage.haskell.org/package/MonadRandom"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/monads-tf-0.1.0.2 b/dev-haskell/monads-tf-0.1.0.2
new file mode 100644
index 000000000000..8d97573df612
--- /dev/null
+++ b/dev-haskell/monads-tf-0.1.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monad classes, using type families
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/monads-tf
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0.2
+SRC_URI=mirror://hackage/packages/archive/monads-tf/0.1.0.2/monads-tf-0.1.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=aaa5c0b97053434f388f5dcde3c90814
diff --git a/dev-haskell/monads-tf-0.1.0.2-r1 b/dev-haskell/monads-tf-0.1.0.2-r1
new file mode 100644
index 000000000000..b96cf93cfdc0
--- /dev/null
+++ b/dev-haskell/monads-tf-0.1.0.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/transformers-0.2.0.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monad classes, using type families
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/monads-tf
+IUSE=doc hscolour profile
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-0.2.0.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0.2
+SRC_URI=mirror://hackage/packages/archive/monads-tf/0.1.0.2/monads-tf-0.1.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=53e5e0b949ce2f6c5361cc8772f2b80b
diff --git a/dev-haskell/monads-tf-0.1.0.3 b/dev-haskell/monads-tf-0.1.0.3
new file mode 100644
index 000000000000..19a57e415915
--- /dev/null
+++ b/dev-haskell/monads-tf-0.1.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monad classes, using type families
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/monads-tf
+IUSE=doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0.3
+SRC_URI=mirror://hackage/packages/archive/monads-tf/0.1.0.3/monads-tf-0.1.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f5db029a1e9210250423721e3582e960
diff --git a/dev-haskell/monads-tf/Manifest b/dev-haskell/monads-tf/Manifest
deleted file mode 100644
index cad23bb4564b..000000000000
--- a/dev-haskell/monads-tf/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST monads-tf-0.1.0.2.tar.gz 14206 BLAKE2B 1e01e6b5632ff28b64476fe019aa7b7453da9ed7994662cfb556f17da689e3071dd21b63fdde497837a6846d3abf37c4a239f435545777dec1a7b717d0155071 SHA512 5539d735f3d638a700a36e1d3cf0a96dbfd15f9701208e2a6ab71eaee2d00b6e2bd49acbc3e561414e923952ca702d33662511fe057a95bad125609f6216b620
-DIST monads-tf-0.1.0.3.tar.gz 14159 BLAKE2B e77b87e274ab8a29af6033fdc69a965b4013f43556bbc65e16eea35d49899e022294a87196a8e7c086659874a939010449102f5c9fa2f17b128212e567bcd588 SHA512 e1be602c584b42390b617cee164c8cb1c4bb17093c44033275924f273c94212e53faceb35aeabadf43e68f9631830e41266858daa10aa2f3af6300ebc20f3ea4
-EBUILD monads-tf-0.1.0.2-r1.ebuild 728 BLAKE2B f3af54c078d780ba04b50275db842dca55f890a4def474e42412fdfc5cd319e670f1450f784987543acdc8cefc5969c0937d5d3c09afa7b66ffaaca8f0115be3 SHA512 316260e6605ad032bbe32a5386f4635ab367e7feefec98d7287b07e9a9bed33f3906cf5d7c91324c8c0ea50cc426dd4874e3569f3727f97bb5f850e30bfb8441
-EBUILD monads-tf-0.1.0.2.ebuild 665 BLAKE2B 234d456b3ccc8d2a709386be0c61f1b446bd4f513b2c7436ea1194d112774c69660d27dc65e690c5c58c03b5183b4f35a21c1542c6589a4a3ab6a60eab2e26ac SHA512 e56732ca5d1e57b982b4d8c0d3c8b523fdbdf1f3fdec40a2000196719a479c33587bf28942b63d96e75b00bf5d3233c82faa3c2e37f9249fc63aff5b0e824e00
-EBUILD monads-tf-0.1.0.3.ebuild 670 BLAKE2B c264d0feae8991e58a5fee6fa655ec5a5caab8ae74f7b2ade72e13cf9542bd016c4e18c6a7044f076adb1a3f2e9734a7a12fdbfdc485ecdc1648dc90e36d46fd SHA512 4bf823b1cc408840d96dbdf71a0e260ba9748b5587dddbaf3b2bdfaa279690fa5d21702c00ea0ff7e39a26aba3d9b5754bfefacb515d91d3df4897186c2cdac6
-MISC metadata.xml 687 BLAKE2B 1c11c49644f25d19f06b19c1364bcc6faa1e9efca8e562d73ce09952c8f30ea1719287daa0eb5c3349ed7ceed3dd55906b8056fe3a0b245aee4cc27007ab432d SHA512 72b970d9cf3f67fd8022ce8ad559112c563759be1b98974aec30c0edb00034fd8f9aa2ad68765eb6337b7d96e2a1f2ea042529f8f0cf1227f4aabf8274b89ee1
diff --git a/dev-haskell/monads-tf/metadata.xml b/dev-haskell/monads-tf/metadata.xml
deleted file mode 100644
index bc1ca19bbc27..000000000000
--- a/dev-haskell/monads-tf/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Monad classes using type families, with instances for various
-		monad transformers, inspired by the paper /Functional Programming
-		with Overloading and Higher-Order Polymorphism/, by Mark P
-		Jones, in /Advanced School of Functional Programming/, 1995
-		(&lt;http://web.cecs.pdx.edu/~mpj/pubs/springschool.html&gt;).
-		
-		This package is almost a compatible replacement for the @mtl-tf@ package.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/monads-tf/monads-tf-0.1.0.2-r1.ebuild b/dev-haskell/monads-tf/monads-tf-0.1.0.2-r1.ebuild
deleted file mode 100644
index 91c30c285153..000000000000
--- a/dev-haskell/monads-tf/monads-tf-0.1.0.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monad classes, using type families"
-HOMEPAGE="http://hackage.haskell.org/package/monads-tf"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.3
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'transformers >= 0.2.0.0 && < 0.5' 'transformers >= 0.2.0.0'
-}
diff --git a/dev-haskell/monads-tf/monads-tf-0.1.0.2.ebuild b/dev-haskell/monads-tf/monads-tf-0.1.0.2.ebuild
deleted file mode 100644
index 0591e93b26c4..000000000000
--- a/dev-haskell/monads-tf/monads-tf-0.1.0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monad classes, using type families"
-HOMEPAGE="http://hackage.haskell.org/package/monads-tf"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.3
-"
diff --git a/dev-haskell/monads-tf/monads-tf-0.1.0.3.ebuild b/dev-haskell/monads-tf/monads-tf-0.1.0.3.ebuild
deleted file mode 100644
index 693c922a3569..000000000000
--- a/dev-haskell/monads-tf/monads-tf-0.1.0.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monad classes, using type families"
-HOMEPAGE="http://hackage.haskell.org/package/monads-tf"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.3
-"
diff --git a/dev-haskell/mono-traversable-0.1.0.0 b/dev-haskell/mono-traversable-0.1.0.0
new file mode 100644
index 000000000000..85d3ba09272a
--- /dev/null
+++ b/dev-haskell/mono-traversable-0.1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-3.0.3:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-lang/ghc-7.0.1:= >=dev-haskell/cabal-1.10.0.0 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Type classes for mapping, folding, and traversing monomorphic containers
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/mono-traversable
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/comonad-3.0.3:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-lang/ghc-7.0.1:=
+SLOT=0/0.1.0.0
+SRC_URI=mirror://hackage/packages/archive/mono-traversable/0.1.0.0/mono-traversable-0.1.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=90f9676d23a25179a51b1311acfbcbd0
diff --git a/dev-haskell/mono-traversable-0.10.0.1 b/dev-haskell/mono-traversable-0.10.0.1
new file mode 100644
index 000000000000..cbc0695db534
--- /dev/null
+++ b/dev-haskell/mono-traversable-0.10.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-3.0.3:=[profile?] >=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?] >=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] >=dev-haskell/semigroups-0.10:=[profile?] >=dev-haskell/split-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.6:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/foldl dev-haskell/hspec dev-haskell/hunit dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Type classes for mapping, folding, and traversing monomorphic containers
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/mono-traversable
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/comonad-3.0.3:=[profile?] >=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?] >=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] >=dev-haskell/semigroups-0.10:=[profile?] >=dev-haskell/split-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.6:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.10.0.1
+SRC_URI=mirror://hackage/packages/archive/mono-traversable/0.10.0.1/mono-traversable-0.10.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b4592b3411f55f4ae9cd467a66df3b3c
diff --git a/dev-haskell/mono-traversable-0.10.2 b/dev-haskell/mono-traversable-0.10.2
new file mode 100644
index 000000000000..f645aa372acb
--- /dev/null
+++ b/dev-haskell/mono-traversable-0.10.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-3.0.3:=[profile?] >=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?] >=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] >=dev-haskell/semigroups-0.10:=[profile?] >=dev-haskell/split-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.6:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/foldl dev-haskell/hspec dev-haskell/hunit dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Type classes for mapping, folding, and traversing monomorphic containers
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/mono-traversable
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/comonad-3.0.3:=[profile?] >=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?] >=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] >=dev-haskell/semigroups-0.10:=[profile?] >=dev-haskell/split-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.6:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.10.2
+SRC_URI=mirror://hackage/packages/archive/mono-traversable/0.10.2/mono-traversable-0.10.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0a3bd4b0de25b3aeae2a24deb1f0207c
diff --git a/dev-haskell/mono-traversable-0.4.0.1 b/dev-haskell/mono-traversable-0.4.0.1
new file mode 100644
index 000000000000..aa0bef7a6ef4
--- /dev/null
+++ b/dev-haskell/mono-traversable-0.4.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-3.0.3:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.6:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.0.1:= >=dev-haskell/cabal-1.10.0.0 test? ( dev-haskell/foldl dev-haskell/hspec dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Type classes for mapping, folding, and traversing monomorphic containers
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/mono-traversable
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/comonad-3.0.3:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.6:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.0.1:=
+SLOT=0/0.4.0.1
+SRC_URI=mirror://hackage/packages/archive/mono-traversable/0.4.0.1/mono-traversable-0.4.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a8c8b72e664bf6d8d9a35cbd910e9354
diff --git a/dev-haskell/mono-traversable-0.6.3 b/dev-haskell/mono-traversable-0.6.3
new file mode 100644
index 000000000000..72c0a4afdfa1
--- /dev/null
+++ b/dev-haskell/mono-traversable-0.6.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-3.0.3:=[profile?] >=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?] >=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] >=dev-haskell/semigroups-0.10:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.6:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/foldl dev-haskell/hspec dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Type classes for mapping, folding, and traversing monomorphic containers
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/mono-traversable
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/comonad-3.0.3:=[profile?] >=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?] >=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] >=dev-haskell/semigroups-0.10:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.6:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.6.3
+SRC_URI=mirror://hackage/packages/archive/mono-traversable/0.6.3/mono-traversable-0.6.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f46afbeda618f05af9db4b08f0e0fe99
diff --git a/dev-haskell/mono-traversable-0.7.0 b/dev-haskell/mono-traversable-0.7.0
new file mode 100644
index 000000000000..e773627dd189
--- /dev/null
+++ b/dev-haskell/mono-traversable-0.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-3.0.3:=[profile?] >=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?] >=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] >=dev-haskell/semigroups-0.10:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.6:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/foldl dev-haskell/hspec dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Type classes for mapping, folding, and traversing monomorphic containers
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/mono-traversable
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/comonad-3.0.3:=[profile?] >=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?] >=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] >=dev-haskell/semigroups-0.10:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.6:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.0
+SRC_URI=mirror://hackage/packages/archive/mono-traversable/0.7.0/mono-traversable-0.7.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f46afbeda618f05af9db4b08f0e0fe99
diff --git a/dev-haskell/mono-traversable-0.9.2.1 b/dev-haskell/mono-traversable-0.9.2.1
new file mode 100644
index 000000000000..c3ccd0132918
--- /dev/null
+++ b/dev-haskell/mono-traversable-0.9.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-3.0.3:=[profile?] >=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?] >=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] >=dev-haskell/semigroups-0.10:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.6:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/foldl dev-haskell/hspec dev-haskell/hunit dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Type classes for mapping, folding, and traversing monomorphic containers
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/mono-traversable
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/comonad-3.0.3:=[profile?] >=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?] >=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] >=dev-haskell/semigroups-0.10:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.6:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.9.2.1
+SRC_URI=mirror://hackage/packages/archive/mono-traversable/0.9.2.1/mono-traversable-0.9.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=711cf478200fdd389d7dafa4bd968fc5
diff --git a/dev-haskell/mono-traversable-1.0.1.1 b/dev-haskell/mono-traversable-1.0.1.1
new file mode 100644
index 000000000000..4bbbd410ba2e
--- /dev/null
+++ b/dev-haskell/mono-traversable-1.0.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/hashable:=[profile?] >=dev-haskell/semigroups-0.10:=[profile?] >=dev-haskell/split-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.6:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/foldl dev-haskell/hspec dev-haskell/hunit dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Type classes for mapping, folding, and traversing monomorphic containers
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/mono-traversable
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/hashable:=[profile?] >=dev-haskell/semigroups-0.10:=[profile?] >=dev-haskell/split-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.6:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.0.1.1
+SRC_URI=mirror://hackage/packages/archive/mono-traversable/1.0.1.1/mono-traversable-1.0.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=27385de1431ec86e299d973bbd420086
diff --git a/dev-haskell/mono-traversable-instances-0.1.0.0 b/dev-haskell/mono-traversable-instances-0.1.0.0
new file mode 100644
index 000000000000..d8c8118bf947
--- /dev/null
+++ b/dev-haskell/mono-traversable-instances-0.1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-3.0.3:=[profile?] >=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?] >=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?] >=dev-haskell/mono-traversable-1.0:=[profile?] <dev-haskell/mono-traversable-1.1:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Extra typeclass instances for mono-traversable
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/mono-traversable#readme
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/comonad-3.0.3:=[profile?] >=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?] >=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?] >=dev-haskell/mono-traversable-1.0:=[profile?] <dev-haskell/mono-traversable-1.1:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.1.0.0
+SRC_URI=mirror://hackage/packages/archive/mono-traversable-instances/0.1.0.0/mono-traversable-instances-0.1.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=42ee9ecdfb1ed3782d2b3bfc0f976be8
diff --git a/dev-haskell/mono-traversable-instances/Manifest b/dev-haskell/mono-traversable-instances/Manifest
deleted file mode 100644
index 5a5e09c5b068..000000000000
--- a/dev-haskell/mono-traversable-instances/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mono-traversable-instances-0.1.0.0.tar.gz 2520 BLAKE2B d32b11aa8a9c73859fb1f30cb64b2a9573ce40afb29eb008cd031e642366b56dddb869e44964fcb47587beabe63476c3fe4ccba01158e5fc3b999d01c7ed351e SHA512 53eeb28d68769cc995a2abf4219e6ccbe211d53f190112bb3c6792a3591ccb6334691ec491d92563489d64c7f39df81b02c0a36178daff135fce8b8475f43d0b
-EBUILD mono-traversable-instances-0.1.0.0.ebuild 991 BLAKE2B b7d1b1e4c81b4229923751742fa6b5e8e0cba1f2e9f8507763e8ac511e9721bd38d2e71d3d84c9f9a08e9b858b005a1d1e76c620c1b28e1a037509293c11d847 SHA512 167cb4d361ff611a1c2066fdd5b989d423a3caa188327c8799a7c4d03fef77ef68a9212d345c725e0ef07ee7edc76297fa1f0289df24958cf4617077701fa9da
-MISC metadata.xml 401 BLAKE2B 9005827126635ebd7b761356f28550e648a5a4e576bc75efd4ccb2f76d0133a1fe689cb7ef8bb9a5da25dd1affdb972a70dbb311f70deb7650b92b380f797334 SHA512 25c6807322263d9f27672e39bb00326ad5c2c677e46d8fb76bfcbb03a8464c012a0820c67cf8794cd11d20dbc80cb4a0b73a1125318f0d12a67f0ab2788fc367
diff --git a/dev-haskell/mono-traversable-instances/metadata.xml b/dev-haskell/mono-traversable-instances/metadata.xml
deleted file mode 100644
index 874395902d38..000000000000
--- a/dev-haskell/mono-traversable-instances/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Please see README.md
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/mono-traversable</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/mono-traversable-instances/mono-traversable-instances-0.1.0.0.ebuild b/dev-haskell/mono-traversable-instances/mono-traversable-instances-0.1.0.0.ebuild
deleted file mode 100644
index f1ead9534de7..000000000000
--- a/dev-haskell/mono-traversable-instances/mono-traversable-instances-0.1.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Extra typeclass instances for mono-traversable"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3.0.3:=[profile?]
-	>=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?]
-	>=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?]
-	>=dev-haskell/mono-traversable-1.0:=[profile?] <dev-haskell/mono-traversable-1.1:=[profile?]
-	>=dev-haskell/semigroupoids-3.0:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/mono-traversable/Manifest b/dev-haskell/mono-traversable/Manifest
deleted file mode 100644
index 596716bdbb5d..000000000000
--- a/dev-haskell/mono-traversable/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-DIST mono-traversable-0.1.0.0.tar.gz 10583 BLAKE2B 7ef52b14d0a9839563d325bee616f429fd4acabdc22420f72b4830e1fe75fe61c4c50cece947ed76ef0da33ff217704c585358caf6d0c71caa5a171ecf943f08 SHA512 ed193e9560995e63c18b31923b2ebebf391070c62bc2437174648f555cf6d003cf6017f50ddf7acc9b10d4f7840e62f119cafe6674e6e9f8cb2a91064ba1e80c
-DIST mono-traversable-0.10.0.1.tar.gz 38271 BLAKE2B 8cd761b41eb9bb511ca7116fd01bc2a7eb9f3f06726288c8f716a2f79a2933ce3a778bce04c7e9838938ddd01c7e5165970e44d00112300898a1f1ce54e754f5 SHA512 d7aad07345f1df9c9e48911f5febe63c3bad921f7dbe6115e082e70605d73411605724b00d6ef0efebce168ca40e7fedb7ea6068986b7f5ba0db1c6bc6e47e36
-DIST mono-traversable-0.10.2.tar.gz 38494 BLAKE2B f30887b8b8183e4f480cf22711dd18f6e55c84e22e01f4e439f30ee83811afecd5b605efb235d5dc519edc25f0fb638a9dd2209cd9d10f490bd890a0dd061ee5 SHA512 49e6ed11f280093b013c6489a96a4eaba09bfe656dd8fa1100db3188d5d6c9a24550115b071e14821f7cc696e50bb03dae06b1cf1c53430887ae4d7f0b058577
-DIST mono-traversable-0.4.0.1.tar.gz 21696 BLAKE2B d6c4b55621ef6348f1831b205fdda6ff2658045fbd17bd85b928b7a9172aa6fc082fecb8d9849090416256b073f21ec737fb046a84d56e2b5d3e3601fdd61104 SHA512 f38e1511ed8887902571f2908e3e94c2806ef528ced0fe56bbf5c92d6237fa2f7c721f2a41350164182fa2f8e914987376e99c0ae61b06f9299b744e9aeb2246
-DIST mono-traversable-0.6.3.tar.gz 23577 BLAKE2B 2c7b239beb3c142347f22b49897b57da304f561b93d6400d470321f514c6c01ac77c39856c9e29339bb2c9295373bac63088a236ad9da27fa16887792402a8f9 SHA512 e850f48fb8510052e20170dc8b113b0b85653dfda7fc705fbf9169b487af3537dd779601c88fbabc0873987b66baf3bebcb3ab1536798ff884a8e781918163e6
-DIST mono-traversable-0.7.0.tar.gz 27752 BLAKE2B 9201a12a06fda335ed637c46cb982b14196ca58818cdd3b04ff8be5899bf369728910382038a0ed2a8c7daa9bc4989039bae776cad8f1483daaf59144db6bb51 SHA512 ef2bda089208c85048d400541c4b5d0c336e06ff8aeeecb0bce7f804888e35560621ba685c53a2037bc11a9703f488e289b0ed86e47a4165e91c47b57d62b6c2
-DIST mono-traversable-0.9.2.1.tar.gz 36866 BLAKE2B 941cc511660f341f0301fbad513c97f43fa6d4d954a398bc78c3b3601b563424d8a9ad2f746a19542432226738bb0b9baf812b0911dadb71b40dd4c6f9d8e605 SHA512 595f4d48034a9a002951359fced926492939cb16e34db8cdaf302e07da72420ed54619613fdec8d7186be008d2f75c7726f76cc6326ec734aedd72f8a0256db2
-DIST mono-traversable-1.0.1.1.tar.gz 37982 BLAKE2B cbee32442ce30bfde8230b2914905d1ae34c81ed36190c57609e582fa6a952436061f4d7bd87501d004c069e2ca57ca2a483cf6f655bfc92d6af609dc56bf33c SHA512 2be39644bc67841ece7675098b3507a5cac1a0eb6e97d776d3e0ffffc09821fa2c4db1d0046e69ae611301144308f27d29e45ff449ac2290ee74fde07db0638d
-EBUILD mono-traversable-0.1.0.0.ebuild 967 BLAKE2B 90178d6d8f454672e5b13f5219340793904be025dd56156b63d635c6916f9474f77e44bc5cb8fe3c8a2354801316a79184db073e88e8551e3558581ff4a340fe SHA512 e550945e906b138846671c92427f6ec888db23d69cb3247781411f135150c7aafcd3c1aa6b88c570f9f50ae1f2c82e74ca1837ccfda03a0ed7cb0e4c1298b305
-EBUILD mono-traversable-0.10.0.1.ebuild 1321 BLAKE2B 23048db429f22203521ad025070a966ab86053cd13e85b3e9feff635667cfabd0dd379dd0a88433bb4ad4f526f30e1c27fa7f0a8b8ed14b2aead5527edf1a0cf SHA512 d1ad3096c7d821e65c07c37a8be8ec054535c202f493e9d4ebc97caa3e25191519d67ab8d38df48017ee3faa50af8d1318a14a0bd4f17c721ebe051561c082d6
-EBUILD mono-traversable-0.10.2.ebuild 1321 BLAKE2B c5fbe50fd3f61a796c0606bc298d6e6f6cb17a60f040d326e99f0e17156c6bbdd6464b51361fe0f448dc384651c2d08c6a02eebb6442ad467bfa5a41816dbf72 SHA512 069846f0443245f831eb894ab8ef329b0c132ea11f04bfabd02c5c2dc5cbd425867c691511d8cf1fc388df294e66837ac7ffb3a259d33e98250fa508a72ef457
-EBUILD mono-traversable-0.4.0.1.ebuild 1103 BLAKE2B eb0df0644a376e5b3f2655e3167f14ae23b8defdd2db02ffbe3c6d5ec06bf80c205d3f07b6ac77fb94d0ad31c02df0343820567af9f8ec7d47c9d777bb2667ed SHA512 a9a47deab1a2587c30a9b99547aaad975ed0ff8bcdc970cfc3d79598f2f697bdb49b98d2cbb0d89b204b512e0f87fde8ab21a9162f0b581a7dd98d5a8379737c
-EBUILD mono-traversable-0.6.3.ebuild 1264 BLAKE2B a02c582d61909e0dc883b5c4153074929e7cd0d3b1221fb993d7eeb1a469fd9df834892157fed621848de20125a5d7d62715f8e60f0091e1edf0af4bcb3079fc SHA512 e24d2102ebffe534aa5f551b481afb304744a43ad30a82df4453bee4c97c68365296996d1d0d2c31a347b69db1b078857114486707756b904c2f3bef1fc17099
-EBUILD mono-traversable-0.7.0.ebuild 1264 BLAKE2B a02c582d61909e0dc883b5c4153074929e7cd0d3b1221fb993d7eeb1a469fd9df834892157fed621848de20125a5d7d62715f8e60f0091e1edf0af4bcb3079fc SHA512 e24d2102ebffe534aa5f551b481afb304744a43ad30a82df4453bee4c97c68365296996d1d0d2c31a347b69db1b078857114486707756b904c2f3bef1fc17099
-EBUILD mono-traversable-0.9.2.1.ebuild 1284 BLAKE2B 72b3f76f7049825347ffaf15c99208eccb59fad37d7e7087a3c5c1ed9062dd5d556ac68e6156ea1ce2996d34626b17de98d024222e44b126f2dbb0e3d25a9176 SHA512 1a78870bd119803c47ed63532c315654ea65984f0e5159473237e7a13285c78f7fb8ecddad674ecbdb0de80a01fa4e86411cca2a8ac4ccfa00d9d44036946dca
-EBUILD mono-traversable-1.0.1.1.ebuild 989 BLAKE2B 424ae1498d08c9d845f275fea1c6a62bd806e5b9b5728f3969b9dde5f70f87c5f3e7fdb14a165f126f15833a6627c36e60a89a3d52aa16d350b92e8b05d1915f SHA512 19cb7a28a0210a3da2d9c978cba1e735f7f97e3ba074dc11e577180070b487bd29aedd06206d9693e985eccf955666a4339d8a8fa30697ef64e2b1d55cb38a7d
-MISC metadata.xml 535 BLAKE2B cbe1667be6853bfbd8cb382455247e28f1fb887e92ac6fa21fc926c5f504a57fc70568a096f2aa43142e77a711b36f5003f21e956cdc8b63ff860b429d23e4bd SHA512 051c88194092ed402f6e824fc05dba55fa73dc7790d8594b6cfd1ca7e779d1e529e0ad44f9f56a9aba6f0048edc75614edf72e0f4b6bf1f8b8c81ac0475065f8
diff --git a/dev-haskell/mono-traversable/metadata.xml b/dev-haskell/mono-traversable/metadata.xml
deleted file mode 100644
index 6717fd02f8a4..000000000000
--- a/dev-haskell/mono-traversable/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Monomorphic variants of the Functor, Foldable, and Traversable typeclasses. Contains even more experimental code for abstracting containers and sequences.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/mono-traversable</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/mono-traversable/mono-traversable-0.1.0.0.ebuild b/dev-haskell/mono-traversable/mono-traversable-0.1.0.0.ebuild
deleted file mode 100644
index 76f7e579bec5..000000000000
--- a/dev-haskell/mono-traversable/mono-traversable-0.1.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type classes for mapping, folding, and traversing monomorphic containers"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3.0.3:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/semigroupoids-3.0:=[profile?]
-	>=dev-haskell/semigroups-0.9:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/mono-traversable/mono-traversable-0.10.0.1.ebuild b/dev-haskell/mono-traversable/mono-traversable-0.10.0.1.ebuild
deleted file mode 100644
index 0677d5eb6494..000000000000
--- a/dev-haskell/mono-traversable/mono-traversable-0.10.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type classes for mapping, folding, and traversing monomorphic containers"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3.0.3:=[profile?]
-	>=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?]
-	>=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/semigroupoids-3.0:=[profile?]
-	>=dev-haskell/semigroups-0.10:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-haskell/vector-algorithms-0.6:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/foldl
-		dev-haskell/hspec
-		dev-haskell/hunit
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/mono-traversable/mono-traversable-0.10.2.ebuild b/dev-haskell/mono-traversable/mono-traversable-0.10.2.ebuild
deleted file mode 100644
index 32b167b7660b..000000000000
--- a/dev-haskell/mono-traversable/mono-traversable-0.10.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type classes for mapping, folding, and traversing monomorphic containers"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3.0.3:=[profile?]
-	>=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?]
-	>=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/semigroupoids-3.0:=[profile?]
-	>=dev-haskell/semigroups-0.10:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-haskell/vector-algorithms-0.6:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/foldl
-		dev-haskell/hspec
-		dev-haskell/hunit
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/mono-traversable/mono-traversable-0.4.0.1.ebuild b/dev-haskell/mono-traversable/mono-traversable-0.4.0.1.ebuild
deleted file mode 100644
index 8f1d6609cd7f..000000000000
--- a/dev-haskell/mono-traversable/mono-traversable-0.4.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type classes for mapping, folding, and traversing monomorphic containers"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3.0.3:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/semigroupoids-3.0:=[profile?]
-	>=dev-haskell/semigroups-0.9:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-haskell/vector-algorithms-0.6:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-	test? ( dev-haskell/foldl
-		dev-haskell/hspec
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/mono-traversable/mono-traversable-0.6.3.ebuild b/dev-haskell/mono-traversable/mono-traversable-0.6.3.ebuild
deleted file mode 100644
index 6c7accec7d4a..000000000000
--- a/dev-haskell/mono-traversable/mono-traversable-0.6.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type classes for mapping, folding, and traversing monomorphic containers"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3.0.3:=[profile?]
-	>=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?]
-	>=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/semigroupoids-3.0:=[profile?]
-	>=dev-haskell/semigroups-0.10:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-haskell/vector-algorithms-0.6:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/foldl
-		dev-haskell/hspec
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/mono-traversable/mono-traversable-0.7.0.ebuild b/dev-haskell/mono-traversable/mono-traversable-0.7.0.ebuild
deleted file mode 100644
index 6c7accec7d4a..000000000000
--- a/dev-haskell/mono-traversable/mono-traversable-0.7.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type classes for mapping, folding, and traversing monomorphic containers"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3.0.3:=[profile?]
-	>=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?]
-	>=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/semigroupoids-3.0:=[profile?]
-	>=dev-haskell/semigroups-0.10:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-haskell/vector-algorithms-0.6:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/foldl
-		dev-haskell/hspec
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/mono-traversable/mono-traversable-0.9.2.1.ebuild b/dev-haskell/mono-traversable/mono-traversable-0.9.2.1.ebuild
deleted file mode 100644
index a04d8753963e..000000000000
--- a/dev-haskell/mono-traversable/mono-traversable-0.9.2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type classes for mapping, folding, and traversing monomorphic containers"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3.0.3:=[profile?]
-	>=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?]
-	>=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/semigroupoids-3.0:=[profile?]
-	>=dev-haskell/semigroups-0.10:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-haskell/vector-algorithms-0.6:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/foldl
-		dev-haskell/hspec
-		dev-haskell/hunit
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/mono-traversable/mono-traversable-1.0.1.1.ebuild b/dev-haskell/mono-traversable/mono-traversable-1.0.1.1.ebuild
deleted file mode 100644
index d001a3dccc5b..000000000000
--- a/dev-haskell/mono-traversable/mono-traversable-1.0.1.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type classes for mapping, folding, and traversing monomorphic containers"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hashable:=[profile?]
-	>=dev-haskell/semigroups-0.10:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-haskell/vector-algorithms-0.6:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/foldl
-		dev-haskell/hspec
-		dev-haskell/hunit
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/mountpoints-1.0.2 b/dev-haskell/mountpoints-1.0.2
new file mode 100644
index 000000000000..1fd6766c7fb2
--- /dev/null
+++ b/dev-haskell/mountpoints-1.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=list mount points
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/mountpoints
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.2
+SRC_URI=mirror://hackage/packages/archive/mountpoints/1.0.2/mountpoints-1.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f1a664e20aa846ce7cf4cade3a069c05
diff --git a/dev-haskell/mountpoints/Manifest b/dev-haskell/mountpoints/Manifest
deleted file mode 100644
index 435cfcaa42eb..000000000000
--- a/dev-haskell/mountpoints/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mountpoints-1.0.2.tar.gz 13505 BLAKE2B 137b4c66e6a4ab27e48eebe52607ce6ad71cca1c9abfe5ebd0ae130bbd857b8fddb22575f356f30ab58e171a549d0a726b4ab41287658d35860df300c7c8dcdd SHA512 763b58944ef4422641d4ce92d7a61c79fa95cdae9795e48db194ce10df622a3e079670099daa35f7bb51d4d10ee54ccc411105eb918bab2327d54571d9bd9060
-EBUILD mountpoints-1.0.2.ebuild 540 BLAKE2B 731cec81988199c279ea98fb6c657b515ab97a9a614c242d131e9a1f00c301d061821079c2fcd3f638fee56805dcca94ed6aaef3899f3b11efb767aefafde351 SHA512 2e011a90314b662a011177f32378385146439842a720f7831b314d8739bb9cdccc30c71d1b859adf4a80f0579fc2209e409550bd81c1bb9b97acfd1fabf37f6b
-MISC metadata.xml 372 BLAKE2B 746692dce6685240a7b974c50af267a76cc65049ee32c30b13ffebe2f383d16621a8004602f454ea473deb9c93966b88e0d426bd5ffb1007b5847959343b7bd9 SHA512 817f960b9afea3178f360a9e753a8c148288dc1583178bf12301f019613b2cc1e1f9150930a25bd9a2a33af7af9c718486053002165ad88b5db79853ed46594e
diff --git a/dev-haskell/mountpoints/metadata.xml b/dev-haskell/mountpoints/metadata.xml
deleted file mode 100644
index b6a3cce6bc7d..000000000000
--- a/dev-haskell/mountpoints/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Lists currently mounted filesystems.
-		
-		Works on: Linux, BSD, Mac OS X, Android
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/mountpoints/mountpoints-1.0.2.ebuild b/dev-haskell/mountpoints/mountpoints-1.0.2.ebuild
deleted file mode 100644
index f30d29d6c8d0..000000000000
--- a/dev-haskell/mountpoints/mountpoints-1.0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="list mount points"
-HOMEPAGE="http://hackage.haskell.org/package/mountpoints"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/mtl-2.1.3.1 b/dev-haskell/mtl-2.1.3.1
new file mode 100644
index 000000000000..b919782199bf
--- /dev/null
+++ b/dev-haskell/mtl-2.1.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5322b98f044369af885a1bd008999574
diff --git a/dev-haskell/mtl-2.2.1 b/dev-haskell/mtl-2.2.1
new file mode 100644
index 000000000000..de3cf255cbfa
--- /dev/null
+++ b/dev-haskell/mtl-2.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.4:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=aa6f90f979bc6e9de5152d759d592afd
diff --git a/dev-haskell/mtl-2.2.1-r1 b/dev-haskell/mtl-2.2.1-r1
new file mode 100644
index 000000000000..8bc47208e955
--- /dev/null
+++ b/dev-haskell/mtl-2.2.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7ccef655845f8056c3d37edebc69218c
diff --git a/dev-haskell/mtl-compat-0.2.1.3 b/dev-haskell/mtl-compat-0.2.1.3
new file mode 100644
index 000000000000..a085e9d00908
--- /dev/null
+++ b/dev-haskell/mtl-compat-0.2.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/transformers-compat:= >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8
+DESCRIPTION=Backported Control.Monad.Except module from mtl
+EAPI=5
+HOMEPAGE=https://github.com/RyanGlScott/mtl-compat
+IUSE=profile
+KEYWORDS=alpha amd64 ppc sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/transformers-compat:= >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.1.3
+SRC_URI=mirror://hackage/packages/archive/mtl-compat/0.2.1.3/mtl-compat-0.2.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=755450fea9311f4b8da797ce868948ae
diff --git a/dev-haskell/mtl-compat/Manifest b/dev-haskell/mtl-compat/Manifest
deleted file mode 100644
index 4f28ce323a91..000000000000
--- a/dev-haskell/mtl-compat/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mtl-compat-0.2.1.3.tar.gz 4584 BLAKE2B 47cfbaf9f60f586318a0aa838e64d0ae13fe69386b738e3c45eb393acb77176c85a9e99f7c81384704d177bf7c895f866813880ba0f2285116a566f24114645c SHA512 c9afa97eb5dc1bddcbf0e088352141d56b603562f80fcbde6811610a4e71e1496dd5f07e4338644930bf06b403bc08d35799f7063ae845ecdb71e619b2342a18
-EBUILD mtl-compat-0.2.1.3.ebuild 1004 BLAKE2B b0eb2790a1b583883896859b36d457ff62425f3170934acca32df549a651395ff0f90f2a29da1f3d4c082507f2f91cce316be49308d3a337727491a772c02543 SHA512 9a709056bb20e2d5e6e18fb0fd6672c0d25321ca404d4318f446c26984e8a751c7e4cee22017d8b45d5bd1c3684bba6a5420ec090465c3c36a664dbc1c6e95cd
-MISC metadata.xml 1161 BLAKE2B 1ad804c5c754f337f5a046fe2b386d10149d9f05f8afbd5beb4a6a8bb4ddcc0a2e8e5c44f6c0b3f422ad93e3a59f80633210592681faea074a0e03a150d9332e SHA512 3a51b3c6dd7b62ef720aa1fcefd0bd810c36b8ac0322e83ca0d1552ace59bea71f55e4e77fc97a9aafd304b833ab8b3c11dee0ccac29b46418b99d367510cdbd
diff --git a/dev-haskell/mtl-compat/metadata.xml b/dev-haskell/mtl-compat/metadata.xml
deleted file mode 100644
index 033f9421a7a1..000000000000
--- a/dev-haskell/mtl-compat/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package backports the "Control.Monad.Except" module from
-		@mtl@ (if using @mtl-2.2.0.1@ or earlier), which reexports the
-		@ExceptT@ monad transformer and the @MonadError@ class.
-		
-		This package should only be used if there is a need to use the
-		@Control.Monad.Except@ module specifically. If you just want
-		the @mtl@ class instances for @ExceptT@, use
-		@transformers-compat@ instead, since @mtl-compat@ does nothing
-		but reexport the instances from that package.
-		
-		Note that unlike how @mtl-2.2@ or later works, the
-		"Control.Monad.Except" module defined in this package exports
-		all of @ExceptT@'s monad class instances. Therefore, you may
-		have to declare @import Control.Monad.Except ()@ at the top of
-		your file to get all of the @ExceptT@ instances in scope.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">RyanGlScott/mtl-compat</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/mtl-compat/mtl-compat-0.2.1.3.ebuild b/dev-haskell/mtl-compat/mtl-compat-0.2.1.3.ebuild
deleted file mode 100644
index 30aafe733b88..000000000000
--- a/dev-haskell/mtl-compat/mtl-compat-0.2.1.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5
-
-CABAL_FEATURES="lib profile" # haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Backported Control.Monad.Except module from mtl"
-HOMEPAGE="https://github.com/RyanGlScott/mtl-compat"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	dev-haskell/transformers-compat:=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	local mtl_arg=()
-
-	has_version '>=dev-haskell/mtl-2.0.1' && \
-		has_version '<dev-haskell/mtl-2.2' && \
-		mtl_arg+=(--flag=two-point-one)
-	has_version '>=dev-haskell/mtl-2.2.0.1' && \
-		has_version '<dev-haskell/mtl-2.2.1' && \
-		mtl_arg+=(--flag=two-point-two)
-
-	haskell-cabal_src_configure \
-		${mtl_arg}
-}
diff --git a/dev-haskell/mtl/Manifest b/dev-haskell/mtl/Manifest
deleted file mode 100644
index 27eae738ee2e..000000000000
--- a/dev-haskell/mtl/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST mtl-2.1.3.1.tar.gz 13955 BLAKE2B ded18304c2c5158cfaf02e77c01829895079d9a344692d8a4294ccafce66f867b709fb64b9b82fba728d659afb17ee54560fdb3b3894398677408eda7cf878dd SHA512 dbb388eda920ba23525f89f1be840f23e7afdf8a0efdbee9a2efd03eb0c9fd64e0788e186236bbdcc6203c9fc02a3512a63ad4dc82946f6e9364bdb1a94e5f62
-DIST mtl-2.2.1.tar.gz 15391 BLAKE2B a3ef2496a7b876cb1747a00aec092c21751c2774983f8db0fd78a8c4da220296c96dec3327c78c3e9eec9f43af25d7462518e3a03a69e80c1186777bcca43f08 SHA512 5c31626b15551ee1757ad701b8e5552202bb6fe1dbd002039e3b78c6d01108a5c50f565c4993d165a00eb564d9d72fb8d2aae891b6242f0ca8cb11f7b95c5c6b
-EBUILD mtl-2.1.3.1.ebuild 730 BLAKE2B a5788a915799eb4afe30f5b43dd16a09ed54f69b36af671bb1cb9e76916218ba0a7930c6c1d7a81b125b4cb763250db0789fe2cb8da37f0c25d565b98589ccfd SHA512 7587ae2baab00904fb99a3166eadbb368cb0244465e257f453cdc9067cb05c70b2e93947ff391ccbe7a9f0e0b82b4872fead3dc232ffa43ff034de4b022e4567
-EBUILD mtl-2.2.1-r1.ebuild 771 BLAKE2B ca45bed525180333f99c08cf5445ec603f5da37fca4941fe7ad69c2b2ce0cb2747061da06ef221c4d256066a6ee084cec4b0a3af951abc7516d9621b7bd2bb70 SHA512 5a6f1343101e3ee89b892b9b3507de2b4bc730e9a349059d0927c02294e4f6d4c6d1b2911bc636f54288bf0bdcf2ec5aa92dddee4f686cde71bf31cbd11b6604
-EBUILD mtl-2.2.1.ebuild 732 BLAKE2B 85a5b8e7d961f0bad76cff5d819ef15286c7620f8b9de8ed0abb37077e78b0441a6674acf63f412a33412ede2844249608acbce8999fe4879630f511de7949e5 SHA512 5fc301bbf32eeec1fa79c1f736645fe08bb80b56e2b8bd87812b759f6e2c24b75efde453f8ddd64f3b39afb383e579a8534425b23914ec137484d3a3381c54a4
-MISC metadata.xml 693 BLAKE2B da27e97919715cacee75756746262ee8706cd83f26967cf33bba060e85034cbc546a0c52093ba34dc9db7faa81db2fe0162adf4882cfb6fd7d86137915721ff9 SHA512 3f98568414ef1de6679c4d8a1f381bba6eff560b889830d711578252feb9dae978a60fdfd7e84f5ba71d09a2710a21cd464e1735b5bd139462d12694df8be781
diff --git a/dev-haskell/mtl/metadata.xml b/dev-haskell/mtl/metadata.xml
deleted file mode 100644
index bd178081f99e..000000000000
--- a/dev-haskell/mtl/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Monad classes using functional dependencies, with instances
-		for various monad transformers, inspired by the paper
-		/Functional Programming with Overloading and Higher-Order Polymorphism/,
-		by Mark P Jones, in /Advanced School of Functional Programming/, 1995
-		(&lt;http://web.cecs.pdx.edu/~mpj/pubs/springschool.html&gt;).
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/mtl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/mtl/mtl-2.1.3.1.ebuild b/dev-haskell/mtl/mtl-2.1.3.1.ebuild
deleted file mode 100644
index ae20efd812c0..000000000000
--- a/dev-haskell/mtl/mtl-2.1.3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monad classes, using functional dependencies"
-HOMEPAGE="https://github.com/ekmett/mtl"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/mtl/mtl-2.2.1-r1.ebuild b/dev-haskell/mtl/mtl-2.2.1-r1.ebuild
deleted file mode 100644
index 30214e3fa1dc..000000000000
--- a/dev-haskell/mtl/mtl-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monad classes, using functional dependencies"
-HOMEPAGE="https://github.com/ekmett/mtl"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'transformers == 0.4.*' 'transformers >= 0.4'
-}
diff --git a/dev-haskell/mtl/mtl-2.2.1.ebuild b/dev-haskell/mtl/mtl-2.2.1.ebuild
deleted file mode 100644
index 7c5552bdafc5..000000000000
--- a/dev-haskell/mtl/mtl-2.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monad classes, using functional dependencies"
-HOMEPAGE="https://github.com/ekmett/mtl"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.4:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/multipart-0.1.2 b/dev-haskell/multipart-0.1.2
new file mode 100644
index 000000000000..e42ba94e5449
--- /dev/null
+++ b/dev-haskell/multipart-0.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/parsec-2.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HTTP multipart split out of the cgi package
+EAPI=5
+HOMEPAGE=https://github.com/silkapp/multipart
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ppc sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/parsec-2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.2
+SRC_URI=mirror://hackage/packages/archive/multipart/0.1.2/multipart-0.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4f119764e3913139bee4322420c569d8
diff --git a/dev-haskell/multipart/Manifest b/dev-haskell/multipart/Manifest
deleted file mode 100644
index 425e78ce4817..000000000000
--- a/dev-haskell/multipart/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST multipart-0.1.2.tar.gz 6787 BLAKE2B f367f689510873eb0f58e08cd74efceb021ab4294495e4048766b12fe7242163a61f4207821e0fd7c12289433807cf0d198ef53d3a471469ee40a3a9f88d0620 SHA512 abc3c7ad89cf9f46d72abaca3ca4782ba717ed6306b81c0c2c0bebde098a330c3a2ee4c62494cd66928265843ef497005bcf09962b50f302a9419712adef578a
-EBUILD multipart-0.1.2.ebuild 604 BLAKE2B 7b211e7ddfee4d599e4fbf3164492b11d77dfe42f2d48b555aed7cf78ead49c51d456d1d0afeb8f94d8f303424d7c2596af29cac5f88352917a0b8a2480c0d84 SHA512 939ce4cc9606647c2b04d5d30e8234421dd8dda262cc2beb8c1590d95faf1f14adb05f7e11174b8d22ef127f9eefe3a61c301811dedbcbc82712f9681d4ab16f
-MISC metadata.xml 416 BLAKE2B 5de7cbdea445b25a6da17f9f952ed901e474a353f0713c25c90654b54c685a3f8956635c80ef3b9cef7e43bf81dccd526a8963655badeb87fff5876813c452ee SHA512 9b4d0482515cf7fac4b2d5615f97c3e5cf0127780a65abfc0eb6a2972121b8738aaa9be9fbd63f57301f7fd0be9560605b8d27ceaf296ce169741206e60dde7c
diff --git a/dev-haskell/multipart/metadata.xml b/dev-haskell/multipart/metadata.xml
deleted file mode 100644
index 8073f02ae312..000000000000
--- a/dev-haskell/multipart/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		HTTP multipart split out of the cgi package
-	</longdescription>
-	<upstream>
-		<remote-id type="github">silkapp/multipart</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/multipart/multipart-0.1.2.ebuild b/dev-haskell/multipart/multipart-0.1.2.ebuild
deleted file mode 100644
index 2b5bac3e709b..000000000000
--- a/dev-haskell/multipart/multipart-0.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP multipart split out of the cgi package"
-HOMEPAGE="https://github.com/silkapp/multipart"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/murmur-hash-0.1.0.9 b/dev-haskell/murmur-hash-0.1.0.9
new file mode 100644
index 000000000000..6c5b99b0e0c4
--- /dev/null
+++ b/dev-haskell/murmur-hash-0.1.0.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=MurmurHash2 implementation for Haskell
+EAPI=6
+HOMEPAGE=https://github.com/nominolo/murmur-hash
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0.9
+SRC_URI=mirror://hackage/packages/archive/murmur-hash/0.1.0.9/murmur-hash-0.1.0.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=927262cc13fdc32b85723d7364f0e8ed
diff --git a/dev-haskell/murmur-hash/Manifest b/dev-haskell/murmur-hash/Manifest
deleted file mode 100644
index adf09d987ae5..000000000000
--- a/dev-haskell/murmur-hash/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST murmur-hash-0.1.0.9.tar.gz 4204 BLAKE2B 33781f0a94f767d8f4fc9e10e3c94718308e24370ebfd9f66cd5279bf9c7204136103a8e4aa86f3025559e87075e47bde6930135215cd9b1c4275d696f2c2490 SHA512 7ec34346d6361de9e9d716d98f207534807faea97c683212e5ab037d2e16f007845eb265dba0e232617a80acc7e37f4238d4424883b975d04057ade595788486
-EBUILD murmur-hash-0.1.0.9.ebuild 547 BLAKE2B 269d60526f712f73fe211507fd0db85acc2852a0c493a6aad0902f6444dbd754e6269c69dd98d30399161742f0be8edf223654e2bc7277ede98e4f8e5b020ea7 SHA512 14a26bfa82b65da42f980dec2bfe5df3f3d423c9b9636f38678bd14e24d80d6b1df73910911e0f438a1b3f44193286fe227328be45fe79517d421f0e286718a2
-MISC metadata.xml 625 BLAKE2B 0bccd08db0d4a54371359aea8188fc94bc198886c5b2cd6c5895ae84b508f3df958238dbd4bec90aa5d24d83b4884c38e2af568e0f64aafe770e667eab6aef23 SHA512 0a34e2c2f2c0908bceac9f12fb82259cc54ea33198d73400332d00ec7a54591505bb0b1ce387408219b44fd96136a33ef9f27c99e1a0a00be38dc1ed6fd82aa1
diff --git a/dev-haskell/murmur-hash/metadata.xml b/dev-haskell/murmur-hash/metadata.xml
deleted file mode 100644
index e0fb34889e78..000000000000
--- a/dev-haskell/murmur-hash/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Implements MurmurHash2, a good, fast, general-purpose,
-		non-cryptographic hashing function.  See
-		&lt;http://murmurhash.googlepages.com/&gt; for details.
-		
-		This implementation is pure Haskell, so it might be a bit slower
-		than a C FFI binding.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">nominolo/murmur-hash</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/murmur-hash/murmur-hash-0.1.0.9.ebuild b/dev-haskell/murmur-hash/murmur-hash-0.1.0.9.ebuild
deleted file mode 100644
index 6b67a4722b5f..000000000000
--- a/dev-haskell/murmur-hash/murmur-hash-0.1.0.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="MurmurHash2 implementation for Haskell"
-HOMEPAGE="https://github.com/nominolo/murmur-hash"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/mutable-containers-0.3.2 b/dev-haskell/mutable-containers-0.3.2
new file mode 100644
index 000000000000..b5b4b1a4491e
--- /dev/null
+++ b/dev-haskell/mutable-containers-0.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mono-traversable:=[profile?] >=dev-haskell/primitive-0.5.2.1:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Abstactions and concrete implementations of mutable containers
+EAPI=5
+HOMEPAGE=https://github.com/fpco/mutable-containers
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/mono-traversable:=[profile?] >=dev-haskell/primitive-0.5.2.1:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.3.2
+SRC_URI=mirror://hackage/packages/archive/mutable-containers/0.3.2/mutable-containers-0.3.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0ca87317bbb8dad29f76799d26486f47
diff --git a/dev-haskell/mutable-containers-0.3.2.1 b/dev-haskell/mutable-containers-0.3.2.1
new file mode 100644
index 000000000000..bd72637e76ff
--- /dev/null
+++ b/dev-haskell/mutable-containers-0.3.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mono-traversable:=[profile?] >=dev-haskell/primitive-0.5.2.1:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Abstactions and concrete implementations of mutable containers
+EAPI=6
+HOMEPAGE=https://github.com/fpco/mutable-containers
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/mono-traversable:=[profile?] >=dev-haskell/primitive-0.5.2.1:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.3.2.1
+SRC_URI=mirror://hackage/packages/archive/mutable-containers/0.3.2.1/mutable-containers-0.3.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ea5e8100e275305d0cdfbd414e5c57a9
diff --git a/dev-haskell/mutable-containers-0.3.3 b/dev-haskell/mutable-containers-0.3.3
new file mode 100644
index 000000000000..68cc79352531
--- /dev/null
+++ b/dev-haskell/mutable-containers-0.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mono-traversable:=[profile?] >=dev-haskell/primitive-0.5.2.1:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Abstactions and concrete implementations of mutable containers
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/mono-traversable
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/mono-traversable:=[profile?] >=dev-haskell/primitive-0.5.2.1:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.3.3
+SRC_URI=mirror://hackage/packages/archive/mutable-containers/0.3.3/mutable-containers-0.3.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b7c22ebbe5f82eccbe4afc37bb8fbdf0
diff --git a/dev-haskell/mutable-containers/Manifest b/dev-haskell/mutable-containers/Manifest
deleted file mode 100644
index 9cad12041245..000000000000
--- a/dev-haskell/mutable-containers/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST mutable-containers-0.3.2.1.tar.gz 12102 BLAKE2B d681d6283d6c4a7a0d53fd9d112f818b540b62e3e307014b6a10f1d6fb4fa08ea20e9159b8e927f4ccb1fd7590d2c6c4bab3eb7e775922c9fc357afc29a21126 SHA512 77c573e6e4e1bb8efd5bc1ec049d62b2db3c7973a8ce750b061f23561e23edb49b896ee59d27d88cc10ff67932ed101999bd7f5750959a3c0bcca021afbf6960
-DIST mutable-containers-0.3.2.tar.gz 11969 BLAKE2B aca0aec25ad68f086e79186b7e20405947e16e9b73431db018b27a85c87e8b239a4468fdd0005ff70c6a7575d627435ceced27039956bdd4b94011557fda396d SHA512 b75e650406d92de25b903b4a761d760a797d099c7d3fd82a791c1b86caee104081edff159e78022178a284f7ca61233de91c179a435429dd585c46f97c384274
-DIST mutable-containers-0.3.3.tar.gz 12062 BLAKE2B df134f1186ec174f50b3413079c56e427dd89200a0120aa0cf31abf36f0a74aae1c56f9b7e34373877a4d005b26eb918ac907882960cfee39303f2cae09b49d1 SHA512 0708f0d432136fc3bb52b9f0159e131f4c02829bd6a2e47d4f1be9a1a70e0b492d885d1ca64e11955aceb7a4b98b9a44dce0c3f0865b1513112c5f8fc2189abf
-EBUILD mutable-containers-0.3.2.1.ebuild 765 BLAKE2B 6f2e88992e7b89078c8736ffde783e57e47dd351aa57dc61c22807ac88c66289b772dfaf284ca40390f47263e3e680b783e1a11994fc6ea3033cf95945d97649 SHA512 c8e454df1dea9b7e964e548d8417a5fdbd98b3e2b40bba698f20efd8f41ed4dc6503009541f390d0b303ea9429b97db72f932b49e0631a4870a5f01a55969ac5
-EBUILD mutable-containers-0.3.2.ebuild 765 BLAKE2B 134b305f50ab6e5994e10a6cd617ee6e7e8f5ee4050b8d91a96cfbf6373dfd389f8b155629b06bc7f64fb065381e37832baf301ee6318708d7323b27149638d6 SHA512 1614571c92dd10bb5bc2caaa38b25d81884c04eb6e39376779bf618cea49b4dac145f291f5b5aa7314cc2e6d8e7e4bf4da1f67965db324496fd209d01717c3e0
-EBUILD mutable-containers-0.3.3.ebuild 765 BLAKE2B 68db5217da8366a981d205ae36c003d00b9c2ccefd143e6744b3e1e43ca97836cb0b45c389fe4d61e4d8aab0fb399796782fadc6ae287e4f312468a7e55fda09 SHA512 d23af536b1b373f929cca00d15e721a9eef2b6b9318e231b06a4b037207e9c037097c07d6d2f72d0f34332f3a3ddcc031b8c2a22a11b11d9b18d898002f3d3d5
-MISC metadata.xml 460 BLAKE2B e2c954f63ea0de78e36c50a6009786ba959e4bc97c00bb382ec50d4025c1c3024f9cb24bea111b8aee202db80fc8a6afc5f0eab7a4f98c5444e12f12ad4de0b4 SHA512 3db09c6dac33579c0402cd1ac9eb3554b54a41463612995f5003d983971faa1c5acfae71934d083f46233cbf6b53e54e4072b7fa4a2e54fff944d9aeebb89acd
diff --git a/dev-haskell/mutable-containers/metadata.xml b/dev-haskell/mutable-containers/metadata.xml
deleted file mode 100644
index e18e9b048ff8..000000000000
--- a/dev-haskell/mutable-containers/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		See docs and README at &lt;http://www.stackage.org/package/mutable-containers&gt;
-	</longdescription>
-	<upstream>
-		<remote-id type="github">fpco/mutable-containers</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/mutable-containers/mutable-containers-0.3.2.1.ebuild b/dev-haskell/mutable-containers/mutable-containers-0.3.2.1.ebuild
deleted file mode 100644
index 093b47450f78..000000000000
--- a/dev-haskell/mutable-containers/mutable-containers-0.3.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Abstactions and concrete implementations of mutable containers"
-HOMEPAGE="https://github.com/fpco/mutable-containers"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mono-traversable:=[profile?]
-	>=dev-haskell/primitive-0.5.2.1:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/mutable-containers/mutable-containers-0.3.2.ebuild b/dev-haskell/mutable-containers/mutable-containers-0.3.2.ebuild
deleted file mode 100644
index 402171e34d99..000000000000
--- a/dev-haskell/mutable-containers/mutable-containers-0.3.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Abstactions and concrete implementations of mutable containers"
-HOMEPAGE="https://github.com/fpco/mutable-containers"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mono-traversable:=[profile?]
-	>=dev-haskell/primitive-0.5.2.1:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/mutable-containers/mutable-containers-0.3.3.ebuild b/dev-haskell/mutable-containers/mutable-containers-0.3.3.ebuild
deleted file mode 100644
index 36e12b9eca86..000000000000
--- a/dev-haskell/mutable-containers/mutable-containers-0.3.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Abstactions and concrete implementations of mutable containers"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mono-traversable:=[profile?]
-	>=dev-haskell/primitive-0.5.2.1:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/mwc-random-0.12.0.1 b/dev-haskell/mwc-random-0.12.0.1
new file mode 100644
index 000000000000..07ed58f2a856
--- /dev/null
+++ b/dev-haskell/mwc-random-0.12.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-6.10.4:= test? ( dev-haskell/hunit dev-haskell/quickcheck >=dev-haskell/statistics-0.10.1.0 dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast, high quality pseudo random number generation
+EAPI=5
+HOMEPAGE=https://github.com/bos/mwc-random
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.12.0.1
+SRC_URI=mirror://hackage/packages/archive/mwc-random/0.12.0.1/mwc-random-0.12.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6cffa00a5facd081ffab2e01fbd40df7
diff --git a/dev-haskell/mwc-random-0.13.3.2 b/dev-haskell/mwc-random-0.13.3.2
new file mode 100644
index 000000000000..c37e161c0576
--- /dev/null
+++ b/dev-haskell/mwc-random-0.13.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/quickcheck >=dev-haskell/statistics-0.10.1.0 dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast, high quality pseudo random number generation
+EAPI=5
+HOMEPAGE=https://github.com/bos/mwc-random
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.13.3.2
+SRC_URI=mirror://hackage/packages/archive/mwc-random/0.13.3.2/mwc-random-0.13.3.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=27e55e6b222938129c558c96c436041d
diff --git a/dev-haskell/mwc-random-0.13.4.0 b/dev-haskell/mwc-random-0.13.4.0
new file mode 100644
index 000000000000..b9ef5821fe60
--- /dev/null
+++ b/dev-haskell/mwc-random-0.13.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8.0.4 test? ( dev-haskell/hunit dev-haskell/quickcheck >=dev-haskell/statistics-0.10.1.0 dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast, high quality pseudo random number generation
+EAPI=5
+HOMEPAGE=https://github.com/bos/mwc-random
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.13.4.0
+SRC_URI=mirror://hackage/packages/archive/mwc-random/0.13.4.0/mwc-random-0.13.4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8da7d5ab4c72ea740ced18542c7374b9
diff --git a/dev-haskell/mwc-random/Manifest b/dev-haskell/mwc-random/Manifest
deleted file mode 100644
index e02ce7797035..000000000000
--- a/dev-haskell/mwc-random/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST mwc-random-0.12.0.1.tar.gz 19471 BLAKE2B 077a8fb171440a65202e64d1a4bbebda3491885cf2d54106bbd5f6c9e6e9ca516cf7a7352bf419672509876a4e122f3b026f186d07dbc62e24c871ba1f9e08b6 SHA512 fbb08f2ee50a650e994e123b10e5211a5d87c1a0f65c910f984b81bef85713e18a7c8780cc6e8dc9ab60644e57cacb39ab5bc462151d285c74900d048394e490
-DIST mwc-random-0.13.3.2.tar.gz 22290 BLAKE2B 2686689205c232fc2fae3ee28f478b50dd0dd27cb49efa1f81752655f464fb8ea16e46ae6d27e45104082fa4f930ea09450fd863253188233df29e9133e645b1 SHA512 67a4f99bba5884cc59d5bd521f89b1b9c0b1d473d1f157a23857e45d4759f30b6e868fd5a9e444c8563345b2dd465256fdeee97e6a68d51b00e4bbbcd8bb200f
-DIST mwc-random-0.13.4.0.tar.gz 22927 BLAKE2B 1c7bf3470a389f0c77fdebe7e1a90f750fc7458d1c574b3a45933eddd87961433b0f4b21e784a2e5bf85a73893f96fb730e86d1c0a7c3d0c3400bf72be153c0c SHA512 1f1e005998fa8310710629d69258465b214bc2b369ab95cb307689209f1812b17301fba28d33c45f8ae0ba63381ea6775ad9037a9b52464d7df35c36b77594cf
-EBUILD mwc-random-0.12.0.1.ebuild 842 BLAKE2B accabb4eacfa2aee4bdf18f1a2128d221f80c3d46dedc35c8b43fbe62cd077256f2c31a22993533261668c1e204f4856a2e5604456a92f609d11b5164df27580 SHA512 95542941a60beb7f6d98a6d0796554b6b42f954c1b1b9f4fe981f92861f49d4a4c7e40beb23e5d84e0e88eb259ea72593f94624ebae024b9f73be992f59dedcb
-EBUILD mwc-random-0.13.3.2.ebuild 894 BLAKE2B 2b1f8acf11a8b65999722218894cb247d373bc2cf0ba68502c60ec34591e33cb0f652fd171f0a197a3466283aac87426c29c93419b221bbbcee034c4189ba54b SHA512 5dc89c3ddd80dc9ca9dca8e39df8b483060deb03461ae33e7dd5e90f435f4c1c9b53133be278ee5a6c92c4cc134dfd7572178d03558a50177a27057ba810d794
-EBUILD mwc-random-0.13.4.0.ebuild 913 BLAKE2B 5b415bd1a9190100ee0eb3a8b453296d66fcd03c3879d267dc08dbe0f0f80859ef2de83144621c5527f6f17dbba05ad66c9c398d6749a3102131c60f3185ce55 SHA512 9d0ba50c009eb9709b9ea38d33d060be79d1d41d12132ddf6e1ad9c60553d525d663bf32860f2d422157be6e871fd92b5143fabbb0fc25956901bf56f9bb1c1d
-MISC metadata.xml 974 BLAKE2B 496a32207f648cd028d776ac0884fbcf3223477b606d2e6891a8fd4363add0ff4886210e06303b8bfaa02695f367064bb12de6ff304101d6bcd93826ed74637e SHA512 48483d69d8c91937c75cc4bb9b618dcb036dfbdaaa78d439b665c98cb42e417317fd289afbcb071ff2cb36efab88b93561abb757ca7de35ad92f87a0d6599e1b
diff --git a/dev-haskell/mwc-random/metadata.xml b/dev-haskell/mwc-random/metadata.xml
deleted file mode 100644
index 62bc3b139fc2..000000000000
--- a/dev-haskell/mwc-random/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package contains code for generating high quality random
-		numbers that follow either a uniform or normal distribution.  The
-		generated numbers are suitable for use in statistical applications.
-		
-		The uniform PRNG uses Marsaglia's MWC256 (also known as MWC8222)
-		multiply-with-carry generator, which has a period of 2^8222 and
-		fares well in tests of randomness.  It is also extremely fast,
-		between 2 and 3 times faster than the Mersenne Twister.
-		
-		Compared to the mersenne-random package, this package has a more
-		convenient API, is faster, and supports more statistical
-		distributions.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bos/mwc-random</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/mwc-random/mwc-random-0.12.0.1.ebuild b/dev-haskell/mwc-random/mwc-random-0.12.0.1.ebuild
deleted file mode 100644
index 4d1fb05e3b52..000000000000
--- a/dev-haskell/mwc-random/mwc-random-0.12.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast, high quality pseudo random number generation"
-HOMEPAGE="https://github.com/bos/mwc-random"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-		>=dev-haskell/vector-0.7:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		test? ( dev-haskell/hunit
-			dev-haskell/quickcheck
-			>=dev-haskell/statistics-0.10.1.0
-			dev-haskell/test-framework
-			dev-haskell/test-framework-hunit
-			dev-haskell/test-framework-quickcheck2
-		)
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/mwc-random/mwc-random-0.13.3.2.ebuild b/dev-haskell/mwc-random/mwc-random-0.13.3.2.ebuild
deleted file mode 100644
index 49549808dcda..000000000000
--- a/dev-haskell/mwc-random/mwc-random-0.13.3.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast, high quality pseudo random number generation"
-HOMEPAGE="https://github.com/bos/mwc-random"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # breaks when already installed package is broken
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		>=dev-haskell/statistics-0.10.1.0
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/mwc-random/mwc-random-0.13.4.0.ebuild b/dev-haskell/mwc-random/mwc-random-0.13.4.0.ebuild
deleted file mode 100644
index 4bfc50a41787..000000000000
--- a/dev-haskell/mwc-random/mwc-random-0.13.4.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast, high quality pseudo random number generation"
-HOMEPAGE="https://github.com/bos/mwc-random"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # circylar depend: mwc-random[test]->statistics->mwc-random
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.4
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		>=dev-haskell/statistics-0.10.1.0
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/nanospec-0.1.0 b/dev-haskell/nanospec-0.1.0
new file mode 100644
index 000000000000..af02d0a9a810
--- /dev/null
+++ b/dev-haskell/nanospec-0.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/silently ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A lightweight implementation of a subset of Hspec's API
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/nanospec
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.1.0
+SRC_URI=mirror://hackage/packages/archive/nanospec/0.1.0/nanospec-0.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7ccf28ca55dba38d86c9596105cb19c4
diff --git a/dev-haskell/nanospec-0.2.0 b/dev-haskell/nanospec-0.2.0
new file mode 100644
index 000000000000..204df9498475
--- /dev/null
+++ b/dev-haskell/nanospec-0.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 >=dev-haskell/silently-1.2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A lightweight implementation of a subset of Hspec's API
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/nanospec
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.2.0
+SRC_URI=mirror://hackage/packages/archive/nanospec/0.2.0/nanospec-0.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7733d7de41c41afc9c6e59484d945a2b
diff --git a/dev-haskell/nanospec-0.2.1 b/dev-haskell/nanospec-0.2.1
new file mode 100644
index 000000000000..9db8dac06c1a
--- /dev/null
+++ b/dev-haskell/nanospec-0.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 >=dev-haskell/silently-1.2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A lightweight implementation of a subset of Hspec's API
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/nanospec
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.2.1
+SRC_URI=mirror://hackage/packages/archive/nanospec/0.2.1/nanospec-0.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fcc39eb0b58808b43955e96d3809942b
diff --git a/dev-haskell/nanospec/Manifest b/dev-haskell/nanospec/Manifest
deleted file mode 100644
index 976ee2969676..000000000000
--- a/dev-haskell/nanospec/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST nanospec-0.1.0.tar.gz 3408 BLAKE2B 1aee0ad0d544439ff7baf1b58bee79f3348d13f4bb21042fa2818a79a4d719f7c66b6ade0902d18967f6822d2165a8da815b5bfc10dd946139afe3213aac47c5 SHA512 6e38bcee0d9a5f2e6b42566bb3e4aec57a61115dd649cb441721cb79193caac5aaf59aeef54a30dccb7e939e6512632221ec9e03b86142e5cb7671ef3433d4e9
-DIST nanospec-0.2.0.tar.gz 3451 BLAKE2B 428d01a9fccd73aef9e7cc268c96127e39b81cba30778a4979b5a9eebbf9d4e3e49f29e3b9fd42331cc2dd3f1e6b7eef0fa4def617335ca679dd25fdfd8156df SHA512 318458a205bc0bb48d83f9291cb8f047d6ca20b03174ae6a4a00d9f1b921a058641f80870e12f8eda3f238bd1b98dca96cb324161ea14cf2f0f3da1314edade4
-DIST nanospec-0.2.1.tar.gz 3478 BLAKE2B 1bee45c06ca7fce951c5652708843c3a91eb579e59a82e50403d8549f421eb48519c9e263596c381df6247983e5f9fb4dc07d1fd90299cb56644bfb24ccf78cd SHA512 ee5b5080fefc5a213b59c8d146054f59b73dbfc8ed909ea308ec2646cd3e071a7de6115563a13fb683434725e3756fa71acbfcec77e85e3dfaa9400c7e249769
-EBUILD nanospec-0.1.0.ebuild 641 BLAKE2B e650e7b7ad4d7889a45c575e3fbbc6481ac1334efbd6ec67c9958edc8d238b02905459646e33bd06194d5eb75d16600679fdad96ca125e53733051d15a7ba4e7 SHA512 7fe4fffaaf8cf720f86054605744a44ee6081b31f34ae982a854b81d1849b1805143f5a90852f5b27da951d74a526550353c21c6142706659a08c8afaf2de4fe
-EBUILD nanospec-0.2.0.ebuild 718 BLAKE2B fdb5cc441ff4fb1266f06c3478f537ed75ee120a5f00d1675790f16f16de0755af713664f4ec8694dac978baea61488ffa440e55f1c4e450918c18e65e8b8be6 SHA512 48995255dea9e7139b66f03eb6a3c4b50d268daf09fb00e1fa17920c3e5aa1d92378759679bfa1c0a79512eccd199cafe469e58e43e65e0f10d3b1de81bed13b
-EBUILD nanospec-0.2.1.ebuild 678 BLAKE2B 7fba64d90c9dde250bd776ff19529f7e9dbb5a70dd0cf8bff626db7e6f092931e427789cae51a45f43c1b412da31572dbf904fd7b8f9ff714ed66eb5ca8fa001 SHA512 6ed6f663b6337a9656ec2e68ce658ce125c5df46bb05218a974b4f42eb2b9ba0b5eb86347a2f57036fdace583ec935228edf43100df3ca36d799b55f9c9f6775
-MISC metadata.xml 375 BLAKE2B d4fec83f694238cc866e7c263166bcfcb6d1e988528d32c1276348273a6af67c25b8a9a92b7ef408e408fc6b7e874dc0fa552e3cfb8e1bed0ff9c1bc21216cbe SHA512 70735952a27c99222b87bc5662f69c32f3f96595e7db04c4726d192256d98b4169367669359b9e5aa3b0c84b5495583a36c334de65de93b84b38df6a5a3a89fe
diff --git a/dev-haskell/nanospec/metadata.xml b/dev-haskell/nanospec/metadata.xml
deleted file mode 100644
index f22e2abd4a74..000000000000
--- a/dev-haskell/nanospec/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A lightweight implementation of a subset of Hspec's API with
-		minimal dependencies.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/nanospec/nanospec-0.1.0.ebuild b/dev-haskell/nanospec/nanospec-0.1.0.ebuild
deleted file mode 100644
index 89006ebc9738..000000000000
--- a/dev-haskell/nanospec/nanospec-0.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A lightweight implementation of a subset of Hspec's API"
-HOMEPAGE="http://hackage.haskell.org/package/nanospec"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/silently
-		)"
diff --git a/dev-haskell/nanospec/nanospec-0.2.0.ebuild b/dev-haskell/nanospec/nanospec-0.2.0.ebuild
deleted file mode 100644
index 8c28e3c4c8d8..000000000000
--- a/dev-haskell/nanospec/nanospec-0.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A lightweight implementation of a subset of Hspec's API"
-HOMEPAGE="http://hackage.haskell.org/package/nanospec"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RESTRICT=test # circular depend: nanospec[test]->silently[test]->nanospec
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/silently-1.2.4 )
-"
diff --git a/dev-haskell/nanospec/nanospec-0.2.1.ebuild b/dev-haskell/nanospec/nanospec-0.2.1.ebuild
deleted file mode 100644
index bafe71391e72..000000000000
--- a/dev-haskell/nanospec/nanospec-0.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A lightweight implementation of a subset of Hspec's API"
-HOMEPAGE="http://hackage.haskell.org/package/nanospec"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # cyclic depend
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/silently-1.2.4 )
-"
diff --git a/dev-haskell/nats-0.1.2 b/dev-haskell/nats-0.1.2
new file mode 100644
index 000000000000..3d81653e5b61
--- /dev/null
+++ b/dev-haskell/nats-0.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= <dev-lang/ghc-7.10:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell 98 natural numbers
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/nats/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:= <dev-lang/ghc-7.10:=
+SLOT=0/0.1.2
+SRC_URI=mirror://hackage/packages/archive/nats/0.1.2/nats-0.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fa141fa48986e63bd01ed4c560d143e8
diff --git a/dev-haskell/nats-0.2 b/dev-haskell/nats-0.2
new file mode 100644
index 000000000000..99a51bff3a20
--- /dev/null
+++ b/dev-haskell/nats-0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= <dev-lang/ghc-7.10:= hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] ) >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Natural numbers
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/nats/
+IUSE=+hashable doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:= <dev-lang/ghc-7.10:= hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] )
+SLOT=0/0.2
+SRC_URI=mirror://hackage/packages/archive/nats/0.2/nats-0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=69d6d8301eefd788f2334c55f73f5df6
diff --git a/dev-haskell/nats-1 b/dev-haskell/nats-1
new file mode 100644
index 000000000000..24c6de75fcd0
--- /dev/null
+++ b/dev-haskell/nats-1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] ) >=dev-haskell/cabal-1.10
+DESCRIPTION=Natural numbers
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/nats/
+IUSE=+hashable profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:= hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] )
+SLOT=0/1
+SRC_URI=mirror://hackage/packages/archive/nats/1/nats-1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=206da0fd81c7d71313b439d833eccb18
diff --git a/dev-haskell/nats/Manifest b/dev-haskell/nats/Manifest
deleted file mode 100644
index e7cea353b2ae..000000000000
--- a/dev-haskell/nats/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST nats-0.1.2.tar.gz 3954 BLAKE2B f20f839d3aa4ac0a06f873d87ac5a691a7eeb62489904875918dd395302cee021cd59bbb0cafb88fd8554c99e14ba7dc9dff5a3704a394b5d342133560347fd3 SHA512 11903b123d0ed27af9fccc8bb7c343dcf42ac8d58768e628460153b0bf6f27bf1f1271890b26a48eb234b3b89bb7b9e48266a4b39742f56bcf8913e0c3751ab1
-DIST nats-0.2.tar.gz 4740 BLAKE2B 9300e1834feec441d35246377314c7c302c16c76548498352c08f07262bb491dd68ea9303cc22e67416c349e224153c484977d14491eabcb6ce22a2991f7c0cb SHA512 419f2b4f938b7d590f45a25be163e25f29d47ec0fe7cf5d1f69cb9624c5617dfc25a0b14daf1b31ac590c021120eb5cd93bdf902d27136e3019e30ce2b5d3188
-DIST nats-1.tar.gz 5768 BLAKE2B 1c8e08ce3cefade9103d4d16202d68eb1efae526ec1a4595768b121b15ee55ae5e071cfe6a1923219422a33278d53b290ec0aeee47c4eb8a7c6aed319dec0628 SHA512 a53b8890d3b9f9f799d0af25626d23a570b7d3f227968d4a1033385d87e4502120e26f8623a3c5c0c21dc0db98a000ff79565cbab0298fd9c17a917ea8e11edf
-EBUILD nats-0.1.2.ebuild 549 BLAKE2B 9f4cb10197a1c245b86f6a363bd09a911dd42c65ea56dddd7488051e9bb1fcfb6ec9a944c7c0a5411e7d2c5fae7c5ad73a45382f63503845efa464c69c490ca1 SHA512 27003be2e6c2f1cbd16d831c0985b66b6b98a7872033ee0d65936c59cfa03e8d9d55b6ca674db58788f868e628588d0671de7a58778cc271dcba4cf575dcc09f
-EBUILD nats-0.2.ebuild 723 BLAKE2B b3a01acb8b93191fba49d52ec09f8f6a9cfb7439f8e8246b0e4d1819a50de1be3d2f1fea550dfd951db751207962cea536e13e62e40aa065b8ff9887384e3050 SHA512 359222ca82e11e451b9e1e608ee31759e79e1d604dd584ee99fa6b3bd6aad1aff63f2f4b68f4d28693667cdfd95a80e29dea799f5e5e631aa24cd6debdb5b4b6
-EBUILD nats-1.ebuild 707 BLAKE2B 5dc4414f0fdea168a86bdb78e928013370fb2027d5b1a2dbe6dea12579c86ca894361305fdfc071661bc6a5434cf31e3485dedac9ddacdebd9c965a1267ab9ff SHA512 31d4b2e6b9e7e2c6127d198e63665fdca151e1755b2519415740e3c0ac3e1292912b43aafa1a5f8c481b247154be53faaf700b09f82aa3cbe3a8bea186d38c1a
-MISC metadata.xml 703 BLAKE2B a3434d123064ec0470602448e541cf91d65d32c06dbb25bb1287b43a606792789cd6be1942d7558a35297a4a31da86e082343541ec39d9c58946544f33550c64 SHA512 533f3697500bc5cc931743a82562816555c0b6f17a9e552f394c2f0286d12c1a4e8e0447b708785d2413f2945e4432ad3853d49190ad11a0a8632bffeb1915d7
diff --git a/dev-haskell/nats/metadata.xml b/dev-haskell/nats/metadata.xml
deleted file mode 100644
index 1c6077508d48..000000000000
--- a/dev-haskell/nats/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haskell 98 natural numbers
-	</longdescription>
-	<use>
-		<flag name="hashable">
-			You can disable the use of the `hashable` package using
-			USE=-hashable. Disabling this is an unsupported configuration, but it may be
-			useful for accelerating builds in sandboxes for expert users. If set we will
-			not supply an instance of `Hashable`.
-		</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ekmett/nats</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/nats/nats-0.1.2.ebuild b/dev-haskell/nats/nats-0.1.2.ebuild
deleted file mode 100644
index e301724c6a9a..000000000000
--- a/dev-haskell/nats/nats-0.1.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 natural numbers"
-HOMEPAGE="https://github.com/ekmett/nats/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:= <dev-lang/ghc-7.10:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/nats/nats-0.2.ebuild b/dev-haskell/nats/nats-0.2.ebuild
deleted file mode 100644
index 4fdc31f4d50e..000000000000
--- a/dev-haskell/nats/nats-0.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Natural numbers"
-HOMEPAGE="https://github.com/ekmett/nats/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+hashable"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:= <dev-lang/ghc-7.10:=
-	hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag hashable hashable)
-}
diff --git a/dev-haskell/nats/nats-1.ebuild b/dev-haskell/nats/nats-1.ebuild
deleted file mode 100644
index 68a31f45648f..000000000000
--- a/dev-haskell/nats/nats-1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile" # on ghc-7.10 does nothing
-inherit haskell-cabal
-
-DESCRIPTION="Natural numbers"
-HOMEPAGE="https://github.com/ekmett/nats/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+hashable"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag hashable hashable)
-}
diff --git a/dev-haskell/neat-interpolation-0.3.2.1 b/dev-haskell/neat-interpolation-0.3.2.1
new file mode 100644
index 000000000000..be6b99d61416
--- /dev/null
+++ b/dev-haskell/neat-interpolation-0.3.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=<dev-haskell/base-prelude-2:=[profile?] >=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/htf-0.11 <dev-haskell/htf-0.14 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A quasiquoter for neat and simple multiline text interpolation
+EAPI=6
+HOMEPAGE=https://github.com/nikita-volkov/neat-interpolation
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=<dev-haskell/base-prelude-2:=[profile?] >=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/0.3.2.1
+SRC_URI=mirror://hackage/packages/archive/neat-interpolation/0.3.2.1/neat-interpolation-0.3.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e9c8a6967fe57495f7e7b80b2f0bcf4d
diff --git a/dev-haskell/neat-interpolation/Manifest b/dev-haskell/neat-interpolation/Manifest
deleted file mode 100644
index c675537718b9..000000000000
--- a/dev-haskell/neat-interpolation/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST neat-interpolation-0.3.2.1.tar.gz 4339 BLAKE2B e3f7a87308839de027e566bb5498ab7d1983bfaa8c81ee225a18d40e3cf5a3ad31dc8f52660e85f1532e33fcc5bc29e6ffcc3d9bf69095ef7d5408cf98231659 SHA512 aaefc95b85e8546bd20848b3d4da39437b48e5e3c54829f9ae06f8f4021752812a643a638bcc10213db168d3217bd8913b2feec81d90199a14eea8c35fe62245
-EBUILD neat-interpolation-0.3.2.1.ebuild 832 BLAKE2B a14ec55722005fa2162268e61f86a39ea5a53221c411f63750683f53bac1a967e61417ed79752685909975593e06eac03467b7837c5130933a80a4d19a02dd74 SHA512 bdbdcd5434452c50f0452d64009bac73b6b35e41616aefff5d6fde9a9a26426008e1049fc2c64b943b95dc5e32dc06318381323a61dcbf362f1fcc4e92eba179
-MISC metadata.xml 528 BLAKE2B 8f1ce2fd25af69785d68ddc9dda15763c223577601992b171479ad804a75de01dc8acd97afff5ff9230d3dbf08f935d6ea37dc82620860571f7727ec1834b678 SHA512 0f3cad29fba3eeeb53a1b9091ed7dab3799f1dca2df3896976785edbd8b194676fe42d8f0ee642fb74eb69afea8ef2ffadbb8e3bf39799ec25a87f36e7df48d9
diff --git a/dev-haskell/neat-interpolation/metadata.xml b/dev-haskell/neat-interpolation/metadata.xml
deleted file mode 100644
index d8ffb5043713..000000000000
--- a/dev-haskell/neat-interpolation/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A quasiquoter for producing Text values with support for
-		a simple interpolation of input values.
-		It removes the excessive indentation from the input and
-		accurately manages the indentation of all lines of the interpolated variables.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/neat-interpolation/neat-interpolation-0.3.2.1.ebuild b/dev-haskell/neat-interpolation/neat-interpolation-0.3.2.1.ebuild
deleted file mode 100644
index e33689966ee2..000000000000
--- a/dev-haskell/neat-interpolation/neat-interpolation-0.3.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A quasiquoter for neat and simple multiline text interpolation"
-HOMEPAGE="https://github.com/nikita-volkov/neat-interpolation"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/base-prelude-2:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-2:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/htf-0.11 <dev-haskell/htf-0.14 )
-"
diff --git a/dev-haskell/network-2.4.1.2 b/dev-haskell/network-2.4.1.2
new file mode 100644
index 000000000000..1f66e8cac08d
--- /dev/null
+++ b/dev-haskell/network-2.4.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6c22707b0224c20f6df535c85d55c01b
diff --git a/dev-haskell/network-2.4.2.2 b/dev-haskell/network-2.4.2.2
new file mode 100644
index 000000000000..f4c3437d71f3
--- /dev/null
+++ b/dev-haskell/network-2.4.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7d072d241db0a38fa42daf532a7ba996
diff --git a/dev-haskell/network-2.5.0.0 b/dev-haskell/network-2.5.0.0
new file mode 100644
index 000000000000..a025da872373
--- /dev/null
+++ b/dev-haskell/network-2.5.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=55606c5f4604a355d3deaba59926a2d5
diff --git a/dev-haskell/network-2.6.2.1 b/dev-haskell/network-2.6.2.1
new file mode 100644
index 000000000000..40454bb54ab0
--- /dev/null
+++ b/dev-haskell/network-2.6.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=841b4f3c810dddcb91c0c511d19150bd
diff --git a/dev-haskell/network-2.6.3.1-r1 b/dev-haskell/network-2.6.3.1-r1
new file mode 100644
index 000000000000..ce8596bdca64
--- /dev/null
+++ b/dev-haskell/network-2.6.3.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/doctest-0.10.1 dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9160e0214352f94960583438307d398c
diff --git a/dev-haskell/network-bytestring-0.1.3.4 b/dev-haskell/network-bytestring-0.1.3.4
new file mode 100644
index 000000000000..ed093140f5cf
--- /dev/null
+++ b/dev-haskell/network-bytestring-0.1.3.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/network-2.2.1.1:=[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=Fast, memory-efficient, low-level networking
+EAPI=5
+HOMEPAGE=https://github.com/tibbe/network-bytestring
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/network-2.2.1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.1.3.4
+SRC_URI=mirror://hackage/packages/archive/network-bytestring/0.1.3.4/network-bytestring-0.1.3.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=991cbe3a84d44351c958d3439d2c5488
diff --git a/dev-haskell/network-bytestring/Manifest b/dev-haskell/network-bytestring/Manifest
deleted file mode 100644
index 5373fda08fc3..000000000000
--- a/dev-haskell/network-bytestring/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX network-bytestring-0.1.3.4-ghc-7.6.patch 1162 BLAKE2B 74e782e8bf6da88912cddfb76acbadf5f4cc838ca9b1a0ed27e0d01d60ed276dfb717f42910acd7852dca49a081af65f35c1382e0801e5c3c41b89308dc096a7 SHA512 e8da8d66d1b3ee3e8a49260c758f9cbeb0ef32c504f6a7d948fa6b3058659cb92c3fbbbc80d9127e8caa2d1517330724ebdd03ac378d6d5790823afd4baea538
-DIST network-bytestring-0.1.3.4.tar.gz 9182 BLAKE2B d36a2e56aa2c024ef2e42f1580d9f149863b50ec92ff7b50db14ba4fd7d49da5631b989276f9d9efeea411d367d1314a970461e0eb5c95b2c91532ffa4b31681 SHA512 eba844a3d8927c08d119342f196a6cfbb0c54eb194abb4e4da5614cddbdd685923950a339494e17fdae47eae4249896c5f68390d4abb5d0321fb358612cd3a76
-EBUILD network-bytestring-0.1.3.4.ebuild 775 BLAKE2B ecb38597600fd5952710873057b06aebd35c92313362991e139f2bba6f2166b69eb72c8e09de1c6968fbadb21b4d4dcdeb9352ac9cf14950eca4098f580ca22c SHA512 64f19a6c43fa6a097b9f0179ff524108ee740fcad7484a7b54caa31af08ea0260720dfceefda8f5d0062d9d2faaa4004f0da5c217e14dcb970c3fc7922c83cbf
-MISC metadata.xml 482 BLAKE2B 8f5d486d10b59d08bfa75cef7a9ae629b485be125e61035f188b18eb184e2dc2534b7f9c733d83a8e0e05bea499961695a213467136a729169820c63182c06dc SHA512 56424f93007e34687fc1a6d16ec941124541ef0f522743865b647ab3ba52b43963395a4fab00b2337da1f76552905af7225aaa67b1c8341893988f1d5b6fbc74
diff --git a/dev-haskell/network-bytestring/files/network-bytestring-0.1.3.4-ghc-7.6.patch b/dev-haskell/network-bytestring/files/network-bytestring-0.1.3.4-ghc-7.6.patch
deleted file mode 100644
index 7ba2e0f465b6..000000000000
--- a/dev-haskell/network-bytestring/files/network-bytestring-0.1.3.4-ghc-7.6.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/Network/Socket/ByteString.hs b/Network/Socket/ByteString.hs
-index 2fbeaa3..adf3116 100644
---- a/Network/Socket/ByteString.hs
-+++ b/Network/Socket/ByteString.hs
-@@ -45,7 +45,7 @@ import Data.ByteString (ByteString)
- import Data.ByteString.Internal (createAndTrim)
- import Data.ByteString.Unsafe (unsafeUseAsCStringLen)
- import Data.Word (Word8)
--import Foreign.C.Types (CInt)
-+import Foreign.C.Types
- import Foreign.Marshal.Alloc (allocaBytes)
- import Foreign.Ptr (Ptr, castPtr)
- import Network.Socket (SockAddr, Socket(..), sendBufTo, recvBufFrom)
-diff --git a/Network/Socket/ByteString/Internal.hs b/Network/Socket/ByteString/Internal.hs
-index c6a835b..eb41194 100644
---- a/Network/Socket/ByteString/Internal.hs
-+++ b/Network/Socket/ByteString/Internal.hs
-@@ -11,9 +11,9 @@ module Network.Socket.ByteString.Internal
- import System.IO.Error (ioeSetErrorString, mkIOError)
- 
- #if !defined(mingw32_HOST_OS)
--import Foreign.C.Types (CInt)
-+import Foreign.C.Types
- import Foreign.Ptr (Ptr)
--import System.Posix.Types (CSsize)
-+import System.Posix.Types
- 
- import Network.Socket.ByteString.IOVec (IOVec)
- import Network.Socket.ByteString.MsgHdr (MsgHdr)
diff --git a/dev-haskell/network-bytestring/metadata.xml b/dev-haskell/network-bytestring/metadata.xml
deleted file mode 100644
index ff0b4d01a27a..000000000000
--- a/dev-haskell/network-bytestring/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Fast, memory-efficient, low-level socket functions
-		that use 'Data.ByteString's instead of 'String's.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">tibbe/network-bytestring</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/network-bytestring/network-bytestring-0.1.3.4.ebuild b/dev-haskell/network-bytestring/network-bytestring-0.1.3.4.ebuild
deleted file mode 100644
index ded2df7614b0..000000000000
--- a/dev-haskell/network-bytestring/network-bytestring-0.1.3.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Fast, memory-efficient, low-level networking"
-HOMEPAGE="https://github.com/tibbe/network-bytestring"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/network-2.2.1.1:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.6.patch
-	cabal_chdeps \
-		'network    >= 2.2.1.1 && < 2.3' 'network    >= 2.2.1.1' \
-		'base       < 4.4' 'base'
-}
diff --git a/dev-haskell/network-conduit-1.0.0-r1 b/dev-haskell/network-conduit-1.0.0-r1
new file mode 100644
index 000000000000..04fa965e8e8e
--- /dev/null
+++ b/dev-haskell/network-conduit-1.0.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND==dev-haskell/conduit-1.0*:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] =dev-haskell/monad-control-0.3*:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Stream socket data using conduits
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND==dev-haskell/conduit-1.0*:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] =dev-haskell/monad-control-0.3*:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/network-2.3:=[profile?]
+SLOT=0/1.0.0
+SRC_URI=mirror://hackage/packages/archive/network-conduit/1.0.0/network-conduit-1.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9761508a4fdb99f454b29c17f8866c1e
diff --git a/dev-haskell/network-conduit-1.0.2.2 b/dev-haskell/network-conduit-1.0.2.2
new file mode 100644
index 000000000000..62653726bfe3
--- /dev/null
+++ b/dev-haskell/network-conduit-1.0.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-7.0.1:= >=dev-haskell/cabal-1.10.0.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Stream socket data using conduits
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-7.0.1:=
+SLOT=0/1.0.2.2
+SRC_URI=mirror://hackage/packages/archive/network-conduit/1.0.2.2/network-conduit-1.0.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9f14c7fbae47b65ce2d9b7753e2b3085
diff --git a/dev-haskell/network-conduit-1.1.0 b/dev-haskell/network-conduit-1.1.0
new file mode 100644
index 000000000000..4f70d524d090
--- /dev/null
+++ b/dev-haskell/network-conduit-1.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8
+DESCRIPTION=Stream socket data using conduits. (deprecated)
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.1.0
+SRC_URI=mirror://hackage/packages/archive/network-conduit/1.1.0/network-conduit-1.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6890dc9c08ca4750325bac7349a1c96c
diff --git a/dev-haskell/network-conduit/Manifest b/dev-haskell/network-conduit/Manifest
deleted file mode 100644
index a948fca49e72..000000000000
--- a/dev-haskell/network-conduit/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST network-conduit-1.0.0.tar.gz 5853 BLAKE2B 9c6a1692d8839dd81ba5b9ae6d6728c310ea5888753089a35bfdb8b53d98925a7925da4ed5f75ae64de23b0962df83e9f941588e3f1a5b2ca09bcfd04dd74d4b SHA512 9f16e529da022d2a4049fe9d41f8df0eb1fb34b4ad80f755944074b4016688169f3efd78a4ad2c052c1951ddccb728552077d88b533ed8fde1425c469a27f7c4
-DIST network-conduit-1.0.2.2.tar.gz 7072 BLAKE2B edbef7b63493b5317dd9a043273e310c47529933b82f8ea9876ac3ac0044d6f8e6d9a39c893b52b2c7ff88de4ce705dd55e039e1ae49a17420dee1386f464d96 SHA512 3dcc755ccb0ddb9c543fccec54c32ab52749602c7c9367ee70b569a1f6aa2924ae0b7207b946d6e3d55e562758e65e694c13aa464498f5927c84239f09b1c8b7
-DIST network-conduit-1.1.0.tar.gz 1357 BLAKE2B 7952df2ab1a141a6d9b5460bc128ea1b45df0ea178a1d75e8e746d66d5d11c9cee278e56bb99dc4aed62af94312b1c3e6eb9f89be4ba94c198d96091b90100a5 SHA512 1bda46190bc9759e9d85f61f4555dca4444c307305b8a7ebfc3e88519ae8119e313eaf4095541c487b8431ad342320d83ff4dd1ebf271cf10c11414c652b34d1
-EBUILD network-conduit-1.0.0-r1.ebuild 813 BLAKE2B a3b5a268d099e87e4aacafbc17a8146e7640a4f91f6936e6f475bc9046face52952baa347e8357b0e00bd7d4d2dd02fa07976dab6e629606056c2ea000934875 SHA512 bd2bcbcf8a7294fbfb8f6e721a3a7b5cf4038f62f63b31497b71c325353b27a72a47d49389e659fd5ade2c5fd45613079bd3746d170329c94b3e1928eb2e4594
-EBUILD network-conduit-1.0.2.2.ebuild 1009 BLAKE2B b597ac25acb1465d8ef71d4ed38b3252e47205328fca47f40830445c2c508f1fbb07594dff4448c0c68f3f86aaee5fc690467a0823de23223c7bc2618d27adbf SHA512 40ae3babeba6a0753cde7db476a8e883fb55b21442d1df579e14cce6d732e025c645cf4123570c4f52d4ed1607d9a106e013b691883272fa2d229ad1f09439c3
-EBUILD network-conduit-1.1.0.ebuild 606 BLAKE2B 7d0062eaecbe2fa274eda7b2f77879da373fb0e6b02c37439f3fb7bc86823dbe9604b3ec7df46009806a0d9d78d8786ca7d5cbbf4cd32f3ec0e25ec8193d1c77 SHA512 543e3748638059ab38ae16dda1d08fdea41f8a7f72c9453bbfd3b35de28eebac1366cab35798a6a40b97376c78130213feb921f75d0e7550d2f81d756041af9b
-MISC metadata.xml 406 BLAKE2B fdb568f1abe1792e097d4fcf5138bc86f980956429cd421054aa11e96ba57acd6b1a240295d741472d35dfa86076f43c5908b5e393f57ab184ec312f2a902481 SHA512 a7f050ad57487449aa6bbdfbb98d70a3942748613a1e6d1cda26b6baedafb8f57df481c9afb5d3d99260f502b386505f38d95bef6c83596f52b478a4e986c467
diff --git a/dev-haskell/network-conduit/metadata.xml b/dev-haskell/network-conduit/metadata.xml
deleted file mode 100644
index 8451d83ac011..000000000000
--- a/dev-haskell/network-conduit/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Stream socket data using conduits.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/conduit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/network-conduit/network-conduit-1.0.0-r1.ebuild b/dev-haskell/network-conduit/network-conduit-1.0.0-r1.ebuild
deleted file mode 100644
index 368d7f37cb3f..000000000000
--- a/dev-haskell/network-conduit/network-conduit-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Stream socket data using conduits"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/conduit-1.0*:=[profile?]
-		>=dev-haskell/lifted-base-0.1:=[profile?]
-		=dev-haskell/monad-control-0.3*:=[profile?]
-		>=dev-haskell/transformers-0.2.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		>=dev-haskell/network-2.3:=[profile?]
-		"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/network-conduit/network-conduit-1.0.2.2.ebuild b/dev-haskell/network-conduit/network-conduit-1.0.2.2.ebuild
deleted file mode 100644
index 1487b0dbea9d..000000000000
--- a/dev-haskell/network-conduit/network-conduit-1.0.2.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-#hackport: flags: -network-bytestring
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Stream socket data using conduits"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-0.4:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-network-bytestring
-}
diff --git a/dev-haskell/network-conduit/network-conduit-1.1.0.ebuild b/dev-haskell/network-conduit/network-conduit-1.1.0.ebuild
deleted file mode 100644
index 2eb7ea8a9404..000000000000
--- a/dev-haskell/network-conduit/network-conduit-1.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-#hackport: flags: -network-bytestring
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Stream socket data using conduits. (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/network-data-0.5.3 b/dev-haskell/network-data-0.5.3
new file mode 100644
index 000000000000..285e5d4b6fe5
--- /dev/null
+++ b/dev-haskell/network-data-0.5.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/cereal-0.2:=[profile?] >=dev-haskell/prettyclass-1.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.22.2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Library for network data structures and their serialization
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/network-data
+IUSE=+small_base doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cereal-0.2:=[profile?] >=dev-haskell/prettyclass-1.0:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.5.3
+SRC_URI=mirror://hackage/packages/archive/network-data/0.5.3/network-data-0.5.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=aad0cf0c99f5d4b707866de57898d836
diff --git a/dev-haskell/network-data/Manifest b/dev-haskell/network-data/Manifest
deleted file mode 100644
index f0d54b442094..000000000000
--- a/dev-haskell/network-data/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST network-data-0.5.3.tar.gz 5795 BLAKE2B 38946312b36f27dc6dc4e6324f716fc7a7d3e19af41e309be17eeeda9139cc1385bafabeaa33dcd9de1d3a9302f279c4b069c7ec9eb37519d0dd7b8b200f93a4 SHA512 911cd9cc5af3b0bd49939b6ce79886c8d07fb2e4700a837560f5e6b6bb2a74dca319889f01dea87f463c6ee0df2d7b9442f4ed5201ed4acd4aadceb85b69ddec
-EBUILD network-data-0.5.3.ebuild 1029 BLAKE2B ef7630e01b87320cc98fbae9fa6c4dac9935ffcd8efe75a79b68cadbc15b64e5777b5189f2147e460426d91497cf18aa3de72ad4aaa07cff8eb2eee76d70b9e2 SHA512 158c0046e09ed1a672bbe90adb3e5c30cb809ef51cd2de581909b4cc5758e18e17474ba8cb7345d644c6a30ddb3f581d519339bd1e4366e873331c872f9bb14e
-MISC metadata.xml 540 BLAKE2B 7440efa8998bfd04bc77b8f74bc8b198e8e5406815fb0d4f1fe44a66c537442bb193338dc83cf363fd5965812f6aa66948cdd2d71dd5eb8741b405c3dc375601 SHA512 c77a39280dac6233eed91611117d68eaf47267c181d9b95606edeb2c688bdd26a657f0b2837f2f2b766570379561c4310d6ad419d7e741a6a90d3f6bb6dd81dc
diff --git a/dev-haskell/network-data/metadata.xml b/dev-haskell/network-data/metadata.xml
deleted file mode 100644
index e4533ee51f10..000000000000
--- a/dev-haskell/network-data/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="small_base">Build the split-up base package.</flag>
-	</use>
-	<longdescription>
-		This library includes definitions for common headers such as
-		Ethernet, IPv4, IPv6, UDP, TCP, etc. This code is untested for any serious
-		work - use at your own risk.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/network-data/network-data-0.5.3.ebuild b/dev-haskell/network-data/network-data-0.5.3.ebuild
deleted file mode 100644
index 88fb2d222396..000000000000
--- a/dev-haskell/network-data/network-data-0.5.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Library for network data structures and their serialization"
-HOMEPAGE="http://hackage.haskell.org/package/network-data"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+small_base"
-
-# dev-haskell/prettyclass is not required for ghc 7.10.1, just adding
-# it for backwards compatibility with <ghc 7.10.1
-
-RDEPEND=">=dev-haskell/cereal-0.2:=[profile?]
-	>=dev-haskell/prettyclass-1.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-src_prepare() {
-	if has_version "<dev-lang/ghc-7.10.1"; then
-		cabal_chdeps \
-			'pretty >= 1.1.2' 'pretty >= 1.0, prettyclass >= 1.0'
-	fi
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag small_base small_base)
-}
diff --git a/dev-haskell/network-info-0.2.0.10 b/dev-haskell/network-info-0.2.0.10
new file mode 100644
index 000000000000..26f860629e0a
--- /dev/null
+++ b/dev-haskell/network-info-0.2.0.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Access the local computer's basic network configuration
+EAPI=6
+HOMEPAGE=https://github.com/jystic/network-info
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.0.10
+SRC_URI=mirror://hackage/packages/archive/network-info/0.2.0.10/network-info-0.2.0.10.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=81672dad723e48f6c1cf7512703bbe66
diff --git a/dev-haskell/network-info-0.2.0.8 b/dev-haskell/network-info-0.2.0.8
new file mode 100644
index 000000000000..36404ca0a371
--- /dev/null
+++ b/dev-haskell/network-info-0.2.0.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Access the local computer's basic network configuration
+EAPI=5
+HOMEPAGE=https://github.com/jystic/network-info
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.0.8
+SRC_URI=mirror://hackage/packages/archive/network-info/0.2.0.8/network-info-0.2.0.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=119ff21d374d40f436ec5221917c2f7f
diff --git a/dev-haskell/network-info/Manifest b/dev-haskell/network-info/Manifest
deleted file mode 100644
index 6c7cad6df7c9..000000000000
--- a/dev-haskell/network-info/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST network-info-0.2.0.10.tar.gz 6278 BLAKE2B 52cec7dc2866ff0aad9f0180391c2e093d3147f7de1dd96baa7ec1f9d149792aca371d7f5bb3a32d254f2fd3a35f6a6b3fb479967ad7cb0a125944aca7eeaa88 SHA512 d578f64860fb3c04d11a444d9636bde57402b6728529e73c7741b056ef0d8f68cb0958118212f2d47826dc28ba9b2bfcc9aef8b5b2e9fc3da8eaadc796160895
-DIST network-info-0.2.0.8.tar.gz 5998 BLAKE2B 99ec593628e7f0f3e3995145917bed53d22b381b65bd6aaf611f3b60fc2c093967ac8e7914c614012c66fc410fc106213e34e9fe787e09dc847554e1f670533c SHA512 3b2d23085c8c4cb1cfefc8be75dd7b0c2e144a28b8c203149a246c8b9173d1e3f6b2fdb0e6ac3d13066d0d3b219b12dc82f2e935d3b661ff4dc6d858e376f3be
-EBUILD network-info-0.2.0.10.ebuild 565 BLAKE2B a86f87d5647bc97748cf057a82a8b69838d959660b58a1a3b96a102fd2c0ec4d91265034d31612c05b28550726258818c6c7cc1d0334d685593fda0b00469b38 SHA512 092c4c56550b3885d036086285baa41bd845b2ec8f23641f40e93a9ac9ac6fd3927a98e5ad8ded9149613e1a3c3dc5a066470fa4e6596932434f7de16f30e4ed
-EBUILD network-info-0.2.0.8.ebuild 565 BLAKE2B b6aceff9d6a22b621dad36e38f857e78efc6ea62e03afd0e4332cae03524588a332a2685c33c77428e433b9f532d4a9110e2cf6b711a036ab5e226697470067e SHA512 9a0441f1c8e6bdb42349fec16022e201ee1f304a15cf6a69cfb8be72747a735727b22e790a4af1915ffff9b53244ebcdfac3ea8c0f2b226e7c9c6d4f91a4c483
-MISC metadata.xml 807 BLAKE2B 8627851cabedecc279e50c9813dc1c6f926cff0a48f90c82265ba1d417d9a5a40c4e8cb422c03fbc7749f1a66c23dbf4bcc848ce0506e7ea0d1ec4704bc0684f SHA512 d6eaaca151f5d3b70131b374162c5ac6119a905849c59f89806e5837b867c76acbe0d3a7ca47e7e5492b2abe77bd09d427d53f97559c0e04cb9f6e373b436392
diff --git a/dev-haskell/network-info/metadata.xml b/dev-haskell/network-info/metadata.xml
deleted file mode 100644
index f67a3903830a..000000000000
--- a/dev-haskell/network-info/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library provides simple read-only access to the
-		local computer's networking configuration. It is
-		currently capable of getting a list of all the network
-		interfaces and their respective IPv4, IPv6 and MAC
-		addresses.
-		
-		network-info has been tested and is known to work on
-		Ubuntu 10.10, FreeBSD 9.0, Mac OS X 10.6.4 and Windows
-		XP/7. It probably works on other flavours of Linux,
-		OS X, FreeBSD and Windows as well.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">jystic/network-info</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/network-info/network-info-0.2.0.10.ebuild b/dev-haskell/network-info/network-info-0.2.0.10.ebuild
deleted file mode 100644
index f1adc0d6e1a8..000000000000
--- a/dev-haskell/network-info/network-info-0.2.0.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Access the local computer's basic network configuration"
-HOMEPAGE="https://github.com/jystic/network-info"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/network-info/network-info-0.2.0.8.ebuild b/dev-haskell/network-info/network-info-0.2.0.8.ebuild
deleted file mode 100644
index c1cfe74de98d..000000000000
--- a/dev-haskell/network-info/network-info-0.2.0.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Access the local computer's basic network configuration"
-HOMEPAGE="https://github.com/jystic/network-info"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/network-multicast-0.0.11 b/dev-haskell/network-multicast-0.0.11
new file mode 100644
index 000000000000..04592837f0ee
--- /dev/null
+++ b/dev-haskell/network-multicast-0.0.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple multicast library
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/network-multicast
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.0.11
+SRC_URI=mirror://hackage/packages/archive/network-multicast/0.0.11/network-multicast-0.0.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4aeda3ee8cecbf86471f61fc0445c4bd
diff --git a/dev-haskell/network-multicast-0.1.0 b/dev-haskell/network-multicast-0.1.0
new file mode 100644
index 000000000000..49da6efff93a
--- /dev/null
+++ b/dev-haskell/network-multicast-0.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple multicast library
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/network-multicast
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0
+SRC_URI=mirror://hackage/packages/archive/network-multicast/0.1.0/network-multicast-0.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9c7a3bc0441484e11d9bbd2c297707d5
diff --git a/dev-haskell/network-multicast/Manifest b/dev-haskell/network-multicast/Manifest
deleted file mode 100644
index 3671e312df4a..000000000000
--- a/dev-haskell/network-multicast/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST network-multicast-0.0.11.tar.gz 2970 BLAKE2B b58ed23c8dc8ed0c556685ce2a233c72517fbb7a72fa6fc71676f7ac6886a7e3a5ec3ec90bb37805dbb3dd07e3b129bf3a1a5be958d2240df782dc7e40e12ce1 SHA512 f38f4e683117412b97b602ddc324b17ffbb6c20f265086565b16124c15cb99ec63e4a21092cd33e87756d7c9ae15de8c63d8dd192503f7abfbbcf455f02796b2
-DIST network-multicast-0.1.0.tar.gz 3023 BLAKE2B f9ab3881a6ca4d575643328121dd69626fb5e35fe508da0611e4b74d4725f232365db63fc97a8926e653ca972ba6663c476a2c4d159fc52c93dfa5464f824bb3 SHA512 e40de36f5e9bfd999033825c1b834895fd20e649ed5e297f601c0112ed9c02a66aaa05110df8eaa3329d79a7d44d77f077ca231f4fd1587a633ca1847083b0c7
-EBUILD network-multicast-0.0.11.ebuild 589 BLAKE2B 97384a3b74c30ae84e0b2db1f52f6162e040f14d28d6550f03500757ceb2d2a731b2468b0cddf6183e6242185bf683df070c6117c9a9e461cc28611120cc6da5 SHA512 c3efd560d8f938e0053ea702a731a7bd6cc3596161a5ee8c53d3a5bdb7a386ada54204df9ff8d4915d12a043ae445005135e6a7ab8b2d03f474c5cefd4120830
-EBUILD network-multicast-0.1.0.ebuild 591 BLAKE2B 8ba5bbcd8870a875284b5f38a8cbbae632eb71e608064d21f7ec4ed70212c4dcf7724358b2088ee5db6fd2c2389b290bb7bdd0acbe670691e81ddaa045934f78 SHA512 3edf2e7ba0d0f2b239f63065b8fdd74cccc16e472b7fca8abf09fa956fd898cbc60d94a11981c4dae665c3db668dfcabd8f096ce60753e5b5f41dbbf14cc892f
-MISC metadata.xml 388 BLAKE2B b18d972ab62c4aa23b380fa69b2fa3f67d6fb1eb777a2bfbaee87b8ba9e391e5c1ae86e2da7f4c7ba9c5da1ff6719ec5d3273f1e4484f0b4f2dc75b02b0615b1 SHA512 7f3201b67d296092839d3e81bada2b845eaf35de4dd6ad24fa560df33ca5e8d3bf4955720b05d595d761dd29b0c22b99344b84498515722e53834a8b72eb23af
diff --git a/dev-haskell/network-multicast/metadata.xml b/dev-haskell/network-multicast/metadata.xml
deleted file mode 100644
index 6ca2a5311001..000000000000
--- a/dev-haskell/network-multicast/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The "Network.Multicast" module is for sending
-		UDP datagrams over multicast (class D) addresses.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/network-multicast/network-multicast-0.0.11.ebuild b/dev-haskell/network-multicast/network-multicast-0.0.11.ebuild
deleted file mode 100644
index 877112e7dc05..000000000000
--- a/dev-haskell/network-multicast/network-multicast-0.0.11.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple multicast library"
-HOMEPAGE="http://hackage.haskell.org/package/network-multicast"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/network:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/network-multicast/network-multicast-0.1.0.ebuild b/dev-haskell/network-multicast/network-multicast-0.1.0.ebuild
deleted file mode 100644
index 64ebe5330ec1..000000000000
--- a/dev-haskell/network-multicast/network-multicast-0.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple multicast library"
-HOMEPAGE="http://hackage.haskell.org/package/network-multicast"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/network:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/network-protocol-xmpp-0.4.8 b/dev-haskell/network-protocol-xmpp-0.4.8
new file mode 100644
index 000000000000..7dad3791b6fa
--- /dev/null
+++ b/dev-haskell/network-protocol-xmpp-0.4.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/gnuidn-0.2:=[profile?] <dev-haskell/gnuidn-0.3:=[profile?] >=dev-haskell/gnutls-0.1.4:=[profile?] <dev-haskell/gnutls-0.3:=[profile?] >=dev-haskell/gsasl-0.3:=[profile?] <dev-haskell/gsasl-0.4:=[profile?] >=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?] >=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Client library for the XMPP protocol
+EAPI=5
+HOMEPAGE=https://john-millikin.com/software/haskell-xmpp/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-haskell/gnuidn-0.2:=[profile?] <dev-haskell/gnuidn-0.3:=[profile?] >=dev-haskell/gnutls-0.1.4:=[profile?] <dev-haskell/gnutls-0.3:=[profile?] >=dev-haskell/gsasl-0.3:=[profile?] <dev-haskell/gsasl-0.4:=[profile?] >=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?] >=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.8
+SRC_URI=mirror://hackage/packages/archive/network-protocol-xmpp/0.4.8/network-protocol-xmpp-0.4.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=287e2fa94af34385c5f5a05733f4a341
diff --git a/dev-haskell/network-protocol-xmpp/Manifest b/dev-haskell/network-protocol-xmpp/Manifest
deleted file mode 100644
index bb0b2550759e..000000000000
--- a/dev-haskell/network-protocol-xmpp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST network-protocol-xmpp-0.4.8.tar.gz 24289 BLAKE2B 53d5f7c35846a4727fc15994d332213573b73893e37ef8fb5121bcf7e4ea684e1f794856317d3b8b51e0b8a7d5cb829ab1af0d226c75d745a7e280e9c4ecc992 SHA512 029cbb1a0ea6691fd886b326eee7a24e8300bbece1f0c0f564b43b0e344f4107ca980d97342271cab0b9c1333fc445ac10f7dfae41dd2b6e6ea995bfb810311e
-EBUILD network-protocol-xmpp-0.4.8.ebuild 1142 BLAKE2B 1d54267adb8b4c41780b317750d62afe8f05cc6274cdf81bc47a7c6017c786ce2e7c4a18e5d187f0ba21996747b71b5a3cb62f4080aec7a3be574adc641dca01 SHA512 6b2df62b53bd15e34a46167f5be5c431fd6216f350b593933572d61ab6d4c3474ac9b744e9b9e4e4a153e57f8720cf95df92772a604d74bb9d88bb6f543d881c
-MISC metadata.xml 328 BLAKE2B 3dc9ce30dc6ca5538f15de5a750943a1104a446c80b89b04a2e78b010fabc56c0790ac2f20b22f2dcdfa1286196aa29f1e8a9476703420a308a0439d66f362a3 SHA512 c3ca347c855d7510dd2be06116586d131b091c056fc6ae221f8ee4aee122e3cf355d590e44fda1af5b8907488d5df5731901b5798d9300757cf83d8c646da968
diff --git a/dev-haskell/network-protocol-xmpp/metadata.xml b/dev-haskell/network-protocol-xmpp/metadata.xml
deleted file mode 100644
index c36ec5ac9648..000000000000
--- a/dev-haskell/network-protocol-xmpp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Client library for the XMPP protocol.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/network-protocol-xmpp/network-protocol-xmpp-0.4.8.ebuild b/dev-haskell/network-protocol-xmpp/network-protocol-xmpp-0.4.8.ebuild
deleted file mode 100644
index d2c6ef2f3a09..000000000000
--- a/dev-haskell/network-protocol-xmpp/network-protocol-xmpp-0.4.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Client library for the XMPP protocol"
-HOMEPAGE="https://john-millikin.com/software/haskell-xmpp/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/gnuidn-0.2:=[profile?] <dev-haskell/gnuidn-0.3:=[profile?]
-	>=dev-haskell/gnutls-0.1.4:=[profile?] <dev-haskell/gnutls-0.3:=[profile?]
-	>=dev-haskell/gsasl-0.3:=[profile?] <dev-haskell/gsasl-0.4:=[profile?]
-	>=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?]
-	>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?]
-	>=dev-haskell/network-2.2:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/network-uri-2.5.0.0 b/dev-haskell/network-uri-2.5.0.0
new file mode 100644
index 000000000000..e2c3d96945dd
--- /dev/null
+++ b/dev-haskell/network-uri-2.5.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9370ad55561b95248457621e377d3ae6
diff --git a/dev-haskell/network-uri-2.6.0.3 b/dev-haskell/network-uri-2.6.0.3
new file mode 100644
index 000000000000..4b0eef85a424
--- /dev/null
+++ b/dev-haskell/network-uri-2.6.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:= !<dev-haskell/network-2.6 >=dev-haskell/cabal-1.10 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7e52a120ccdef9e6a64ef2d46f5136fe
diff --git a/dev-haskell/network-uri-2.6.1.0 b/dev-haskell/network-uri-2.6.1.0
new file mode 100644
index 000000000000..9128f2fd3889
--- /dev/null
+++ b/dev-haskell/network-uri-2.6.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:= !<dev-haskell/network-2.6 >=dev-haskell/cabal-1.10 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dd692b5d13fac81c04637befad0120ef
diff --git a/dev-haskell/network-uri/Manifest b/dev-haskell/network-uri/Manifest
deleted file mode 100644
index 66084fc1c83e..000000000000
--- a/dev-haskell/network-uri/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST network-uri-2.5.0.0.tar.gz 1665 BLAKE2B 7f4c1090cf22f83b69b2cc222001f607f6bc0ff9a98a9d20438da8cdea751cded6ffd2b39f05561724cb87f194a15028240bb44c06d24d539dc6c42ac4b25f86 SHA512 9bc738e6de09a3dfd1b929c6f9c557abedef239034e886ca65d15a1ffc423dc72ce8b09f0f374ebd701b237600b65d031d5bc75f5ea937291328f4a1d01e6061
-DIST network-uri-2.6.0.3.tar.gz 26639 BLAKE2B 6d94ac9c89bf0758deabc6869d0964050a610620466054f704608212033e410edd23497c8cfb4d746b891d6f0e7b30c76581f2ba1cf57082d0ce59714ce1c5c6 SHA512 69d52462ed5af44fc3c1e27b741d87a33e0e90fe1fb314f68fd7b8819007a0e88dbde5f53ae7672d820ee48ac99cb9e422dc7274b7032c965f867089468d73ba
-DIST network-uri-2.6.1.0.tar.gz 27262 BLAKE2B 9ef806e6a97a62b43d15887f7e8bad20568db5cbfcbea320d749b9f4b98ebc8eb729762982baf627df792d0535665f4a52a76afdba40e3a73c475bcf86b17238 SHA512 c1b6e516cd19875aab0da325dcb8f5c6b98d43c3952bda4f96bd9c798882357c724b2facbef09e2e98d29b696a9e5518a2de9463fb0af4c5df0734fe2654cc24
-EBUILD network-uri-2.5.0.0.ebuild 584 BLAKE2B 73c08aae0c27a0a0f019b91c120ce5188e4896a0cdc7bcbb9450bf12b14cd12464bfd24a1b2df3c8ba4afa1474b15eff9db8139363428f3606ef50cd7ac8487b SHA512 822478511de9c64f11c9fe8e9ed2ae5d31d5d4361b95b7d44b8887446aaf14e4e743a99ed1826eb93493be0b0b8cdafc2b874e1c51dba3e6ed5280820f708ca8
-EBUILD network-uri-2.6.0.3.ebuild 854 BLAKE2B c2e6acf1e998232985ee3028dbe8f76d22670da9857dbca7450aedeee2ebe4ea8a4f31d090453550b482d0bf7d7d89d03b9342848e79cc35155825130b535f45 SHA512 1614647c24e65ac9d0a7dfce862634f06b1c0af159f1e22c0130c239e459ae975baab599c18ddb18840bc465c6516a5226909978642094967c0da9833771ae56
-EBUILD network-uri-2.6.1.0.ebuild 861 BLAKE2B 27d083a5e1d66426ac8df71d449276708ba6245a101e6d1b22db7c30be021c665732115d1a52c821aa4f4db9f8dbf2fd3d528aff098471b3cf815197c75c9814 SHA512 284c95d8d30589d8f51eb8bcec0c2d78fbf2364282239cd7ca3d9f12575d36b513c531bb3f36f77b53fee2760a95e392f851129168c39234e58ad952741dc320
-MISC metadata.xml 1145 BLAKE2B 08c579460c155f26b818729fd01266a1a9ef569c32a60a0820baf19005d1f8be213b7f3340f724b54cd4671c116557645ecac359c8a221cf14fe9f83c408c408 SHA512 5f7bbc0bdb35e22641ca82c19b948a3dda898d3f697babdf450b94ae9a90cf299fe3c3356d3d9649bd59a4de065423ab542666dd00cbc619d4071573c627d148
diff --git a/dev-haskell/network-uri/metadata.xml b/dev-haskell/network-uri/metadata.xml
deleted file mode 100644
index 8bbc355a0a8b..000000000000
--- a/dev-haskell/network-uri/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides an URI manipulation inteface.
-		
-		In network-2.6 the @Network.URI@ module was split off from the
-		network package into this package. If you're using the @Network.URI@
-		module you can automatically get it from the right package by adding
-		this to your .cabal file:
-		
-		&gt; flag network-uri
-		&gt;   description: Get Network.URI from the network-uri package
-		&gt;   default: True
-		&gt;
-		&gt; library
-		&gt;   -- ...
-		&gt;   if flag(network-uri)
-		&gt;     build-depends: network-uri &gt;= 2.6
-		&gt;   else
-		&gt;     build-depends: network &lt; 2.6
-		
-		If you want to use other modules from the network package while
-		using the @Network.URI@ modules from this package, add a @network &gt;
-		2.6@ clause to the first @build-depends@ line.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">haskell/network-uri</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/network-uri/network-uri-2.5.0.0.ebuild b/dev-haskell/network-uri/network-uri-2.5.0.0.ebuild
deleted file mode 100644
index c8e3442c21f1..000000000000
--- a/dev-haskell/network-uri/network-uri-2.5.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="URI manipulation"
-HOMEPAGE="https://github.com/haskell/network-uri"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/network-uri/network-uri-2.6.0.3.ebuild b/dev-haskell/network-uri/network-uri-2.6.0.3.ebuild
deleted file mode 100644
index 62effe9c4a61..000000000000
--- a/dev-haskell/network-uri/network-uri-2.6.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="URI manipulation"
-HOMEPAGE="https://github.com/haskell/network-uri"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	!<dev-haskell/network-2.6
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/network-uri/network-uri-2.6.1.0.ebuild b/dev-haskell/network-uri/network-uri-2.6.1.0.ebuild
deleted file mode 100644
index 880801091572..000000000000
--- a/dev-haskell/network-uri/network-uri-2.6.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="URI manipulation"
-HOMEPAGE="https://github.com/haskell/network-uri"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	!<dev-haskell/network-2.6
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/network/Manifest b/dev-haskell/network/Manifest
deleted file mode 100644
index ae0ad1bdc0c3..000000000000
--- a/dev-haskell/network/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX network-2.6.3.1-no-LDFLAGS.patch 419 BLAKE2B 25519c4a7e4fe8e4fe0a833f4beef41c90e27e5602da7510a023f646321d5c6983e75964442b172726d3cb854cf98e8c5c3dde847a18a3c1cecac2673318143a SHA512 4197173760689f0b141edfc5242abce1ec8a7e290b0bf91a8e71f81f8dec7f1d259f84458adf5a2426678c1c3c1e0aad95041096562d9381bbe1aa7ce40b9359
-DIST network-2.4.1.2.tar.gz 140424 BLAKE2B 7e9d3036caa1ecdec1ffbc684310271cdd92998cebc35a51d65b858975ab8210612e445bc26071bebc67bb7ece5af31a6082de46932724a4afca63fb68238791 SHA512 a9a0237477fbb484ff8a66121a7808e35d4df68552c18cead1f96243f945e9517583f39c769c3ecbd643ec86a253bb3cba638ffb780feb503d60595ad7c4c7f5
-DIST network-2.4.2.2.tar.gz 141558 BLAKE2B a2e9137b79da5e9d136a9e10eee796b2aeaa81bd38cdfa5b4a2822711a9ec2fed3019ecf91c84f2ca6dc00824455814fac53c6a75bf7a5af89ec733ea4be0c6f SHA512 e1aa5caa4e3ca368f8499ff9ed337e6827909a6d1c622cc2133871eac3b9d257d982c421f40d4d0118e50a5a421102f084d95b4e98faf91599b6c002988b1466
-DIST network-2.5.0.0.tar.gz 141768 BLAKE2B a7da62a236f87d4afb48e1289b536d924b04179b1608b6ca55f755dcbe08a468546a52c69f2a3f681e9e2ff05a952d1dbbd87831dd03e3a8a2f911eb17a379c0 SHA512 37048752b5d4d68f9ce57f9c7a3bfe2657a207c5853a6ecaae74ff9c8f9afb2ba76c9e517bfd955c427cbfccc39d921a1849c5a8094603ad5081012d9f5bb47d
-DIST network-2.6.2.1.tar.gz 118092 BLAKE2B 38f5be09b44ef90e4ecec2d73809abc8bcd15f55b95f6e390d925634e9e56776e00fd0bb5d223d26c85bd31d318ec61553918eeaf8b9c15258aaa70a41e6494d SHA512 debf0a05e1b9d048b7212ff21b92895da84c864bf71c3c5adee5070402c94a38f6722fbc11cfb15df36fe9bfe092bb0c29a0f3f9475a319f38e0c0659989cb68
-DIST network-2.6.3.1.tar.gz 120418 BLAKE2B 5e48e61e3f8b3ac9d9fa5bfca37929581291941d1f55f332614bf61552354a31e1f565092e4f83e67181384553b5efe2040d12882f85fe03d2377b93233e883a SHA512 3c23ef0a1bf5383cc2479a517875037f9de38c79c1293734cc723111ab880a5842e091ee91a612090d0a2e422d53028d17cf5b0800af0d1d6c983d564197b9a6
-EBUILD network-2.4.1.2.ebuild 807 BLAKE2B ef48c8befbad8c6f2c5647c7acf7b74df49f68cf0a696212588ccb90c5b02c0e01506d075ba864e6df30fd8f51b77476a4e758bbe460d0cb820750c5ca4ac5f2 SHA512 985b6fbe642cc043abab7d0d15723906ac653917b088cb43bd05d60fe30824226703109cd916ec066305c4b9dde41d843f2e0e2c34b8ce5d2a51641a2f8d5605
-EBUILD network-2.4.2.2.ebuild 808 BLAKE2B 289122cd7b81e8a2f489ddec200289ce3ccd0f00b086648e56ec782fbe41833611d26d1059f389745347b98d1e9485bcbafdc4afddb100a02804313487c1a3e2 SHA512 3641f8921938efa645506c241e41674c2d258be4222f048270e2ee44f399a740a16022ab54380cc17c53a9dfa9dd9756b220759cd7fb9bb093cd595bc47b7fe3
-EBUILD network-2.5.0.0.ebuild 805 BLAKE2B 6d7a2d41f119bb33f13c78239f79c5d61137746f44b5a0e084b51f7ac9ead905e0b76809f98f8e2c793292495cc036890b96bda3ae9026480955764037c94432 SHA512 6ddc314d9b9e3649fe615b9bc81e861fc7fc1ca6395438a01d92ae46a1140e8e413a41c4c3a4d59b369914f5d9c742706950c5aa3dcff3c2b1f754cf3a488ad3
-EBUILD network-2.6.2.1.ebuild 721 BLAKE2B 6ae391901c4233310972552f7e915c5c189f4bb7733df64b49956ba80b3594be4e5303c2df0b696a80435c5ccd6c760541378a218084c304268dbebf016b563d SHA512 b7d3749ea0a9c07707d6071c9fbab4dc8a8a5a6023ca28035c2ea5fd2dafdc9ff5310800efd87142be53fc14752ec0e06084b3c318a305e5e0ac8af4b396e8b0
-EBUILD network-2.6.3.1-r1.ebuild 796 BLAKE2B 07c8b038bc44eaeb8c87aed502d3d14f405efcc777a4c4dcca0a3a9c37733b07aec9b0db6d61ebbe5d0fdf9c2efe209abaf44cb5d62b4c42b42d0967b060cabc SHA512 bafa3370b203bad1f5495b26b195a71a266c2ef8df196c6ab78aa360cc264fb0659a8f1842cc530636f43c10e091a361e9a89c34f4d69de7b7970cfb347fd37c
-MISC metadata.xml 339 BLAKE2B 18307a0d079346dd5375b9b1bc7e305cab5d4d540b3c2c3dabe7cfd58fa4d1c3cfa85ec9e783b39e3aa5680f0341a42cbe67d13243cf44e90ede9835c5c69f2a SHA512 d01bf59dc204787d38413ec975da4530201bfaa8e7f68547e253013469c881cd258813129845de80aa3cbe0939c94cf59efc4605ae6351560fd214e7dbd4ce0f
diff --git a/dev-haskell/network/files/network-2.6.3.1-no-LDFLAGS.patch b/dev-haskell/network/files/network-2.6.3.1-no-LDFLAGS.patch
deleted file mode 100644
index eeb41c960c7b..000000000000
--- a/dev-haskell/network/files/network-2.6.3.1-no-LDFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Don't persist LDFLAGS into package database.
-
-https://bugs.gentoo.org/609624
-diff --git a/network.buildinfo.in b/network.buildinfo.in
-index 69e63a6..2079179 100644
---- a/network.buildinfo.in
-+++ b/network.buildinfo.in
-@@ -2,3 +2,2 @@ ghc-options: -DCALLCONV=@CALLCONV@ @EXTRA_CPPFLAGS@
- ghc-prof-options: -DCALLCONV=@CALLCONV@ @EXTRA_CPPFLAGS@
--ld-options: @LDFLAGS@
- cc-options: -DCALLCONV=@CALLCONV@ @EXTRA_CPPFLAGS@
diff --git a/dev-haskell/network/metadata.xml b/dev-haskell/network/metadata.xml
deleted file mode 100644
index 6c171b8854fc..000000000000
--- a/dev-haskell/network/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-    <name>Gentoo Haskell</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">haskell/network</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/network/network-2.4.1.2.ebuild b/dev-haskell/network/network-2.4.1.2.ebuild
deleted file mode 100644
index 9c15948573b7..000000000000
--- a/dev-haskell/network/network-2.4.1.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level networking interface"
-HOMEPAGE="https://github.com/haskell/network"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/hunit
-			dev-haskell/test-framework
-			dev-haskell/test-framework-hunit
-			dev-haskell/test-framework-quickcheck2
-		)"
diff --git a/dev-haskell/network/network-2.4.2.2.ebuild b/dev-haskell/network/network-2.4.2.2.ebuild
deleted file mode 100644
index 25698bd9b44c..000000000000
--- a/dev-haskell/network/network-2.4.2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level networking interface"
-HOMEPAGE="https://github.com/haskell/network"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/network/network-2.5.0.0.ebuild b/dev-haskell/network/network-2.5.0.0.ebuild
deleted file mode 100644
index de91b6b7b949..000000000000
--- a/dev-haskell/network/network-2.5.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level networking interface"
-HOMEPAGE="https://github.com/haskell/network"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/network/network-2.6.2.1.ebuild b/dev-haskell/network/network-2.6.2.1.ebuild
deleted file mode 100644
index cbc2837f057a..000000000000
--- a/dev-haskell/network/network-2.6.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level networking interface"
-HOMEPAGE="https://github.com/haskell/network"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
diff --git a/dev-haskell/network/network-2.6.3.1-r1.ebuild b/dev-haskell/network/network-2.6.3.1-r1.ebuild
deleted file mode 100644
index f0d3ee377b79..000000000000
--- a/dev-haskell/network/network-2.6.3.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level networking interface"
-HOMEPAGE="https://github.com/haskell/network"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # missing regression test file
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.10.1
-		dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
-
-PATCHES=("${FILESDIR}"/${P}-no-LDFLAGS.patch)
diff --git a/dev-haskell/newtype-0.2 b/dev-haskell/newtype-0.2
new file mode 100644
index 000000000000..f3db0865b330
--- /dev/null
+++ b/dev-haskell/newtype-0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A typeclass and set of functions for working with newtypes
+EAPI=4
+HOMEPAGE=http://hackage.haskell.org/package/newtype
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.8.2
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/newtype/0.2/newtype-0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=878b24eee2b41da5c627bbe9ca80b0a6
diff --git a/dev-haskell/newtype/Manifest b/dev-haskell/newtype/Manifest
deleted file mode 100644
index bb7dd8dfa042..000000000000
--- a/dev-haskell/newtype/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST newtype-0.2.tar.gz 3476 BLAKE2B 2c1dc7f78966680b927c7fb30bb76469b0fd5043e4d3a5917bf0de53e67f6bd7e9eb080a566d732e55afc4116dc3ad3d7eef511468adc67ff7a9076449c98d08 SHA512 9f5115df618223b5acf81ef7d15dc95db5930b39863ee89e2613500bd5a5b4cf421510a4330bbe77d7c456b56f4e93072b53fe31aec2f4dbebd966b80f667958
-EBUILD newtype-0.2.ebuild 557 BLAKE2B 3c8349a521d7bd10f8e59253a4cb6d4128084cebe1cd7180f1f36dc66b44357c0c0fc52fe820fac9474856e854aa6f54b4c63f665eb6edc9f49d9b6b74446235 SHA512 9144008bdc07c0786b4ebf33357849c5750351794bf06c753587d7ec7838f1aa125a7ced9ba7484e6c28618d9da528e5520f9a54f2e51dd68b772bc075076ad4
-MISC metadata.xml 457 BLAKE2B 91199f5831c7431f71b4851e9ef19b0be90d604ad18087201febd2402e7839cc343dbffdc0904f0b43d31b2900037fc63d9f036d8daab713e4dcce80edbdc6b9 SHA512 75b00c69ad2b24cee918d3ae93f9bf4d8f66bb4a8e977af215c88b712dbbb235586add1750647215896544bfe79ac073fc50d588de267a4df2cdbcf2d7c53075
diff --git a/dev-haskell/newtype/metadata.xml b/dev-haskell/newtype/metadata.xml
deleted file mode 100644
index 483360127934..000000000000
--- a/dev-haskell/newtype/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Per Conor McBride, the Newtype typeclass represents the packing and unpacking of a newtype, and allows you to operatate under that newtype with functions such as ala.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/newtype/newtype-0.2.ebuild b/dev-haskell/newtype/newtype-0.2.ebuild
deleted file mode 100644
index 28aaa9505fa4..000000000000
--- a/dev-haskell/newtype/newtype-0.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass and set of functions for working with newtypes"
-HOMEPAGE="http://hackage.haskell.org/package/newtype"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/nonce-1.0.2 b/dev-haskell/nonce-1.0.2
new file mode 100644
index 000000000000..ab2beda783cc
--- /dev/null
+++ b/dev-haskell/nonce-1.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/cprng-aes-0.5:=[profile?] <dev-haskell/cprng-aes-0.7:=[profile?] >=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generate cryptographic nonces
+EAPI=5
+HOMEPAGE=https://github.com/prowdsponsor/nonce
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/cprng-aes-0.5:=[profile?] <dev-haskell/cprng-aes-0.7:=[profile?] >=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.2
+SRC_URI=mirror://hackage/packages/archive/nonce/1.0.2/nonce-1.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8f7d8dbc35ddf93cce550fa18faa1cb3
diff --git a/dev-haskell/nonce/Manifest b/dev-haskell/nonce/Manifest
deleted file mode 100644
index afce242f5949..000000000000
--- a/dev-haskell/nonce/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nonce-1.0.2.tar.gz 2872 BLAKE2B ca6fe229e9682b91eee7886576eead09f47d259c760fc8e37d4c079ce810fa4ba3e08e53ef175ebe9787e7c921d3ab866fb2a446a116fde4a979d513b494dbdb SHA512 e47ed297c7aaa1ed98b6ce711cbc6653dbcbeba9b132750e588c9134f544e8b92b857f36a9331350711df14259dd0f54e49fa6e0da10e9334c5bf76952431894
-EBUILD nonce-1.0.2.ebuild 985 BLAKE2B f934f5e2384415345726b1ead0be72429deeeaf87a89a8d80e7d90fc5f6f4896ffa5314d461523f916c5366fe55290ae12ad937c5eedd49d63196b2b8c26ea9a SHA512 f7d6806b82c849f0121aca500f3e2e1e02c9fa4c55d668ec5e4ae955b4d4eb7fc2e7afa31e093eb7d0a0ead06694eed5c1cece9d203b2a2418417e34a2e9d19f
-MISC metadata.xml 806 BLAKE2B 6304bb46d197c2b8d88b4bc194e638e29abc7da6819dce3b310c2be1fc63dfba1b7dd03d5be52ba75709354aae8e5979440bb4c882de26040fd6e50ba8853898 SHA512 2e86de83f8508e9a698f2f0c09b1412a484050093fd1aed583bcd6378d6ff801b7956bcb7c261eb1b82825f2600715c7886fd00bf04774c005b8dba79bdc6960
diff --git a/dev-haskell/nonce/metadata.xml b/dev-haskell/nonce/metadata.xml
deleted file mode 100644
index ef3750fcd2b4..000000000000
--- a/dev-haskell/nonce/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		According to the Wikipedia, a nonce is an arbitrary number used
-		only once in a cryptographic communication.  This package
-		contain helper functions for generating nonces.
-		
-		There are many kinds of nonces used in different situations.
-		It's not guaranteed that by using the nonces from this package
-		you won't have any security issues.  Please make sure that the
-		nonces generated via this package are usable on your design.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">prowdsponsor/nonce</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/nonce/nonce-1.0.2.ebuild b/dev-haskell/nonce/nonce-1.0.2.ebuild
deleted file mode 100644
index b7dcac58cf5e..000000000000
--- a/dev-haskell/nonce/nonce-1.0.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate cryptographic nonces"
-HOMEPAGE="https://github.com/prowdsponsor/nonce"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/cprng-aes-0.5:=[profile?] <dev-haskell/cprng-aes-0.7:=[profile?]
-	>=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?]
-	>=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'base              >= 4.5   && < 4.9' 'base              >= 4.5'
-}
diff --git a/dev-haskell/numinstances-1.4 b/dev-haskell/numinstances-1.4
new file mode 100644
index 000000000000..e2761c1ce214
--- /dev/null
+++ b/dev-haskell/numinstances-1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Instances of numeric classes for functions and tuples
+EAPI=5
+HOMEPAGE=https://github.com/conal/NumInstances
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.4
+SRC_URI=mirror://hackage/packages/archive/NumInstances/1.4/NumInstances-1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7e444d91a8d1f80ac7affc57b31756fc
diff --git a/dev-haskell/numinstances/Manifest b/dev-haskell/numinstances/Manifest
deleted file mode 100644
index 7f25b911dae1..000000000000
--- a/dev-haskell/numinstances/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST NumInstances-1.4.tar.gz 4749 BLAKE2B d25b62c0396c85ceed1bc1fe384a9d6f7a7601c0d1e3952ef482884db91f3a33306be2e2637a58fccd51cafd03ac3e0203ba65906a0c167f97a08726b68d2bd4 SHA512 d36b6d924345142004c3fdfe5d329a8679ddab2763a117d80b7f8a7077cd98961696fdca573578ce2389bc54563a926445cb63c3d3b888a1c54d22bc329236c6
-EBUILD numinstances-1.4.ebuild 636 BLAKE2B f3a47723a3a04016c6350d36fa6ff4b9e044f7b4800326e5c1856afedbe0e9ff550c2c6904122c9f428151080dd104f1067c8f86231dd33b164d6a3152590e3d SHA512 24c88278416c15e40b1d11c9b49452ae9ef45e4048154a1230625753ce04d62355405aa9a940d21c05f939718ed7e5cf1d1e78883c03436cc2d7849506e774d5
-MISC metadata.xml 427 BLAKE2B 8e262b5f50fbaca839c8e12c23dbe4d5164ba83f7d883c0d5f41003b56681d15c457a6a6b68ff98424b24022ee53445789b64b9cc07be2c01ebb369d505372f9 SHA512 63426e7aedce3f67c9fd8d5a72073442df403e37f8f10cf2407998b31d2cee228bb7701737e3dcf2aa5cc33941eb4841436af09d7c67cc775113650007b5efbc
diff --git a/dev-haskell/numinstances/metadata.xml b/dev-haskell/numinstances/metadata.xml
deleted file mode 100644
index b02d6f3617e9..000000000000
--- a/dev-haskell/numinstances/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Instances of numeric classes for functions and tuples
-	</longdescription>
-	<upstream>
-		<remote-id type="github">conal/NumInstances</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/numinstances/numinstances-1.4.ebuild b/dev-haskell/numinstances/numinstances-1.4.ebuild
deleted file mode 100644
index 72d0223a2fee..000000000000
--- a/dev-haskell/numinstances/numinstances-1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="NumInstances"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Instances of numeric classes for functions and tuples"
-HOMEPAGE="https://github.com/conal/NumInstances"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/objectname-1.0.0.0 b/dev-haskell/objectname-1.0.0.0
new file mode 100644
index 000000000000..63db7a741734
--- /dev/null
+++ b/dev-haskell/objectname-1.0.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.8.2 dev-haskell/cabal doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Explicitly handled object names
+EAPI=4
+HOMEPAGE=https://github.com/svenpanne/ObjectName
+IUSE=doc hscolour profile
+KEYWORDS=amd64 sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.8.2
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/ObjectName/1.0.0.0/ObjectName-1.0.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7bc2e1ae1c7e5fc610f92740aac7ec70
diff --git a/dev-haskell/objectname-1.0.1.0 b/dev-haskell/objectname-1.0.1.0
new file mode 100644
index 000000000000..ef8cb3cdd556
--- /dev/null
+++ b/dev-haskell/objectname-1.0.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= dev-haskell/cabal doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Explicitly handled object names
+EAPI=5
+HOMEPAGE=https://github.com/svenpanne/ObjectName
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.1.0
+SRC_URI=mirror://hackage/packages/archive/ObjectName/1.0.1.0/ObjectName-1.0.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=87e6a49f028b59aa711fd3877f2d790a
diff --git a/dev-haskell/objectname-1.1.0.1 b/dev-haskell/objectname-1.1.0.1
new file mode 100644
index 000000000000..d60b5e57f5fd
--- /dev/null
+++ b/dev-haskell/objectname-1.1.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Explicitly handled object names
+EAPI=5
+HOMEPAGE=https://github.com/svenpanne/ObjectName
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.0.1
+SRC_URI=mirror://hackage/packages/archive/ObjectName/1.1.0.1/ObjectName-1.1.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7ccd90f1c6fc46de7474c0530619447a
diff --git a/dev-haskell/objectname/Manifest b/dev-haskell/objectname/Manifest
deleted file mode 100644
index 32b29f09310d..000000000000
--- a/dev-haskell/objectname/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST ObjectName-1.0.0.0.tar.gz 1843 BLAKE2B 029eddfd406b45bec034b8e93d1b8bea78ef4f217f6bf3fc8fb81630f67933f538327df59688c34e64f43d35a447b23fd4d8cbc04b1b11e6b18f9faccc84da99 SHA512 ceb9c88e20641f29725d1cfd4ad421cdd3ade2b6e7ba6d45efa1802a616b950299832d47d2c71208c639bfdb7ae8af051541dfef4d92c9a10ae7d3cf4ba076c7
-DIST ObjectName-1.0.1.0.tar.gz 2265 BLAKE2B de1e8ae29569f355f4b711d8e08f03842e4176feb7bd79a1b5d3c1df050f698a8927ed216447783182b601b339564f172a58bc2431331039d0389a46aa5e1078 SHA512 e526ca1334a2ec81eac1ab7dde4a459d9541761cf708098fe011f84681143819553e1540ce71d122a5f744c1adc9965bb9eb25f216e039233edcdfbc5d6d33d2
-DIST ObjectName-1.1.0.1.tar.gz 2557 BLAKE2B ba67de5c6bf8dc522dbb245064ceaf9b6498979d511fb0b7624083362c6d954c70e292c03edec1663e4265cf935c5eb833dc4833b2acb17b29f957e6b028a98e SHA512 e0b94813d29ccba4a54c699e039ab101039a9482f594c990547a04f9de511e4d27d5a93fc5f176ea5e3a8d940d31477f0e69dcd6f7c867f67bb117933d2cce64
-EBUILD objectname-1.0.0.0.ebuild 604 BLAKE2B a06a8e12bd7a8d8da06c640ccfb75e4258369bad3f8e3199cebb32b9e69f803a0db1d611a08738fab91c73e20c3a8325bc72a1a31ee99a19a201083d70ce82ab SHA512 eafa7fdf1e1ada70d9e51adb27bdd682f0384ca51d00328b42f61b6d828f3ef26fef9bf0a5c2408b2a12422d96dbe58552c9f3d4b6e0fdd4d88db27d0f205c70
-EBUILD objectname-1.0.1.0.ebuild 610 BLAKE2B e5e53376e19386ed525d49d5ea402bd3a63079ed45ecadf8f50ba1b34ebb73359bfaae47e7fdefd272c1fb79c01b20867dadd12b1be34d06f1eeb22fdfc68d3a SHA512 b75e1afccacc1b845df8bbf07773b195c4d5eddab3b988a8b24b37d776578d40d98b9ae5edfac02fd8f065c3593adaf6ac714a1853b4309ece51772b33f93e03
-EBUILD objectname-1.1.0.1.ebuild 708 BLAKE2B e8962689719253b41d852ee2fc053fbae04e8115d5cf31396166feba84934e3fc032ad3e2785f0b9cbd1eef4b33e2acdeba3820c4262942f1c48404e194aaae5 SHA512 6d4bc6911d6249f73d58ce0ef0af8e708e1939577ab9503cc77d3ee4f9f7b441093e8a9e1568b8b49fbcf1ff26bb2c3a3b4ff9a55caedf94ddae4dcd927cfa54
-MISC metadata.xml 596 BLAKE2B a43d8028870e22b19d34519c3ff131a473293aa8f2572657a61489163a6d157064b191b0dee3b8c93b77b05cc40b1c3c4201a688cb4d57e7a0e4aac988fe8cbd SHA512 efce1983ae651b42654dfdfcba73f7c73ebe8dcf725b43bf8ec80e7b9b98c4b5f1611ace0f74147299ea92c4d5d973cd399e116280451cbc6c817f8a6b8f7d7e
diff --git a/dev-haskell/objectname/metadata.xml b/dev-haskell/objectname/metadata.xml
deleted file mode 100644
index 87310c649b7b..000000000000
--- a/dev-haskell/objectname/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This tiny package contains the class ObjectName, which corresponds to the
-		general notion of explicitly handled identifiers for API objects, e.g. a
-		texture object name in OpenGL or a buffer object name in OpenAL.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">haskell-opengl/ObjectName</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/objectname/objectname-1.0.0.0.ebuild b/dev-haskell/objectname/objectname-1.0.0.0.ebuild
deleted file mode 100644
index b4222a2d945f..000000000000
--- a/dev-haskell/objectname/objectname-1.0.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="ObjectName"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Explicitly handled object names"
-HOMEPAGE="https://github.com/svenpanne/ObjectName"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		dev-haskell/cabal"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/objectname/objectname-1.0.1.0.ebuild b/dev-haskell/objectname/objectname-1.0.1.0.ebuild
deleted file mode 100644
index 36e2cdb49ed3..000000000000
--- a/dev-haskell/objectname/objectname-1.0.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="ObjectName"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Explicitly handled object names"
-HOMEPAGE="https://github.com/svenpanne/ObjectName"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/cabal
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/objectname/objectname-1.1.0.1.ebuild b/dev-haskell/objectname/objectname-1.1.0.1.ebuild
deleted file mode 100644
index aa65ea5d70f3..000000000000
--- a/dev-haskell/objectname/objectname-1.1.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="ObjectName"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Explicitly handled object names"
-HOMEPAGE="https://github.com/svenpanne/ObjectName"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/old-locale-1.0.0.7 b/dev-haskell/old-locale-1.0.0.7
new file mode 100644
index 000000000000..e57bf2a092f7
--- /dev/null
+++ b/dev-haskell/old-locale-1.0.0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1ebf9830a2ce62bd48a89b6e3f2044ed
diff --git a/dev-haskell/old-locale/Manifest b/dev-haskell/old-locale/Manifest
deleted file mode 100644
index 7905fadae992..000000000000
--- a/dev-haskell/old-locale/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST old-locale-1.0.0.7.tar.gz 3384 BLAKE2B 338edfdfebca9e6658a814199b48ec16b9783f487ec9ba5746c9785d4c7032a7402de8b30c8b1c938695bef9026b8fb842a273f4fb61d79360d7fbe41aeab238 SHA512 34d018cb040de9adce3ddb8cffabe2a0610f6cd0ff5340ee721b7076671bd5cc3e830f58d16e73240df4b068510f7a24fd1995efc38f002b52d228abc4581d6a
-EBUILD old-locale-1.0.0.7.ebuild 758 BLAKE2B 14377167a23b06a948597abf9718fa3d17de8dba6b43b76e33cc7510f591f256f88710820fb0259ff4303c14ef1e88b5040e66611f1652322b8b7caf3a2b4a73 SHA512 0166665288ca5d395ff5ae2349ce47a1f9fa7a4c92f97b1ac9d9b03d44e3dfe55733cfaeb3603c474874fe60e168505515847968e13fd890d4080af0252d054a
-MISC metadata.xml 388 BLAKE2B 074104122b929fe61bfcb49c703017947ef93715c19594cdb7b0bb28c099565c37c703a40da7440b1202ddd355b7335f43f444b52e55fcd2b9a346cbd1175eb8 SHA512 0ef6e366f38c2426e2b1ccdce4519cb1fb23415567d32f60abf2a413d26392e7eef31b0712cecece23ebd930a36bbce318da7985b7c9691797278077c5d25a15
diff --git a/dev-haskell/old-locale/metadata.xml b/dev-haskell/old-locale/metadata.xml
deleted file mode 100644
index 326450b71c69..000000000000
--- a/dev-haskell/old-locale/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides the ability to adapt to
-		locale conventions such as date and time formats.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild b/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild
deleted file mode 100644
index 1e5896221474..000000000000
--- a/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="locale library"
-HOMEPAGE="http://hackage.haskell.org/package/old-locale"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-# it's not quite true, but there was no major releases
-CABAL_CORE_LIB_GHC_PV="6.12.* 7.0.* 7.2.* 7.4.* 7.6.* 7.8.*"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >= 4.2 && < 4.9' 'base >= 4.2'
-}
diff --git a/dev-haskell/old-time-1.1.0.3-r1 b/dev-haskell/old-time-1.1.0.3-r1
new file mode 100644
index 000000000000..f566e703195c
--- /dev/null
+++ b/dev-haskell/old-time-1.1.0.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18.1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d4145fe57d3b97e035c67843f5e01bb8
diff --git a/dev-haskell/old-time/Manifest b/dev-haskell/old-time/Manifest
deleted file mode 100644
index 207752bf8afd..000000000000
--- a/dev-haskell/old-time/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST old-time-1.1.0.3.tar.gz 74219 BLAKE2B e0f4e6fca5f92fdaf1aec8fbb02d339020e9547acbe23d5b5a00bed3b38e4267653331e4b7fc58f0d62f6158e51d78867f4e3bdd29591dffeab7a132d03f3d6e SHA512 a701c62266f9f3c6dc60eba970b6c25a61bf82b6b8bb6b0073e0e44908598926fe7813a7ae1b1f9da98e4861a8f0565d0bd025cb97307b71c08cb9b0b2e321bb
-EBUILD old-time-1.1.0.3-r1.ebuild 852 BLAKE2B a3941ba5a1748735b3447a84c47cde6cec4f228c8db319d6788cf8c591bd40470a508d995101ff53c538986ac4b476e5a2b316c027fd9fbd5aff273efafad2f4 SHA512 4a6a2dee6507a30c5cafa11aeadab865bd5a353ed3a8d2875093d3227fecd8d0ed353fd7eb0c950f3eeee811d2d56176f5cf5966ade47fba5e51add1f6d08cd8
-MISC metadata.xml 448 BLAKE2B 34d0199dadaa1847b1b54ad5663e05bb29098eb8541cfa4dabd8ab85d114927d0123fffd5133653823bfbadc7a4f263785c56fcfa0f8dc55189d19002d215b3f SHA512 06c860a7effc26f89667d44037c2f386a867b7f3d27344ab5638040f7c55367b03b298891351923555f717c89c43bcc98d44695f06fa0914094ff456eea9b4d5
diff --git a/dev-haskell/old-time/metadata.xml b/dev-haskell/old-time/metadata.xml
deleted file mode 100644
index 96a6689305de..000000000000
--- a/dev-haskell/old-time/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides the old time library.
-		
-		For new projects, the newer
-		&lt;http://hackage.haskell.org/package/time time library&gt;
-		is recommended.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild b/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild
deleted file mode 100644
index 6d908455b678..000000000000
--- a/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Time library"
-HOMEPAGE="http://hackage.haskell.org/package/old-time"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.2
-"
-
-# it's not quite true, but there was no major releases
-CABAL_CORE_LIB_GHC_PV="6.12.* 7.0.* 7.2.* 7.4.* 7.6.* 7.8.*"
-
-src_prepare() {
-	cabal_chdeps \
-		'base       >= 4.7 && < 4.9' 'base       >= 4.7'
-}
diff --git a/dev-haskell/open-browser-0.2.1.0-r1 b/dev-haskell/open-browser-0.2.1.0-r1
new file mode 100644
index 000000000000..46372c779e33
--- /dev/null
+++ b/dev-haskell/open-browser-0.2.1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Open a web browser from Haskell
+EAPI=6
+HOMEPAGE=https://github.com/rightfold/open-browser
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.1.0
+SRC_URI=mirror://hackage/packages/archive/open-browser/0.2.1.0/open-browser-0.2.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c7bd3aed94ffbb946c286b9449206315
diff --git a/dev-haskell/open-browser/Manifest b/dev-haskell/open-browser/Manifest
deleted file mode 100644
index 2a4eedb09fd5..000000000000
--- a/dev-haskell/open-browser/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST open-browser-0.2.1.0.tar.gz 2629 BLAKE2B 5b56acd53d887e92e5a10cdb36e62ccd4bfdb4002988ebb553b9a5d52af5d7d13f02e5d6d37df52788191d951c401e7497eaf972e59884fd0eb41a28342a0f1d SHA512 94ba71597c270b518742534b1b9b9a7ca0ede2eeb08a030b03cca6dbe6e5a2de363dc443bae907ca5c90b126aeb7dc5f5dd1eada95ca78a0ba1a8d472df4ada1
-EBUILD open-browser-0.2.1.0-r1.ebuild 649 BLAKE2B 49d0cb1f63bde78eaeb7a230588de4e74a8e9739666679274063011e36a511332df3ec7994e5f7a85fd561745354b8034036902d34df471712d320aedbf37316 SHA512 a820d21dd0a374dc243d1d28fb754a80ea10903a9643de615b0718659972da885cab78e616db4db51f933bbccca98f4f743a3068f3676170e9f0be1264425d0d
-MISC metadata.xml 379 BLAKE2B 99a5894d81746c1b3aa164b6a8cd7f249f43ec7be38a82ab602ffad5cccbaa56a7a77a32d1940246a7e69299a391585cd2e458b53cf369b23b3bedcdc6c550fb SHA512 1ef81fefad7503503e590522b99fa34248df5df8d2f275b41501244922a0d7f662a8681527f57bbeb275238bd8e05882973719dab26fb980106d47bc76345ea2
diff --git a/dev-haskell/open-browser/metadata.xml b/dev-haskell/open-browser/metadata.xml
deleted file mode 100644
index 59f5d334b5e5..000000000000
--- a/dev-haskell/open-browser/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Open a web browser from Haskell.
-		Currently BSD, Linux, OS X and Windows are supported.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/open-browser/open-browser-0.2.1.0-r1.ebuild b/dev-haskell/open-browser/open-browser-0.2.1.0-r1.ebuild
deleted file mode 100644
index dca61ae014c1..000000000000
--- a/dev-haskell/open-browser/open-browser-0.2.1.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Open a web browser from Haskell"
-HOMEPAGE="https://github.com/rightfold/open-browser"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'executable example' 'executable open-browser-example'
-}
diff --git a/dev-haskell/openal-1.4.0.2 b/dev-haskell/openal-1.4.0.2
new file mode 100644
index 000000000000..89ca13a7f763
--- /dev/null
+++ b/dev-haskell/openal-1.4.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/objectname:=[profile?] dev-haskell/statevar:=[profile?] dev-haskell/tensor:=[profile?] media-libs/openal >=dev-lang/ghc-6.10.4:= dev-haskell/cabal doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A binding to the OpenAL cross-platform 3D audio API
+EAPI=5
+HOMEPAGE=http://connect.creativelabs.com/openal/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/objectname:=[profile?] dev-haskell/statevar:=[profile?] dev-haskell/tensor:=[profile?] media-libs/openal >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.4.0.2
+SRC_URI=mirror://hackage/packages/archive/OpenAL/1.4.0.2/OpenAL-1.4.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=007a39ff760489fb0c0cf7627ad1ed76
diff --git a/dev-haskell/openal-1.6.0.0 b/dev-haskell/openal-1.6.0.0
new file mode 100644
index 000000000000..c2db747fed6c
--- /dev/null
+++ b/dev-haskell/openal-1.6.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/opengl-2.9.0.0:=[profile?] >=dev-lang/ghc-6.10.4:= media-libs/openal >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A binding to the OpenAL cross-platform 3D audio API
+EAPI=5
+HOMEPAGE=https://github.com/haskell-openal/ALUT
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/opengl-2.9.0.0:=[profile?] >=dev-lang/ghc-6.10.4:= media-libs/openal
+SLOT=0/1.6.0.0
+SRC_URI=mirror://hackage/packages/archive/OpenAL/1.6.0.0/OpenAL-1.6.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3a935d9c1fc5588f7bae4b6c57f23c23
diff --git a/dev-haskell/openal-1.7.0.0 b/dev-haskell/openal-1.7.0.0
new file mode 100644
index 000000000000..39d8d25a0de8
--- /dev/null
+++ b/dev-haskell/openal-1.7.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?] >=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-2.13:=[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/openal >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A binding to the OpenAL cross-platform 3D audio API
+EAPI=5
+HOMEPAGE=https://github.com/haskell-openal/ALUT
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?] >=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-2.13:=[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/openal
+SLOT=0/1.7.0.0
+SRC_URI=mirror://hackage/packages/archive/OpenAL/1.7.0.0/OpenAL-1.7.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2f8defc9b94783b2e9c09faa344dbc48
diff --git a/dev-haskell/openal-1.7.0.4 b/dev-haskell/openal-1.7.0.4
new file mode 100644
index 000000000000..3a4ea61c0f94
--- /dev/null
+++ b/dev-haskell/openal-1.7.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?] >=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-3.1:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= media-libs/openal >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A binding to the OpenAL cross-platform 3D audio API
+EAPI=6
+HOMEPAGE=https://github.com/haskell-openal/ALUT
+IUSE=examples doc hscolour profile
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?] >=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-3.1:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= media-libs/openal
+SLOT=0/1.7.0.4
+SRC_URI=mirror://hackage/packages/archive/OpenAL/1.7.0.4/OpenAL-1.7.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b0a2c0294a682b41c153e2d5ef7dcac6
diff --git a/dev-haskell/openal/Manifest b/dev-haskell/openal/Manifest
deleted file mode 100644
index ae6e1f65db49..000000000000
--- a/dev-haskell/openal/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST OpenAL-1.4.0.2.tar.gz 116835 BLAKE2B ffc833fa7fb69ec52ca2a6ae05c8971eab1b90c48f75760f0e148d4b69c3102736dedc02fcbf867fae16c3977ea75ad01e8df07f4ff225b08602974143979dbf SHA512 33075901fab42af8b91c0c46c590ddc5d1409c0ef2d49dfb1aa6f9b584ac3b8aa1f099cb9d5fdbf84905a9a1f689c3c0a389954db36b06b0eef5e1ceaef5928a
-DIST OpenAL-1.6.0.0.tar.gz 41111 BLAKE2B 65a4e85554e27b42be20846893ce0b8c1003a86e5f52dc6a58993eb499225382ae65c3b34219ab6677822a4aed7af08ccc466ae2d67f35ad892771486f102add SHA512 e804a89124f26b66e55715a7bc69d741c76cbd8dd1b08d32e6284d86d76f91626afcbdd8d4f8716cf124a509f5e252c5e584839255db2af12c9c4160d13668f3
-DIST OpenAL-1.7.0.0.tar.gz 41297 BLAKE2B c306699e4dec7c2f4ce29085f8003bd7096aedc3abeea655cad2a650dc530a137ab7bdb8591f05717492a5c823834ceea0003369b0ed35ea7a736666ce89df1c SHA512 2d2a4623e8559c49ae025a695e50115cf9dc31952a4666006913c797b45fcb560e772d939f76999de6273078cf1986feb263fd428e52df3a1db2cdfa80815f17
-DIST OpenAL-1.7.0.4.tar.gz 40801 BLAKE2B 098ac8dc76e7b530d8c3546555e365897b6070b908b7294567a62d911ba2ad6900d218b5e4dc371a2240891d8ca0302211e55b300f077f385af25d9177ca0198 SHA512 4268e1c356451cafc7aaf211076712cbd6c84022837cb50670a15d9d98c8df823cb11a07696ef39bf30baa813a770710c3f7628289212e02e10fa59e339a3013
-EBUILD openal-1.4.0.2.ebuild 748 BLAKE2B 35e39cee14220dbe85b4e59770bc81b3cdb5ea8bca84016ad35ab6bf2c5d43b6337b3b5a915486bd10659f2cf6ef93938c15147e41b30a8d01d7b20547d93faf SHA512 981fb966bd7e86b61c71f903dea21c13469930b4a5ce3cc099e3c540d97af93d51a8f79dd1aa21ecb873f65d4cf8b3ed4ac4fc13748d4862ce5b103f6983a226
-EBUILD openal-1.6.0.0.ebuild 829 BLAKE2B 020c50689305dbfaea031943aea71e2c196e16658992de0c6379c4b4bd77c2a226bd78991986d83865269cf133796d8b22c2766abff7452f9d027c2805817b6d SHA512 5a9db82159092cc720c716577f41e1982fb98f18e68da9ec14b1cd5bd44a82c0cb1409e0012d9dd48dd1faa36aecb79a2d0b6697ffce0f68fc49cfe56a64d14b
-EBUILD openal-1.7.0.0.ebuild 1111 BLAKE2B d1eee14cd6ee7eff8249b39e2482f0841b257d1767cefa6408e89c4729060233691528b61706e87a7f0a89e06dd66c42c8a8d76a196d31b70cf0ed1060520a1a SHA512 ece7eee06f0c1f8b6a591add786a96913bde2bfbe1e0736bc3c37f7a30a4d3d453537b870aee1315dd86121cc44c1656d9601824c93583f8bd580fa864f37b0e
-EBUILD openal-1.7.0.4.ebuild 1182 BLAKE2B 85bda7fecdb61a0710d4cec29b4611dcc3003e72bbf18b63b862d5445fff6b8b59d6138b946443640dcf9134adde813ce724ad9ed45e478e547a33cca1076909 SHA512 80d4e1d751e9b351587988db1643ce46c39c7e2d87897b19b44e4fbc4cdfbef759ab0fe889be387e6811f39f5aac257b38a15cad8647bbc7833be429ab401a67
-MISC metadata.xml 311 BLAKE2B d1edbd170f8774a220b1750e05390e0f6693a81de85b49b6d54df3ca8502adb7faf0aa99b66bd0374209433d91c1697216780b9de70d3a173b16256a72b6fba7 SHA512 41a19ed33057a3d03f99c30fe71898900cf0d5a15fa90c23de4bac7313872ceef0aa0f0d59f50d24ecb58bac144b46264812fa107137c187b67f084d3a307ee4
diff --git a/dev-haskell/openal/metadata.xml b/dev-haskell/openal/metadata.xml
deleted file mode 100644
index da1f27875e62..000000000000
--- a/dev-haskell/openal/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">haskell-openal/ALUT</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/openal/openal-1.4.0.2.ebuild b/dev-haskell/openal/openal-1.4.0.2.ebuild
deleted file mode 100644
index 249be72e821e..000000000000
--- a/dev-haskell/openal/openal-1.4.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the OpenAL cross-platform 3D audio API"
-HOMEPAGE="http://connect.creativelabs.com/openal/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS=" amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/objectname:=[profile?]
-		dev-haskell/statevar:=[profile?]
-		dev-haskell/tensor:=[profile?]
-		media-libs/openal
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		dev-haskell/cabal"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/openal/openal-1.6.0.0.ebuild b/dev-haskell/openal/openal-1.6.0.0.ebuild
deleted file mode 100644
index c1ce7762c303..000000000000
--- a/dev-haskell/openal/openal-1.6.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-#hackport: flags: -usenativewindowslibraries
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the OpenAL cross-platform 3D audio API"
-HOMEPAGE="https://github.com/haskell-openal/ALUT"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/opengl-2.9.0.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	media-libs/openal
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/openal/openal-1.7.0.0.ebuild b/dev-haskell/openal/openal-1.7.0.0.ebuild
deleted file mode 100644
index 705fff889f5b..000000000000
--- a/dev-haskell/openal/openal-1.7.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -usenativewindowslibraries
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the OpenAL cross-platform 3D audio API"
-HOMEPAGE="https://github.com/haskell-openal/ALUT"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?]
-	>=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-2.13:=[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/openal
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/openal/openal-1.7.0.4.ebuild b/dev-haskell/openal/openal-1.7.0.4.ebuild
deleted file mode 100644
index 70ad746eecf2..000000000000
--- a/dev-haskell/openal/openal-1.7.0.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -usenativewindowslibraries,buildexamples:examples
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the OpenAL cross-platform 3D audio API"
-HOMEPAGE="https://github.com/haskell-openal/ALUT"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="examples"
-
-RDEPEND=">=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?]
-	>=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-3.1:=[profile?]
-	>=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	media-libs/openal
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples buildexamples) \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/opengl-2.12.0.1 b/dev-haskell/opengl-2.12.0.1
new file mode 100644
index 000000000000..8d2e4fca6922
--- /dev/null
+++ b/dev-haskell/opengl-2.12.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/gluraw-1.3:=[profile?] <dev-haskell/gluraw-1.6:=[profile?] >=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?] >=dev-haskell/openglraw-2.1:=[profile?] <dev-haskell/openglraw-2.6:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?] >=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=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 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.3:=[profile?] <dev-haskell/gluraw-1.6:=[profile?] >=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?] >=dev-haskell/openglraw-2.1:=[profile?] <dev-haskell/openglraw-2.6:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?] >=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.12.0.1
+SRC_URI=mirror://hackage/packages/archive/OpenGL/2.12.0.1/OpenGL-2.12.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=130b9eef493c283dd8f2585d5b898dd4
diff --git a/dev-haskell/opengl-2.2.1.1 b/dev-haskell/opengl-2.2.1.1
new file mode 100644
index 000000000000..1ea646c0977c
--- /dev/null
+++ b/dev-haskell/opengl-2.2.1.1
@@ -0,0 +1,13 @@
+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	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7a993f31725e83df19a8a4f207f86229
diff --git a/dev-haskell/opengl-2.5.0.0 b/dev-haskell/opengl-2.5.0.0
new file mode 100644
index 000000000000..91034ee10287
--- /dev/null
+++ b/dev-haskell/opengl-2.5.0.0
@@ -0,0 +1,13 @@
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=71ba06e0ba7f265bbe007ce680e92037
diff --git a/dev-haskell/opengl-2.6.0.1 b/dev-haskell/opengl-2.6.0.1
new file mode 100644
index 000000000000..dd7c26c27727
--- /dev/null
+++ b/dev-haskell/opengl-2.6.0.1
@@ -0,0 +1,13 @@
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5cbd05c439b94cf2282c894d2b2af8d6
diff --git a/dev-haskell/opengl-2.8.0.0 b/dev-haskell/opengl-2.8.0.0
new file mode 100644
index 000000000000..c44bb4505e7e
--- /dev/null
+++ b/dev-haskell/opengl-2.8.0.0
@@ -0,0 +1,13 @@
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c571a067c67bfe2dae6e29f70be63576
diff --git a/dev-haskell/opengl-2.9.2.0 b/dev-haskell/opengl-2.9.2.0
new file mode 100644
index 000000000000..845e17f303b4
--- /dev/null
+++ b/dev-haskell/opengl-2.9.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/gluraw-1.3.0.0:=[profile?] >=dev-haskell/openglraw-1.4.1.0:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=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.3.0.0:=[profile?] >=dev-haskell/openglraw-1.4.1.0:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.9.2.0
+SRC_URI=mirror://hackage/packages/archive/OpenGL/2.9.2.0/OpenGL-2.9.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5e93e0446579925d3ae2a79aa6d6a02f
diff --git a/dev-haskell/opengl-3.0.1.0 b/dev-haskell/opengl-3.0.1.0
new file mode 100644
index 000000000000..2cd9d96adbe7
--- /dev/null
+++ b/dev-haskell/opengl-3.0.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/gluraw-2.0:=[profile?] <dev-haskell/gluraw-2.1:=[profile?] >=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?] >=dev-haskell/openglraw-3.0:=[profile?] <dev-haskell/openglraw-3.3:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?] >=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=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 graphics system
+EAPI=6
+HOMEPAGE=http://www.haskell.org/haskellwiki/Opengl
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/gluraw-2.0:=[profile?] <dev-haskell/gluraw-2.1:=[profile?] >=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?] >=dev-haskell/openglraw-3.0:=[profile?] <dev-haskell/openglraw-3.3:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?] >=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/3.0.1.0
+SRC_URI=mirror://hackage/packages/archive/OpenGL/3.0.1.0/OpenGL-3.0.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=916205e145ece97a8d3a97ef15f7128f
diff --git a/dev-haskell/opengl/Manifest b/dev-haskell/opengl/Manifest
deleted file mode 100644
index 2c118590de34..000000000000
--- a/dev-haskell/opengl/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-AUX opengl-2.2.1.1-ghc-7.4.patch 1209 BLAKE2B e8b6cd8d35cba6ff61fcddf1087a3993df0a81f9775d71552010efbc90b66bf80c294a2282c708ec711e8ee7dbbb3f1db6f38f00de01bfac5ad1cf30f43af1d7 SHA512 0e774a69cba5d99e6362ff2e36a94b212e96ea95de7817b3d6cf15e383d4de4e9cb9ab5c7fbd07e33951e4b6b1a67c7e6f0512c4cd41fe92ab722f1d76ea47e1
-AUX opengl-2.9.2.0-ghc-7.10.patch 538 BLAKE2B 1d532d8a36627c389a10d341c7f887d71c2f97b9e101caf40da87c2e1ee319c8bcd57b9d6c97e99583ca52d1a82a58a37af42316bc141b5fad1b1b4638f1528a SHA512 df64e2277c053b9404369ba6def4b474bb49302947405558b3a49ae054a5416a7f28c858e51e3457d2fd90e28af74aeb08424afe3a7389ef381ca4e3b321ee53
-DIST OpenGL-2.12.0.1.tar.gz 125419 BLAKE2B f6cb30335f783d9474d112159fef0d7af744c3bef54580485e1df77d58f625d4ba9a6c46120c1dc5d96fa98c89f34a6e63e91909f0f5dd1f7626460ad3f55612 SHA512 58c21efade5a8e10a78a61eaee35986e61581e3ef898f657e3f4c0479e0e35f60772bfa489bf49dfdbf3c395826df513f3f116278fb400d568babed1061e4765
-DIST OpenGL-2.2.1.1.tar.gz 176695 BLAKE2B 5816950e5ca853c1891136e8124d9cec51d901b68ea00c8558d136d1140afe7d200aa8d5cae7a335a9dc5099d8c7436c803927ed5b4b6ebbe5680bf4f886c6eb SHA512 24184a839123c10f228e79ef0bdf5c69b440065828e9b87a820f80c8bcd5a03c4ea179b8aab186e29b1bc435028d9f453dd8e6c22302751f4cc8c93e37742d85
-DIST OpenGL-2.5.0.0.tar.gz 105010 BLAKE2B 454d7f67424a1f9b5aa35dca17c54ffb5e2e67215776c51e0949c9bbe6c93b91ca0b8a925fbffaadeb47e4e2e36c0b8ae1c14ec3a9296f68373bfab3819a6031 SHA512 020a9c8615f636b2d9394f245581a324cdee7341604799552a1a65c56a0d44d419593d4058de46156dd8bae03293f6848e4dc47bbe321a1cdcb2994cb587928e
-DIST OpenGL-2.6.0.1.tar.gz 119962 BLAKE2B 6a67dde2a8b7ce83bf30ed14d669ba55440028a7b3ee93934a86c97ba220c0e64fecf13147790465645fe4eff16a2c2068996bbf2ebf34d54fc43753ba165d8a SHA512 ac7d09e71bffb58fd80736c7bd3b1e4cfbe1b4ca9ad40502c12132cfbc4e8dd1a446500548ab32f19288032ec533feea9d9e1c5db1078ae84ce798d9cd05b7f6
-DIST OpenGL-2.8.0.0.tar.gz 123107 BLAKE2B 56663621a2e3c121080ede51ca6685821758b05f843ee5994902bc6ad5b9263cdcdcfeced6ebc355c4cd29e5dec43f7f4697bcc4ac00f59e80ac24a88c1aaf6c SHA512 ff39f9ddd997b93cabd54a837f2f1a8739a72ad882151801ae10300f0301716283a443071c996b6a928af5f1fecc53b09d92bb2074ad6684a783e96abe622429
-DIST OpenGL-2.9.2.0.tar.gz 122514 BLAKE2B f6d4e40b2b49dcbf542e7ec8e437d5b69834b593d0584ac512dffde97478b5e2f66d94c96129c910d428e1c7311319a0c751b48d52402fc90993407545bd124a SHA512 1abb31033fe57056a0a3d00308910033d25d800f3da9ee4ecfd43bf25d8a392d6344463f3173da432a35ab3bbe5b5964c2aa5b0de5252e4f274025fd8d0dd0e9
-DIST OpenGL-3.0.1.0.tar.gz 129993 BLAKE2B b47ac84c84ef891c0663d26b286e17b1b444ef0f05cd15ebeaf67a2469f26a745d3dee5e998b1d996ad23942ff43ed54ef82acd3f80440193a7a5e3c9628b5df SHA512 ce6d7a15b4a7d43ed0a8896a36dc890057b67472ca9b8c96143df9b5936ae3fdfc49a7dec4cff4d76407d76420ae60e606a4747a8ecc995141c82291433a1cdd
-EBUILD opengl-2.12.0.1.ebuild 1099 BLAKE2B da1760056af0103ea37b12bb789b9ccc24b1bd797af998ba2eb086bb761117792ed4f90532b79ff876772ae4ce4c8a5713a60fd991551b50e6a43f33dfe7ac10 SHA512 8173c21ef635da0d0caa115826d7f727e4ab6b70c7da37a8680814d9acd8ebfce8614c4e6c5dd0d70b8216e118ff874d0346193d64c7eb13eb61bf813920f4bf
-EBUILD opengl-2.2.1.1.ebuild 574 BLAKE2B 0bdf9494534b61e2c3bd90bad012cc94d107364abc0e3763f4a8ee15e51eb3a1de23bbc665201f49d85fda763be77bb8f57d14aa818be0818303cb7fe8f0ba2c SHA512 aed7b0ecbd3e5d1fe0b4415ffa090e0facbb7b4227bd977e2b51154b002bfc35914052eb4571700ee6ae848195ea432be4fbf9e36d1182c89cd3aeb04772eb69
-EBUILD opengl-2.5.0.0.ebuild 822 BLAKE2B 2fd8251433c936bf262d65ee173611245dc847d21523d6b66af09a6c259078d6cf07ee06a8f4081af7d9d80d35f7e927fd8bc7e43c6b4a0cb9cb952f49ef70c5 SHA512 aafcc755202ca7d6b67d56ac48b50362f79156c6de69f62d50e7c3d77de19b3c79f4f132ddac4ee281ee2c77d41fbcba9232517cade6f0522524cbc049958af3
-EBUILD opengl-2.6.0.1.ebuild 838 BLAKE2B 386e7d6ab89752b18e42f380268ec8a448f70dc72090eb37828717843172c5c71f5d5ecc5d77753ba2b183e45702f2feed41fa2b92ee5c374b60a9bf248ddfcc SHA512 bd6588d6753cbccc9ee4b4cc13ce1d90e13263449f3344beefc5778ab1f4a7e72a1bc8e458acea797465ece6e227c73a94f42dce07d9fb57c65e075175ffc7f5
-EBUILD opengl-2.8.0.0.ebuild 715 BLAKE2B 3fbd1b615d4d27d907103a7ee6f9906316339953e13e2c8e88fb2c267b4e8a318ebcb65a8a322189f954cf15a7e58ba44fbafd157cb976e203079484d6354d1a SHA512 51e9bb66912af0c554be323ef2c47d80c2c3bb8f3568def96ba04d3fb1f4f2771f6a1cf809b5de2a060a8e560016b4634fabeb5efa8c6564d433b08968aec51e
-EBUILD opengl-2.9.2.0.ebuild 809 BLAKE2B ba59a4d88b6249eb325c91767ffe1a1f88a8a5d760426b268e6448ff5f8bcd0f7773faebb829184e05dc8079d43e6712f684f492ce618e9c32a85bb356a0ec2e SHA512 b7fbf36c581b6ba02aab52a4d82f9f599468c0e37b9f123e47750c6dafd415d8f77f37880a30a632e785725fc11245d7cb8656d4846f1dc94d136580d959d704
-EBUILD opengl-3.0.1.0.ebuild 1090 BLAKE2B fa3caa67c174caef454f608b62e974c4f18c75b372657c69ec9391ee0610b204204de14cb17d653fb50dd5d45e424f80109f0558a29d87ce794db8fa05ac831f SHA512 c25a869ecdeaf5642ed8d4035039be09e00210eae2cc6164c3fa3be8aae04618accadfd5381fc3f0aa00d1cd6d0e7fea18e1608f3f35023ad6fc9389cd74589b
-MISC metadata.xml 814 BLAKE2B 1fd42b44c7f720c6afed3556f087a57102dab18d4348b7b5e8c0665f9e52da441df52ca34a0c6236777918055777baf6baabfbf366c28803ed27b6bba482b767 SHA512 f56f0537d0df2c6fcd18812b99705d09a565031e909403ada47835ac343aa80b4045124c92226bdba6d0b779d8ff9ba04f21f3fc57eaf080c82f7b1aa301f64f
diff --git a/dev-haskell/opengl/files/opengl-2.2.1.1-ghc-7.4.patch b/dev-haskell/opengl/files/opengl-2.2.1.1-ghc-7.4.patch
deleted file mode 100644
index 772b17539523..000000000000
--- a/dev-haskell/opengl/files/opengl-2.2.1.1-ghc-7.4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fix build failure against ghc-7.4
-
-[ 4 of 84] Compiling Graphics.Rendering.OpenGL.GL.GLboolean ( Graphics/Rendering/OpenGL/GL/GLboolean.hs, dist/build/Graphics/Rendering/OpenGL/GL/GLboolean.o )
-
-Graphics/Rendering/OpenGL/GL/GLboolean.hs:27:23:
-    Could not deduce (Eq a) arising from a use of `/='
-    from the context (Num a)
-      bound by the type signature for
-                 unmarshalGLboolean :: Num a => a -> Bool
-      at Graphics/Rendering/OpenGL/GL/GLboolean.hs:27:1-27
-    Possible fix:
-      add (Eq a) to the context of
-        the type signature for unmarshalGLboolean :: Num a => a -> Bool
-    In the expression: (/= 0)
-    In an equation for `unmarshalGLboolean':
-        unmarshalGLboolean = (/= 0)
-
-Reported-by: Christian Lask
-diff --git a/Graphics/Rendering/OpenGL/GL/GLboolean.hs b/Graphics/Rendering/OpenGL/GL/GLboolean.hs
-index cab7356..cc4faa8 100644
---- a/Graphics/Rendering/OpenGL/GL/GLboolean.hs
-+++ b/Graphics/Rendering/OpenGL/GL/GLboolean.hs
-@@ -23,5 +23,5 @@ marshalGLboolean :: Num a => Bool -> a
- marshalGLboolean False = 0
- marshalGLboolean True  = 1
- 
--unmarshalGLboolean :: Num a => a -> Bool
-+unmarshalGLboolean :: (Eq a, Num a) => a -> Bool
- unmarshalGLboolean = (/= 0)
diff --git a/dev-haskell/opengl/files/opengl-2.9.2.0-ghc-7.10.patch b/dev-haskell/opengl/files/opengl-2.9.2.0-ghc-7.10.patch
deleted file mode 100644
index 02967bf16502..000000000000
--- a/dev-haskell/opengl/files/opengl-2.9.2.0-ghc-7.10.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Graphics/Rendering/OpenGL/GL/IOState.hs b/Graphics/Rendering/OpenGL/GL/IOState.hs
-index 6fbc144..2c2a42d 100644
---- a/Graphics/Rendering/OpenGL/GL/IOState.hs
-+++ b/Graphics/Rendering/OpenGL/GL/IOState.hs
-@@ -21 +21,2 @@ module Graphics.Rendering.OpenGL.GL.IOState (
--import Control.Monad(replicateM)
-+import Control.Applicative
-+import Control.Monad(replicateM,ap)
-@@ -31,0 +33,4 @@ instance Functor (IOState s) where
-+instance Applicative (IOState s) where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
diff --git a/dev-haskell/opengl/metadata.xml b/dev-haskell/opengl/metadata.xml
deleted file mode 100644
index cbb3b5a94e2c..000000000000
--- a/dev-haskell/opengl/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A Haskell binding for the OpenGL graphics system (GL, version 3.2) and its
-		accompanying utility library (GLU, version 1.3).
-		
-		OpenGL is the industry's most widely used and supported 2D and 3D graphics
-		application programming interface (API), incorporating a broad set of
-		rendering, texture mapping, special effects, and other powerful visualization
-		functions. For more information about OpenGL and its various extensions,
-		please see &lt;http://www.opengl.org/&gt;
-		and &lt;http://www.opengl.org/registry/&gt;.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/opengl/opengl-2.12.0.1.ebuild b/dev-haskell/opengl/opengl-2.12.0.1.ebuild
deleted file mode 100644
index 2941e0cb625c..000000000000
--- a/dev-haskell/opengl/opengl-2.12.0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenGL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenGL graphics system"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/gluraw-1.3:=[profile?] <dev-haskell/gluraw-1.6:=[profile?]
-	>=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?]
-	>=dev-haskell/openglraw-2.1:=[profile?] <dev-haskell/openglraw-2.6:=[profile?]
-	>=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?]
-	>=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/opengl/opengl-2.2.1.1.ebuild b/dev-haskell/opengl/opengl-2.2.1.1.ebuild
deleted file mode 100644
index 448ed8d4ae24..000000000000
--- a/dev-haskell/opengl/opengl-2.2.1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-CABAL_FEATURES="lib profile haddock"
-inherit base haskell-cabal
-
-MY_PN=OpenGL
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="OpenGL bindings for haskell"
-HOMEPAGE="http://haskell.org/ghc/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 sparc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.4
-	virtual/opengl
-	virtual/glu
-	media-libs/freeglut"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}/${P}-ghc-7.4.patch")
diff --git a/dev-haskell/opengl/opengl-2.5.0.0.ebuild b/dev-haskell/opengl/opengl-2.5.0.0.ebuild
deleted file mode 100644
index 5c9520759895..000000000000
--- a/dev-haskell/opengl/opengl-2.5.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenGL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenGL graphics system"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-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"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/opengl/opengl-2.6.0.1.ebuild b/dev-haskell/opengl/opengl-2.6.0.1.ebuild
deleted file mode 100644
index 62b589aa2668..000000000000
--- a/dev-haskell/opengl/opengl-2.6.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenGL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenGL graphics system"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-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:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/opengl/opengl-2.8.0.0.ebuild b/dev-haskell/opengl/opengl-2.8.0.0.ebuild
deleted file mode 100644
index f077bb46112c..000000000000
--- a/dev-haskell/opengl/opengl-2.8.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenGL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenGL graphics system"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/gluraw-1.1.0.0:=[profile?]
-		>=dev-haskell/openglraw-1.3.0.0:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/opengl/opengl-2.9.2.0.ebuild b/dev-haskell/opengl/opengl-2.9.2.0.ebuild
deleted file mode 100644
index 5e6eb84881bb..000000000000
--- a/dev-haskell/opengl/opengl-2.9.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-MY_PN="OpenGL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenGL graphics system"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/gluraw-1.3.0.0:=[profile?]
-	>=dev-haskell/openglraw-1.4.1.0:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-}
diff --git a/dev-haskell/opengl/opengl-3.0.1.0.ebuild b/dev-haskell/opengl/opengl-3.0.1.0.ebuild
deleted file mode 100644
index 12c842a4843c..000000000000
--- a/dev-haskell/opengl/opengl-3.0.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenGL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenGL graphics system"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/gluraw-2.0:=[profile?] <dev-haskell/gluraw-2.1:=[profile?]
-	>=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?]
-	>=dev-haskell/openglraw-3.0:=[profile?] <dev-haskell/openglraw-3.3:=[profile?]
-	>=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?]
-	>=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/openglraw-1.2.0.0 b/dev-haskell/openglraw-1.2.0.0
new file mode 100644
index 000000000000..090b9477b7b3
--- /dev/null
+++ b/dev-haskell/openglraw-1.2.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.8.2 virtual/opengl >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A raw 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-lang/ghc-6.8.2 virtual/opengl
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/OpenGLRaw/1.2.0.0/OpenGLRaw-1.2.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7bdf9cad6d8876c157002cca4efb0e82
diff --git a/dev-haskell/openglraw-1.3.0.0 b/dev-haskell/openglraw-1.3.0.0
new file mode 100644
index 000000000000..dcd8aa7f362a
--- /dev/null
+++ b/dev-haskell/openglraw-1.3.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= virtual/opengl >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A raw 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-lang/ghc-7.4.1:= virtual/opengl
+SLOT=0/1.3.0.0
+SRC_URI=mirror://hackage/packages/archive/OpenGLRaw/1.3.0.0/OpenGLRaw-1.3.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4baa476c35f041f5eeecb2b801ecb95e
diff --git a/dev-haskell/openglraw-1.5.0.0 b/dev-haskell/openglraw-1.5.0.0
new file mode 100644
index 000000000000..56590d9acae3
--- /dev/null
+++ b/dev-haskell/openglraw-1.5.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= virtual/opengl >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A raw 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-lang/ghc-7.4.1:= virtual/opengl
+SLOT=0/1.5.0.0
+SRC_URI=mirror://hackage/packages/archive/OpenGLRaw/1.5.0.0/OpenGLRaw-1.5.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e39419d19cac5c77647456602f18c9c8
diff --git a/dev-haskell/openglraw-2.5.1.0 b/dev-haskell/openglraw-2.5.1.0
new file mode 100644
index 000000000000..d09d75e1e3c1
--- /dev/null
+++ b/dev-haskell/openglraw-2.5.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/opengl >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A raw 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/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/opengl
+SLOT=0/2.5.1.0
+SRC_URI=mirror://hackage/packages/archive/OpenGLRaw/2.5.1.0/OpenGLRaw-2.5.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0463be02159ced8955caf7ea54900e04
diff --git a/dev-haskell/openglraw-3.2.4.0 b/dev-haskell/openglraw-3.2.4.0
new file mode 100644
index 000000000000..9c2855d4c05b
--- /dev/null
+++ b/dev-haskell/openglraw-3.2.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/fixed-0.2:=[profile?] <dev-haskell/fixed-0.3:=[profile?] >=dev-haskell/half-0.2.2.1:=[profile?] <dev-haskell/half-0.3:=[profile?] >=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= virtual/opengl >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A raw binding for the OpenGL graphics system
+EAPI=6
+HOMEPAGE=http://www.haskell.org/haskellwiki/Opengl
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/fixed-0.2:=[profile?] <dev-haskell/fixed-0.3:=[profile?] >=dev-haskell/half-0.2.2.1:=[profile?] <dev-haskell/half-0.3:=[profile?] >=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= virtual/opengl
+SLOT=0/3.2.4.0
+SRC_URI=mirror://hackage/packages/archive/OpenGLRaw/3.2.4.0/OpenGLRaw-3.2.4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1951ff3944b555dc2e05c284e9616a8a
diff --git a/dev-haskell/openglraw/Manifest b/dev-haskell/openglraw/Manifest
deleted file mode 100644
index 0edc021b6411..000000000000
--- a/dev-haskell/openglraw/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST OpenGLRaw-1.2.0.0.tar.gz 72680 BLAKE2B 0bc467e3ce46fa09fd0c410d9fbfb2967f286d7d36b4a8e322ed2258c4097bd3008a734017af6b86b3866253ce3760b237095df01560bfbe1f3402da0bb74fbd SHA512 8cf6301943a72036c9396d7d4d99223feb62bc419cdf8395622b0a1a7c55e7e44f66a6f30e324bc54d9660758eee5b5701f412a375289c82646dbf9b53fb7bf9
-DIST OpenGLRaw-1.3.0.0.tar.gz 75328 BLAKE2B 0bccfed258369fa0e84737bc752b6db5db768cec2bcb5030c11c265f8565ec0f8269da29ede8d91ae899b97e11a06a552f9cc81a0949256f8a9c55cf820f1e6d SHA512 444cf2238ebb24710cfca95f11c2ba4888bc70793880f69bc93c932ebb5e44485303699fb0c1e2ea9450f5a911162fe3142aa2bf91d3948f7abd2d07ad1b255e
-DIST OpenGLRaw-1.5.0.0.tar.gz 102276 BLAKE2B 33cf8f755a48952bf65fc748e11febd0ddbd3ba6810c2d9ed71d24926c3ba257c73a65aa58505757221b75b9f7912c4dc7aa080425e7b6b19035fc2d1acaa4a2 SHA512 455d1149d70a73e12493ce931bce72c62a11568a43d4b139b8c4a5e5c940533e23feb46c71b2a76eb80d3d9512825bb8ed176d4701e17be890b47ba63fccac76
-DIST OpenGLRaw-2.5.1.0.tar.gz 733570 BLAKE2B 6d8ae440d4ab782a578dd3d3bc3bd734f06909a5ecdd9474561596249eb7bfe7dce4047634ad2d271c612f006a18f4ab2706083a572acacf9f78cbc1889b024c SHA512 98f6224d57e8fd5d152a9e028c4c8dafa69de4d52ef30e5a44555cb4c32d0fc92db1b3651beb388f357f59d2a0dd40e0946b26967287f56f268f0ed08008873a
-DIST OpenGLRaw-3.2.4.0.tar.gz 799693 BLAKE2B 3eb97d991242113175b737a1fc9e59e3ff58d63dc4b1ea605414c9650002760e93c6bb3493199d62f8f7ae6db7220c2b07e1e901ed3fbaa8a464c023fda915b6 SHA512 8339fb8a04ddc1c366bb6e93e3c0cabaf7a7c18f5bd687e1f7af36e66f664d8877716a3ac97cce9855ee5af50e3f95e5e0ed19c0137d90013a9cbf6f529ebcfc
-EBUILD openglraw-1.2.0.0.ebuild 644 BLAKE2B e939499bd90d83c14d7bfb01e7492901797b40add187dc3c5a9f66eca7e5cf64adc901f6a9241c2fdf38f8a4446b0a627d986e1661fe1dc9207efb3a07680dd6 SHA512 dc987210fce52a07b661256d165775ffa34063babfcb25c23326b442d84dc2e91c2400c1fe6b1bb1055e94cd20cf1c496bf228f8c1ba949777479ec0cc86f010
-EBUILD openglraw-1.3.0.0.ebuild 647 BLAKE2B 50e92aec39029397a4a413683baa20180ce5244a8fb81c8b0652b3f1999e38353bf5c73adcb0946eb95c3f2ed7649a3fe52bef21e493225bde550df9f4f68ac5 SHA512 c238a257680eee7314872b20835e05af188c2e94a6346d6949d58ab18ec0329a5b9a23430cbe7a707efaabd19942640dd4ebaa681c7008526aee928b193a2858
-EBUILD openglraw-1.5.0.0.ebuild 835 BLAKE2B a987aa2c683d500e6ba40b9377b6559c5306a50a30db5aa529e2fdb819dee64abd53288bfbc4a700dacc62ce309d541e627a257f5211200cd5b3ff9fbcbda4c7 SHA512 9df906ad7d61f9dafba71a698a4218b15635c9355fa0b4ac643e9901441ab2608079dc017e80253ddfb7ff31644162b0c2218c6d0eb44c5fdb332f0d5c38251a
-EBUILD openglraw-2.5.1.0.ebuild 990 BLAKE2B 9dadb95263ba5824c565ee7c4ee68915b08f361a621ed6fe74d33ad684555c3ac28286f2f20f412aca1116951d2cd2e8781389822e914b97626096f178aee219 SHA512 646c71655159306e1509eb1bb5ad6b2939240e446afd101589311eb22943c0376c6bf2924e7bab53208471dfe672d2af7bdbdd1074149912b5aa52cbdc63c665
-EBUILD openglraw-3.2.4.0.ebuild 1117 BLAKE2B cd759fd4b76479d8d6a54b728e93cf9fb8146d6efff5edaf03b28c0ed282c00774ef857f825584d8da8e21f4f2b84d72f4f15d92d8ea069f3ace2b47d06fd26e SHA512 d519d324cbc53c83b6868adfa6a2e83bdcafa6ce7cb16fcbf40f79a92389648d3065a30c4e8c6cff89ee6f7b25084f5e3dbaa6305572d631b9d34d29c25bae9a
-MISC metadata.xml 1327 BLAKE2B b71049e49f15888f0f67058e7518201ca46e7ae64ad907f36fd3507fdb0de0b07a04bc8d8c1f0bc0c6565951ab8ce9ce30a579a678e8de99c99519474fc6ed06 SHA512 d44492c262c233ad31f207d991a69a6404d37aa3bf158479017ec74bac144eef6e69db8179f022c4cd6c6b15cefeb7431345b0cb76885ac37e1e8a2c1e18feb7
diff --git a/dev-haskell/openglraw/metadata.xml b/dev-haskell/openglraw/metadata.xml
deleted file mode 100644
index 84cd0aab231b..000000000000
--- a/dev-haskell/openglraw/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		OpenGLRaw is a raw Haskell binding for the OpenGL 3.2 graphics system and
-		lots of OpenGL extensions. It is basically a 1:1 mapping of OpenGL's C API,
-		intended as a basis for a nicer interface. OpenGLRaw offers access to all
-		necessary functions, tokens and types plus a general facility for loading
-		extension entries. The module hierarchy closely mirrors the naming structure
-		of the OpenGL extensions, making it easy to find the right module to import.
-		All API entries are loaded dynamically, so no special C header files are
-		needed for building this package. If an API entry is not found at runtime, a
-		userError is thrown.
-		
-		OpenGL is the industry's most widely used and supported 2D and 3D graphics
-		application programming interface (API), incorporating a broad set of
-		rendering, texture mapping, special effects, and other powerful visualization
-		functions. For more information about OpenGL and its various extensions,
-		please see &lt;http://www.opengl.org/&gt;
-		and &lt;http://www.opengl.org/registry/&gt;.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/openglraw/openglraw-1.2.0.0.ebuild b/dev-haskell/openglraw/openglraw-1.2.0.0.ebuild
deleted file mode 100644
index 708bbf44ffc9..000000000000
--- a/dev-haskell/openglraw/openglraw-1.2.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenGLRaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2
-		virtual/opengl"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/openglraw/openglraw-1.3.0.0.ebuild b/dev-haskell/openglraw/openglraw-1.3.0.0.ebuild
deleted file mode 100644
index c6343283f106..000000000000
--- a/dev-haskell/openglraw/openglraw-1.3.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenGLRaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-		virtual/opengl"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/openglraw/openglraw-1.5.0.0.ebuild b/dev-haskell/openglraw/openglraw-1.5.0.0.ebuild
deleted file mode 100644
index ef24363dee92..000000000000
--- a/dev-haskell/openglraw/openglraw-1.5.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-#hackport: flags: -usenativewindowslibraries,-useglxgetprocaddress
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenGLRaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-useglxgetprocaddress \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/openglraw/openglraw-2.5.1.0.ebuild b/dev-haskell/openglraw/openglraw-2.5.1.0.ebuild
deleted file mode 100644
index 7bda91cdfec4..000000000000
--- a/dev-haskell/openglraw/openglraw-2.5.1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -usenativewindowslibraries,-useglxgetprocaddress,-osandroid,-usegles2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenGLRaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-osandroid \
-		--flag=-usegles2 \
-		--flag=-useglxgetprocaddress \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/openglraw/openglraw-3.2.4.0.ebuild b/dev-haskell/openglraw/openglraw-3.2.4.0.ebuild
deleted file mode 100644
index 7b7ba4f13aae..000000000000
--- a/dev-haskell/openglraw/openglraw-3.2.4.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -usenativewindowslibraries,-useglxgetprocaddress,-osandroid,-usegles2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenGLRaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fixed-0.2:=[profile?] <dev-haskell/fixed-0.3:=[profile?]
-	>=dev-haskell/half-0.2.2.1:=[profile?] <dev-haskell/half-0.3:=[profile?]
-	>=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-osandroid \
-		--flag=-usegles2 \
-		--flag=-useglxgetprocaddress \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/openssl-streams-1.2.1.0 b/dev-haskell/openssl-streams-1.2.1.0
new file mode 100644
index 000000000000..94cbd589491d
--- /dev/null
+++ b/dev-haskell/openssl-streams-1.2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hsopenssl-0.10.3:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?] >=dev-haskell/io-streams-1.0:=[profile?] <dev-haskell/io-streams-1.4:=[profile?] >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=OpenSSL network support for io-streams
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/openssl-streams
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hsopenssl-0.10.3:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?] >=dev-haskell/io-streams-1.0:=[profile?] <dev-haskell/io-streams-1.4:=[profile?] >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.1.0
+SRC_URI=mirror://hackage/packages/archive/openssl-streams/1.2.1.0/openssl-streams-1.2.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c393a4fb81ce38a97386fa4c3226be73
diff --git a/dev-haskell/openssl-streams/Manifest b/dev-haskell/openssl-streams/Manifest
deleted file mode 100644
index aa55af2c078b..000000000000
--- a/dev-haskell/openssl-streams/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST openssl-streams-1.2.1.0.tar.gz 6266 BLAKE2B 2d7866b7667547f5c4f2c2873471c7ff9ac60ee89e9c791d816b46185bda456d4bdd13ce5894688ff56926b337d38208719f8c3d22cfd0606529732cfcec3235 SHA512 c429bdcbb4ce893d79941eccb849f7064fb88073423b4395e0f50795ddef699934c148549f800b551914c7983cb2b8fc988dccfb4e0363f422726c0cdeaa5018
-EBUILD openssl-streams-1.2.1.0.ebuild 1018 BLAKE2B e9b7a23a182d00d0a22d6e2280a6926ee19605f61377cdbde2891ace0ca0dea53d99099b4b03704cf459fce5fc6d02b3453cc37501467e45a202a2253bd603ce SHA512 a86a3a07b627fec2493dfb9840aefd80f72eafd73f9846a45dd6b7cc0b8d5161baca2dce12c30baa14da2bbbba93dc153543c30a04d387769a053feec76ed69a
-MISC metadata.xml 503 BLAKE2B cc36035993804b20d4025345b53ba02d1f42db25604c9a64846a724b9ce99c1f2e9857c4d22a31ad63c168b26d334c64422d15e281e1aec96c31b7499e4bf095 SHA512 7bfc0ffe8f358d7000cae786b34b009d7b18be733b4f905ced9c0d956e7f3dd9fb9ff1b6db64ba09b4188aadef49f0885532aeb581b187a26f596ac0c9cc096d
diff --git a/dev-haskell/openssl-streams/metadata.xml b/dev-haskell/openssl-streams/metadata.xml
deleted file mode 100644
index 55c1e4ed829e..000000000000
--- a/dev-haskell/openssl-streams/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The openssl-streams library contains io-streams routines for secure
-		networking using OpenSSL (by way of HsOpenSSL).
-		
-		/ChangeLog/
-		
-		[@1.1.0.0@] Updated @openssl-streams@ to work with @io-streams@ 1.1.0.0.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/openssl-streams/openssl-streams-1.2.1.0.ebuild b/dev-haskell/openssl-streams/openssl-streams-1.2.1.0.ebuild
deleted file mode 100644
index 99e33c6e2b86..000000000000
--- a/dev-haskell/openssl-streams/openssl-streams-1.2.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="OpenSSL network support for io-streams"
-HOMEPAGE="http://hackage.haskell.org/package/openssl-streams"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hsopenssl-0.10.3:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?]
-	>=dev-haskell/io-streams-1.0:=[profile?] <dev-haskell/io-streams-1.4:=[profile?]
-	>=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 )
-"
diff --git a/dev-haskell/options-1.2.1.1 b/dev-haskell/options-1.2.1.1
new file mode 100644
index 000000000000..4ba6a678b6a8
--- /dev/null
+++ b/dev-haskell/options-1.2.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5 >=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A powerful and easy-to-use command-line option parser
+EAPI=5
+HOMEPAGE=https://john-millikin.com/software/haskell-options/
+IUSE=doc hscolour profile test
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/1.2.1.1
+SRC_URI=mirror://hackage/packages/archive/options/1.2.1.1/options-1.2.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9b7d90e72a869f40e2a2acfad95bdb9a
diff --git a/dev-haskell/options/Manifest b/dev-haskell/options/Manifest
deleted file mode 100644
index 01a61da8ec8a..000000000000
--- a/dev-haskell/options/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST options-1.2.1.1.tar.gz 25327 BLAKE2B 66611694e5beb558e185cd9a89e9368ebac035118360a4c1cb9bcba5ad2a0be74c32848e3983aec999b4cee6e3138c527fe31c869b52c84719ee89afe3aad232 SHA512 615a3767b74ca0ba2eae993f6e475963df2a0933f1e6c9bbfe35144c4dc6018af276144b2ec1b608b695dc7fca904784ebc63cd58a432f966588846cb36f94ea
-EBUILD options-1.2.1.1.ebuild 860 BLAKE2B 85adfff07995b3f2b576ede295e35be3b17ca5c88be9348bbda24b6a9e39a2ebcbad692124540dccd3c53875f0ee474aa19982fffa2e0e5b51252eeca757cca8 SHA512 10cdbf905a60b8e8226cb2703ea5fda1042fb05d887a11bd2c4e4edccb9b2d84f674ee205c35d4da270a914f25178c7c3b8ddf13c10293bd313f5835ac49d4d3
-MISC metadata.xml 1803 BLAKE2B 8cb824136f208f42f22c79344cdceeff042be92bb2fda3ebd0ff18931b028980459bcdfac015b4c5bdd4481d2b4fd2e5395eaf6eee2bb3352649354c238cf59a SHA512 0ee4d11702f1f43fb4fbb5416b96fbcf5d56ce3280deaa0474acce57a00f172133b19a8ce204c76a1b89320e708b9e3eb2cefb0ed1306d45d131073a382cef27
diff --git a/dev-haskell/options/metadata.xml b/dev-haskell/options/metadata.xml
deleted file mode 100644
index 4d7ecf23aaee..000000000000
--- a/dev-haskell/options/metadata.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The @options@ package lets library and application developers easily work
-		with command-line options.
-		
-		The following example is a full program that can accept two options,
-		@--message@ and @--quiet@:
-		
-		@
-		import Control.Applicative
-		import Options
-		
-		data MainOptions = MainOptions
-		&amp;#x20;   &amp;#x7b; optMessage :: String
-		&amp;#x20;   , optQuiet :: Bool
-		&amp;#x20;   &amp;#x7d;
-		
-		instance 'Options' MainOptions where
-		&amp;#x20;   defineOptions = pure MainOptions
-		&amp;#x20;       \&lt;*\&gt; simpleOption \"message\" \"Hello world!\"
-		&amp;#x20;           \"A message to show the user.\"
-		&amp;#x20;       \&lt;*\&gt; simpleOption \"quiet\" False
-		&amp;#x20;           \"Whether to be quiet.\"
-		
-		main :: IO ()
-		main = runCommand $ \\opts args -&gt; do
-		&amp;#x20;   if optQuiet opts
-		&amp;#x20;       then return ()
-		&amp;#x20;       else putStrLn (optMessage opts)
-		@
-		
-		&gt;$ ./hello
-		&gt;Hello world!
-		&gt;$ ./hello --message='ciao mondo'
-		&gt;ciao mondo
-		&gt;$ ./hello --quiet
-		&gt;$
-		
-		In addition, this library will automatically create documentation options
-		such as @--help@ and @--help-all@:
-		
-		&gt;$ ./hello --help
-		&gt;Help Options:
-		&gt;  -h, --help
-		&gt;    Show option summary.
-		&gt;  --help-all
-		&gt;    Show all help options.
-		&gt;
-		&gt;Application Options:
-		&gt;  --message :: text
-		&gt;    A message to show the user.
-		&gt;    default: "Hello world!"
-		&gt;  --quiet :: bool
-		&gt;    Whether to be quiet.
-		&gt;    default: false
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/options/options-1.2.1.1.ebuild b/dev-haskell/options/options-1.2.1.1.ebuild
deleted file mode 100644
index 4757f77492b0..000000000000
--- a/dev-haskell/options/options-1.2.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A powerful and easy-to-use command-line option parser"
-HOMEPAGE="https://john-millikin.com/software/haskell-options/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RESTRICT=test # circular depends
-
-RDEPEND=">=dev-haskell/monads-tf-0.1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3 )
-"
diff --git a/dev-haskell/optparse-applicative-0.11.0.2 b/dev-haskell/optparse-applicative-0.11.0.2
new file mode 100644
index 000000000000..ad79bde30814
--- /dev/null
+++ b/dev-haskell/optparse-applicative-0.11.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-wl-pprint-0.6:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Utilities and combinators for parsing command line options
+EAPI=5
+HOMEPAGE=https://github.com/pcapriotti/optparse-applicative
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/ansi-wl-pprint-0.6:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.11.0.2
+SRC_URI=mirror://hackage/packages/archive/optparse-applicative/0.11.0.2/optparse-applicative-0.11.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=31fbdc99ed83f032e977565e1dfe39a2
diff --git a/dev-haskell/optparse-applicative-0.13.0.0 b/dev-haskell/optparse-applicative-0.13.0.0
new file mode 100644
index 000000000000..1ba3ec9ab06a
--- /dev/null
+++ b/dev-haskell/optparse-applicative-0.13.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/ansi-wl-pprint-0.6.6:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?] >=dev-haskell/semigroups-0.10:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/quickcheck-2.8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Utilities and combinators for parsing command line options
+EAPI=6
+HOMEPAGE=https://github.com/pcapriotti/optparse-applicative
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/ansi-wl-pprint-0.6.6:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?] >=dev-haskell/semigroups-0.10:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0/0.13.0.0
+SRC_URI=mirror://hackage/packages/archive/optparse-applicative/0.13.0.0/optparse-applicative-0.13.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a5f90192aea531affeb345acadb80cef
diff --git a/dev-haskell/optparse-applicative-0.14.2.0 b/dev-haskell/optparse-applicative-0.14.2.0
new file mode 100644
index 000000000000..5da15a05d491
--- /dev/null
+++ b/dev-haskell/optparse-applicative-0.14.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-wl-pprint-0.6.6:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/semigroups-0.10:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.12 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Utilities and combinators for parsing command line options
+EAPI=6
+HOMEPAGE=https://github.com/pcapriotti/optparse-applicative
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/ansi-wl-pprint-0.6.6:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/semigroups-0.10:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.14.2.0
+SRC_URI=mirror://hackage/packages/archive/optparse-applicative/0.14.2.0/optparse-applicative-0.14.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0421164a58d9f53e0ceacafbbd51a67e
diff --git a/dev-haskell/optparse-applicative-0.5.2.1 b/dev-haskell/optparse-applicative-0.5.2.1
new file mode 100644
index 000000000000..7095fc2d4d36
--- /dev/null
+++ b/dev-haskell/optparse-applicative-0.5.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= test? ( =dev-haskell/hunit-1.2* >=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 =dev-haskell/test-framework-th-prime-0.0* ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Utilities and combinators for parsing command line options
+EAPI=5
+HOMEPAGE=https://github.com/pcapriotti/optparse-applicative
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.5.2.1
+SRC_URI=mirror://hackage/packages/archive/optparse-applicative/0.5.2.1/optparse-applicative-0.5.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5e648fbe7d88a5f975304193fbd1d754
diff --git a/dev-haskell/optparse-applicative-0.7.0.2 b/dev-haskell/optparse-applicative-0.7.0.2
new file mode 100644
index 000000000000..68d120669615
--- /dev/null
+++ b/dev-haskell/optparse-applicative-0.7.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-th-prime-0.0 <dev-haskell/test-framework-th-prime-0.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Utilities and combinators for parsing command line options
+EAPI=5
+HOMEPAGE=https://github.com/pcapriotti/optparse-applicative
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.7.0.2
+SRC_URI=mirror://hackage/packages/archive/optparse-applicative/0.7.0.2/optparse-applicative-0.7.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f16a4c9cd88a604808ef5d4abd70ec5f
diff --git a/dev-haskell/optparse-applicative-0.8.1-r1 b/dev-haskell/optparse-applicative-0.8.1-r1
new file mode 100644
index 000000000000..82899734c1bb
--- /dev/null
+++ b/dev-haskell/optparse-applicative-0.8.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/ansi-wl-pprint-0.6:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.6 <dev-haskell/quickcheck-2.8 >=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 >=dev-haskell/test-framework-th-prime-0.0 <dev-haskell/test-framework-th-prime-0.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Utilities and combinators for parsing command line options
+EAPI=5
+HOMEPAGE=https://github.com/pcapriotti/optparse-applicative
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/ansi-wl-pprint-0.6:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.8.1
+SRC_URI=mirror://hackage/packages/archive/optparse-applicative/0.8.1/optparse-applicative-0.8.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=09767507d674ad502455cb89cb160792
diff --git a/dev-haskell/optparse-applicative-0.9.1.1 b/dev-haskell/optparse-applicative-0.9.1.1
new file mode 100644
index 000000000000..8b7ee2431345
--- /dev/null
+++ b/dev-haskell/optparse-applicative-0.9.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-wl-pprint-0.6:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.6 <dev-haskell/quickcheck-2.8 >=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 >=dev-haskell/test-framework-th-prime-0.0 <dev-haskell/test-framework-th-prime-0.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Utilities and combinators for parsing command line options
+EAPI=5
+HOMEPAGE=https://github.com/pcapriotti/optparse-applicative
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/ansi-wl-pprint-0.6:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.9.1.1
+SRC_URI=mirror://hackage/packages/archive/optparse-applicative/0.9.1.1/optparse-applicative-0.9.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ebcb5b70b5d861ee8d8d66a15e71996b
diff --git a/dev-haskell/optparse-applicative/Manifest b/dev-haskell/optparse-applicative/Manifest
deleted file mode 100644
index f0348ca709dd..000000000000
--- a/dev-haskell/optparse-applicative/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-DIST optparse-applicative-0.11.0.2.tar.gz 30425 BLAKE2B 2bcdff429adc14240883b2bb1f54449d18ce10ae787f4575a60bf170868f71d4633ceea509f0b5ed4fc71a1d0d1fd68b07782ebf2b2a820e47a8c2fbf246c677 SHA512 eb10a274074dacf2a481c964f8fcb125c1ea6be7f33388c938ad310b49d959484102caeb1849e0370292286b7603f68853cf23ded634bb09cd34871eaec74caf
-DIST optparse-applicative-0.13.0.0.tar.gz 36101 BLAKE2B 4dae014b933ee9e89cc417327763b92a94647ee7b5b31662df73cc3d7a1ae26dae2e2931cc1f5e573753ba7dbdefffc797125621650c248c12ecdc72c40a4232 SHA512 ef08f4b994703a35f7c50ba93017742188c612c99a6e69cf7329a42427e2862ec0b8498fa57dd1f64a225d3ed94c62815af211efead9e73adc32482e22e46ccb
-DIST optparse-applicative-0.14.2.0.tar.gz 53512 BLAKE2B 512823fe0c10c31eb213aa68e1821918ebc4034b171c3f5b0c62ea2072c9b6e54695a3f94bc4d73dc1f19f67dfb664ccdfae7fe1cf0ab46433a618e7709401d3 SHA512 ad2252e4501be93ccf1fd9529790b850bdb01b8f36ac9cbb4145015d7609799c9774fd42feec9c8a8b535a9d17b60e0f80b9e75ac7c92444aa5098d2b9ccc096
-DIST optparse-applicative-0.5.2.1.tar.gz 24123 BLAKE2B aec5c0718ff629097b80a635077544d6f441fa653c4d71b196c4a5fe6773485c62fb94d615f56852bef024f262800316c18db3df30ed0d4b53c745125ace1c86 SHA512 7246fc6b6c9ec1c9a7b4f4e8850d80fe0958b9c659b2f31c455738d09b70178bb71f164198871874414e1fdf0ecf38098fdbc65f838224a6f6235f2d000f3876
-DIST optparse-applicative-0.7.0.2.tar.gz 26682 BLAKE2B 4cca1216fc7267adb848d716e8ea5a9e895b418d9cd8410e1de6ee22f3eb909559ab404846af3cdbbb9c26503410f3c02dbf440296ba49252ca691ad144337e9 SHA512 94f583d7df97f2887cc4fea8d5b22261195c3f30bb9bf0aec2579d5b2d31583692835dc9df1273c544c3ef72343159ee90531450f7c498617a0595479efc5d0c
-DIST optparse-applicative-0.8.1.tar.gz 32055 BLAKE2B cc11e066a37e4506189c390db7b999ef1e87082d015f09c0bc922369e864d861791c9cfad543a9d891ce964dfd53625fc36d9a4d4513a7ca9973562e3fda679a SHA512 bd7b8462d897439a77dffdc187dbf61e51937960e339c3bd5009b7479e84dd1ca1e40529c8ffd7d198d26542c23e38c45d91abe8e1b1d420090859f0f07574d6
-DIST optparse-applicative-0.9.1.1.tar.gz 32757 BLAKE2B c169a44d8256a573e9df11f8754930e5b3e8aa6c9b49d370f7cd3debc3546dabda40319a875b8a44b9c25bd5281377568e80e5b705d55f16e3fbb95851f4726a SHA512 616e144512e8628dbc88bc0ce6e47f4aa95a6d5e5fbc3b07aabaf4bedb104808bed7bb959bbb4d88aa6861b98dedbc4ac08924e220ef2cd3b3ebc42945871bdd
-EBUILD optparse-applicative-0.11.0.2.ebuild 873 BLAKE2B 1d9de0711ac87f2101d08055f74d4edc93c6b14520949239ca43bc1f999092f6dbc1e7b2c3693f54202f58477c3d02fdb4f947dd13d9ae15db8ebeb89a831efa SHA512 062e2031a3785156e06c49d27ed433f90c3d9685cd12b96273708bffe832efbb2e1f88d95e3387736a49612bbc8214f9a269be2eb059799ff4ddc96dc8c1df8e
-EBUILD optparse-applicative-0.13.0.0.ebuild 1072 BLAKE2B bc61b44883f27989bbf5c21febdc9ae770080de65f860bcc0f9da347af67f6fc8ec573a50246c1dcaacc4f6f6dc6e7ee3e9e71646818a0a0f34158ad8e932f6c SHA512 a2d0b0491060ce63652b97aa7e940a4448cff0fa673d04aa702360d7da2e77980761600f0e848f20c7ad48aaac21e7f9ae7299c60460dd4b42d7487668580be9
-EBUILD optparse-applicative-0.14.2.0.ebuild 1007 BLAKE2B 42fe3b290dcdc4b9dc11ff5544480a22f1050989810bad0924e58f3f18245dcd45e98a7992cf5d6fddb039835e6bd19939552de0c8d445fcd55896ee1a1a64bc SHA512 6f89c467083cce56f55a3e86fa0adb32dfae664e67ed8c3c5bdf8553abe687a67cb0c68b9b697054fe97352a37afdcfc9f4ddfbd78a8b13c3e64e554e7e6cb51
-EBUILD optparse-applicative-0.5.2.1.ebuild 935 BLAKE2B 5d011e441899448267ffb9e1b73e8d7bdcb97f5d92d80b99c9ab40b1a7ee067b19d521792bbb852526075e7685ef2661e6ec87a4d204c14b8b02461623b5c58a SHA512 2e392465b689d6ac4872c759cd554886219677da306c31c3051f64d5d1abc9e55851226a11e86adf7f022864c0d0b442b8734c6e4424fc8f70c6ad65d04bef84
-EBUILD optparse-applicative-0.7.0.2.ebuild 984 BLAKE2B f081359bd56e35f56275680ed85f3dbf319156c210f3daf6205a3d6e051780b273627855097a8e0a406f5505d110a1a3bd1968c7c2fc0ceee062e5afda3f05e7 SHA512 ad7c701563bbe44077ee529d327c680712e375901725c67dd4ed78f177baa777e69a9b4d07e850cf9346a305e7c4f1ce7dd7c75379414074f062b528cde0e510
-EBUILD optparse-applicative-0.8.1-r1.ebuild 1326 BLAKE2B 93d0230032509f5f8e3b60667715352f48b96f2bc40b47e51330f9ab52c20a67ff76a196df793cf978e9ad33ef3fd2a264e9b4d791a22a54de3fd3274de2d286 SHA512 0bb43517d44157a931430670928814132d9597c730af8056ad3de8e6ecf5ee112ae2cd6be34bdab5c2d775727f95d2a3e24f5a150f71f469b135dc1cf8e80cff
-EBUILD optparse-applicative-0.9.1.1.ebuild 1325 BLAKE2B 35365839f263079679cf3eff55e23779be4b26ba02583cc55333771b930b4460c321fb95a7b5e9642fc6a7b61288ff145fdfc73492f2bdadcc7be425d6641734 SHA512 d7f15c5784b130929c4ec02b4fa8ce8aaed972165bef36dc170818852b6670d4045a691256520922c58ed631f60941551f8587c7af834ea9c62d6a5c3740ef90
-MISC metadata.xml 2419 BLAKE2B 72ac407f2e7c334e2eb858f0e2d2989de4ca64c356daebf058d1fce7cd41bbe60f4fd854e36191d47bc19f37742e31d0b05a304e45146ad7d31e2ac51d107819 SHA512 2603f8c908033d5fa05907836fe97b178e8a0de4e4b316af4089b930dc69027e412ea53e47dca3a71ae794c5ff82628f30d14a50c0e705884c942d6274eb88a6
diff --git a/dev-haskell/optparse-applicative/metadata.xml b/dev-haskell/optparse-applicative/metadata.xml
deleted file mode 100644
index a9f0962e5dcf..000000000000
--- a/dev-haskell/optparse-applicative/metadata.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Here is a simple example of an applicative option parser:
-		
-		@
-		data Sample = Sample
-		&amp;#x20; &amp;#x7b; hello :: String
-		&amp;#x20; , quiet :: Bool &amp;#x7d;
-		
-		sample :: Parser Sample
-		sample = Sample
-		&amp;#x20; \&lt;$\&gt; strOption
-		&amp;#x20;     ( long \"hello\"
-		&amp;#x20;     &amp; metavar \"TARGET\"
-		&amp;#x20;     &amp; help \"Target for the greeting\" )
-		&amp;#x20; \&lt;*\&gt; switch
-		&amp;#x20;     ( long \"quiet\"
-		&amp;#x20;     &amp; help \"Whether to be quiet\" )
-		@
-		
-		The parser is built using applicative style starting from a set of basic
-		combinators. In this example, @hello@ is defined as an 'option' with a
-		@String@ argument, while @quiet@ is a boolean 'flag' (called 'switch').
-		
-		A parser can be used like this:
-		
-		@
-		greet :: Sample -&gt; IO ()
-		greet (Sample h False) = putStrLn $ \"Hello, \" ++ h
-		greet _ = return ()
-		
-		main :: IO ()
-		main = execParser opts \&gt;\&gt;= greet
-		&amp;#x20; where
-		&amp;#x20;   opts = info (helper \&lt;*\&gt; sample)
-		&amp;#x20;     ( fullDesc
-		&amp;#x20;     &amp; progDesc \"Print a greeting for TARGET\"
-		&amp;#x20;     &amp; header \"hello - a test for optparse-applicative\" )
-		@
-		
-		The @greet@ function is the entry point of the program, while @opts@ is a
-		complete description of the program, used when generating a help text. The
-		'helper' combinator takes any parser, and adds a @help@ option to it (which
-		always fails).
-		
-		The @hello@ option in this example is mandatory (since it doesn't have a
-		default value), so running the program without any argument will display a
-		help text:
-		
-		&gt;hello - a test for optparse-applicative
-		&gt;
-		&gt;Usage: hello --hello TARGET [--quiet]
-		&gt;  Print a greeting for TARGET
-		&gt;
-		&gt;Available options:
-		&gt;  -h,--help                Show this help text
-		&gt;  --hello TARGET           Target for the greeting
-		&gt;  --quiet                  Whether to be quiet
-		
-		containing a short usage summary, and a detailed list of options with
-		descriptions.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">pcapriotti/optparse-applicative</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.11.0.2.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.11.0.2.ebuild
deleted file mode 100644
index 6f726f121dfc..000000000000
--- a/dev-haskell/optparse-applicative/optparse-applicative-0.11.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities and combinators for parsing command line options"
-HOMEPAGE="https://github.com/pcapriotti/optparse-applicative"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-wl-pprint-0.6:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.13.0.0.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.13.0.0.ebuild
deleted file mode 100644
index 7e2d69cbf0a2..000000000000
--- a/dev-haskell/optparse-applicative/optparse-applicative-0.13.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities and combinators for parsing command line options"
-HOMEPAGE="https://github.com/pcapriotti/optparse-applicative"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RESTRICT=test # missing files
-
-RDEPEND=">=dev-haskell/ansi-wl-pprint-0.6.6:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?]
-	>=dev-haskell/semigroups-0.10:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/quickcheck-2.8 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck                      == 2.8.*' 'QuickCheck                      >= 2.8'
-}
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.14.2.0.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.14.2.0.ebuild
deleted file mode 100644
index b894f4d452f5..000000000000
--- a/dev-haskell/optparse-applicative/optparse-applicative-0.14.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities and combinators for parsing command line options"
-HOMEPAGE="https://github.com/pcapriotti/optparse-applicative"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-wl-pprint-0.6.6:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/semigroups-0.10:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.12 )
-"
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.5.2.1.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.5.2.1.ebuild
deleted file mode 100644
index 713c5402fc75..000000000000
--- a/dev-haskell/optparse-applicative/optparse-applicative-0.5.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities and combinators for parsing command line options"
-HOMEPAGE="https://github.com/pcapriotti/optparse-applicative"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-lang/ghc-7.4.1:="
-DEPEND="${RDEPEND}
-		test? ( =dev-haskell/hunit-1.2*
-			>=dev-haskell/test-framework-0.6
-			<dev-haskell/test-framework-0.9
-			>=dev-haskell/test-framework-hunit-0.2
-			<dev-haskell/test-framework-hunit-0.4
-			=dev-haskell/test-framework-th-prime-0.0*
-		)
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.7.0.2.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.7.0.2.ebuild
deleted file mode 100644
index 16a746173bad..000000000000
--- a/dev-haskell/optparse-applicative/optparse-applicative-0.7.0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities and combinators for parsing command line options"
-HOMEPAGE="https://github.com/pcapriotti/optparse-applicative"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-th-prime-0.0 <dev-haskell/test-framework-th-prime-0.1 )
-"
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.8.1-r1.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.8.1-r1.ebuild
deleted file mode 100644
index 9deb5ed53634..000000000000
--- a/dev-haskell/optparse-applicative/optparse-applicative-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities and combinators for parsing command line options"
-HOMEPAGE="https://github.com/pcapriotti/optparse-applicative"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-wl-pprint-0.6:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/quickcheck-2.6 <dev-haskell/quickcheck-2.8
-		>=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4
-		>=dev-haskell/test-framework-th-prime-0.0 <dev-haskell/test-framework-th-prime-0.1 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'transformers >= 0.2 && < 0.4' \
-		'transformers >= 0.2 && < 0.5'
-}
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.9.1.1.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.9.1.1.ebuild
deleted file mode 100644
index 218b1ca75010..000000000000
--- a/dev-haskell/optparse-applicative/optparse-applicative-0.9.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities and combinators for parsing command line options"
-HOMEPAGE="https://github.com/pcapriotti/optparse-applicative"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-wl-pprint-0.6:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/quickcheck-2.6 <dev-haskell/quickcheck-2.8
-		>=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4
-		>=dev-haskell/test-framework-th-prime-0.0 <dev-haskell/test-framework-th-prime-0.1 )
-"
diff --git a/dev-haskell/optparse-simple-0.0.3 b/dev-haskell/optparse-simple-0.0.3
new file mode 100644
index 000000000000..89d1aa8b5354
--- /dev/null
+++ b/dev-haskell/optparse-simple-0.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/either:=[profile?] dev-haskell/gitrev:=[profile?] dev-haskell/optparse-applicative:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple interface to optparse-applicative
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/optparse-simple
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/either:=[profile?] dev-haskell/gitrev:=[profile?] dev-haskell/optparse-applicative:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.0.3
+SRC_URI=mirror://hackage/packages/archive/optparse-simple/0.0.3/optparse-simple-0.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d47f38f4bb76fdd4f197ca1903e17877
diff --git a/dev-haskell/optparse-simple/Manifest b/dev-haskell/optparse-simple/Manifest
deleted file mode 100644
index c6f41aa5a5ab..000000000000
--- a/dev-haskell/optparse-simple/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST optparse-simple-0.0.3.tar.gz 2972 BLAKE2B ff7a559c9f05278ba3b18085fc4f8a48d43025383c38840b3987613ad79aa74590df1ce518b78c338c8bef412c098954b72cb92a31744dbad113510c2e3b4eb7 SHA512 d607482a9ef9e9d4992328fb141cf797ad72e43cbe42eab23adacd21843b8c62c98d6c8fc342b2a11019a220759854b6587a1fd07fa8268462c4cc3d40c4a1c4
-EBUILD optparse-simple-0.0.3.ebuild 677 BLAKE2B a59a4fd7b1dd1d8b947d29e2e996e5c9d6421b6f1cbc19788aaba7968d7f46359525b6ca5c76d5a686a440dfbb721c88ba37e9b9e35968b27df07b6bcad2abfa SHA512 221b266a5b821fc2ddf0b866d07e508afdaf8f6bd1983502415544a48cda1b1e71d32cbddc149187b64e1818690d9034ebb18d8d6675fe255aa1f19bfbbbf67f
-MISC metadata.xml 331 BLAKE2B 379c6e1a5d703af489b136d791922e6ea46799276389a232e08768dbe72526da3bf09c362314d9fa1c397d6b9ca91852735112d2c1e2442e0107133fcdc3c446 SHA512 31537d60ed4b39ab3e2b3cbed7b6d6daa61021a325165eefa10cbbbd34bdc085353e56fbebe45fc0b5f2fa6a4a7d9b56f183b324c94a2b7961c17fee06cd14e9
diff --git a/dev-haskell/optparse-simple/metadata.xml b/dev-haskell/optparse-simple/metadata.xml
deleted file mode 100644
index fd80ae8104d5..000000000000
--- a/dev-haskell/optparse-simple/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Simple interface to optparse-applicative
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/optparse-simple/optparse-simple-0.0.3.ebuild b/dev-haskell/optparse-simple/optparse-simple-0.0.3.ebuild
deleted file mode 100644
index 0ac1d9a5a79b..000000000000
--- a/dev-haskell/optparse-simple/optparse-simple-0.0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple interface to optparse-applicative"
-HOMEPAGE="http://hackage.haskell.org/package/optparse-simple"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/either:=[profile?]
-	dev-haskell/gitrev:=[profile?]
-	dev-haskell/optparse-applicative:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/pandoc-citeproc-0.1.2.1 b/dev-haskell/pandoc-citeproc-0.1.2.1
new file mode 100644
index 000000000000..87459dda1341
--- /dev/null
+++ b/dev-haskell/pandoc-citeproc-0.1.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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?] ) >=dev-haskell/cabal-1.12 test? ( dev-haskell/aeson-pretty >=dev-haskell/diff-0.3 ) 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 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?] )
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=816a3fe5f18e19d5867d76838e6843b3
diff --git a/dev-haskell/pandoc-citeproc-0.10.4 b/dev-haskell/pandoc-citeproc-0.10.4
new file mode 100644
index 000000000000..3a012906e8f3
--- /dev/null
+++ b/dev-haskell/pandoc-citeproc-0.10.4
@@ -0,0 +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 )
+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
+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?] )
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=060d795e271b4d97d388e19c315ce8da
diff --git a/dev-haskell/pandoc-citeproc-0.10.4.1 b/dev-haskell/pandoc-citeproc-0.10.4.1
new file mode 100644
index 000000000000..1ea396ff9872
--- /dev/null
+++ b/dev-haskell/pandoc-citeproc-0.10.4.1
@@ -0,0 +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 )
+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
+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?] )
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cbbb0c229f8b1f74e2de5b087c555326
diff --git a/dev-haskell/pandoc-citeproc-0.2 b/dev-haskell/pandoc-citeproc-0.2
new file mode 100644
index 000000000000..0967524a0f08
--- /dev/null
+++ b/dev-haskell/pandoc-citeproc-0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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?] ) >=dev-haskell/cabal-1.12 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 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?] )
+RESTRICT=test
+SLOT=0/0.2
+SRC_URI=mirror://hackage/packages/archive/pandoc-citeproc/0.2/pandoc-citeproc-0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f9a1d3cd269cd3db2e72765023a19ce8
diff --git a/dev-haskell/pandoc-citeproc-0.3.1 b/dev-haskell/pandoc-citeproc-0.3.1
new file mode 100644
index 000000000000..e9e466745fee
--- /dev/null
+++ b/dev-haskell/pandoc-citeproc-0.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=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?] ) >=dev-haskell/cabal-1.12 test? ( >=app-text/pandoc-1.12.1 dev-haskell/aeson >=dev-haskell/pandoc-types-1.12.3 dev-haskell/text >=dev-haskell/yaml-0.8.8.2 ) 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 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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9454bea0e41c6edd751e1a4031638c31
diff --git a/dev-haskell/pandoc-citeproc-0.6 b/dev-haskell/pandoc-citeproc-0.6
new file mode 100644
index 000000000000..cac55d91cf11
--- /dev/null
+++ b/dev-haskell/pandoc-citeproc-0.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=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?] ) >=dev-haskell/cabal-1.12 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 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?] )
+RESTRICT=test
+SLOT=0/0.6
+SRC_URI=mirror://hackage/packages/archive/pandoc-citeproc/0.6/pandoc-citeproc-0.6.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5afe86981240fe810fa9f61ecad2e200
diff --git a/dev-haskell/pandoc-citeproc-0.7.2 b/dev-haskell/pandoc-citeproc-0.7.2
new file mode 100644
index 000000000000..a665319a3596
--- /dev/null
+++ b/dev-haskell/pandoc-citeproc-0.7.2
@@ -0,0 +1,14 @@
+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.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?] ) >=dev-haskell/cabal-1.12 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
+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?] )
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1591554beceee3ba9980a56d8fa905ca
diff --git a/dev-haskell/pandoc-citeproc-0.8.1.3 b/dev-haskell/pandoc-citeproc-0.8.1.3
new file mode 100644
index 000000000000..7eacbad6e81c
--- /dev/null
+++ b/dev-haskell/pandoc-citeproc-0.8.1.3
@@ -0,0 +1,14 @@
+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 )
+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
+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?] )
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dd2bc27f520d5dbcc64a1d502754d280
diff --git a/dev-haskell/pandoc-citeproc/Manifest b/dev-haskell/pandoc-citeproc/Manifest
deleted file mode 100644
index a4a342808dde..000000000000
--- a/dev-haskell/pandoc-citeproc/Manifest
+++ /dev/null
@@ -1,19 +0,0 @@
-AUX pandoc-citeproc-0.6-ghc-7.10.patch 5725 BLAKE2B ea42a4af4d64b3fb156ce479ecc807dfe9e2ec2c0d9dbeeb555b2f584329178a437e40abe03cd1f6c8088af5e9de0c8029490998d68d979c9621c8886b930714 SHA512 ce3286a45b0d49e7e2d6544f5378c4789dbd9092fdd5eddc04a1f162770d828e5af1fc81d7c52a2c57d35c52323a60a660aeb6a77a57686413e423c70b07a00f
-AUX pandoc-citeproc-0.9-no-binutils.patch 912 BLAKE2B 191df6e5d4257fe1c8b7aa6a90ff74eaa44bd328553b1fe29a0fcbe5350a5868b1427fa5525c2f152f86af448ec4d00c1ddbe2d415d964082734e1188aa95ba1 SHA512 cac11810f8fadc32f5841e45419ecab1a60c8b9855558eaff126d5ce9e4062ddeb28b3980050f198469aafabd43480ea8be9532b209d2118634679d5bed908a7
-DIST pandoc-citeproc-0.1.2.1.tar.gz 217171 BLAKE2B 1d8080616fe8ed838a8b1d6f59b10fd5abf1c9eb0fe2b1d0fd183670e6db41dcb70258fdb5dbf70fbd053a2a8759eb3afade8573b87d35efcf67d77a0a4a5825 SHA512 a83e34700b2f6f835aec0f66b199a1a43cb5e3318133774b7897316d676870ba56538468904ca754f246bf10a0826f834d6dba791d18a906405ed7c01126b77e
-DIST pandoc-citeproc-0.10.4.1.tar.gz 252717 BLAKE2B 048c38cec654a07ac2f5fea21269eb234eba17f362ce4aa84b26d8bd09c6a7c14bc2c0258f3d9c1984dcb06f8db99eb34d832894cb4b959171e62376e9517b98 SHA512 afe0b81c4e58dc80cd0d05977d919bb1f1c8e7a77aba5ed960a04f3a6ff8ec398a62dc5e8497d01db7f67e9ce808a94d1b53c4cecb8b6a28893ec8076555c7ec
-DIST pandoc-citeproc-0.10.4.tar.gz 252481 BLAKE2B 782de52be122a7cb94d816d6ba2438db036036167985244f6b8ab63b95f12077511ce9eb0d84a20a7a59834eb88159dd1953ec205c7403c614d9ad0dee8bf9cd SHA512 f188cf2d6642c0dddf2437d23096d488f5e6eb44b9931b004feb72c8adc1a5240d85f8ed48ced9f073733ee546818e3530962e2f2b2ce6cfa52979ec1fdd7cee
-DIST pandoc-citeproc-0.2.tar.gz 249374 BLAKE2B 375ed1517d64d3bfd94fa7d7d66480e796a94e33c29eed7cb84019b6d77f77f6ae2c0b23a92596de890f6a70805ace0ba454e73d166c47819896e6b6ce977a0d SHA512 f7205afb15aeb71dc756e9f49a265f4c4c1380075b088b8c9e366fe363c2ea059b1d28bcbbe70bab449b987bbceba5d1cb7a693f5bf6bc0e3132cb995fd639c4
-DIST pandoc-citeproc-0.3.1.tar.gz 258552 BLAKE2B 6206dc5739e61f9763fc52e591d3b3272744f0a70186ac068a3f6b91b3b61a624c38bf17bb2c050a05cc8629c67906c4919dea5b2ea52eede0346ec2fe6196e3 SHA512 739580e46d3c7f447d7c0092e62c22339e8b3d656b9adc25b235b06cc8815c1d57a9221fb3b62854bc32ab02c64f4dad036d44a2357fbbd470b9c1bd0224621a
-DIST pandoc-citeproc-0.6.tar.gz 227239 BLAKE2B 3942af5577d69b08f22fa00f1174f61c63b886ed2a6c62758903cbe2b0f34d21466dec272b747a4bd80d8b879a048dce5a887c69d588e99c1de0b96eb67b470c SHA512 eb626e0d776b798757d6b8644d0f5642f07141d614f1a3afe6e265ca77cf17030cee3ff267870d3f0a226c7111d68746a5a88c4a9689e2103f329f1b8fc4bd58
-DIST pandoc-citeproc-0.7.2.tar.gz 246215 BLAKE2B 503335489085918de584fcb3b623a3b5b40255efaa80ac8e58f4e4b85073f238fd92e547e4dbbdc90c71ee050be015e37955fdf1a06bdfa4a95d345bcadd1e0b SHA512 857fe05cc1b427a5de36d61c568b1054ecc5517ef9b9e73ade768d886340f6092784c0cbcdc9f87e04a1820edfebc702b34776f664c4d427f484011993f4bec2
-DIST pandoc-citeproc-0.8.1.3.tar.gz 310914 BLAKE2B 1944971f25cc0d43908a25ebfa7fde19a53f3af880ead82ba2c278580ff74c37087086921eb9087dca60419a4bf59b49d543ad78aa61f358e98ebda5a875b2ad SHA512 f03e036b05e108e1720715d0f5020ef443491478230a3ebb5024e4cbc2dfa05765b4118e5fbe124514439f14b3a07a898df74a0c3b3bbeb138abbad6af2f473b
-EBUILD pandoc-citeproc-0.1.2.1.ebuild 2112 BLAKE2B e5582ffece63ca73d5baa9734c1ba52f1dd64bb4b16a2ae20d6eef35b2d90267502e6c444ac372ca17fa1336ca7ff1a77401343a2730481768edf72d657fc12f SHA512 045079850b978e26ac8b38b7a40454389cfb68e206b3c70b64b53b7bb8b879cfd10d582ce70568b2720dd3139fa20e31587ed8943a821e6a66020a9a951c0ff1
-EBUILD pandoc-citeproc-0.10.4.1.ebuild 2353 BLAKE2B c65f96c29f54be6b12bb70ca834dd9eac07ed1dcbace4693e18f2b59bc757ba694298660d7a6bc3a116dd7e241418e2ef1bd998af6f9f56b569cba50f013ef32 SHA512 ca6c837df3ca2d161e003d88add248add3d0bf1b529962e2510e7c20f93852c5795159d88619f175d739b0eaa0e527f06791ece1109a4a44892dff68f0ef7169
-EBUILD pandoc-citeproc-0.10.4.ebuild 2355 BLAKE2B 6f6de2fd77773b3ecf0d011465fa360c6829fd719b6f683924be70c04e475f47563ceb97f6b0f3f61f1b9301ccc6df4c1a56734a4229fb2fe1ef8f1a78e324e3 SHA512 173fa06c3c3b7adfd20d96c1e31f7ee243eaa16717fc65f46d520f067188f4f8b049a3fdc040427e2f656bd8082b3521c018de6020ce50c67ba6234d9afc5509
-EBUILD pandoc-citeproc-0.2.ebuild 2104 BLAKE2B f2c4ba52ef6ae42f472b060875e0e3d9a13a60537335550d297cfb2e4c56480a146be5300e3d3aafd2d6bcf58d1e27db8d82b15906942da35bebc68185f021a5 SHA512 6b4e5509fe98b9eb1dc46fc2c27a9c0710ed0842b08c02f00fb6554e15cab7a052d46e687e997dfd0221a994248890571e5175b91e041062122fd3df4d5614c5
-EBUILD pandoc-citeproc-0.3.1.ebuild 2456 BLAKE2B df9191dd352fd92d0f36f3cba53a236e70b4496f416c5a7bb2b9118653c1764c4c0b098edaff900120193f9fd36d338b930f3d69ce334c54b30cb239debd39b8 SHA512 3a5813c0a8658663e9013d4df111cd8810b1528ecfc6b4af25d14eb10bbcec6eaacaa658fede91a906a19e7b8e90b176d1157ffe10fee2f7c46c1c637bf86ec6
-EBUILD pandoc-citeproc-0.6.ebuild 2136 BLAKE2B c43e19ba1fd693a2598a6625cc5720da8d710cb14aea0c7141f8ad6476318dead3bf82ebc1b22066860c9ce7e238e644fb6d679eba7f8f669e74008d0d319976 SHA512 a40e996c79544932e0785b9e1fb033398090682af58bac03f06676af74407d5dea6de01297f8cbc09abc3dcc707f6dfe11c4df178cdb221d20d462da739b978a
-EBUILD pandoc-citeproc-0.7.2.ebuild 2110 BLAKE2B 356f3fcbf564edb93f5f474f246b0011dd5e639cc0127b57ee5eb2f4c1ef7963dc347e8ff9acd3106eac4a269ca59185b558150332079fcfc36c4acafea01ae1 SHA512 c0736a3700eefa3d828b95f939b613005054cb41772759f5cefbb3b2b0e2b43201d173d0594dfd7a74d83772d342a846e35b42bb3b3fe57dff294b5af9eba6e9
-EBUILD pandoc-citeproc-0.8.1.3.ebuild 2228 BLAKE2B 20bcd33932e68a9286dd232ad9099733c2c56210428c3c42766078b0122dd39cd221d55a85dc01564e09d632c96a2563231dc17f8abb5ca0e7cad4658f964576 SHA512 94130e2d9809947df54a223d85950bedc1ee2c8a800af9c4f6db7c84ba81a9eb4c689f67f5898f4c43f5881e09f09c0be6dfbce8037a34601df886c129f0acfa
-MISC metadata.xml 1820 BLAKE2B f68edda59c92492087b719091f86f5bfcdd53790117ac1e378789cc4a0fa948b05949f26f56f6c14c2f127002dbbda9a7a3a0098d9a303e8aa9ad214d9f40f7e SHA512 96e5b6d8b20ca55fa2e93eb72bcb49c3f1196643366ff6e887df30197cb70c4bae6e0bd6d22f5b64f6830c27f3757f83ace246ad5517b464e227f8223e02687d
diff --git a/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.6-ghc-7.10.patch b/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.6-ghc-7.10.patch
deleted file mode 100644
index cee2d93bc213..000000000000
--- a/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.6-ghc-7.10.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- pandoc-citeproc-0.6-orig/src/Text/CSL/Pandoc.hs	2014-09-22 14:04:21.000000000 +1000
-+++ pandoc-citeproc-0.6/src/Text/CSL/Pandoc.hs	2015-01-10 11:57:26.900041860 +1100
-@@ -201,10 +201,10 @@
-                                        && isEndPunct c -> True
-                               (c:_) | isEndPunct c     -> True
-                                     | otherwise        -> False
--  where isEndPunct c = c `elem` ".,;:!?"
-+  where isEndPunct c = c `elem` (".,;:!?" :: String)
- 
- startWithPunct :: [Inline] -> Bool
--startWithPunct = and . map (`elem` ".,;:!?") . headInline
-+startWithPunct = and . map (`elem` (".,;:!?" :: String)) . headInline
- 
- deNote :: Pandoc -> Pandoc
- deNote = topDown go
-@@ -324,7 +324,7 @@
-   sp <- option "" (pSpace >> return " ")
-   r <- many1 (notFollowedBy pSpace >> notFollowedBy pLocatorPunct >> anyToken)
-   let s = stringify r
--  guard $ any isDigit s || all (`elem` "IVXLCM") s
-+  guard $ any isDigit s || all (`elem` ("IVXLCM" :: String)) s
-   return $ punct ++ sp ++ s
- 
- pDigit :: Parsec [Inline] st ()
---- pandoc-citeproc-0.6-orig/src/Text/CSL/Proc.hs	2014-09-22 14:04:21.000000000 +1000
-+++ pandoc-citeproc-0.6/src/Text/CSL/Proc.hs	2015-01-10 11:56:18.797456065 +1100
-@@ -288,7 +288,7 @@
-         case ys of
-              Formatted [] -> xs
-              Formatted (Note _ : _) -> xs <> ys
--             Formatted (Str [c]:_) | c `elem` ", ;:" -> xs <> ys
-+             Formatted (Str [c]:_) | c `elem` (", ;:" :: String) -> xs <> ys
-              _ -> xs <> Formatted [Space] <> ys
-       formatAuth   = formatOutput . localMod
-       formatCits   = (if isNote then toNote else id) .
-@@ -328,7 +328,7 @@
-     | otherwise        = id
-     where
-       isPunct' [] = False
--      isPunct' xs = all (`elem` ".,;:!? ") xs
-+      isPunct' xs = all (`elem` (".,;:!? " :: String)) xs
-       check o = case cleanOutput o of
-                   [] -> ONull
-                   x  -> case trim' x of
---- pandoc-citeproc-0.6-orig/src/Text/CSL/Eval/Names.hs	2014-09-22 14:04:21.000000000 +1000
-+++ pandoc-citeproc-0.6/src/Text/CSL/Eval/Names.hs	2015-01-10 11:55:41.839119783 +1100
-@@ -1,4 +1,4 @@
--{-# LANGUAGE PatternGuards #-}
-+{-# LANGUAGE PatternGuards, FlexibleContexts #-}
- -----------------------------------------------------------------------------
- -- |
- -- Module      :  Text.CSL.Eval.Names
---- pandoc-citeproc-0.6-orig/src/Text/CSL/Eval.hs	2014-09-22 14:04:21.000000000 +1000
-+++ pandoc-citeproc-0.6/src/Text/CSL/Eval.hs	2015-01-10 11:55:23.090597159 +1100
-@@ -1,4 +1,4 @@
--{-# LANGUAGE PatternGuards #-}
-+{-# LANGUAGE PatternGuards, FlexibleContexts #-}
- -----------------------------------------------------------------------------
- -- |
- -- Module      :  Text.CSL.Eval
---- pandoc-citeproc-0.6-orig/src/Text/CSL/Parser.hs	2014-09-22 14:04:21.000000000 +1000
-+++ pandoc-citeproc-0.6/src/Text/CSL/Parser.hs	2015-01-10 11:54:59.755477862 +1100
-@@ -144,7 +144,7 @@
- 
- parseCslTerm :: Cursor -> CslTerm
- parseCslTerm cur =
--    let body = unpack $ T.dropAround (`elem` " \t\r\n") $
-+    let body = unpack $ T.dropAround (`elem` (" \t\r\n" :: String)) $
-                   T.concat $ cur $/ content
-     in CT
-       { cslTerm        = stringAttr "name" cur
---- pandoc-citeproc-0.6-orig/src/Text/CSL/Style.hs	2014-09-22 14:04:21.000000000 +1000
-+++ pandoc-citeproc-0.6/src/Text/CSL/Style.hs	2015-01-10 11:53:23.641828264 +1100
-@@ -130,7 +130,7 @@
-   -- this is needed for versions of pandoc that don't turn
-   -- a span with font-variant:small-caps into a SmallCaps element:
-   where handleSmallCapsSpans (Span ("",[],[("style",sty)]) ils)
--            | filter (`notElem` " \t;") sty == "font-variant:small-caps" =
-+            | filter (`notElem` (" \t;" :: String)) sty == "font-variant:small-caps" =
-               SmallCaps ils
-         handleSmallCapsSpans x = x
- 
-@@ -206,15 +206,15 @@
- appendWithPunct (Formatted left) (Formatted right) =
-   Formatted $
-   case concat [lastleft, firstright] of
--       [' ',d] | d `elem` ",.:;" -> initInline left ++ right
--       [c,d] | c `elem` " ,.:;", d == c -> left ++ tailInline right
--       [c,'.'] | c `elem` ",.!:;?" -> left ++ tailInline right
--       [c,':'] | c `elem` ",!:;?" -> left ++ tailInline right  -- Mich.: 2005
--       [c,'!'] | c `elem` ",.!:;?" -> left ++ tailInline right
--       [c,'?'] | c `elem` ",.!:;?" -> left ++ tailInline right
--       [c,';'] | c `elem` ",:;" -> left ++ tailInline right -- et al.;
--       [':',c] | c `elem` ",.!:;?" -> left ++ tailInline right
--       [';',c] | c `elem` ",.!:;?" -> left ++ tailInline right
-+       [' ',d] | d `elem` (",.:;" :: String) -> initInline left ++ right
-+       [c,d] | c `elem` (" ,.:;" :: String), d == c -> left ++ tailInline right
-+       [c,'.'] | c `elem` (",.!:;?" :: String) -> left ++ tailInline right
-+       [c,':'] | c `elem` (",!:;?" :: String) -> left ++ tailInline right  -- Mich.: 2005
-+       [c,'!'] | c `elem` (",.!:;?" :: String) -> left ++ tailInline right
-+       [c,'?'] | c `elem` (",.!:;?" :: String) -> left ++ tailInline right
-+       [c,';'] | c `elem` (",:;" :: String) -> left ++ tailInline right -- et al.;
-+       [':',c] | c `elem` (",.!:;?" :: String) -> left ++ tailInline right
-+       [';',c] | c `elem` (",.!:;?" :: String) -> left ++ tailInline right
-        -- ".;" -> right  -- e.g. et al.;
-        _    -> left ++ right
-   where lastleft     = lastInline left
---- pandoc-citeproc-0.6-orig/src/Text/CSL/Util.hs	2014-09-22 14:04:21.000000000 +1000
-+++ pandoc-citeproc-0.6/src/Text/CSL/Util.hs	2015-01-10 11:51:31.789057499 +1100
-@@ -1,4 +1,4 @@
--{-# LANGUAGE ScopedTypeVariables, PatternGuards #-}
-+{-# LANGUAGE ScopedTypeVariables, PatternGuards, FlexibleContexts #-}
- module Text.CSL.Util
-   ( safeRead
-   , readNum
diff --git a/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.9-no-binutils.patch b/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.9-no-binutils.patch
deleted file mode 100644
index c7c8655e14d8..000000000000
--- a/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.9-no-binutils.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fails to build with -f-bibutils:
-https://bugs.gentoo.org/516640
-diff --git a/pandoc-citeproc.hs b/pandoc-citeproc.hs
-index 7006e02..f72fa41 100644
---- a/pandoc-citeproc.hs
-+++ b/pandoc-citeproc.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE CPP #-}
- module Main where
-@@ -75,2 +76,3 @@ readFormat = go . map toLower
-         go "bibtex"   = Just Bibtex
-+#ifdef USE_BIBUTILS
-         go "ris"      = Just Ris
-@@ -87,2 +89,3 @@ readFormat = go . map toLower
-         go "yaml"     = Just Yaml
-+#endif
-         go _          = Nothing
-diff --git a/src/Text/CSL/Input/Bibutils.hs b/src/Text/CSL/Input/Bibutils.hs
-index 081fa91..49ddbd0 100644
---- a/src/Text/CSL/Input/Bibutils.hs
-+++ b/src/Text/CSL/Input/Bibutils.hs
-@@ -64,3 +64,3 @@ readBiblioFile f
- #else
--        _           -> error $ "citeproc: Bibliography format not supported.\n" ++
-+        _           -> error $ "citeproc: Bibliography format not supported.\n"
- #endif
diff --git a/dev-haskell/pandoc-citeproc/metadata.xml b/dev-haskell/pandoc-citeproc/metadata.xml
deleted file mode 100644
index cc43b3deba93..000000000000
--- a/dev-haskell/pandoc-citeproc/metadata.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="bibutils">use Chris Putnam's <pkg>app-text/bibutils</pkg></flag>
-		<flag name="embed_data_files">Embed locale files into the library (needed for windows packaging)</flag>
-		<flag name="network">use <pkg>dev-haskell/network</pkg> and <pkg>dev-haskell/http</pkg> to retrieve CSL file from URIs</flag>
-		<flag name="hexpat">use <pkg>dev-haskell/hexpat</pkg> instead of <pkg>dev-haskell/xml</pkg> for XML parsing</flag>
-		<flag name="small_base">Choose the new smaller, split-up base package.</flag>
-		<flag name="test_citeproc">Build the test-citeproc program</flag>
-		<flag name="unicode_collation">Use Haskell bindings to the <pkg>dev-libs/icu</pkg></flag>
-	</use>
-	<longdescription>
-		The pandoc-citeproc library exports functions for
-		using the citeproc system with pandoc.  It relies on
-		citeproc-hs, a library for rendering
-		bibliographic reference citations into a variety
-		of styles using a macro language called Citation
-		Style Language (CSL). More details on CSL can be
-		found here: &lt;http://citationstyles.org/&gt;.
-		
-		Currently this package includes a copy of the citeproc-hs
-		code. When citeproc-hs is updated to be compatible,
-		this package will simply depend on citeproc-hs.
-		
-		This package also contains two executables: pandoc-citeproc,
-		which works as a pandoc filter (pandoc &gt;= 1.12), and
-		biblio2yaml, which converts bibliographic databases to
-		a yaml format suitable for inclusion in pandoc YAML
-		metadata.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">jgm/pandoc-citeproc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.1.2.1.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.1.2.1.ebuild
deleted file mode 100644
index ccaee0e55d7e..000000000000
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.1.2.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Supports using pandoc with citeproc"
-HOMEPAGE="http://hackage.haskell.org/package/pandoc-citeproc"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils embed_data_files +hexpat +network +small_base unicode_collation"
-RESTRICT=test # missing files: locales-en-US.xml: openBinaryFile
-
-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?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	test? ( dev-haskell/aeson-pretty
-		>=dev-haskell/diff-0.3 )
-"
-
-src_configure() {
-	# workaround bug on ghc-7.6.3:
-	# > [13 of 24] Compiling Text.CSL.Input.Bibtex ...
-	# > stack overflow: use +RTS -K<size> to increase it
-	replace-hcflags -O[2-9] -O1
-
-	haskell-cabal_src_configure \
-		$(cabal_flag bibutils bibutils) \
-		$(cabal_flag embed_data_files embed_data_files) \
-		$(cabal_flag hexpat hexpat) \
-		$(cabal_flag network network) \
-		$(cabal_flag small_base small_base) \
-		$(cabal_flag unicode_collation unicode_collation)
-}
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild
deleted file mode 100644
index e2d63fc8aa19..000000000000
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -small_base
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Supports using pandoc with citeproc"
-HOMEPAGE="https://github.com/jgm/pandoc-citeproc"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+bibutils debug embed_data_files test_citeproc unicode_collation"
-
-RESTRICT=test # execs a process dropping environment (with LD_PRELOAD)
-
-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?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	test? ( !test_citeproc? ( >=dev-haskell/temporary-1.1 ) )
-	embed_data_files? ( dev-haskell/hsb2hs )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bibutils bibutils) \
-		$(cabal_flag debug debug) \
-		$(cabal_flag embed_data_files embed_data_files) \
-		--flag=-small_base \
-		$(cabal_flag test_citeproc test_citeproc) \
-		$(cabal_flag unicode_collation unicode_collation)
-}
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.ebuild
deleted file mode 100644
index 64db508e0edf..000000000000
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -small_base
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Supports using pandoc with citeproc"
-HOMEPAGE="https://github.com/jgm/pandoc-citeproc"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils debug embed_data_files test_citeproc unicode_collation"
-
-RESTRICT=test # execs a process dropping environment (with LD_PRELOAD)
-
-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?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	test? ( !test_citeproc? ( >=dev-haskell/temporary-1.1 ) )
-	embed_data_files? ( dev-haskell/hsb2hs )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bibutils bibutils) \
-		$(cabal_flag debug debug) \
-		$(cabal_flag embed_data_files embed_data_files) \
-		--flag=-small_base \
-		$(cabal_flag test_citeproc test_citeproc) \
-		$(cabal_flag unicode_collation unicode_collation)
-}
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.2.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.2.ebuild
deleted file mode 100644
index 72658455f8d1..000000000000
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Supports using pandoc with citeproc"
-HOMEPAGE="http://hackage.haskell.org/package/pandoc-citeproc"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils embed_data_files +hexpat +network +small_base unicode_collation"
-RESTRICT=test # missing files: locales-en-US.xml: openBinaryFile
-
-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?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-"
-
-src_configure() {
-	# workaround bug on ghc-7.6.3:
-	# > [13 of 24] Compiling Text.CSL.Input.Bibtex ...
-	# > stack overflow: use +RTS -K<size> to increase it
-	replace-hcflags -O[2-9] -O1
-
-	haskell-cabal_src_configure \
-		$(cabal_flag bibutils bibutils) \
-		$(cabal_flag embed_data_files embed_data_files) \
-		$(cabal_flag hexpat hexpat) \
-		$(cabal_flag network network) \
-		$(cabal_flag small_base small_base) \
-		$(cabal_flag unicode_collation unicode_collation)
-}
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild
deleted file mode 100644
index 6db5f10ed771..000000000000
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-#hackport: flags: -small_base
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Supports using pandoc with citeproc"
-HOMEPAGE="http://hackage.haskell.org/package/pandoc-citeproc"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+bibutils embed_data_files +hexpat +network test_citeproc unicode_collation"
-
-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?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	test? ( >=app-text/pandoc-1.12.1
-		dev-haskell/aeson
-		>=dev-haskell/pandoc-types-1.12.3
-		dev-haskell/text
-		>=dev-haskell/yaml-0.8.8.2 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'network >= 2,' 'network >= 2, network-uri,'
-}
-
-src_configure() {
-	# workaround bug on ghc-7.6.3:
-	# > [13 of 24] Compiling Text.CSL.Input.Bibtex ...
-	# > stack overflow: use +RTS -K<size> to increase it
-	[[ $(ghc-version) == 7.6.* ]] && replace-hcflags -O[2-9] -O1
-	[[ $(ghc-version) == 7.8.* ]] && replace-hcflags -O[2-9] -O1
-
-	haskell-cabal_src_configure \
-		$(cabal_flag bibutils bibutils) \
-		$(cabal_flag embed_data_files embed_data_files) \
-		$(cabal_flag hexpat hexpat) \
-		$(cabal_flag network network) \
-		--flag=-small_base \
-		$(cabal_flag test_citeproc test_citeproc) \
-		$(cabal_flag unicode_collation unicode_collation)
-}
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.6.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.6.ebuild
deleted file mode 100644
index 1172030256f2..000000000000
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.6.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -small_base
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit base haskell-cabal
-
-DESCRIPTION="Supports using pandoc with citeproc"
-HOMEPAGE="http://hackage.haskell.org/package/pandoc-citeproc"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils embed_data_files test_citeproc unicode_collation"
-
-RESTRICT=test # missing files
-
-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?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-"
-
-PATCHES=("${FILESDIR}/${PN}-0.6-ghc-7.10.patch")
-
-src_configure() {
-	# workaround bug on ghc-7.6.3:
-	# > [13 of 24] Compiling Text.CSL.Input.Bibtex ...
-	# > stack overflow: use +RTS -K<size> to increase it
-	[[ $(ghc-version) == 7.6.* ]] && replace-hcflags -O[2-9] -O1
-	[[ $(ghc-version) == 7.8.* ]] && replace-hcflags -O[2-9] -O1
-
-	haskell-cabal_src_configure \
-		$(cabal_flag bibutils bibutils) \
-		$(cabal_flag embed_data_files embed_data_files) \
-		--flag=-small_base \
-		$(cabal_flag test_citeproc test_citeproc) \
-		$(cabal_flag unicode_collation unicode_collation)
-}
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild
deleted file mode 100644
index 332e82c6e28d..000000000000
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -small_base
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Supports using pandoc with citeproc"
-HOMEPAGE="http://hackage.haskell.org/package/pandoc-citeproc"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+bibutils debug embed_data_files test_citeproc unicode_collation"
-
-RESTRICT=test # fd:8: hClose: resource vanished (Broken pipe)
-
-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?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9-no-binutils.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bibutils bibutils) \
-		$(cabal_flag debug debug) \
-		$(cabal_flag embed_data_files embed_data_files) \
-		--flag=-small_base \
-		$(cabal_flag test_citeproc test_citeproc) \
-		$(cabal_flag unicode_collation unicode_collation)
-}
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild
deleted file mode 100644
index 51b893fd6c45..000000000000
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -small_base
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Supports using pandoc with citeproc"
-HOMEPAGE="http://hackage.haskell.org/package/pandoc-citeproc"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils debug embed_data_files test_citeproc unicode_collation"
-
-RESTRICT=test # execs a process dropping environment (with LD_PRELOAD)
-
-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?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	embed_data_files? ( dev-haskell/hsb2hs )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9-no-binutils.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bibutils bibutils) \
-		$(cabal_flag debug debug) \
-		$(cabal_flag embed_data_files embed_data_files) \
-		--flag=-small_base \
-		$(cabal_flag test_citeproc test_citeproc) \
-		$(cabal_flag unicode_collation unicode_collation)
-}
diff --git a/dev-haskell/pandoc-types-1.12.3 b/dev-haskell/pandoc-types-1.12.3
new file mode 100644
index 000000000000..5e9c0c6026e5
--- /dev/null
+++ b/dev-haskell/pandoc-types-1.12.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Types for representing a structured document
+EAPI=5
+HOMEPAGE=http://johnmacfarlane.net/pandoc
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/1.12.3
+SRC_URI=mirror://hackage/packages/archive/pandoc-types/1.12.3/pandoc-types-1.12.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=604726bde5d20f5a8880fec8b6334f83
diff --git a/dev-haskell/pandoc-types-1.12.4.5 b/dev-haskell/pandoc-types-1.12.4.5
new file mode 100644
index 000000000000..6084d426c281
--- /dev/null
+++ b/dev-haskell/pandoc-types-1.12.4.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-0.10:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Types for representing a structured document
+EAPI=5
+HOMEPAGE=http://johnmacfarlane.net/pandoc
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-0.10:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.12.4.5
+SRC_URI=mirror://hackage/packages/archive/pandoc-types/1.12.4.5/pandoc-types-1.12.4.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=03f2ab3a36e8176cde89c9354119a08e
diff --git a/dev-haskell/pandoc-types-1.12.4.7 b/dev-haskell/pandoc-types-1.12.4.7
new file mode 100644
index 000000000000..80b1688f201b
--- /dev/null
+++ b/dev-haskell/pandoc-types-1.12.4.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-0.11:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Types for representing a structured document
+EAPI=5
+HOMEPAGE=http://johnmacfarlane.net/pandoc
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-0.11:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.12.4.7
+SRC_URI=mirror://hackage/packages/archive/pandoc-types/1.12.4.7/pandoc-types-1.12.4.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d7d6c2d11bfc945c86a390e3d8c3c654
diff --git a/dev-haskell/pandoc-types-1.17.0.4 b/dev-haskell/pandoc-types-1.17.0.4
new file mode 100644
index 000000000000..91a5fc45926a
--- /dev/null
+++ b/dev-haskell/pandoc-types-1.17.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-1.1:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] >=dev-haskell/quickcheck-2:2=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10 ~dev-haskell/string-qq-0.0.2 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Types for representing a structured document
+EAPI=6
+HOMEPAGE=http://johnmacfarlane.net/pandoc
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-1.1:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] >=dev-haskell/quickcheck-2:2=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.17.0.4
+SRC_URI=mirror://hackage/packages/archive/pandoc-types/1.17.0.4/pandoc-types-1.17.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=07beedb3f0d2739fcf7e3a7880e378c0
diff --git a/dev-haskell/pandoc-types/Manifest b/dev-haskell/pandoc-types/Manifest
deleted file mode 100644
index 5812fd7f00e1..000000000000
--- a/dev-haskell/pandoc-types/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST pandoc-types-1.12.3.tar.gz 18633 BLAKE2B 53776ac60c3e658ae6bf348d065d449045b5b0474b16550270c7087c766f1726fed80135ae92cab087a76dee8994a6ff3f68cc7085145f1e065a7cddf3b2759f SHA512 8da2d37baa962c4a414a60ac274736897499b3ba26bd54e2e6dd10616f204c3e143e4e66c97fa209781d73bde35fab7a466a8eaa06edaa13eaa178aa77c285af
-DIST pandoc-types-1.12.4.5.tar.gz 13341 BLAKE2B e0c9d079a8b5ee1eef07d8da87f621a1b005a984ae9b52b81241530bc5e7ef632fd9efe52aa7ab6f55978b28a15ef049769bdaeb5a94cc3b09b5cba8f34f757d SHA512 7f4c1156b074e61cd6fb5f37f5555700f5c21a24eb4226770fb8c83be3dc6075fef0b7b183c06561cc42c194fea0ac7356572e05097165e87e162b161f9c8993
-DIST pandoc-types-1.12.4.7.tar.gz 13208 BLAKE2B 6d823bc596cb779e67d6ba3af0323de2747ff0280e82fb4c319a8ebb5dbe5211015708c5241146a6a8210f9f1907c1d92aa5aac90397d3de3c249d5cf32968fd SHA512 cabb59d4f6bfec3c00d4cac4f2bda60e11ce96394b61d79650544b3249b5ef81758da0d8d08cb3de68ed252845ae1b6f2c4d663e80b4cdc076916c278ac4fc4b
-DIST pandoc-types-1.17.0.4.tar.gz 21540 BLAKE2B ba11e3a9c8fc98597cfaf0812ca35d6346f2c43aa7f67adf3f098b2410d12aed6b60b28003eec16e4cd82c6a355ec03b78d590bfa672d579ca8adc5ad1c63fb5 SHA512 3b3aaa2d6b62be8b3876ead411a0d48277666ab3dd718e5aad5ecca01cb9d66a4d7973bdc250e4fd2d061917d0836f63e6412534fa854c2c886dc798e34c60fc
-EBUILD pandoc-types-1.12.3.ebuild 695 BLAKE2B fc64d56e0957dea1c15add3f6c0b59c88f98dfc3e79e8a364e9e4b9829f5bbf4ad8539a46e9c75fb38a278c66c18ed838a5c82cab79207cc32c211097a935c50 SHA512 a8166d05fb2f9fb4987d285d7df646258e46627777ef6207e94672eccc69a30758b34ca20ecedc80171f718306f3492d232882559d63d9a7d135dda46c69c238
-EBUILD pandoc-types-1.12.4.5.ebuild 783 BLAKE2B fe22912e04f47afe422ab86bc52b8696a719758039d199f3e12d9a73e344e31fb7161ab0f437b4efb2aa7672d1d5d351dde7a278505139e02187af958693ec51 SHA512 e7bcce11cd96f914de745e663487b97e930959b81be4d6d3206f640255ab35516f1eae54367e84ac9cdb99c833a57dc34e1e147966292d6195631162a85ed612
-EBUILD pandoc-types-1.12.4.7.ebuild 785 BLAKE2B 55694fa8a8f62e49f828e3ef0b8b3860402ce0448938671a9b6b1452ed5141e50d7125ad06d0bb674a504f9cef4a4b3843e5bf065ac87df15e6ca5cd29e08e4a SHA512 594c847452055bfafb6d5b6b040d7613b38a430433292cdf0b2a2b2f24bbde24a881b05851f4865461f4be1ecfcf4e9661f4284ec66db9404e768a8f3eae02f6
-EBUILD pandoc-types-1.17.0.4.ebuild 1171 BLAKE2B 0670ea4fdd6fc34bfd7eb16180688025a534bd5ac35b2d4e5fcc12829448219881bd653b5dbb5a9a29807c57d71241e103b242b2392b41f654ed0153a64585ad SHA512 cb0075b8e7e33464951b0979ad19e7a0582f6fb5904ad5e6749bc1f172f937bd686b6346795895007ff5a24125a549ec1237afa32962d08c0aaaf0e1c09b1ae8
-MISC metadata.xml 742 BLAKE2B be89ec8208d0891fbe9af9f4cdbd438daaaf96e8fa3478b9b9713c57349e6a516c0b8d5ad1074e4b34d02e0d1f1d52ff27a7dcc2699362ed7ddd5bee18940255 SHA512 438830b6cd891695dbc45cb03b0bcd34f85fb5d7225384617a1d130c086b687e7dfed06d4122b0025ad70eba4ed25e2d3dd2803a0a84012d225b75cdfb6fa9e6
diff --git a/dev-haskell/pandoc-types/metadata.xml b/dev-haskell/pandoc-types/metadata.xml
deleted file mode 100644
index 39e4e9303f27..000000000000
--- a/dev-haskell/pandoc-types/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package contains definitions for the <pkg>app-text/pandoc</pkg> data
-		structure, which is used by pandoc to represent
-		structured documents.  These definitions used to live
-		in the pandoc package, but starting with pandoc 1.7, they
-		have been split off, so that other packages can use them
-		without drawing in all of pandoc's dependencies, and
-		pandoc itself can depend on packages (like <pkg>dev-haskell/citeproc-hs</pkg>)
-		that use them.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.12.3.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.12.3.ebuild
deleted file mode 100644
index 34569d4d96a9..000000000000
--- a/dev-haskell/pandoc-types/pandoc-types-1.12.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Types for representing a structured document"
-HOMEPAGE="http://johnmacfarlane.net/pandoc"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.12.4.5.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.12.4.5.ebuild
deleted file mode 100644
index e86ffc48b780..000000000000
--- a/dev-haskell/pandoc-types/pandoc-types-1.12.4.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Types for representing a structured document"
-HOMEPAGE="http://johnmacfarlane.net/pandoc"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-0.10:=[profile?]
-	>=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.12.4.7.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.12.4.7.ebuild
deleted file mode 100644
index c9f47524b407..000000000000
--- a/dev-haskell/pandoc-types/pandoc-types-1.12.4.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Types for representing a structured document"
-HOMEPAGE="http://johnmacfarlane.net/pandoc"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-0.11:=[profile?]
-	>=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.17.0.4.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.17.0.4.ebuild
deleted file mode 100644
index 88e285e75326..000000000000
--- a/dev-haskell/pandoc-types/pandoc-types-1.17.0.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Types for representing a structured document"
-HOMEPAGE="http://johnmacfarlane.net/pandoc"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-1.1:=[profile?]
-	>=dev-haskell/deepseq-generics-0.1:=[profile?]
-	>=dev-haskell/quickcheck-2:2=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10
-		~dev-haskell/string-qq-0.0.2
-		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/pango-0.12.5.3 b/dev-haskell/pango-0.12.5.3
new file mode 100644
index 000000000000..35e11368d3ed
--- /dev/null
+++ b/dev-haskell/pango-0.12.5.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cairo-0.12.5.3:0=[profile?] <dev-haskell/cairo-0.13:0=[profile?] >=dev-haskell/glib-0.12.5.3:0=[profile?] <dev-haskell/glib-0.13:0=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:= x11-libs/cairo x11-libs/pango >=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binding to the Pango text rendering engine
+EAPI=5
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/cairo-0.12.5.3:0=[profile?] <dev-haskell/cairo-0.13:0=[profile?] >=dev-haskell/glib-0.12.5.3:0=[profile?] <dev-haskell/glib-0.13:0=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:= x11-libs/cairo x11-libs/pango
+SLOT=0/0.12.5.3
+SRC_URI=mirror://hackage/packages/archive/pango/0.12.5.3/pango-0.12.5.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=feb3f506ec824a4bbecb8e8c4ef03f87
diff --git a/dev-haskell/pango-0.13.1.1 b/dev-haskell/pango-0.13.1.1
new file mode 100644
index 000000000000..8a96a0831fd6
--- /dev/null
+++ b/dev-haskell/pango-0.13.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/cairo x11-libs/pango >=dev-haskell/cabal-1.18 dev-haskell/gtk2hs-buildtools virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binding to the Pango text rendering engine
+EAPI=5
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/cairo x11-libs/pango
+SLOT=0/0.13.1.1
+SRC_URI=mirror://hackage/packages/archive/pango/0.13.1.1/pango-0.13.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a3db631e51d94eff6ecce67432ba7175
diff --git a/dev-haskell/pango-0.13.3.1 b/dev-haskell/pango-0.13.3.1
new file mode 100644
index 000000000000..e2b83da8fa5e
--- /dev/null
+++ b/dev-haskell/pango-0.13.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/cairo x11-libs/pango >=dev-haskell/cabal-1.24 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binding to the Pango text rendering engine
+EAPI=6
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/cairo x11-libs/pango
+SLOT=0/0.13.3.1
+SRC_URI=mirror://hackage/packages/archive/pango/0.13.3.1/pango-0.13.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e8805760ea13153c39e9c5f624d64e29
diff --git a/dev-haskell/pango/Manifest b/dev-haskell/pango/Manifest
deleted file mode 100644
index aba8569a7faf..000000000000
--- a/dev-haskell/pango/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST pango-0.12.5.3.tar.gz 60968 BLAKE2B 93abd241ed7809b3ece5862e667c80153169011a48bb901e7f14bab71da98fa62d564823bc3a30f3b9d6f3d5ead96d63b99abd34cd278fdf580413f97f7962b5 SHA512 bf93159f10519a0b5c313e0398f4fef703aa97eb4d0c998851be1cb1b7b69b2e28595dbfea2659de89cd2b0df64e1a945a90c22aee503eed2e85482bfa583d45
-DIST pango-0.13.1.1.tar.gz 61730 BLAKE2B 185e53cb9b5355a1eb4ffe39e56eb043ab2ce09bd902a7af85f4c8d5925f8640c5aa64f74fe3d630fa155745eed5eb73e409889bde953ed9ed850cfd4724e5ff SHA512 4dd021e03e18bea64b51ad1b4c5cae2cd214f0f26bd41deecf83626f25d70670e2472877e60ff49c30cd0f3e993d8cb4ba7adc3fee26454f8713e2a5bc7a9284
-DIST pango-0.13.3.1.tar.gz 52564 BLAKE2B 1c562635e9c0586363e5f3b234ae7303bf6f624a9e368afabdd3ee83477c9f4a831e072c336347af10c6b6442edac19714e4839b0f5b8a8d142b7309718e9e52 SHA512 7bcdd64abaf768bcbfc08f2fad93bc8ac142aa30b17ac0ee67ceec1429368f5a1c7cda6ed14d78278b69c948cdd4cd01630febfe41d9078c7f54d72c59d7b9b6
-EBUILD pango-0.12.5.3.ebuild 920 BLAKE2B c0ca88c931e5f497e42fb1a967278ed66d9a6701b544babbd54217f87846383288c5f7ede338546719bec097ff80e78944a3e350e98cf216d02537c5cd646ba2 SHA512 afaa3abef2611040ce401906e17dc86885dece75db854394127939446f75b078a5f6720efaaad22d186b566c5012fc4b484c17cfd92bfb1b9728ae7d0ca540bb
-EBUILD pango-0.13.1.1.ebuild 925 BLAKE2B 273fcbdb6b991e604ef83b057bcdf4393211413467e81670eccac678646d97a61d60fefbf33e1597759c29e2856890c2f8779eebb8e6955506c4cd895bc0ffb4 SHA512 0f1d0b195f1da4400ad322ae2b277b642f3c70b0a454db0736d16a2de49b0379453f309b2bd591202a4d1ee96da19a753d0e149f93c3bc999905d24c6cacfe9e
-EBUILD pango-0.13.3.1.ebuild 892 BLAKE2B abffaff262dffb66f1a486c0df08a1085948c40e928de6f14a692c20e47d08cf995acf2bd7a9de591902f3e841998f5e30f35cdac9a87755e7791b0bae615061 SHA512 b7455aca5cbfe67a354b492fe14ab96c22589501ee38eae83f8250a341999cb4125fe8a6b73677dfe6447047d87c8f9624d7c9d9d2d020f0b87f9b1ca1972eba
-MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/pango/metadata.xml b/dev-haskell/pango/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/pango/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/pango/pango-0.12.5.3.ebuild b/dev-haskell/pango/pango-0.12.5.3.ebuild
deleted file mode 100644
index c88af39de11c..000000000000
--- a/dev-haskell/pango/pango-0.12.5.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-#nocabaldep is for the fancy cabal-detection feature at build-time
-CABAL_FEATURES="lib profile haddock hoogle hscolour nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Pango text rendering engine"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cairo-0.12.5.3:0=[profile?] <dev-haskell/cairo-0.13:0=[profile?]
-	>=dev-haskell/glib-0.12.5.3:0=[profile?] <dev-haskell/glib-0.13:0=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	x11-libs/cairo
-	x11-libs/pango
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/pango/pango-0.13.1.1.ebuild b/dev-haskell/pango/pango-0.13.1.1.ebuild
deleted file mode 100644
index 0b5020d04292..000000000000
--- a/dev-haskell/pango/pango-0.13.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Pango text rendering engine"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
-	>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	x11-libs/cairo
-	x11-libs/pango
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-	dev-haskell/gtk2hs-buildtools
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/pango/pango-0.13.3.1.ebuild b/dev-haskell/pango/pango-0.13.3.1.ebuild
deleted file mode 100644
index 97ceba4c17fb..000000000000
--- a/dev-haskell/pango/pango-0.13.3.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Pango text rendering engine"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
-	>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	x11-libs/cairo
-	x11-libs/pango
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/parallel-1.1.0.1 b/dev-haskell/parallel-1.1.0.1
new file mode 100644
index 000000000000..02f23d8043d4
--- /dev/null
+++ b/dev-haskell/parallel-1.1.0.1
@@ -0,0 +1,13 @@
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b196898e57f4aa1bcebe15b94b57ea3c
diff --git a/dev-haskell/parallel-3.2.0.3 b/dev-haskell/parallel-3.2.0.3
new file mode 100644
index 000000000000..396a3169348a
--- /dev/null
+++ b/dev-haskell/parallel-3.2.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=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=Parallel programming library
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/parallel
+IUSE=doc hscolour profile
+KEYWORDS=amd64 sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=3/3.2.0.3
+SRC_URI=mirror://hackage/packages/archive/parallel/3.2.0.3/parallel-3.2.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=24b68942ad41ca6754441785bd447615
diff --git a/dev-haskell/parallel-3.2.1.0 b/dev-haskell/parallel-3.2.1.0
new file mode 100644
index 000000000000..476f8b26ecb8
--- /dev/null
+++ b/dev-haskell/parallel-3.2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parallel programming library
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/parallel
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=3/3.2.1.0
+SRC_URI=mirror://hackage/packages/archive/parallel/3.2.1.0/parallel-3.2.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3b5574ee96b264f0082e9eca83e821fc
diff --git a/dev-haskell/parallel-io-0.3.3-r2 b/dev-haskell/parallel-io-0.3.3-r2
new file mode 100644
index 000000000000..c623b0079e43
--- /dev/null
+++ b/dev-haskell/parallel-io-0.3.3-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>dev-haskell/extensible-exceptions-0.1.0.1:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Combinators for executing IO actions in parallel on a thread pool
+EAPI=5
+HOMEPAGE=http://batterseapower.github.com/parallel-io
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>dev-haskell/extensible-exceptions-0.1.0.1:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.3
+SRC_URI=mirror://hackage/packages/archive/parallel-io/0.3.3/parallel-io-0.3.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=98640a1d5d085a318c220666161cc03c
diff --git a/dev-haskell/parallel-io/Manifest b/dev-haskell/parallel-io/Manifest
deleted file mode 100644
index 03f8441b234f..000000000000
--- a/dev-haskell/parallel-io/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST parallel-io-0.3.3.tar.gz 9435 BLAKE2B 97d3e1343a20748173d9bc15e1bd84cde4e66f4e8bc916a18550c9f5e9c7a97a06861ab83db6ed3c7975da0142e287da0c6dc1c6483d9f78544564516181e650 SHA512 4d2ddb9ad4b3b362e431774495fa7e4cc4476768257f2915f3a6e64c1872a5bcf880d71e1f678997a23fbf9cfa22bc2b38df9f2866897d3cbb6d35e65eb542db
-EBUILD parallel-io-0.3.3-r2.ebuild 843 BLAKE2B d672e07ffdc6c656399512f67993eeba45864f9496bd3f2bab1fbe2f76e909af7a66f190ada51e2c44876ec2c4c970d517fbcfecb10c7a8801cef6553cfa231d SHA512 0475c9b5d0008b5f9376debd79be4c1e29a3d67a5f535f4be80360eb48026f4ca824a2f3933af449e04c2799ce6e6f9be8de66197511b383ab8b1362dfe905fa
-MISC metadata.xml 899 BLAKE2B d4f43c2b5febedc199fed9b9e7a1cd911b626f65a8c6eb8993f94740e708689792ce41850bdaa27a0e492016d126c144ef79ad4b3964b6fd1e5c75547aaee3a6 SHA512 9461bf5d5391ba700a775c4193d0d0dc96d96a5591a4db16352e21aeeeb0f7fd776e8cc4aee55d9f3bedf59444d34477e9da9b22ea14f44b8e9f333de1f9c2e0
diff --git a/dev-haskell/parallel-io/metadata.xml b/dev-haskell/parallel-io/metadata.xml
deleted file mode 100644
index a02ec8bbfe5a..000000000000
--- a/dev-haskell/parallel-io/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides combinators for sequencing IO actions onto a thread pool. The
-		thread pool is guaranteed to contain no more unblocked threads than a user-specified upper limit, thus
-		minimizing contention.
-		
-		Furthermore, the parallel combinators can be used reentrantly - your parallel
-		actions can spawn more parallel actions - without violating this property of the thread pool.
-		
-		The package is inspired by the thread &lt;http://thread.gmane.org/gmane.comp.lang.haskell.cafe/56499/focus=56521&gt;.
-		Thanks to Neil Mitchell and Bulat Ziganshin for some of the code this package is based on.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/parallel-io/parallel-io-0.3.3-r2.ebuild b/dev-haskell/parallel-io/parallel-io-0.3.3-r2.ebuild
deleted file mode 100644
index 048d8362c8fb..000000000000
--- a/dev-haskell/parallel-io/parallel-io-0.3.3-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Combinators for executing IO actions in parallel on a thread pool"
-HOMEPAGE="http://batterseapower.github.com/parallel-io"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-#hackport: flags: -test -fuzz -benchmark
-
-RDEPEND=">dev-haskell/extensible-exceptions-0.1.0.1:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'random >= 1.0 && < 1.1' 'random >= 1.0 && < 1.2'
-}
diff --git a/dev-haskell/parallel/Manifest b/dev-haskell/parallel/Manifest
deleted file mode 100644
index 8965cd637613..000000000000
--- a/dev-haskell/parallel/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST parallel-1.1.0.1.tar.gz 8074 BLAKE2B 60e3680b57da14dab9f33a217297cd05679caaa68f0e894c615e547e3d54016206e81643d745d7f9d0a0dddeac3bd4aed4a521d18aff7708b6e8efa1e2c0a204 SHA512 edf887f5d7c6b3b0df03405e632367240d5eb7c9cbb157b572f16241418513feac28cea5b9d61249eed87ab37b01591ad682b5d9a9815af6d0b0e00d4c076e99
-DIST parallel-3.2.0.3.tar.gz 12527 BLAKE2B a3c52089a36ba1189d037b3fb93bcfb029965f3a8329990f464bf0d880654b40fa6148b23070f30053bda9efdf123cdf70a1b6d0d6ce02fd22fc5f0792997eba SHA512 28c0d30d51a6d66379190f96e6c057dde044e2bab25b9e87d6bbad2d43e9f1e6e82c1a11aaa61ce3fbf3681ddcc04f7d48cb6b8c9b611d24e5d95247a0cd0882
-DIST parallel-3.2.1.0.tar.gz 13199 BLAKE2B 7559c9b90f7849c119b545aa2a110f45150367a179c6d9a8514853b4a8bd5aca524d790e1bf111cfdd83d33886cb38fc136c29ed9a2a99f4d4d890946ad1f0eb SHA512 5b5051aa70320a70eb0f2326d49afbcda32f24f9a48463f8854f9d61cca2e61cf321b1f34989d1009f0cc8e49934c820f3d5f89a1d675701d9cf46df65dd2d6d
-EBUILD parallel-1.1.0.1.ebuild 540 BLAKE2B 6b932114209ce32018c4a9231e86ddf23d0f9d7e1e43c4b599eb5a6277487109ba559772136a050c1363c395a013bb5b96c0d3faf321f32f4f9ccc53ab43e165 SHA512 d1c1e05c15bc0e750a266410b088e3ad243e73591e21d16dc986b197939b8ab9e5091ac34b0b22183afd3fddd3e31e5b5ce977f42b5b69e8c0ec85ef8fbe48c0
-EBUILD parallel-3.2.0.3.ebuild 687 BLAKE2B 1c450c5a9deb27644484d1caef0b2a0ff87d070ab7d54492d2b0c0781f6a707eb86c46fb8f234c3c8f0f7dec0d3a00ea747c048682379e687741c0f8feaf890c SHA512 eb4c6be51a7de5e6460039d51a9f414a10cc2263129490d39ab24d12655de56d09e4a6dcf1606bd3b9d473cb06878fe0d3cf2ab81223e4b247b90423eaba28fa
-EBUILD parallel-3.2.1.0.ebuild 551 BLAKE2B 7505e67de449e22fa953f8f6dc9109991b8d0c69fd69a63d965236ac8a35f2ab22dba206cbbb89d94176c348d58ec240a39d83c41d3c0c6892c5ff6be2cd554e SHA512 3217d8521f21c683c7f9b1f4f587d078486fbc9e48423c3ad500941b1319b7921b7cb41f1541e0b818a89a28d63f5dd3e239aec8a06736ef5f4f60a42779e845
-MISC metadata.xml 348 BLAKE2B b3ff628c3dd2e4cc55659f1236f459cba5964c4e20fed7c05b060320ec2564c10bc76eb545637f14f921feea48f3e3fa9f69d978b906a2d371e735f50e98c09f SHA512 2ec2707ab414044b06c87575e74dd42b27bbd0f3040139f8778a70954bf6941c20abb07798052a1c44e51f64b6250abaf621eefabfec3cc6cf696d05104e046f
diff --git a/dev-haskell/parallel/metadata.xml b/dev-haskell/parallel/metadata.xml
deleted file mode 100644
index dd457a941da4..000000000000
--- a/dev-haskell/parallel/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides a library for parallel programming.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/parallel/parallel-1.1.0.1.ebuild b/dev-haskell/parallel/parallel-1.1.0.1.ebuild
deleted file mode 100644
index 51a820ebdf72..000000000000
--- a/dev-haskell/parallel/parallel-1.1.0.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
-
-DESCRIPTION="parallel programming library"
-HOMEPAGE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/parallel"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1"
-KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/parallel/parallel-3.2.0.3.ebuild b/dev-haskell/parallel/parallel-3.2.0.3.ebuild
deleted file mode 100644
index f6a915d0c706..000000000000
--- a/dev-haskell/parallel/parallel-3.2.0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parallel programming library"
-HOMEPAGE="http://hackage.haskell.org/package/parallel"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3/${PV}"
-KEYWORDS="amd64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	cabal_chdeps \
-		'array      >= 0.1 && < 0.5' 'array      >= 0.1 && < 0.6' \
-		'deepseq >= 1.1 && < 1.4' 'deepseq >= 1.1'
-}
diff --git a/dev-haskell/parallel/parallel-3.2.1.0.ebuild b/dev-haskell/parallel/parallel-3.2.1.0.ebuild
deleted file mode 100644
index e1687365f272..000000000000
--- a/dev-haskell/parallel/parallel-3.2.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parallel programming library"
-HOMEPAGE="http://hackage.haskell.org/package/parallel"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3/${PV}"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/parsec-2.1.0.1 b/dev-haskell/parsec-2.1.0.1
new file mode 100644
index 000000000000..f44bb789ac23
--- /dev/null
+++ b/dev-haskell/parsec-2.1.0.1
@@ -0,0 +1,13 @@
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cfd027b091644533650f2c7566e33bfb
diff --git a/dev-haskell/parsec-3.1.11 b/dev-haskell/parsec-3.1.11
new file mode 100644
index 000000000000..8fa167ae0427
--- /dev/null
+++ b/dev-haskell/parsec-3.1.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 >=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cd31eafef244e542d8b658af6c669a3b
diff --git a/dev-haskell/parsec-3.1.5 b/dev-haskell/parsec-3.1.5
new file mode 100644
index 000000000000..27dcdf6b00eb
--- /dev/null
+++ b/dev-haskell/parsec-3.1.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b000174e346cb3fd34f8be288591b411
diff --git a/dev-haskell/parsec-3.1.9-r1 b/dev-haskell/parsec-3.1.9-r1
new file mode 100644
index 000000000000..f8b6c512b87e
--- /dev/null
+++ b/dev-haskell/parsec-3.1.9-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 >=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=02197077bfb08d569eacf4790ba242d4
diff --git a/dev-haskell/parsec/Manifest b/dev-haskell/parsec/Manifest
deleted file mode 100644
index 85a7e3bafb55..000000000000
--- a/dev-haskell/parsec/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST parsec-2.1.0.1.tar.gz 15430 BLAKE2B e1ee8e2a9e2dffaf2bd05592f53ecbab9c88affa04b0448c1360976726479e91d275dea0f4efccf11be418691c54ad56a081de7e1dfd9581b65bf3f69e48a521 SHA512 c068ded3b04a0544833a4e11d238db8d7d80cce8d88c9fcf8f7446ed6d37766b923a49179b06831fd013b19a530cf859edde0ec089444620472617e978d235bb
-DIST parsec-3.1.11.tar.gz 32412 BLAKE2B 7e463d37b1da799820079500d96d719e2f34781ba1d443391d5a49b60c3ad935c6c4e766aaa5963c1128ca12a0070f86b17fcbdf6e96224573742e0f9341c7f6 SHA512 f913c172295b184fc118a59ad5fd66c35133885c39aac62239fc3a1aa98b4741465f67d0cffafc1706262ada42259a4694bfbb9175a399997e5b8840da4a809f
-DIST parsec-3.1.5.tar.gz 27894 BLAKE2B 4c0daaa10d2307f59770747662b387cd286b46d27c3dff27c581d0e295f7bc652cc7e6e0f141ce69ef15da2af0e9f612f732b9bf09f17c9bab56dba0dc596481 SHA512 58bd5e1ea878349a678c4a8d77caf42962ab65f801411bbbad4fa1e4f387de743f2f64944b5d7ef82042507552f281f70a7f4b40984a0ca4fd37618a0d1ec662
-DIST parsec-3.1.9.tar.gz 29668 BLAKE2B 296049551258044915936afa0928b0d73b30ec7cbb217b3ac76972cfc3f9cb49efbe5091c49fe1232f5bb24951efc0c56d89b7818046cc5b8edeb67796de28f6 SHA512 bc5209813ad0742c68c275f0ecd3e284b6249d2651f75daf16ad9a776003591217eb7d47fdaad88530af90455fe7d3e014c3c1d7d0893482721d4997b23a2d16
-EBUILD parsec-2.1.0.1.ebuild 561 BLAKE2B 2f7099d20ef26a3d5c55baa26625e5ccc3965b7474bfb4c14ab534d40f8d717b4fcf011e6515a5db771e417f0abad35618190a86f81e67fc4c5ef46a3afc2c25 SHA512 8e04bf21b49b8bfce0457a4b19fe30f74d054972a00d850535f87d834092b044a4178cdb060255c88c4c9957a548448f25582064de8f3ee2aafe35a7d74da6d7
-EBUILD parsec-3.1.11.ebuild 945 BLAKE2B c8cfe97320e22cebc8de943109219cf0db856f099c7012051d386a9b31a9d8295f205dc004c55f6d57f70b55fa80fc927c95d6ffbd6e24aef66429ac414d6c61 SHA512 4d081476b1d66b1f16e330401aab5da5491fc264b1c25f3b85c28fd244912ac81816a80d876688cf00ad47bdd9b60d5915e0c7cbc78ac05816f91c03c20ec457
-EBUILD parsec-3.1.5.ebuild 733 BLAKE2B 1df7635d93631501787ebb19ff5cddb33f185ac5669d7387f5886dbb36818795846e6f1a2904790b149c706452713518e4086a565c42e02f1ed604b8cc7d4b46 SHA512 4c8faaa92666d81a5ea501de1e3ef10816984bc17af9199e94b2cc4f34fe32037d2a05ee169d65510f945dd65e381ccf579e961cb474c20f271d79a2b1583755
-EBUILD parsec-3.1.9-r1.ebuild 991 BLAKE2B 4ade9eaaf06e660279f8bf630edb72fcb1cdfd42a365afb8f1d469c44e7638bc7a448443b2d5fe5ab478a9341306ce7fc10eae3108966534b8c5fde038701a9f SHA512 af3e1998151ea0ce9569dae1ec6e16712e1078275aa26768400d03af9c76e6e82e808b092a63842555d17e8322ece085e0f5d9603229496656af5f2790d69f78
-MISC metadata.xml 307 BLAKE2B 16cc6920f5961ab10f92062508514149a785fb6011d4c68de20b40083cd8c80cc6e284a1ec8ab90a8937f14ffffe05602e753e91cc25cf2a28664c292fb5aa47 SHA512 bfda6d40cdde23fd32b6640ef6089cf3060a0d608ae4ba12954df60fd27d86fd3c0e1336a362754927bb00651db8e1a541be195c4cc464fd8bb417f3811b7a51
diff --git a/dev-haskell/parsec/metadata.xml b/dev-haskell/parsec/metadata.xml
deleted file mode 100644
index e593d5b00bd3..000000000000
--- a/dev-haskell/parsec/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">aslatter/parsec</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/parsec/parsec-2.1.0.1.ebuild b/dev-haskell/parsec/parsec-2.1.0.1.ebuild
deleted file mode 100644
index 06bd7f1436c6..000000000000
--- a/dev-haskell/parsec/parsec-2.1.0.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
-
-DESCRIPTION="Monadic parser combinators"
-HOMEPAGE="http://www.cs.uu.nl/~daan/parsec.html"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.6.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/parsec/parsec-3.1.11.ebuild b/dev-haskell/parsec/parsec-3.1.11.ebuild
deleted file mode 100644
index 15e3e257c090..000000000000
--- a/dev-haskell/parsec/parsec-3.1.11.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Monadic parser combinators"
-HOMEPAGE="https://github.com/aslatter/parsec"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 )
-"
diff --git a/dev-haskell/parsec/parsec-3.1.5.ebuild b/dev-haskell/parsec/parsec-3.1.5.ebuild
deleted file mode 100644
index f4c6885fe03d..000000000000
--- a/dev-haskell/parsec/parsec-3.1.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monadic parser combinators"
-HOMEPAGE="http://www.cs.uu.nl/~daan/parsec.html"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/parsec/parsec-3.1.9-r1.ebuild b/dev-haskell/parsec/parsec-3.1.9-r1.ebuild
deleted file mode 100644
index acf69c92f51e..000000000000
--- a/dev-haskell/parsec/parsec-3.1.9-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Monadic parser combinators"
-HOMEPAGE="https://github.com/aslatter/parsec"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'HUnit == 1.2.*' 'HUnit >= 1.2'
-}
diff --git a/dev-haskell/parser-combinators-0.4.0 b/dev-haskell/parser-combinators-0.4.0
new file mode 100644
index 000000000000..4d5840130fbf
--- /dev/null
+++ b/dev-haskell/parser-combinators-0.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lightweight package providing commonly useful parser combinators
+EAPI=6
+HOMEPAGE=https://github.com/mrkkrp/parser-combinators
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.0
+SRC_URI=mirror://hackage/packages/archive/parser-combinators/0.4.0/parser-combinators-0.4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=51d0415227f936bddff45dde89055d6d
diff --git a/dev-haskell/parser-combinators-1.0.0 b/dev-haskell/parser-combinators-1.0.0
new file mode 100644
index 000000000000..ec7ec634a4dc
--- /dev/null
+++ b/dev-haskell/parser-combinators-1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lightweight package providing commonly useful parser combinators
+EAPI=6
+HOMEPAGE=https://github.com/mrkkrp/parser-combinators
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.10.1:=
+SLOT=0/1.0.0
+SRC_URI=mirror://hackage/packages/archive/parser-combinators/1.0.0/parser-combinators-1.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6a826b83739601bc6a2e535f51a13d2c
diff --git a/dev-haskell/parser-combinators/Manifest b/dev-haskell/parser-combinators/Manifest
deleted file mode 100644
index 50ad385e8d8a..000000000000
--- a/dev-haskell/parser-combinators/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST parser-combinators-0.4.0.tar.gz 9130 BLAKE2B 368482bd968a4476366ac04162efe1d8ac502dbb964b21e4090bf48ee9f3e81879bce69a0cb8e72d3b51b4f278be23c3c6bb4f4fd434938682c680214b0a95dd SHA512 9748a8a23bef1cb386970722e148a4cc4e36e8f4100ac34794e2a2223b4bfe0f1e6e0f58d82b500e535cc42a0066be0c5bb5676892e4b607d8d6eac4c4f93a28
-DIST parser-combinators-1.0.0.tar.gz 10349 BLAKE2B c8b21ab8c1afd8fdc931f60258245596a70adb404366f5926743b61b6c7b802558436e7869d012dabaaa8d36097028269cec3c99f647958d0b15d14402c05c6b SHA512 308b38faca865801c2356b9eb0128824956f00a31d98de075166018b34d53a04bad0dc7f1afabafa9946b307ef3fb77df303db78ac7bd6ff476c9b96a3020e9c
-EBUILD parser-combinators-0.4.0.ebuild 749 BLAKE2B f23ea4ee1d77ab09b1c4f1e7911de7b51f0397844ca5d6daa7dd23887de05c0ca9a153e8fb210baed43c63d3f5e5dd33a2103e473d3af385ad20a761a4033098 SHA512 c9b3830008f94fbdce2fec3c1b590253bb331e5f4d57ba5e93a16450bd1a735d8648d8716dbbe8e7747cbd392df6ae4697fe4d5caf6182ffb1fa38dee650c2dd
-EBUILD parser-combinators-1.0.0.ebuild 754 BLAKE2B 8887376129c5c1a47890aa9d1038cd3f94260174d9b1d05e0da4fc46fb7299bc817d0c90f8eeca0e2344aff15d3a10948845a39b5bb3edac5d328ddc78c13b8e SHA512 36c03376d2630c1dbe78b76840aa79acb423a5ded2bd71e02068c63280da1fdbc2195db5098501e9a42d83b4dbaa4279b541c56430b96e75cb39f8a77d12cc2e
-MISC metadata.xml 274 BLAKE2B c388b8c9779670306256f7b3098096fb2f9117ce45a8ae5c695e49cd84a9173dfa05ad46cc34dcba1d13597b51d28d5f6c8919a4e04bac85c6021890a82f273e SHA512 c7240baa772b5bec49aca595a472b5356289983126d38a7285dee7e6e22bb1f2b9ebf5e6996c1c91df3c8939976dbbe90d198806ac9eae35a64add5b604c5af1
diff --git a/dev-haskell/parser-combinators/metadata.xml b/dev-haskell/parser-combinators/metadata.xml
deleted file mode 100644
index 8f34fbbfb77a..000000000000
--- a/dev-haskell/parser-combinators/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		Lightweight package providing commonly useful parser combinators.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/parser-combinators/parser-combinators-0.4.0.ebuild b/dev-haskell/parser-combinators/parser-combinators-0.4.0.ebuild
deleted file mode 100644
index 3f37e4341125..000000000000
--- a/dev-haskell/parser-combinators/parser-combinators-0.4.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5
-#hackport: flags: -dev
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lightweight package providing commonly useful parser combinators"
-HOMEPAGE="https://github.com/mrkkrp/parser-combinators"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-dev
-}
diff --git a/dev-haskell/parser-combinators/parser-combinators-1.0.0.ebuild b/dev-haskell/parser-combinators/parser-combinators-1.0.0.ebuild
deleted file mode 100644
index 34b5f48f1428..000000000000
--- a/dev-haskell/parser-combinators/parser-combinators-1.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5
-#hackport: flags: -dev
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lightweight package providing commonly useful parser combinators"
-HOMEPAGE="https://github.com/mrkkrp/parser-combinators"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-dev
-}
diff --git a/dev-haskell/path-0.5.13 b/dev-haskell/path-0.5.13
new file mode 100644
index 000000000000..914ff8f6086d
--- /dev/null
+++ b/dev-haskell/path-0.5.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3 >=dev-haskell/mtl-2.0 <dev-haskell/mtl-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Support for well-typed paths
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/path
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.5.13
+SRC_URI=mirror://hackage/packages/archive/path/0.5.13/path-0.5.13.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4ac8a20269c8c05034481468c4e1760d
diff --git a/dev-haskell/path-io-1.2.2 b/dev-haskell/path-io-1.2.2
new file mode 100644
index 000000000000..423e32d62e87
--- /dev/null
+++ b/dev-haskell/path-io-1.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/path-0.5:=[profile?] <dev-haskell/path-0.6:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Interface to 'directory' package for users of 'path'
+EAPI=6
+HOMEPAGE=https://github.com/mrkkrp/path-io
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/path-0.5:=[profile?] <dev-haskell/path-0.6:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-lang/ghc-7.10.1:=
+SLOT=0/1.2.2
+SRC_URI=mirror://hackage/packages/archive/path-io/1.2.2/path-io-1.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fbfe377f0ec3c01c6092e48a2052fd7f
diff --git a/dev-haskell/path-io/Manifest b/dev-haskell/path-io/Manifest
deleted file mode 100644
index 0cd2258fb300..000000000000
--- a/dev-haskell/path-io/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST path-io-1.2.2.tar.gz 17818 BLAKE2B 5a4a39ff0282e2d2294b8392af954fd0bba036ff223b95dca1951b202b6a4be14373bf439b826d4fb868e4378f9beb45488a77955a6c8e10bd5af70ea72fb57d SHA512 910af5fd9345daa815235027992e6ab4af3784da7afa314644abaf8acb5bee59f3f1444449ce55e88961c86031cf4537c855e13ba2e777348d9fe4c0104fb6d1
-EBUILD path-io-1.2.2.ebuild 1094 BLAKE2B 59dd6b3621724800680669b3f1f4f8bc3dd37a9c719097aa68b4e0c4c7eacf42fee6625266920abe22a46c1f0c8845741d3ae4c304c1d8c9f5ed9a7daad8ebab SHA512 6a2a8420425e536b022ee705cc9b11b5aa372068b279f7c2a902b2815980003981e6250f93c1febf3f5c3684fbc7871b2a5dbd6426973ad5ea317fa1b5787043
-MISC metadata.xml 340 BLAKE2B dd3091702c88dbfc3d33f22fc20d8c10b506d3efceb9c8b6277c46a11af951de5eba045cf56a73aa2ee88a0010749e3aac8c9a11ca08174f9fdff4caa107a0fe SHA512 6d5348e164095958d860fb532fc3354d8edc244dd1f0b9b90eee725659f5616c54c3e841489c4752aa470e6531d04ae212898a02652876eaf2f18639c17b1827
diff --git a/dev-haskell/path-io/metadata.xml b/dev-haskell/path-io/metadata.xml
deleted file mode 100644
index f7fb2720334b..000000000000
--- a/dev-haskell/path-io/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Interface to directory package for users of path.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/path-io/path-io-1.2.2.ebuild b/dev-haskell/path-io/path-io-1.2.2.ebuild
deleted file mode 100644
index 54a64dff47ee..000000000000
--- a/dev-haskell/path-io/path-io-1.2.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -dev
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Interface to 'directory' package for users of 'path'"
-HOMEPAGE="https://github.com/mrkkrp/path-io"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
-	>=dev-haskell/path-0.5:=[profile?] <dev-haskell/path-0.6:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'time         >= 1.4     && < 1.7' 'time         >= 1.4'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-dev
-}
diff --git a/dev-haskell/path-pieces-0.1.5 b/dev-haskell/path-pieces-0.1.5
new file mode 100644
index 000000000000..cb598213a112
--- /dev/null
+++ b/dev-haskell/path-pieces-0.1.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Components of paths
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/path-pieces
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.5
+SRC_URI=mirror://hackage/packages/archive/path-pieces/0.1.5/path-pieces-0.1.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8015076b57b8146fcb3d7dad7a14d2f0
diff --git a/dev-haskell/path-pieces-0.2.1 b/dev-haskell/path-pieces-0.2.1
new file mode 100644
index 000000000000..ba31a5bc2fad
--- /dev/null
+++ b/dev-haskell/path-pieces-0.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Components of paths
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/path-pieces
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.1
+SRC_URI=mirror://hackage/packages/archive/path-pieces/0.2.1/path-pieces-0.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=baf25945e8958b32deabe4431dbd4162
diff --git a/dev-haskell/path-pieces/Manifest b/dev-haskell/path-pieces/Manifest
deleted file mode 100644
index 36e9f6fb8003..000000000000
--- a/dev-haskell/path-pieces/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST path-pieces-0.1.5.tar.gz 3236 BLAKE2B 8c9261293fd09dd71e2bec2fd48b9e906db656c5fa822d81ae6654c8d9abb59e36c5d8e13659e5ca59a112e3f83bf0c244ca6d3d9e87dd35dd49bfb7b50c1980 SHA512 634a90bc99135192faac44191fc6d40f17795750250cb6088385574eba55717eb40c17b57ba7677e3ce1962d2275a09f3ab7167f465359c152926bee624cd7eb
-DIST path-pieces-0.2.1.tar.gz 3529 BLAKE2B e3b34a630ec0cf69531c46604060efcbe287a45e4fd5b0fb8f76768b605943957d5a99dd3ebee16073e965906ded52584062fbeb4bd4b635c6511b47565c57f2 SHA512 83b8bda16db42ed347e2caa1978f195faf161f53beaaccbf450d21b29b9ae9fc04bcdf8dd17a0db2e11eb9e5bfeddcb605237325c7aaf4ec5cc3402b859674c0
-EBUILD path-pieces-0.1.5.ebuild 664 BLAKE2B d9dde0a6097239d7c102dd637f4278b2f3b9bdbf1c174274d20b6077892dfa35fd774827e5e3a9b57e0009546545c4aa3ee657d5de7034b881b36155eeee45ac SHA512 d0f28c66373f880abebe91b9e8cf97e1105ef4301ae80733683e468acb6f9d1959902d9a5f08ee1b6024288908a408d15425ec4f8117843cb01839e167c017fc
-EBUILD path-pieces-0.2.1.ebuild 664 BLAKE2B 7a8772cf275b6ec42a653e30f964d688064b8839db438f2435a3a6ee97966af3236ea5c357b1ccfb30535d1646438328621f77c42c677cd5774de6001b93f383 SHA512 79af2b90615c320f9b8fc74d0a853f0f13293e2b4c59a29e49d4b00405a76f55b2fdd98728042640675df37de6567bc482a2c1d179bcecbdf2fc68f36f8a44ec
-MISC metadata.xml 311 BLAKE2B 0d09d25269b8b4892513372d3cfa88de5ca6a1e9e8ed2bae1999c2ce54a3c0333b35a44e23005690f913caa28e2687a1f9ab715b24166e7aed7357f34a561a3d SHA512 b8664667237588633d3486a440d2a230aa01ae62488c1fe7808fe22810100dc96e5ebe82e4df82b473c3d100d20d7adeef89918f36ed3d48af3e94e1bdf58ae8
diff --git a/dev-haskell/path-pieces/metadata.xml b/dev-haskell/path-pieces/metadata.xml
deleted file mode 100644
index 45d002c00dba..000000000000
--- a/dev-haskell/path-pieces/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Components of paths.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/path-pieces/path-pieces-0.1.5.ebuild b/dev-haskell/path-pieces/path-pieces-0.1.5.ebuild
deleted file mode 100644
index ceb0a0d2d9e8..000000000000
--- a/dev-haskell/path-pieces/path-pieces-0.1.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Components of paths"
-HOMEPAGE="http://hackage.haskell.org/package/path-pieces"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/path-pieces/path-pieces-0.2.1.ebuild b/dev-haskell/path-pieces/path-pieces-0.2.1.ebuild
deleted file mode 100644
index ea81b884921e..000000000000
--- a/dev-haskell/path-pieces/path-pieces-0.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Components of paths"
-HOMEPAGE="http://hackage.haskell.org/package/path-pieces"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/path/Manifest b/dev-haskell/path/Manifest
deleted file mode 100644
index 3c635d39f154..000000000000
--- a/dev-haskell/path/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST path-0.5.13.tar.gz 16988 BLAKE2B 4fbc3464f674a15a2dc3c543cbf9d705f9c189224e45c6bb4f180e46483547822ed8a90920c183c756ebcd3529ceaa142b7a644b6e2f28a474e1302827b37204 SHA512 bf1e4750aa025382735f0b8329daa092501f1bbcb25ca3951be653cc3193d19be4339697e966db7dbff7ea2f78b251259c9f6f4cb36402a51221b077af388284
-EBUILD path-0.5.13.ebuild 944 BLAKE2B 740e09e37816753c97fa06578b7d634b1436da4eabc8b11e690a04dd262d15eb45218a19cf03241c5ae886b15deacbac7f60db77a142b0f7b5e9bcfae6ccd438 SHA512 09183e48d6fd00f8c5b3d101670abf23a360d6b6f387492b8d36d96cb35e7ca991e0c1fa517dbc8b4af877ff4940b6eda2471c7af3456d125286601e96ae7805
-MISC metadata.xml 295 BLAKE2B 5f4666825b52c64e89d54c65bfa6053986c2c1b3aaa3032e652d304516f4f2d9402e14b66ac9e737722b3b0ae6b3a5509d39d51a2799dec35ee323e88948ca65 SHA512 e416d1a71b8bf287ea2072c15d4bc5b520355d210c7c6a75dcfbfac542caa06fc24319809ece7794ee8325d73080c59e1e881e128e5f5cb89c4b04d17f42893b
diff --git a/dev-haskell/path/metadata.xml b/dev-haskell/path/metadata.xml
deleted file mode 100644
index e42b1c1a4d04..000000000000
--- a/dev-haskell/path/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Path
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/path/path-0.5.13.ebuild b/dev-haskell/path/path-0.5.13.ebuild
deleted file mode 100644
index cafe98096f2d..000000000000
--- a/dev-haskell/path/path-0.5.13.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-#hackport: flags: -validity
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support for well-typed paths"
-HOMEPAGE="http://hackage.haskell.org/package/path"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
-	>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3
-		>=dev-haskell/mtl-2.0 <dev-haskell/mtl-3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-validity
-}
diff --git a/dev-haskell/patience-0.1.1 b/dev-haskell/patience-0.1.1
new file mode 100644
index 000000000000..0dd94eda3379
--- /dev/null
+++ b/dev-haskell/patience-0.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Patience diff and longest increasing subsequence
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/patience
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.1
+SRC_URI=mirror://hackage/packages/archive/patience/0.1.1/patience-0.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=45d4b5c7bc6bf83932eadbe478b73917
diff --git a/dev-haskell/patience/Manifest b/dev-haskell/patience/Manifest
deleted file mode 100644
index 6d4e89447ded..000000000000
--- a/dev-haskell/patience/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST patience-0.1.1.tar.gz 4610 BLAKE2B 6ce8e959dec8493990f66c9cb7b5dc8aaef6cb4edc3207f19156ba527fd993112a29a9d39241a39c2d9c4af600cebdfd31f02833779ce6cbf74e14ce6305273a SHA512 dac94580d9b82023841b5406509f8cd0e58148756e4259708c21b78b480fb4fb67b21a82c81e702275f49d90bcd1d2b46d20bb96267131d4ff57334f110e14f7
-EBUILD patience-0.1.1.ebuild 588 BLAKE2B 41e54c710f9e2fbf9b659e02e204cf5a6df6efb58cdf10f5e4250fd56964fcf56008df1578c9f5f3d2b8ac15572783f002821029fe78f67cc01a3e06190ec65b SHA512 20b84cc967e553c831f2fa44fa96ce687313f3a2e50d31a3bee6538b03edb42fcfb10c03ba4629c3e90200260f275cba32f1b7695534497af4530bf796cd0c3b
-MISC metadata.xml 887 BLAKE2B 0cf15592802803b2efb4a61ec726a019abcb976bdec08c7389e3842fc0067c78aec5b96723fb3afd76c607428548bbc2ad46904f9be6edcdbf2363463d88ed4a SHA512 e6d6b6af598a2d92c07d1464c785f694f91e706ab2706909f4d1920c58764dc84856cadbed8008f337dfddc4ddb4431849b5688a7c6e50c28ff922680a766f78
diff --git a/dev-haskell/patience/metadata.xml b/dev-haskell/patience/metadata.xml
deleted file mode 100644
index 2af4d28dc291..000000000000
--- a/dev-haskell/patience/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library implements the \"patience diff\" algorithm, as well as the patience
-		algorithm for the longest increasing subsequence problem.
-		
-		Patience diff computes the difference between two lists, for example the
-		lines of two versions of a source file.  It provides a good balance of
-		performance, nice output for humans, and implementation simplicity.  For more
-		information, see &lt;http://alfedenzo.livejournal.com/170301.html&gt; and
-		&lt;http://bramcohen.livejournal.com/73318.html&gt;.
-		
-		New in version 0.1.1: relaxed @containers@ dependency, so it should build on
-		GHC 6.10.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/patience/patience-0.1.1.ebuild b/dev-haskell/patience/patience-0.1.1.ebuild
deleted file mode 100644
index dfdb7da7c939..000000000000
--- a/dev-haskell/patience/patience-0.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Patience diff and longest increasing subsequence"
-HOMEPAGE="http://hackage.haskell.org/package/patience"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
diff --git a/dev-haskell/pcap-0.4.5.2-r1 b/dev-haskell/pcap-0.4.5.2-r1
new file mode 100644
index 000000000000..e3a183f1ef47
--- /dev/null
+++ b/dev-haskell/pcap-0.4.5.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-6.12.1:= net-libs/libpcap >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A system-independent interface for user-level packet capture
+EAPI=5
+HOMEPAGE=https://github.com/bos/pcap
+IUSE=doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-6.12.1:= net-libs/libpcap
+SLOT=0/0.4.5.2
+SRC_URI=mirror://hackage/packages/archive/pcap/0.4.5.2/pcap-0.4.5.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=37167239da4314d54770e105ec94871b
diff --git a/dev-haskell/pcap/Manifest b/dev-haskell/pcap/Manifest
deleted file mode 100644
index 1e13c1bd3749..000000000000
--- a/dev-haskell/pcap/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pcap-0.4.5.2.tar.gz 49414 BLAKE2B 3218a30d1b5fe14981578ee95648e0b5f38a6800351645bac7590ece92cadab4f5e2feb67fd9599861751f205240be757e15f0374ad381edeab6f7fb5692bb48 SHA512 75bdaf3700826d94309e7b26f7ed9b367c33df0a7c8e7f4104230f57fff6916c193b0123dbb64f12d2031a1c350d029e471a58ea6bad0dd36de3a40eafbeab33
-EBUILD pcap-0.4.5.2-r1.ebuild 639 BLAKE2B 6c62a6f3853118c3b44c0abe4024b2c63b9dd90d20d06b3a67059328b344593d22ed14c108109f5562242ab6198acfccd5bb4880e3e218deab087a05b1e154ee SHA512 4e535410a56aec27158c89c983c638bac0e414731b4b5117214580384d914b5f1e1985b7b018474c18a6963b21782c0803d6d66e8b873692c886566281fbe199
-MISC metadata.xml 475 BLAKE2B eb18c4c53904052baddfabcf71c46cf553597c25bac84d16725dc93a01f3562ec2ec0edb16df3c7784aa2fc000520ded229f3f2c5138a78441e2ff6e81d925d4 SHA512 10ab37e06c3c986ec2f14fb95caf76d58823802a0e5e49cc927b1ea534c9b03f943b1c34c8bea5d76f472eb2ffe59dd89a04200881d64f75af340f952f2a0c60
diff --git a/dev-haskell/pcap/metadata.xml b/dev-haskell/pcap/metadata.xml
deleted file mode 100644
index ece2d746a816..000000000000
--- a/dev-haskell/pcap/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A system-independent interface for user-level packet capture
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bos/pcap</remote-id>
-		<remote-id type="bitbucket">bos/pcap</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild b/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild
deleted file mode 100644
index 687bf2b32083..000000000000
--- a/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A system-independent interface for user-level packet capture"
-HOMEPAGE="https://github.com/bos/pcap"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-haskell/network:=[profile?]
-		>=dev-lang/ghc-6.12.1:=
-		net-libs/libpcap"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/pcre-light-0.4-r1 b/dev-haskell/pcre-light-0.4-r1
new file mode 100644
index 000000000000..11bd830b26e3
--- /dev/null
+++ b/dev-haskell/pcre-light-0.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-lang/ghc-6.10.4:= dev-libs/libpcre >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Portable regex library for Perl 5 compatible regular expressions
+EAPI=5
+HOMEPAGE=http://code.haskell.org/~dons/code/pcre-light
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:= dev-libs/libpcre
+SLOT=0/0.4
+SRC_URI=mirror://hackage/packages/archive/pcre-light/0.4/pcre-light-0.4.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=87a42d2ccb6a9d21e9f19d30c0610bfa
diff --git a/dev-haskell/pcre-light-0.4.0.4 b/dev-haskell/pcre-light-0.4.0.4
new file mode 100644
index 000000000000..a678eb913284
--- /dev/null
+++ b/dev-haskell/pcre-light-0.4.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= dev-libs/libpcre >=dev-haskell/cabal-1.2.0 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Portable regex library for Perl 5 compatible regular expressions
+EAPI=5
+HOMEPAGE=https://github.com/Daniel-Diaz/pcre-light
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:= dev-libs/libpcre
+SLOT=0/0.4.0.4
+SRC_URI=mirror://hackage/packages/archive/pcre-light/0.4.0.4/pcre-light-0.4.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=60b25d6f304561bc9b4e66a93cbf1c10
diff --git a/dev-haskell/pcre-light/Manifest b/dev-haskell/pcre-light/Manifest
deleted file mode 100644
index c761222731c0..000000000000
--- a/dev-haskell/pcre-light/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX pcre-light-0.4-ghc-7.7.patch 1454 BLAKE2B 655e6e9b0e398b645615e11bd7d9ef28511f9aeecfc438967eb6edbefccfca35e1ad06c4316920155bf68441129a72e0b8c87698dacad7fcc43e08b12dc5ca72 SHA512 48cec940fee9b5eea9835d2538bd00e0020f5c83f211c96b4076453304e342567789da5e911f717df80cf51ad1e07365f4d1f914b3f18dc99a44331f749750f1
-DIST pcre-light-0.4.0.4.tar.gz 15065 BLAKE2B 5ce576bc77e61265326bda0109ce5b8692f06401630400a5f3e8fc94afe3cf7334c0800774bc5acae251a78d4ffe488a3c3435c67d467f75c9ff58c2d8a33996 SHA512 ca5f52a8737b2785b4d3eb7c1463233dc579cf10bdb620397f842d4bddafbe636b992f725f85086e5916f2def163d5d25661acd24a358421e2f7f859a2f876f0
-DIST pcre-light-0.4.tar.gz 28943 BLAKE2B 3458990cddf6361c7b67fcc66c8abfb900e6e1efd93c1eb5b8ab9d46337911e5122dc20d5ba9a1cb28a9cafbab64d06bb15e79361d64e06bb4f6c19674fe40ad SHA512 1cbb37743018e0199d3c23f5cda34a41514ecc375650f2a79935c16b12b4411e5ce1d7fc84b29fbb41458a2493998471cbefc54adbf848d59877c6be4d34b6aa
-EBUILD pcre-light-0.4-r1.ebuild 664 BLAKE2B 7b7f3a6fb367e837a5df6ccc86f6cdb7c9cd0653bb42bbe9f532d1abd9345ca161bad05d25bba7d9dc77f90abf9c4a379a429ba53872ac2097d8d07d8e303a39 SHA512 1ca387a68cda342fc98a2caad58c31cd9edc0b076ebadee996c612bb18e375bf5fe00c98b99a84dc0cf488d1f94b9c81f4ba06e4daea7415ef68930f9ead68d3
-EBUILD pcre-light-0.4.0.4.ebuild 629 BLAKE2B 425826896f2554527087d445dc337965f85fa5ad14d80163da7062d268c4ea3216ef0f1078e4f645ccc4272ba69bcbe8cc7ba20b7b3a10808edd1fcb34afced2 SHA512 2b6819af4922a0f863d188e407cdf3dc49cd20fb546913325851fa384b4e585df4ad249dbaa6f735575ad601080129e8940b3b445552fe67891be803f0de6a5b
-MISC metadata.xml 742 BLAKE2B 729536ebe79ab8a3a9fd3497c1b4d51d9b0c73d5ba7848ae2466386c6b0cd2524b4c1bb61dbc7952cd2736eaf3ee718dadb9c4fcaa3923cced061ea4d43d274d SHA512 0d8f8db2294a8c2f867f93a69161cc50e8284de0e9aa632c39d4b4ae96fc7d79226ee47e6092fa1af2e925e1e8c3471a1033faea43243d78dc2d3d18c8442e2e
diff --git a/dev-haskell/pcre-light/files/pcre-light-0.4-ghc-7.7.patch b/dev-haskell/pcre-light/files/pcre-light-0.4-ghc-7.7.patch
deleted file mode 100644
index 2b4181929f60..000000000000
--- a/dev-haskell/pcre-light/files/pcre-light-0.4-ghc-7.7.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/Text/Regex/PCRE/Light.hs b/Text/Regex/PCRE/Light.hs
-index 80c28a0..7fc9581 100644
---- a/Text/Regex/PCRE/Light.hs
-+++ b/Text/Regex/PCRE/Light.hs
-@@ -77,6 +77,7 @@ import qualified Data.ByteString          as S
- #if __GLASGOW_HASKELL__ >= 608
- import qualified Data.ByteString.Internal as S
- import qualified Data.ByteString.Unsafe   as S
-+import qualified System.IO.Unsafe         as U
- #else
- import qualified Data.ByteString.Base     as S
- #endif
-@@ -193,7 +194,7 @@ compile s o = case compileM s o of
- -- > Left "nothing to repeat"
- --
- compileM :: S.ByteString -> [PCREOption] -> Either String Regex
--compileM str os = unsafePerformIO $
-+compileM str os = U.unsafePerformIO $
-   S.useAsCString str $ \pattern -> do
-     alloca $ \errptr       -> do
-     alloca $ \erroffset    -> do
-@@ -263,7 +264,7 @@ compileM str os = unsafePerformIO $
- -- is returned.
- --
- match :: Regex -> S.ByteString -> [PCREExecOption] -> Maybe [S.ByteString]
--match (Regex pcre_fp _) subject os = unsafePerformIO $ do
-+match (Regex pcre_fp _) subject os = U.unsafePerformIO $ do
-   withForeignPtr pcre_fp $ \pcre_ptr -> do
-     n_capt <- captureCount' pcre_ptr
- 
-@@ -324,7 +325,7 @@ match (Regex pcre_fp _) subject os = unsafePerformIO $ do
- 
- 
- captureCount :: Regex -> Int
--captureCount (Regex pcre_fp _) = unsafePerformIO $ do
-+captureCount (Regex pcre_fp _) = U.unsafePerformIO $ do
-   withForeignPtr pcre_fp $ \pcre_ptr -> do
-     captureCount' pcre_ptr
- 
diff --git a/dev-haskell/pcre-light/metadata.xml b/dev-haskell/pcre-light/metadata.xml
deleted file mode 100644
index db85e01eaea8..000000000000
--- a/dev-haskell/pcre-light/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A small, efficient and portable regex library for Perl 5 compatible regular expressions
-		
-		The PCRE library is a set of functions that implement regular
-		expression pattern matching using the same syntax and semantics as Perl 5.
-		
-		Test coverage data for this library is available at:
-		&lt;http://code.haskell.org/~dons/tests/pcre-light/hpc_index.html&gt;
-		
-	</longdescription>
-	<upstream>
-		<remote-id type="github">Daniel-Diaz/pcre-light</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/pcre-light/pcre-light-0.4-r1.ebuild b/dev-haskell/pcre-light/pcre-light-0.4-r1.ebuild
deleted file mode 100644
index 10929efdfe69..000000000000
--- a/dev-haskell/pcre-light/pcre-light-0.4-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="Portable regex library for Perl 5 compatible regular expressions"
-HOMEPAGE="http://code.haskell.org/~dons/code/pcre-light"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-	dev-libs/libpcre
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-7.7.patch)
diff --git a/dev-haskell/pcre-light/pcre-light-0.4.0.4.ebuild b/dev-haskell/pcre-light/pcre-light-0.4.0.4.ebuild
deleted file mode 100644
index d1560fba8ded..000000000000
--- a/dev-haskell/pcre-light/pcre-light-0.4.0.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Portable regex library for Perl 5 compatible regular expressions"
-HOMEPAGE="https://github.com/Daniel-Diaz/pcre-light"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	dev-libs/libpcre
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.0
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/pem-0.1.2 b/dev-haskell/pem-0.1.2
new file mode 100644
index 000000000000..b31a1a44f64d
--- /dev/null
+++ b/dev-haskell/pem-0.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/cereal:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:= test? ( >=dev-haskell/quickcheck-2.4.0.1 >=dev-haskell/test-framework-0.3.3 dev-haskell/test-framework-quickcheck2 ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Privacy Enhanced Mail (PEM) format reader and writer
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-pem
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/cereal:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.1.2
+SRC_URI=mirror://hackage/packages/archive/pem/0.1.2/pem-0.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c0ce804fd85f4a440b289b1ee673e3db
diff --git a/dev-haskell/pem-0.2.2 b/dev-haskell/pem-0.2.2
new file mode 100644
index 000000000000..d2527d1e4e97
--- /dev/null
+++ b/dev-haskell/pem-0.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base64-bytestring-1.0.0:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2.4.0.1 >=dev-haskell/test-framework-0.3.3 dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Privacy Enhanced Mail (PEM) format reader and writer
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-pem
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base64-bytestring-1.0.0:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.2
+SRC_URI=mirror://hackage/packages/archive/pem/0.2.2/pem-0.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e66bd18622f1f4d333f69f9b9920513b
diff --git a/dev-haskell/pem/Manifest b/dev-haskell/pem/Manifest
deleted file mode 100644
index 25e1e9b258aa..000000000000
--- a/dev-haskell/pem/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST pem-0.1.2.tar.gz 3577 BLAKE2B 2e6a76c1a4b61c50eb1fb0095cdbf18b3a6bc3cd1aeb3f48c04feeda6fdbce3e231e850f61180957bd56b38dee1e093cf99494a7a0d82a78a3bfe6e44732aa5d SHA512 f9bccbbbed160ba662163c90968be71401a1777fbad74bd6b12a4eb23ca61cadd81f92b80a7e5a84a6a76cf15d83aa81ffd5f1fb2fe444679edd4157a8fa388a
-DIST pem-0.2.2.tar.gz 4641 BLAKE2B 488cf8d1ec2dc107657593da3107b98940144772955124fa3c08dfd9963a46d61fdb80fd55520a2dfce130f99351fea4b0c3ff9d3053711d880afcc238f84dbf SHA512 699b13a89c9caa14c25d4a4e1775bc1ccd9b681193622d9638049631dd84b8ddf4e1b25fa5f31b36c8192157c7303b11226917e57d92abc0366bb01bd527b64a
-EBUILD pem-0.1.2.ebuild 841 BLAKE2B c8538accb9fa2faf7b1b817991c27423178674784884cd7c857fdcd4839709e7c55723906c5569d9dc9b10b42ef5b67a7aefa132eb623bb357b1fbd9b7b7fabe SHA512 7193e727cc524880b49e6c113594b7d82232a2cfae38bea8dbcb64413da0c2e7d34704bd3487e7465fc71e0b052950ca5213a07c6bccc616eff4bc56fe863fde
-EBUILD pem-0.2.2.ebuild 823 BLAKE2B c3f21253aa919829923b514721b0497cb57164f95644e61885905dcb9a2bcdbcdadfc2951e58f6787a4fa881eee5c6f59a3aa0f6cc27bf7cf7bb65fc12454037 SHA512 4efa4edc5086801705867d089b797594722d4ce5833cb22241160862bbab763ab2653fa3cea040d1c0306eac57990b07b5115d92092698514c673f67cc693f6a
-MISC metadata.xml 425 BLAKE2B 313798aa4e6882b8aba87359f1e726181c11361dda03d46c85b30c4d99d5225741709b381c7c3babdb465ca3e1849593a60ae1e97f166edda1ff8f415a904b91 SHA512 38fb1ea26100ec335019ac9d954b046c5f2de8afe50ff139b25acbd943a4ef26644be56e7da77e92f68446adc7bacfe870ed22d1d8067d1e80c3f78591a8542b
diff --git a/dev-haskell/pem/metadata.xml b/dev-haskell/pem/metadata.xml
deleted file mode 100644
index 81dbf4317f85..000000000000
--- a/dev-haskell/pem/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Privacy Enhanced Mail (PEM) format reader and writer.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-pem</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/pem/pem-0.1.2.ebuild b/dev-haskell/pem/pem-0.1.2.ebuild
deleted file mode 100644
index 48e620c43f93..000000000000
--- a/dev-haskell/pem/pem-0.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Privacy Enhanced Mail (PEM) format reader and writer"
-HOMEPAGE="https://github.com/vincenthz/hs-pem"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/attoparsec:=[profile?]
-		dev-haskell/base64-bytestring:=[profile?]
-		dev-haskell/cereal:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		test? ( >=dev-haskell/quickcheck-2.4.0.1
-			>=dev-haskell/test-framework-0.3.3
-			dev-haskell/test-framework-quickcheck2
-		)
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/pem/pem-0.2.2.ebuild b/dev-haskell/pem/pem-0.2.2.ebuild
deleted file mode 100644
index 610c68c468e7..000000000000
--- a/dev-haskell/pem/pem-0.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Privacy Enhanced Mail (PEM) format reader and writer"
-HOMEPAGE="https://github.com/vincenthz/hs-pem"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.4.0.1
-		>=dev-haskell/test-framework-0.3.3
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/persistent-2.1.6 b/dev-haskell/persistent-2.1.6
new file mode 100644
index 000000000000..639d0ba69734
--- /dev/null
+++ b/dev-haskell/persistent-2.1.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/fast-logger-2.1:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/monad-logger-0.3:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/path-pieces-0.1:=[profile?] dev-haskell/resource-pool:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/silently:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/text-0.8:=[profile?] >=dev-haskell/transformers-0.2.1:=[profile?] dev-haskell/transformers-base:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Type-safe, multi-backend data serialization
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/persistent
+IUSE=nooverlap doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/fast-logger-2.1:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/monad-logger-0.3:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/path-pieces-0.1:=[profile?] dev-haskell/resource-pool:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/silently:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/text-0.8:=[profile?] >=dev-haskell/transformers-0.2.1:=[profile?] dev-haskell/transformers-base:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/2.1.6
+SRC_URI=mirror://hackage/packages/archive/persistent/2.1.6/persistent-2.1.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e7afd4037c21885f69d6a2011f671b90
diff --git a/dev-haskell/persistent-2.6-r1 b/dev-haskell/persistent-2.6-r1
new file mode 100644
index 000000000000..6f0b6f269016
--- /dev/null
+++ b/dev-haskell/persistent-2.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/fast-logger-2.1:=[profile?] >=dev-haskell/http-api-data-0.2:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/monad-logger-0.3:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/path-pieces-0.1:=[profile?] >=dev-haskell/resource-pool-0.2.2.0:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/silently:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/text-0.8:=[profile?] dev-haskell/transformers-base:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.3 >=dev-haskell/http-api-data-0.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Type-safe, multi-backend data serialization
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/book/persistent
+IUSE=nooverlap doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/fast-logger-2.1:=[profile?] >=dev-haskell/http-api-data-0.2:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/monad-logger-0.3:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/path-pieces-0.1:=[profile?] >=dev-haskell/resource-pool-0.2.2.0:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/silently:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/text-0.8:=[profile?] dev-haskell/transformers-base:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/2.6
+SRC_URI=mirror://hackage/packages/archive/persistent/2.6/persistent-2.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=11eeddf4b428f2c753f3ec3e7b9d970c
diff --git a/dev-haskell/persistent-sqlite-2.1.4.2 b/dev-haskell/persistent-sqlite-2.1.4.2
new file mode 100644
index 000000000000..6048c0b6341a
--- /dev/null
+++ b/dev-haskell/persistent-sqlite-2.1.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-db/sqlite-3.0 >=dev-haskell/aeson-0.6.2:=[profile?] >=dev-haskell/conduit-0.5.3:=[profile?] >=dev-haskell/monad-control-0.2:=[profile?] >=dev-haskell/monad-logger-0.2.4:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-3:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.1:=[profile?] >=dev-lang/ghc-7.6.1:= virtual/libc >=dev-haskell/cabal-1.16.0 test? ( dev-haskell/hspec dev-haskell/persistent-template ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Backend for the persistent library using sqlite3
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/persistent
+IUSE=build-sanity-exe doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-db/sqlite-3.0 >=dev-haskell/aeson-0.6.2:=[profile?] >=dev-haskell/conduit-0.5.3:=[profile?] >=dev-haskell/monad-control-0.2:=[profile?] >=dev-haskell/monad-logger-0.2.4:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-3:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.1:=[profile?] >=dev-lang/ghc-7.6.1:= virtual/libc
+SLOT=0/2.1.4.2
+SRC_URI=mirror://hackage/packages/archive/persistent-sqlite/2.1.4.2/persistent-sqlite-2.1.4.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a96aadfd12268c6765036aa839937e15
diff --git a/dev-haskell/persistent-sqlite-2.6 b/dev-haskell/persistent-sqlite-2.6
new file mode 100644
index 000000000000..c3bddf366647
--- /dev/null
+++ b/dev-haskell/persistent-sqlite-2.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-db/sqlite-3.0 >=dev-haskell/aeson-0.6.2:=[profile?] >=dev-haskell/conduit-0.5.3:=[profile?] >=dev-haskell/monad-control-0.2:=[profile?] >=dev-haskell/monad-logger-0.2.4:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/persistent-2.6:=[profile?] <dev-haskell/persistent-3:=[profile?] dev-haskell/resource-pool:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= virtual/libc >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec dev-haskell/persistent-template dev-haskell/temporary ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Backend for the persistent library using sqlite3
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/book/persistent
+IUSE=build-sanity-exe doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-db/sqlite-3.0 >=dev-haskell/aeson-0.6.2:=[profile?] >=dev-haskell/conduit-0.5.3:=[profile?] >=dev-haskell/monad-control-0.2:=[profile?] >=dev-haskell/monad-logger-0.2.4:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/persistent-2.6:=[profile?] <dev-haskell/persistent-3:=[profile?] dev-haskell/resource-pool:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= virtual/libc
+SLOT=0/2.6
+SRC_URI=mirror://hackage/packages/archive/persistent-sqlite/2.6/persistent-sqlite-2.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c5108f9e1ec8d7fa90de7768c9f8165b
diff --git a/dev-haskell/persistent-sqlite/Manifest b/dev-haskell/persistent-sqlite/Manifest
deleted file mode 100644
index 59324b814dca..000000000000
--- a/dev-haskell/persistent-sqlite/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX persistent-sqlite-2.1.4.2-exe.patch 709 BLAKE2B 41fbf74d91c0cf98a7417754ac3533eac51dbf35258f9fd2f6be286271ecb0699ac461a6d9898fd211c06e288da572080f14d6c19263b8199d49d394de0fdfaa SHA512 96772879c46426fba0e79d23c5b11d2ae3e2e30a272bb11bc3f739eb20a7c5b182e952163b974b440f39c947180675e384dce5d7f7ea693e7835055248e18ced
-DIST persistent-sqlite-2.1.4.2.tar.gz 1460596 BLAKE2B b5bb2a869888fd276fc4a515000253408f878964b5b4b0740406a7655f2488a8b5c9354be108bc4f24b31caafa4916a9973ed2204a4be7ca53745dbc7217893f SHA512 9c959164135120f02464daee6d9012872d12212bcb94128010f05784cd11cd04d2fd2dcca5dafd9036d0bd4154a5262b26816b27d7a335f0404634471e3944c7
-DIST persistent-sqlite-2.6.tar.gz 3565770 BLAKE2B e92865929494d37ea5363dcb5110821e5ae5de099aca3fefa59311d2586b9c450f648fd4077ac7310efe72d5c7267b8f5c943610e65db7731608d8e86c62fdfe SHA512 c0be576429ee0051eeeffff6c6d7168a7993deeca47acd27bf2d0075afad2702855f2c14d8b389697d5053aa097d81fe119e4eb215a1c56f782e2ac95a5f8ff8
-EBUILD persistent-sqlite-2.1.4.2.ebuild 1310 BLAKE2B ef739909ef6a18a13e894861bb674273576fa621265d98083ab2bcc4b5777ee25fb08e8e6c2876f22731abe3dcd3d1c1b6aa1e8222c698d3d6ef3b6f9f636727 SHA512 07adbd493c90b7aef511f0838ab28333864789e7d3ba2990c274374a2f68ada1a25ebb0da41a41dab4340a830ce06c7fdcd6069ed46fd4d30cad913e2562eb0d
-EBUILD persistent-sqlite-2.6.ebuild 1267 BLAKE2B 8138bfba69ae0b2fdb526406c11d2d1bf4bee1f450d6067ed8cf7faff20ca1e5be29afa946b14d44eec3474a695165d59c6c856102feb56fbcea470d31a4fdc8 SHA512 111962f326b915f1b8528987e04016689f6f45f25ccba5467282f2654d9baeef1dd29bacff4449b8d1ab4b2bfa09a0f70b4d993f5e84a761e1f72b972f74796f
-MISC metadata.xml 533 BLAKE2B c34bf1644536c848850e9e5c8049a4f55588c9aca1f430fde30360a3f56d5457a55796e17d430d9622ea6d9beb804fff4fdd12e3120b7b2db322f8c2e319d0fb SHA512 d8224799947db36e76c7e77dd7303f77961f1c0ddeed6b795f3b5c047db6af57148c6a31f3838a9c35900d6859a333bf85965caa68263e23d0533c17ce2ad3d7
diff --git a/dev-haskell/persistent-sqlite/files/persistent-sqlite-2.1.4.2-exe.patch b/dev-haskell/persistent-sqlite/files/persistent-sqlite-2.1.4.2-exe.patch
deleted file mode 100644
index 2bd856f5f786..000000000000
--- a/dev-haskell/persistent-sqlite/files/persistent-sqlite-2.1.4.2-exe.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/persistent-sqlite.cabal b/persistent-sqlite.cabal
-index 39971e7..c0edfe3 100644
---- a/persistent-sqlite.cabal
-+++ b/persistent-sqlite.cabal
-@@ -76,2 +76,2 @@ executable sanity
-     hs-source-dirs: test
--    build-depends: base, persistent-sqlite
-+    build-depends: base, persistent-sqlite, monad-logger
-diff --git a/test/sanity.hs b/test/sanity.hs
-index aed09a3..ce61fed 100644
---- a/test/sanity.hs
-+++ b/test/sanity.hs
-@@ -3,2 +3,3 @@
- import Database.Persist.Sqlite
-+import Control.Monad.Logger
- 
-@@ -7,2 +8,2 @@ $(return []) -- just force TH to run
- main :: IO ()
--main = withSqliteConn ":memory:" $ const $ return ()
-+main = runStderrLoggingT $ withSqliteConn ":memory:" $ const $ return ()
diff --git a/dev-haskell/persistent-sqlite/metadata.xml b/dev-haskell/persistent-sqlite/metadata.xml
deleted file mode 100644
index 8db950fedcee..000000000000
--- a/dev-haskell/persistent-sqlite/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package includes a thin sqlite3 wrapper based on the direct-sqlite package, as well as the entire C library, so there are no system dependencies.
-	</longdescription>
-	<use>
-		<flag name="build-sanity-exe">Build a sanity check test executable.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/persistent-sqlite/persistent-sqlite-2.1.4.2.ebuild b/dev-haskell/persistent-sqlite/persistent-sqlite-2.1.4.2.ebuild
deleted file mode 100644
index a0f11f40ecb6..000000000000
--- a/dev-haskell/persistent-sqlite/persistent-sqlite-2.1.4.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: +systemlib
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Backend for the persistent library using sqlite3"
-HOMEPAGE="https://www.yesodweb.com/book/persistent"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="build-sanity-exe"
-
-RDEPEND=">=dev-db/sqlite-3.0
-	>=dev-haskell/aeson-0.6.2:=[profile?]
-	>=dev-haskell/conduit-0.5.3:=[profile?]
-	>=dev-haskell/monad-control-0.2:=[profile?]
-	>=dev-haskell/monad-logger-0.2.4:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-3:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.1:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-	virtual/libc
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/hspec
-		dev-haskell/persistent-template )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-exe.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag build-sanity-exe build-sanity-exe) \
-		--flag=systemlib
-}
diff --git a/dev-haskell/persistent-sqlite/persistent-sqlite-2.6.ebuild b/dev-haskell/persistent-sqlite/persistent-sqlite-2.6.ebuild
deleted file mode 100644
index 0145c6fbe2db..000000000000
--- a/dev-haskell/persistent-sqlite/persistent-sqlite-2.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: +systemlib
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Backend for the persistent library using sqlite3"
-HOMEPAGE="https://www.yesodweb.com/book/persistent"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="build-sanity-exe"
-
-RDEPEND=">=dev-db/sqlite-3.0
-	>=dev-haskell/aeson-0.6.2:=[profile?]
-	>=dev-haskell/conduit-0.5.3:=[profile?]
-	>=dev-haskell/monad-control-0.2:=[profile?]
-	>=dev-haskell/monad-logger-0.2.4:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-haskell/persistent-2.6:=[profile?] <dev-haskell/persistent-3:=[profile?]
-	dev-haskell/resource-pool:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	virtual/libc
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec
-		dev-haskell/persistent-template
-		dev-haskell/temporary )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag build-sanity-exe build-sanity-exe) \
-		--flag=systemlib
-}
diff --git a/dev-haskell/persistent-template-2.1.3.4 b/dev-haskell/persistent-template-2.1.3.4
new file mode 100644
index 000000000000..49f1318678a8
--- /dev/null
+++ b/dev-haskell/persistent-template-2.1.3.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.10:=[profile?] >=dev-haskell/monad-control-0.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] dev-haskell/monad-logger:=[profile?] dev-haskell/path-pieces:=[profile?] >=dev-haskell/persistent-2.1.3:=[profile?] <dev-haskell/persistent-3:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/text-0.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Type-safe, non-relational, multi-backend persistence
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/persistent
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.10:=[profile?] >=dev-haskell/monad-control-0.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] dev-haskell/monad-logger:=[profile?] dev-haskell/path-pieces:=[profile?] >=dev-haskell/persistent-2.1.3:=[profile?] <dev-haskell/persistent-3:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/text-0.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/2.1.3.4
+SRC_URI=mirror://hackage/packages/archive/persistent-template/2.1.3.4/persistent-template-2.1.3.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=52dc293664317d82824c28098ba8824c
diff --git a/dev-haskell/persistent-template-2.5.1.6-r2 b/dev-haskell/persistent-template-2.5.1.6-r2
new file mode 100644
index 000000000000..a3eb5b0da1a8
--- /dev/null
+++ b/dev-haskell/persistent-template-2.5.1.6-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/aeson-compat-0.3.2.0:=[profile?] <dev-haskell/aeson-compat-0.4:=[profile?] >=dev-haskell/http-api-data-0.2:=[profile?] >=dev-haskell/monad-control-0.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] dev-haskell/monad-logger:=[profile?] dev-haskell/path-pieces:=[profile?] >=dev-haskell/persistent-2.5:=[profile?] <dev-haskell/persistent-3:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/text-0.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Type-safe, non-relational, multi-backend persistence
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/book/persistent
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/aeson-compat-0.3.2.0:=[profile?] <dev-haskell/aeson-compat-0.4:=[profile?] >=dev-haskell/http-api-data-0.2:=[profile?] >=dev-haskell/monad-control-0.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] dev-haskell/monad-logger:=[profile?] dev-haskell/path-pieces:=[profile?] >=dev-haskell/persistent-2.5:=[profile?] <dev-haskell/persistent-3:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/text-0.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/2.5.1.6
+SRC_URI=mirror://hackage/packages/archive/persistent-template/2.5.1.6/persistent-template-2.5.1.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c8c20f132683053640a188efcc886341
diff --git a/dev-haskell/persistent-template/Manifest b/dev-haskell/persistent-template/Manifest
deleted file mode 100644
index 4834193d1765..000000000000
--- a/dev-haskell/persistent-template/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST persistent-template-2.1.3.4.tar.gz 19084 BLAKE2B 625532bca1e65a40f043f6975cf1c3c93329bd593cc2c5f6f9f62c0aa925c91a358518ce69ccc65609b4d2e9686a4337af47bd2a7e6778769d7f3cb40796241d SHA512 8b218dea93a6a2ca80801acb43f101d6809d7118f3b6765a98543d87b12b4b565d5b3ea1f1256863b2493553f996ef5dcc569432507de6477b1f59a02093d95a
-DIST persistent-template-2.5.1.6.tar.gz 20196 BLAKE2B d7d63dbead0348bc3c9239c23e5976337fa952a4a19cf86507064632d0ab1ddd7b26f984285307cf7b3ff177afd8aa5e94708412ba954815959ff09fb857bfb0 SHA512 4e2432a0f0fca28699c3abe9298b10451330dfb4e2b1a7048a2a98e3e18d4b41df06ba1bd53ffbbce3aebb123cd2f6ec9249580490a32c478ff3aff628011916
-EBUILD persistent-template-2.1.3.4.ebuild 1156 BLAKE2B cde410ba68097a2e516f87bde1e212da7b5c0d1406ae8dd8af26c6cde0d310098b37202fb9ce0c31c752a6f3a02231a8bbdcd117bbc34de626cf3be00d1bba3a SHA512 4200f55c3ba85f609f21474e06a31906b71e2723a19d52d154451810246d5003538ce475c3b37451e808b2a99be3b84ea1bb89a22fa031d9f9cf3f13dbbbf1c0
-EBUILD persistent-template-2.5.1.6-r2.ebuild 1469 BLAKE2B 99c37ae6ee30300c5c88b30f5d96a0af88b8ecb78cee3721adf2c8a5058ffd774914c188422d6ae108773c1328e3f3592f96be9bc6b4c8ab8745ce993a9c7a3e SHA512 2d2e0c512fdd60503b6e54597ec1e13751a18e1838ff1cd884fef39cc91b9c23824f81f83fe5e04d88c005b139390d045195d8d496d47baf7cf167816517f152
-MISC metadata.xml 423 BLAKE2B 74c07376a1dec4710e8c652e2400fff81a26fe160c8d66535d96cde967cf6fa2e430a78464478a684ce4bbf0daf93f881fa9803f03c68d7d0d0f74dec421973f SHA512 9bb326d4650a21992d988e00e20936bb9e40138d306c75e1621b4291b6cdeb72bd40d7d25c503f89a5266c157ba917ece4828a7255ad5b5662f450c4e82091ab
diff --git a/dev-haskell/persistent-template/metadata.xml b/dev-haskell/persistent-template/metadata.xml
deleted file mode 100644
index eaabdf9abe86..000000000000
--- a/dev-haskell/persistent-template/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library provides just the general interface and helper functions. You must use a specific backend in order to make this useful.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/persistent-template/persistent-template-2.1.3.4.ebuild b/dev-haskell/persistent-template/persistent-template-2.1.3.4.ebuild
deleted file mode 100644
index 2a1a6f0bc49b..000000000000
--- a/dev-haskell/persistent-template/persistent-template-2.1.3.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe, non-relational, multi-backend persistence"
-HOMEPAGE="https://www.yesodweb.com/book/persistent"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.10:=[profile?]
-	>=dev-haskell/monad-control-0.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	dev-haskell/path-pieces:=[profile?]
-	>=dev-haskell/persistent-2.1.3:=[profile?] <dev-haskell/persistent-3:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	>=dev-haskell/text-0.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/persistent-template/persistent-template-2.5.1.6-r2.ebuild b/dev-haskell/persistent-template/persistent-template-2.5.1.6-r2.ebuild
deleted file mode 100644
index f03bdb05404d..000000000000
--- a/dev-haskell/persistent-template/persistent-template-2.5.1.6-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe, non-relational, multi-backend persistence"
-HOMEPAGE="https://www.yesodweb.com/book/persistent"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/aeson-compat-0.3.2.0:=[profile?] <dev-haskell/aeson-compat-0.4:=[profile?]
-	>=dev-haskell/http-api-data-0.2:=[profile?]
-	>=dev-haskell/monad-control-0.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	dev-haskell/path-pieces:=[profile?]
-	>=dev-haskell/persistent-2.5:=[profile?] <dev-haskell/persistent-3:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	>=dev-haskell/text-0.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'aeson                    >= 0.7       && < 0.12' 'aeson                    >= 0.7' \
-		'http-api-data            >= 0.2       && < 0.3' 'http-api-data            >= 0.2'
-}
diff --git a/dev-haskell/persistent/Manifest b/dev-haskell/persistent/Manifest
deleted file mode 100644
index dbed06a9dffc..000000000000
--- a/dev-haskell/persistent/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST persistent-2.1.6.tar.gz 42889 BLAKE2B 73b5235cca8104b4d10cb87f8ec3faea4f4b4c48b017b5b6a44fbf50cd955b9446e6fccc91a1a7572f9e480270436723316e1c4ed25a8ee9b5399390ff4d8757 SHA512 b1de69547d252a142bce18b837b37be60cc384172473f08dc0d7826dc82f7ce879bb7e0860d31e5c8dadab78992f2c84766bdc804f6ca06b29fa5e7f8391273e
-DIST persistent-2.6.tar.gz 50030 BLAKE2B 434b452c55339acf3ebc5631d6038b1e875959b7b867f033d2d55b72a2cbcc536c999e25bfc1ee6326f93e2c3a730c8a9a781c4677a44a55648edd32951db6ac SHA512 39fe1ec0c959ca0ec9c37feda8b2e4d4ddd706ae2bd4de9c4161db02c85747475f5a61d5daa3ef73f4adc061e13ff138edcbe34fe1baeb93512c1fe68053a282
-EBUILD persistent-2.1.6.ebuild 1654 BLAKE2B d56ab6a208ccac9632c6a02d681f41093e1e1f3f27d3e1e79c4c8a76af31aaa403212133dcd717e9ec767a01aa28acb100ef312e1552782666299e3080d2d8e7 SHA512 76876b49822a5db7eb54ed27fdbec35205bb35974f72768da30bbf875325ede62b6586fddd5d5884301898ecb98a84f541912567e48d214458f84ad2d6396687
-EBUILD persistent-2.6-r1.ebuild 1827 BLAKE2B b5424d181325f6d60447faceff64857a2e12ce76a722f191897f675897c0392e550b49963abe4704f5b5f7c45c62bf4b164a6ea8c787bef4b5a3825d0aa6c6de SHA512 eb62959a74db801e995adf8806a1eccdc54851ddf0de1168ebb20956d2d32eff68377f6fc3c3d372790e87aa6b0eadb8fffb4abf6ecabadbc9b0be3a8ecdf151
-MISC metadata.xml 545 BLAKE2B 930ddcf3f9a50ed279af337a1c0e8972a8dd34d71218d1ec57b312bffb4700efc425359798ba71cb15f764ac4e74333b9835f877c91aadefc5aea7bac9ede850 SHA512 be844f5ffd48d9573cff4389f30efe79882dab1e6786b1e22f8d3b168cf81a83e10da15a4deaa2c6e1189645b70e097f72fcb99242581083c855213065fa686d
diff --git a/dev-haskell/persistent/metadata.xml b/dev-haskell/persistent/metadata.xml
deleted file mode 100644
index 1d312dd3e939..000000000000
--- a/dev-haskell/persistent/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library provides just the general interface and helper functions. You must use a specific backend in order to make this useful.
-	</longdescription>
-	<use>
-		<flag name="nooverlap">Use OverlappingInstances only for String. Only developers should use this.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/persistent/persistent-2.1.6.ebuild b/dev-haskell/persistent/persistent-2.1.6.ebuild
deleted file mode 100644
index ba15c8bb3dcc..000000000000
--- a/dev-haskell/persistent/persistent-2.1.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe, multi-backend data serialization"
-HOMEPAGE="https://www.yesodweb.com/book/persistent"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="nooverlap"
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/fast-logger-2.1:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?]
-	>=dev-haskell/monad-logger-0.3:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-haskell/path-pieces-0.1:=[profile?]
-	dev-haskell/resource-pool:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/silently:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?]
-	>=dev-haskell/transformers-0.2.1:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/hspec-1.3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag nooverlap nooverlap)
-}
diff --git a/dev-haskell/persistent/persistent-2.6-r1.ebuild b/dev-haskell/persistent/persistent-2.6-r1.ebuild
deleted file mode 100644
index 1e3254b497e8..000000000000
--- a/dev-haskell/persistent/persistent-2.6-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe, multi-backend data serialization"
-HOMEPAGE="https://www.yesodweb.com/book/persistent"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="nooverlap"
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/fast-logger-2.1:=[profile?]
-	>=dev-haskell/http-api-data-0.2:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?]
-	>=dev-haskell/monad-logger-0.3:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-haskell/path-pieces-0.1:=[profile?]
-	>=dev-haskell/resource-pool-0.2.2.0:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/silently:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/http-api-data-0.2 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'http-api-data            >= 0.2       && < 0.3' 'http-api-data            >= 0.2'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag nooverlap nooverlap)
-}
diff --git a/dev-haskell/pgp-wordlist-0.1.0.2 b/dev-haskell/pgp-wordlist-0.1.0.2
new file mode 100644
index 000000000000..bbf1460669cf
--- /dev/null
+++ b/dev-haskell/pgp-wordlist-0.1.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-1.2:=[profile?] >=dev-haskell/vector-0.5:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/doctest-0.10 dev-haskell/hunit >=dev-haskell/tasty-0.10 >=dev-haskell/tasty-hunit-0.9 dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Translate between binary data and a human-readable collection of words
+EAPI=6
+HOMEPAGE=https://github.com/quchen/pgp-wordlist
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-1.2:=[profile?] >=dev-haskell/vector-0.5:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/0.1.0.2
+SRC_URI=mirror://hackage/packages/archive/pgp-wordlist/0.1.0.2/pgp-wordlist-0.1.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=65b397af853e04cc1327ec9c67f18db8
diff --git a/dev-haskell/pgp-wordlist/Manifest b/dev-haskell/pgp-wordlist/Manifest
deleted file mode 100644
index 6c60d38e8124..000000000000
--- a/dev-haskell/pgp-wordlist/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pgp-wordlist-0.1.0.2.tar.gz 10142 BLAKE2B 6a4efe0e495a3755b19a8bf49f5fd0e44853a77bec5c9731a4fb0ba9ea2da524d737b7580baebb1aa1bd6e8df40c4584f8e5aca57b95d67e5a4936a66a8a761e SHA512 c34d565b043d6ffb3fee10258fb30596ae08e5c4d57bf8d129f49b4794daf13ae55fae7f648f218821133a824f2abb66a8b5f02b10a9e11f4529007b1a4620b3
-EBUILD pgp-wordlist-0.1.0.2.ebuild 811 BLAKE2B 0935772e4c23c9f66a4b6a764a3994cac9beb165525eb43e8b7f5003d47daf530497ef427db1033509ce55632343338769ee547a056934457fa2005c2068ed00 SHA512 8f20035ff324b1144d50f13b7ed19699bc7eca5806c8dc293285efa5acf2f89f82ca269c3a04bdecf8910a1b01613702a1da9d0844279b8e9be27bf7b6c928f5
-MISC metadata.xml 711 BLAKE2B 03f5cd0583dc81e535b8d1763d0fb2f97ca3b2502f1939ac4337c803a15d43370562acfda23d5790cf6517a3852795fb1d8338a85062260e28cb61074965908f SHA512 87bfd8e09b5ae2d794708027f7d95b3afcff44135a4a9090fc10d3a68196be401e695061c3d8d833d272281d5b42d78f1d40d3e7764dd09fabeb51dbd9fc076a
diff --git a/dev-haskell/pgp-wordlist/metadata.xml b/dev-haskell/pgp-wordlist/metadata.xml
deleted file mode 100644
index df062b638c35..000000000000
--- a/dev-haskell/pgp-wordlist/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		Translate between binary data and a human-readable
-		collection of words.
-		
-		The PGP Word List consists of two phonetic alphabets, each
-		with one word per possible byte value. A string of bytes
-		is translated with these alphabets, alternating between
-		them at each byte.
-		
-		The PGP words corresponding to the bytes @5B 1D CA 6E@
-		are &quot;erase breakaway spellbind headwaters&quot;, for example.
-		
-		For further information, see
-		&lt;http://en.wikipedia.org/wiki/PGP_word_list Wikipedia&gt;.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.2.ebuild b/dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.2.ebuild
deleted file mode 100644
index e077f223462a..000000000000
--- a/dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Translate between binary data and a human-readable collection of words"
-HOMEPAGE="https://github.com/quchen/pgp-wordlist"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-1.2:=[profile?]
-	>=dev-haskell/vector-0.5:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/doctest-0.10
-		dev-haskell/hunit
-		>=dev-haskell/tasty-0.10
-		>=dev-haskell/tasty-hunit-0.9
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/pid1-0.1.0.1 b/dev-haskell/pid1-0.1.0.1
new file mode 100644
index 000000000000..ca38d37e34f8
--- /dev/null
+++ b/dev-haskell/pid1-0.1.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Do signal handling and orphan reaping for Unix PID1 init processes
+EAPI=6
+HOMEPAGE=https://github.com/fpco/pid1#readme
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.8.2:=
+SLOT=0/0.1.0.1
+SRC_URI=mirror://hackage/packages/archive/pid1/0.1.0.1/pid1-0.1.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=429faf34f93d3ae97aaa2676d41b690c
diff --git a/dev-haskell/pid1/Manifest b/dev-haskell/pid1/Manifest
deleted file mode 100644
index b3a93d18d4cf..000000000000
--- a/dev-haskell/pid1/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pid1-0.1.0.1.tar.gz 5677 BLAKE2B bddf32fa3c1d777a4b05977ca0ae806beddd1205998f333c958ffd57ef3bd076701d866648a45c085fe84bb8abf59cf64b879f476ccb80be66989197140586db SHA512 9cf7953d35d230162307c656351f4d552c2d137b54b0cdc8f5bcb07ab6a77aadb903cd968961fbf8b25fa7b9375e149f21e67af3d57713d3dde1d8c8d9df970f
-EBUILD pid1-0.1.0.1.ebuild 578 BLAKE2B d4ba6f4863257dfe655c0a9b94f461533220797335ec916f89ad58ec2170b0f8c92a2e842b8182815994a3a27cd0fb950d0ddb42c57238ee302b1a9c08c41640 SHA512 cca988b7b98b946426bc1b011d985a791a68721b46c865e0ea38f8ce352980ea65af3571f1ee6bbc1f4cd5b43990253a012d4bc971aa92aedcbf9e289331b12e
-MISC metadata.xml 377 BLAKE2B 49ca9e90648e695d60488d58a3bb3e14afca2e8f81bd0f0aa6765fbabc24c58c6ff5f8a693259bf48d81126c48abed0dcbb8c901c9164f0e867239545fd0b7e7 SHA512 9d8b5bfce5c069ec1b9713e838cc65d3e14b9deb60367083ec323942660facd56f83fa46c947da59cf0dd8a446afe2e5645ca52bd2ce23973ccd755e131a5016
diff --git a/dev-haskell/pid1/metadata.xml b/dev-haskell/pid1/metadata.xml
deleted file mode 100644
index f1430f9dafe6..000000000000
--- a/dev-haskell/pid1/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Please see README.md or view Haddocks at &lt;https://www.stackage.org/package/pid1&gt;
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/pid1/pid1-0.1.0.1.ebuild b/dev-haskell/pid1/pid1-0.1.0.1.ebuild
deleted file mode 100644
index 401195048351..000000000000
--- a/dev-haskell/pid1/pid1-0.1.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Do signal handling and orphan reaping for Unix PID1 init processes"
-HOMEPAGE="https://github.com/fpco/pid1#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/pipes-4.1.7 b/dev-haskell/pipes-4.1.7
new file mode 100644
index 000000000000..6bc4ee0e2f45
--- /dev/null
+++ b/dev-haskell/pipes-4.1.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mmorph-1.0.0:=[profile?] <dev-haskell/mmorph-1.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-3 >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-1 >=dev-haskell/test-framework-quickcheck2-0.2.0 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Compositional pipelines
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/pipes
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mmorph-1.0.0:=[profile?] <dev-haskell/mmorph-1.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/4.1.7
+SRC_URI=mirror://hackage/packages/archive/pipes/4.1.7/pipes-4.1.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b803e3fd464b3686ac2701555c852408
diff --git a/dev-haskell/pipes-4.1.9 b/dev-haskell/pipes-4.1.9
new file mode 100644
index 000000000000..cef6809859e7
--- /dev/null
+++ b/dev-haskell/pipes-4.1.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mmorph-1.0.0:=[profile?] <dev-haskell/mmorph-1.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-3 >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-1 >=dev-haskell/test-framework-quickcheck2-0.2.0 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Compositional pipelines
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/pipes
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mmorph-1.0.0:=[profile?] <dev-haskell/mmorph-1.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/4.1.9
+SRC_URI=mirror://hackage/packages/archive/pipes/4.1.9/pipes-4.1.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=05dc7f152baa862086fa7934721a4641
diff --git a/dev-haskell/pipes/Manifest b/dev-haskell/pipes/Manifest
deleted file mode 100644
index de4aba8bc251..000000000000
--- a/dev-haskell/pipes/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST pipes-4.1.7.tar.gz 40008 BLAKE2B 88ed7685da4640d62d5065fe04065477191526990d517376a7cff8c97cbbcf939db5b062e45fe23f15b65f9fcca97d2f30be078354b47109e6d418f7055e2073 SHA512 95e4a24c156d34ac542a3535f71b60248850b228e96f90452dd6ddb1468f2f9db7a60540536568ac49b6a49d3b43caefa867c42d5e75f010e90b99fadf02827c
-DIST pipes-4.1.9.tar.gz 40061 BLAKE2B 038ebcb31bf85d79bc4dd0eff36b7c4265db81e70c58403dc3d2b5609453aad0b8e026428a6466905801f961b8267f111dee082b2ca00020f5dc305fbf2edd9e SHA512 4d285ff4ded925df8611f4e1882b4f29f4853aa8077892cfbbda245d455eea7bbf0969299dc65fd2a793655e69bf66463c330dfe7736a8f234f330b5dd4ab751
-EBUILD pipes-4.1.7.ebuild 1005 BLAKE2B f4f5eab0b3b01e359ef29be936df1f9e0cd7cf731585774b7cb4fe4c39fb450ea2b3ba3b5983acf2d87ab12c7982079c4e023d130ca6aaf5a89140f7e674e7c8 SHA512 363c187c43572a9e07ab941edbff8b8c66c154c78dd2621e9ad8d6f765eb294849a62a2f81ef5678c3823c253bd174beeabf6d18d6df0707d08af4ee339568c2
-EBUILD pipes-4.1.9.ebuild 1003 BLAKE2B 30ce3ff21a8cf00070540e0c415ed2397e90e868f3b7cc0717b4bc93b54ae3962628cbff2b763a4600afa0fde401b98427f934d398a6b745fc2c195201224e93 SHA512 4bb476bdbf4535752b186fe7c92e0a98260af2ef69560d08f0933fe33aac92acd65a8ad6c2aa6658c659a2be1c543679d101097a0ac760cfe5ce9987503d776f
-MISC metadata.xml 1137 BLAKE2B b09460dcaf0d62c841207279c3911029f7ca9f96e663a8758f15dcfc2b4fa8314ba072cf93567d3368e75c8ed7adb0cd9acbb177b81f5e8190f0c47db917a8c7 SHA512 737ad4a728bac17368fd8da2856d97c545f0701399cc6496ac0e488e7e9dc3e23c2b797ebb614f73c013d74808d7d2e081dc512a87f929941b9ab40578c7ccf7
diff --git a/dev-haskell/pipes/metadata.xml b/dev-haskell/pipes/metadata.xml
deleted file mode 100644
index 04e0c63037a8..000000000000
--- a/dev-haskell/pipes/metadata.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		\"Coroutines done right\".  This library generalizes iteratees and coroutines
-		simply and elegantly.
-		
-		Advantages over traditional iteratee\/coroutine implementations:
-		
-		* /Concise API/: Use three simple commands: ('&gt;-&gt;'), 'request', and 'respond'
-		
-		* /Bidirectionality/: Implement duplex channels
-		
-		* /Blazing fast/: Implementation tuned for speed
-		
-		* /Elegant semantics/: Use practical category theory
-		
-		* /Extension Framework/: Mix and match extensions and create your own
-		
-		* /ListT/: Correct implementation of ListT that interconverts with pipes
-		
-		* /Lightweight Dependency/: @pipes@ depends only on @transformers@ and
-		@mmorph@ and compiles rapidly
-		
-		* /Extensive Documentation/: Second to none!
-		
-		Import "Control.Proxy" to use the library.
-		
-		Read "Control.Proxy.Tutorial" for an extensive tutorial.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/pipes/pipes-4.1.7.ebuild b/dev-haskell/pipes/pipes-4.1.7.ebuild
deleted file mode 100644
index 21d7be81f5ea..000000000000
--- a/dev-haskell/pipes/pipes-4.1.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Compositional pipelines"
-HOMEPAGE="http://hackage.haskell.org/package/pipes"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mmorph-1.0.0:=[profile?] <dev-haskell/mmorph-1.1:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-3
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-1
-		>=dev-haskell/test-framework-quickcheck2-0.2.0 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/pipes/pipes-4.1.9.ebuild b/dev-haskell/pipes/pipes-4.1.9.ebuild
deleted file mode 100644
index 22da3eca8507..000000000000
--- a/dev-haskell/pipes/pipes-4.1.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Compositional pipelines"
-HOMEPAGE="http://hackage.haskell.org/package/pipes"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mmorph-1.0.0:=[profile?] <dev-haskell/mmorph-1.1:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-3
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-1
-		>=dev-haskell/test-framework-quickcheck2-0.2.0 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/pointed-4.0 b/dev-haskell/pointed-4.0
new file mode 100644
index 000000000000..fb12cd8861e1
--- /dev/null
+++ b/dev-haskell/pointed-4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.1:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-7.0.1:= >=dev-haskell/cabal-1.10.0.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pointed and copointed data
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/pointed/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.1:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-7.0.1:=
+SLOT=0/4.0
+SRC_URI=mirror://hackage/packages/archive/pointed/4.0/pointed-4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=560f2341d4888764d9db713b18246afe
diff --git a/dev-haskell/pointed-4.1.1 b/dev-haskell/pointed-4.1.1
new file mode 100644
index 000000000000..ac1925097181
--- /dev/null
+++ b/dev-haskell/pointed-4.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.1:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pointed and copointed data
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/pointed/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.1:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/4.1.1
+SRC_URI=mirror://hackage/packages/archive/pointed/4.1.1/pointed-4.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8119895f742cfc935181f7048f8b2fe6
diff --git a/dev-haskell/pointed-4.2.0.2 b/dev-haskell/pointed-4.2.0.2
new file mode 100644
index 000000000000..5d76a4eafb32
--- /dev/null
+++ b/dev-haskell/pointed-4.2.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.1:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/kan-extensions-4.2:=[profile?] <dev-haskell/kan-extensions-5:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pointed and copointed data
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/pointed/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.1:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/kan-extensions-4.2:=[profile?] <dev-haskell/kan-extensions-5:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/4.2.0.2
+SRC_URI=mirror://hackage/packages/archive/pointed/4.2.0.2/pointed-4.2.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2e860127fa6749db68544cd205834f40
diff --git a/dev-haskell/pointed-5-r1 b/dev-haskell/pointed-5-r1
new file mode 100644
index 000000000000..412ec81f29d8
--- /dev/null
+++ b/dev-haskell/pointed-5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/data-default-class-0.0.1:=[profile?] >=dev-lang/ghc-7.4.1:= comonad? ( >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] ) kan-extensions? ( >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] ) semigroupoids? ( >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] ) semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) stm? ( >=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] ) transformers? ( >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] ) unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pointed and copointed data
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/pointed/
+IUSE=+comonad +containers +kan-extensions +semigroupoids +semigroups +stm +tagged +transformers +unordered-containers doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/data-default-class-0.0.1:=[profile?] >=dev-lang/ghc-7.4.1:= comonad? ( >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] ) kan-extensions? ( >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] ) semigroupoids? ( >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] ) semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) stm? ( >=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] ) transformers? ( >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] ) unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] )
+SLOT=0/5
+SRC_URI=mirror://hackage/packages/archive/pointed/5/pointed-5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8528da5d503c2df7bd8ae1d820d0e8ce
diff --git a/dev-haskell/pointed/Manifest b/dev-haskell/pointed/Manifest
deleted file mode 100644
index 035e1fc635a5..000000000000
--- a/dev-haskell/pointed/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST pointed-4.0.tar.gz 3123 BLAKE2B dc99ed4dcb4421ae2aa677493edae00682e36dca5d8ab51d65aa046414a88e3379199dc5062805155b4d0e3b47757d3d788294ef016b4048c0e2c230b17a16f8 SHA512 08aa3753b2d642c4ab72bef0baa2a80daa30b5f545b74536601f1353b9ea22ba17622ff86aafa5351de7dd1edbc89e79bf58ea63b500133aedd48626a9ba7290
-DIST pointed-4.1.1.tar.gz 3253 BLAKE2B 65d3d89dab2a6982623b195b8dd15ee119b1af58da50cb878500d73a58de2269dc4d68a062b71627fc5185bdbe1106eb0586899f873348f1b29155ea814ac206 SHA512 8106c82a3011644ea1bcb18d592e40fa372298e4f7d81a9f23b57b38905f6733377822c574c17630c55c4f91eda77b020f33e1a603f2c2aa22431eedb3677e8c
-DIST pointed-4.2.0.2.tar.gz 4333 BLAKE2B 314f6b05eab009c2c3608ea99b39635509ecfe283247e565aab93f5ff07527d3ca124ad9e8ee9c09eb7b47094f56b032a0b3bbdf17973c4ec857271292fa844f SHA512 bf493138c54d7fef6524d01ee84709d0ab6378870f7e801df62b0ac425899c6113cf9ba93776a1693d544d8d14d553dfa26a0194997a19c80931c5500ef2ee7c
-DIST pointed-5.tar.gz 4873 BLAKE2B a2dadf1f386d8751334c19a1e8a525001a9907ccce912bd0b3bef5e9fafc7d4e62139fd2e34426d995ad72eefe6843ac37959e0ff889f4c40d0bb8c0ab9ad227 SHA512 940a0c30845cb39238a0056f12da4debb488bec9bfac11a384320c79102e92dbd949526188eca46a2e543dfe612f5ee335955413e4f81eb1c1c9bc321805b598
-EBUILD pointed-4.0.ebuild 1102 BLAKE2B 8871bd090fdfb55434dde8ee0876a0d5acc1185d877f7808e0731cd6997046509a74edd56c880b2d1729796f6cc2588afdb9fe6f644db0a8c1c270ec6c86a89d SHA512 d500dd7beeda6020b6af1e2daf6aabb97bde929a2bc784fff3d684e169e2adfb5a1f82df9d312bf1e8e6dbcc00775e1fc0432da2680d59ee41be9c8920ae9ff8
-EBUILD pointed-4.1.1.ebuild 1200 BLAKE2B 6518f8762770f9ed55f5039fb943a00bb348efa25aeda103e21098d3de0a0559ffd0d9cb5c03b907915dedbf06c78b1cd60d796167f701919e2c60f42d0f70bc SHA512 8784e171e03e55ce1978fafb0d322c3569ac024fdcb4c8a517f9365a6117de06f57175fd76bda509089547166b8e24b24580138b0ec39511e4bbe6f9bbed06d8
-EBUILD pointed-4.2.0.2.ebuild 1468 BLAKE2B 80c78d8a6af00cb7a8398921af07b97bc6039212a33872ec9f67838233b4df2cf4ec372ccc25a4a61c319c6c22754e7133a923d4f4b2fd0a59a10e6d45b55429 SHA512 d21bdb24a26a8a6c2e21bc04178dc259619403948afa6f37ab08700a4213ff20e0f7c5bca815e8e9b8a84a33f879835637e7e1c0d3008924cf23602ef3e18b0b
-EBUILD pointed-5-r1.ebuild 2194 BLAKE2B f47d44f6779e9748fffe266db195ab6a66d5590b209f4f0df882615c8d71b8ae7d5155e787d6ea950af1d7fa134347f5dad65555b08dd92d758c50076e9849df SHA512 4d84eafd18f8a84b79bc76ea18d036253c191327a411b11ba50b118c1829e39bd0a11e5590ea0dfba607db97dbbb84ba5aa9443b9eca23856c1cb57a022bec23
-MISC metadata.xml 895 BLAKE2B e6dd059ba6671f2a3b8cceb95e5db17498ed44349fd04f653b70a92c8ee60e226e85ac2a90eeea925a46e787ba15bcf2ef45a6dd2e7a743f4feeb56f4d9486a7 SHA512 dec8581eaf6f554b23d6a1cb811b138f7b8b9d40936c942d958939f5814f3151dabe03036add92e72a2d93995c9031e3b087d285862b69d719aaa027775c6911
diff --git a/dev-haskell/pointed/metadata.xml b/dev-haskell/pointed/metadata.xml
deleted file mode 100644
index 111317520feb..000000000000
--- a/dev-haskell/pointed/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="comonad">optional instances</flag>
-		<flag name="containers">optional instances</flag>
-		<flag name="kan-extensions">optional instances</flag>
-		<flag name="semigroupoids">optional instances</flag>
-		<flag name="semigroups">optional instances</flag>
-		<flag name="stm">optional instances</flag>
-		<flag name="tagged">optional instances</flag>
-		<flag name="transformers">optional instances</flag>
-		<flag name="unordered-containers">optional instances</flag>
-	</use>
-	<longdescription>
-		Haskell 98 pointed and copointed data
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/pointed</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/pointed/pointed-4.0.ebuild b/dev-haskell/pointed/pointed-4.0.ebuild
deleted file mode 100644
index 7c21eef60c03..000000000000
--- a/dev-haskell/pointed/pointed-4.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pointed and copointed data"
-HOMEPAGE="https://github.com/ekmett/pointed/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.1:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-"
diff --git a/dev-haskell/pointed/pointed-4.1.1.ebuild b/dev-haskell/pointed/pointed-4.1.1.ebuild
deleted file mode 100644
index 31ab7f5d0ad9..000000000000
--- a/dev-haskell/pointed/pointed-4.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pointed and copointed data"
-HOMEPAGE="https://github.com/ekmett/pointed/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.1:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/pointed/pointed-4.2.0.2.ebuild b/dev-haskell/pointed/pointed-4.2.0.2.ebuild
deleted file mode 100644
index b47bcea2c730..000000000000
--- a/dev-haskell/pointed/pointed-4.2.0.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pointed and copointed data"
-HOMEPAGE="https://github.com/ekmett/pointed/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.1:=[profile?]
-	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/kan-extensions-4.2:=[profile?] <dev-haskell/kan-extensions-5:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/pointed/pointed-5-r1.ebuild b/dev-haskell/pointed/pointed-5-r1.ebuild
deleted file mode 100644
index e4cd8b689da1..000000000000
--- a/dev-haskell/pointed/pointed-5-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pointed and copointed data"
-HOMEPAGE="https://github.com/ekmett/pointed/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+comonad +containers +kan-extensions +semigroupoids +semigroups +stm +tagged +transformers +unordered-containers"
-
-RDEPEND=">=dev-haskell/data-default-class-0.0.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	comonad? ( >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] )
-	kan-extensions? ( >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] )
-	semigroupoids? ( >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] )
-	semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] )
-	stm? ( >=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?] )
-	tagged? ( >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] )
-	transformers? ( >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-			>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] )
-	unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-				>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'data-default-class >= 0.0.1 && < 0.1' 'data-default-class >= 0.0.1'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag comonad comonad) \
-		$(cabal_flag containers containers) \
-		$(cabal_flag kan-extensions kan-extensions) \
-		$(cabal_flag semigroupoids semigroupoids) \
-		$(cabal_flag semigroups semigroups) \
-		$(cabal_flag stm stm) \
-		$(cabal_flag tagged tagged) \
-		$(cabal_flag transformers transformers) \
-		$(cabal_flag unordered-containers unordered-containers)
-}
diff --git a/dev-haskell/polyparse-1.11 b/dev-haskell/polyparse-1.11
new file mode 100644
index 000000000000..b490406901cf
--- /dev/null
+++ b/dev-haskell/polyparse-1.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A variety of alternative parser combinator libraries
+EAPI=5
+HOMEPAGE=http://code.haskell.org/~malcolm/polyparse/
+IUSE=doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.11
+SRC_URI=mirror://hackage/packages/archive/polyparse/1.11/polyparse-1.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0ec8a3a3f9adec43ceb62e7e6c3f3034
diff --git a/dev-haskell/polyparse-1.9 b/dev-haskell/polyparse-1.9
new file mode 100644
index 000000000000..b9ace28bc1ec
--- /dev/null
+++ b/dev-haskell/polyparse-1.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A variety of alternative parser combinator libraries
+EAPI=5
+HOMEPAGE=http://code.haskell.org/~malcolm/polyparse/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.9
+SRC_URI=mirror://hackage/packages/archive/polyparse/1.9/polyparse-1.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0ebbb34e19b8e8b389a7494d8e6112d0
diff --git a/dev-haskell/polyparse/Manifest b/dev-haskell/polyparse/Manifest
deleted file mode 100644
index 8924a0e6ffd3..000000000000
--- a/dev-haskell/polyparse/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST polyparse-1.11.tar.gz 22978 BLAKE2B 22154655fb090234223189f9f25e871c73f478ee3681313654d737930d594c9a378fa1d259ff4cdbe93d2df5a8ac79104ee12b9efed7e9fdf1caf6ad269ab988 SHA512 b2cecc633596caaa2b8a00ceb16f141cd69de9ec697ce53cd827a17c82cac70ffaf10bc1d8669156ed4d28589b11ac56820b5c02905c8a6bdcae65112126fa5e
-DIST polyparse-1.9.tar.gz 22256 BLAKE2B 01f2280db5d966d86450b4a3ae352e1ba911c1d7b116e6e94cd182c6d49c4b43e6d52f264097b4e8c87867bd535140b18c04a445ee9ab60f9296e1a15bcdeb0f SHA512 80f7cc269c7082d256aa273ce668a8fd9f58b4827fa69e390d749a622d667d5c01b7ede3719d52408d3efa35de66928a3fa659f3798826a2d53222d8a8d9d7e6
-EBUILD polyparse-1.11.ebuild 632 BLAKE2B 5c1ae3477b3f87dcecccf200cf0eeebc0394cbfe3d0f7e4837875828720a5d3e38b84c56cbb14023762d4a2d84911a26edd4c79f51ca3dd73af8b4f3ebd615d1 SHA512 642dcec362c56822d2cb47a0d4ef5f4611c5459434ca7a5ca0dcd7f77b838a1e1ba10e5b3599a16be67d4e25cb6bbe56e10b6199e056447771752700b66dba97
-EBUILD polyparse-1.9.ebuild 626 BLAKE2B 04c98538575bd0a1112c125f96bdcc7d5f89d76f5fe8287642a2c74e6dc746c0aa142a8744141472e2030dc8786f48a1a6df1d38965f3d22edd0b2cb3e9c0713 SHA512 82e2221975f8c460d21183ebb2efe04f0bf2b2b8bb931a5aaaa9b043a92b7b74ff598ab0cd1a857674fedd76a958765566e7e8de075ab2eee1815125d9e72a5f
-MISC metadata.xml 648 BLAKE2B ec7679bb8dec7212a08a306a1b57b796aa6037f642cbedc234a42da09de700a7a7faff3219e9d8019ff6ae0641260e07bbdc7cd78352940f195bc300f6e2bf6b SHA512 ec7413b7f4fbc51776411fef7a21be4bfdbfbb52640d3b21467177b09903c0cdf860c201c7450e9f2dbcd87c918676fd69969319afafc29e75d0f989b4e7963d
diff --git a/dev-haskell/polyparse/metadata.xml b/dev-haskell/polyparse/metadata.xml
deleted file mode 100644
index c662f542cdfb..000000000000
--- a/dev-haskell/polyparse/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A variety of alternative parser combinator libraries, including
-		the original HuttonMeijer set.  The Poly sets have features like
-		good error reporting, arbitrary token type, running state, lazy
-		parsing, and so on.  Finally, Text.Parse is a proposed
-		replacement for the standard Read class, for better
-		deserialisation of Haskell values from Strings.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/polyparse/polyparse-1.11.ebuild b/dev-haskell/polyparse/polyparse-1.11.ebuild
deleted file mode 100644
index d2762f3798da..000000000000
--- a/dev-haskell/polyparse/polyparse-1.11.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A variety of alternative parser combinator libraries"
-HOMEPAGE="http://code.haskell.org/~malcolm/polyparse/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
diff --git a/dev-haskell/polyparse/polyparse-1.9.ebuild b/dev-haskell/polyparse/polyparse-1.9.ebuild
deleted file mode 100644
index cf6cd6b21602..000000000000
--- a/dev-haskell/polyparse/polyparse-1.9.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A variety of alternative parser combinator libraries"
-HOMEPAGE="http://code.haskell.org/~malcolm/polyparse/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/pqueue-1.3.2 b/dev-haskell/pqueue-1.3.2
new file mode 100644
index 000000000000..c302faef4d47
--- /dev/null
+++ b/dev-haskell/pqueue-1.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Reliable, persistent, fast priority queues
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/pqueue
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.3.2
+SRC_URI=mirror://hackage/packages/archive/pqueue/1.3.2/pqueue-1.3.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2fac1666db990609fe6fa9bbb4943a25
diff --git a/dev-haskell/pqueue/Manifest b/dev-haskell/pqueue/Manifest
deleted file mode 100644
index f4c3e7f693a2..000000000000
--- a/dev-haskell/pqueue/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pqueue-1.3.2.tar.gz 22880 BLAKE2B cb486d83e8e293031871206e083d2d9bc1ea7066a8c7bb62703073abc55bb0f272a79890c7a480aefe7b56ce8fa19e3ccfc603d105fbfda965ba1d2854b88266 SHA512 1b3123083717de071593d0223ed1ba2d041b60acdf2e4effe6d337adcdaec26b5327b511f6d8e03cdfd365e81fe2b2856ece0e2e4e7c761c6b54e41896fe0fec
-EBUILD pqueue-1.3.2.ebuild 553 BLAKE2B 70de3f2d8ff12d46312f132d0c97b63906bee6c8b5a9b2a848db68dd89830ea170cc28a8229de026fb67b0bcca91e0954ed356a2a047477da82878c7f36d6b97 SHA512 d329f59cf1fed3a0f9114bcda7cbce6c801f3636b011c7086ae402fd9a3d5a22b385e8d5f1fcfee5582cd10b1f79cf0513bcd97cf5c22450637146308a95b728
-MISC metadata.xml 363 BLAKE2B 534fdab965d2679281600f0d8cf40c986d6a875cc4fe5b2c3534b76ba0a00845e99070e7d4ef6026d04694ceb05038359f2ebd5ba0b667f69926f0b8aa3bd885 SHA512 c689ad5da8efcef893a3e1c5c623916c316a0128f8f60f2830702fb1c07dc80ac59a2aac9fa6b2f41c44b513814d0aac8e035b141d321ab20d0ba37deb419241
diff --git a/dev-haskell/pqueue/metadata.xml b/dev-haskell/pqueue/metadata.xml
deleted file mode 100644
index e91b1155edc7..000000000000
--- a/dev-haskell/pqueue/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A fast, reliable priority queue implementation based on a binomial heap.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/pqueue/pqueue-1.3.2.ebuild b/dev-haskell/pqueue/pqueue-1.3.2.ebuild
deleted file mode 100644
index f52ca16cc018..000000000000
--- a/dev-haskell/pqueue/pqueue-1.3.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Reliable, persistent, fast priority queues"
-HOMEPAGE="http://hackage.haskell.org/package/pqueue"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/prelude-extras-0.4.0.3 b/dev-haskell/prelude-extras-0.4.0.3
new file mode 100644
index 000000000000..1f0694b66e7a
--- /dev/null
+++ b/dev-haskell/prelude-extras-0.4.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Higher order versions of Prelude classes
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/prelude-extras
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.0.3
+SRC_URI=mirror://hackage/packages/archive/prelude-extras/0.4.0.3/prelude-extras-0.4.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7e4f9c27b575ab2740cc095f9c435bcb
diff --git a/dev-haskell/prelude-extras/Manifest b/dev-haskell/prelude-extras/Manifest
deleted file mode 100644
index e4d69ea3f31c..000000000000
--- a/dev-haskell/prelude-extras/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST prelude-extras-0.4.0.3.tar.gz 8141 BLAKE2B 3889146248c758595ccc4dc3a63b31154ee1c412c9f6112b6362fa57aa456184f6121c153553f909436f782c1f6bcea7650f0b5e0c4f72cd18423ebf7a5e041c SHA512 a8a934166ede50654035075978fbd7406245c38d38c2bc90b9349522f93ba2d6a1bd77d8bba3ac47d819c767d15a3f3f6b663defba7a108f8e2f494709b8f76b
-EBUILD prelude-extras-0.4.0.3.ebuild 550 BLAKE2B 2b6fc3f879ca95acdb302653e9083c8dffb3523d373f918f795a2233935b201062c6fedba31f3c064576ea1a8c0c814a60b6aafef6d7123ad8931e7a2c1305e0 SHA512 0181a7be80555dd07b84cce289029691f314140b63afd22b5613d9b17f695d9b456f6e54db94d7078194718b6ffa0079fbf50d8ea4a2e20d69c68c0e3bec54d1
-MISC metadata.xml 627 BLAKE2B 5b8bf62eefbaeb44072de463753e94f9807e3302481c6d1a4bed3e031709b23a88e33ce1e3ba8367402eb3870f142644750d370c2286057b2b38dd5080f9beab SHA512 2554f398de1c38ce607adeef2c810df2ce1c9cafcb0bf0a5a901cd061404e7c82a13fc394857cae6c9c5621fbf00f2d34623a960358d40811c6acadc720433ea
diff --git a/dev-haskell/prelude-extras/metadata.xml b/dev-haskell/prelude-extras/metadata.xml
deleted file mode 100644
index 56725aa37ca5..000000000000
--- a/dev-haskell/prelude-extras/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haskell 98 - higher order versions of Prelude classes to ease programming with polymorphic recursion and reduce UndecidableInstances
-		
-		See &lt;http://flint.cs.yale.edu/trifonov/papers/sqcc.pdf&gt; for further discussion of the approach taken here.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/prelude-extras</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/prelude-extras/prelude-extras-0.4.0.3.ebuild b/dev-haskell/prelude-extras/prelude-extras-0.4.0.3.ebuild
deleted file mode 100644
index 1890be440fc7..000000000000
--- a/dev-haskell/prelude-extras/prelude-extras-0.4.0.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Higher order versions of Prelude classes"
-HOMEPAGE="https://github.com/ekmett/prelude-extras"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/preprocessor-tools-1.0.1 b/dev-haskell/preprocessor-tools-1.0.1
new file mode 100644
index 000000000000..df811b697d62
--- /dev/null
+++ b/dev-haskell/preprocessor-tools-1.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/syb-0:=[profile?] <dev-haskell/syb-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A framework for extending Haskell's syntax via quick-and-dirty preprocessors
+EAPI=5
+HOMEPAGE=https://hackage.haskell.org/package/preprocessor-tools
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/syb-0:=[profile?] <dev-haskell/syb-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.1
+SRC_URI=mirror://hackage/packages/archive/preprocessor-tools/1.0.1/preprocessor-tools-1.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bd90749705581fdc47313876444d2294
diff --git a/dev-haskell/preprocessor-tools/Manifest b/dev-haskell/preprocessor-tools/Manifest
deleted file mode 100644
index 9b353604d38e..000000000000
--- a/dev-haskell/preprocessor-tools/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST preprocessor-tools-1.0.1.tar.gz 9895 BLAKE2B 5ca349188749a776ff203645f14f46d4f613d30c0ba48833426735cc27642b0f7bd85ffa3937396b5cb49df4a3b569388c304c6ea8942764fbc269da3f3fa5d1 SHA512 b039c763eda293950a73c089903bbc2f447b92740077c042a764c2523db581450c96e3fda7ae177336d96626283283843c93006eca73d02951ca9067a3b12665
-EBUILD preprocessor-tools-1.0.1.ebuild 800 BLAKE2B e8350cf57fb51be3aadc4c7565574d8ca7d1f7f5b2763c5c149f530a4a8599217013a18717c547284d738edb2e4080511f31130d72d9f238edd886a765193e75 SHA512 99fe4020482456ba3ad0621388e0af1e1803a5e47eafaf8a202372e1de9f07978cb14ccde04776206127b7f560b6deda291a0d14a679fb97a15e3499c07a10d9
-MISC metadata.xml 716 BLAKE2B 312e83928c7c038456ed536b4ccaa91fb52f7750dccf880dd7c235bdde975c208e8e6c98e948d8b210e2f3840b873e9bf9728caca24519d25c3f61d52fdef012 SHA512 5696afa323cebeaa0ea6ef9c2655779528cdf7a91c606881a70608cb8eace5964892f9f17828b64e10c499d39ba8276da1983e8fa960922e1aa47e56215e7d6f
diff --git a/dev-haskell/preprocessor-tools/metadata.xml b/dev-haskell/preprocessor-tools/metadata.xml
deleted file mode 100644
index eacaa677fc98..000000000000
--- a/dev-haskell/preprocessor-tools/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library provides a quick-and-dirty (but often effective)
-		method for extending Haskell's syntax using a custom
-		preprocessor.  It parses Haskell into a bare-bones AST with just
-		enough knowledge of the syntax to preserve nesting, and then
-		allows transformations on the AST.
-		
-		See the package ixdopp
-		(&lt;http://hackage.haskell.org/cgi-bin/hackage-scripts/package/ixdopp&gt;)
-		for an example of how to do this.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/preprocessor-tools/preprocessor-tools-1.0.1.ebuild b/dev-haskell/preprocessor-tools/preprocessor-tools-1.0.1.ebuild
deleted file mode 100644
index 077bfd556a3d..000000000000
--- a/dev-haskell/preprocessor-tools/preprocessor-tools-1.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A framework for extending Haskell's syntax via quick-and-dirty preprocessors"
-HOMEPAGE="https://hackage.haskell.org/package/preprocessor-tools"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-haskell/syb-0:=[profile?] <dev-haskell/syb-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.3
-"
diff --git a/dev-haskell/pretty-hex-1.0 b/dev-haskell/pretty-hex-1.0
new file mode 100644
index 000000000000..e835ac12b8d8
--- /dev/null
+++ b/dev-haskell/pretty-hex-1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A library for hex dumps of ByteStrings
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/pretty-hex
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0
+SRC_URI=mirror://hackage/packages/archive/pretty-hex/1.0/pretty-hex-1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=463372865a99cfc54cd44305b37f199f
diff --git a/dev-haskell/pretty-hex/Manifest b/dev-haskell/pretty-hex/Manifest
deleted file mode 100644
index 9d99135dfee4..000000000000
--- a/dev-haskell/pretty-hex/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pretty-hex-1.0.tar.gz 2950 BLAKE2B 7fd2049eb42e4e596a54207820d66874620554e72d8f3dae48f5f42b7be089e2b9fe9c9e318a5b13fa4448630a54a7aab3eff593882e6e8df1ed2466a502f35e SHA512 a5ffdecf56b586a23b1243bcace040c7043cc67ced07c5f94d459a2e6a00cade98c70e1480be763ef75946d2aedf87e00d2b653a6f8f23d21cd8e9ab198ea45d
-EBUILD pretty-hex-1.0.ebuild 553 BLAKE2B 0452668aa751f4d013d987e9d2a8927d0f448419919b2a5c4d2ba6a0376bcb8db418e33334544a15e6ded198ffaa399e28a480b7d7bbd4d3afe7d57b548463a9 SHA512 5c93bf7d19910de0b086ab6c9098596284373c1aea145d0193e6fcc37620c9fdee2a665ff28f9002fb95711579f1dfe89fde93f7bb793aad6fa4ac4f0f3c1a1c
-MISC metadata.xml 397 BLAKE2B 0c809f48b3bda3f13fe69824ffadfc45ded78cf4c00e9328793341a10b6d1631fc621a8be95e618b808dc59f47ed9c1a2b0235e89fea087427f90ecf0e1b2657 SHA512 c752a4e15de94c7c408319f92c5ea87131da7b58170c2bfb38632a5f21046093f15c89c49392c19a79d2f3cf44ca7c5a31aca29de738d0fd88f5cf8303062c4f
diff --git a/dev-haskell/pretty-hex/metadata.xml b/dev-haskell/pretty-hex/metadata.xml
deleted file mode 100644
index 97a6d93130aa..000000000000
--- a/dev-haskell/pretty-hex/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library generates pretty hex dumps of ByteStrings in the
-		style of other common *nix hex dump tools.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/pretty-hex/pretty-hex-1.0.ebuild b/dev-haskell/pretty-hex/pretty-hex-1.0.ebuild
deleted file mode 100644
index a43870229aed..000000000000
--- a/dev-haskell/pretty-hex/pretty-hex-1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A library for hex dumps of ByteStrings"
-HOMEPAGE="http://hackage.haskell.org/package/pretty-hex"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/pretty-show-1.6.12 b/dev-haskell/pretty-show-1.6.12
new file mode 100644
index 000000000000..66f1fefae543
--- /dev/null
+++ b/dev-haskell/pretty-show-1.6.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/haskell-lexer-1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 dev-haskell/happy doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Tools for working with derived 'Show' instances and generic inspection of values
+EAPI=6
+HOMEPAGE=http://wiki.github.com/yav/pretty-show
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/haskell-lexer-1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.6.12
+SRC_URI=mirror://hackage/packages/archive/pretty-show/1.6.12/pretty-show-1.6.12.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4fcef6089d3fa7bbf2dd1d54620676c7
diff --git a/dev-haskell/pretty-show-1.6.8.2 b/dev-haskell/pretty-show-1.6.8.2
new file mode 100644
index 000000000000..8f04cfcf70d8
--- /dev/null
+++ b/dev-haskell/pretty-show-1.6.8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/haskell-lexer-1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 dev-haskell/happy doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Tools for working with derived 'Show' instances and generic inspection of values
+EAPI=5
+HOMEPAGE=https://wiki.github.com/yav/pretty-show
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/haskell-lexer-1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.6.8.2
+SRC_URI=mirror://hackage/packages/archive/pretty-show/1.6.8.2/pretty-show-1.6.8.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a09f8228e6fd9e991b319155758728a3
diff --git a/dev-haskell/pretty-show-1.6.9 b/dev-haskell/pretty-show-1.6.9
new file mode 100644
index 000000000000..adb30fa7c859
--- /dev/null
+++ b/dev-haskell/pretty-show-1.6.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/haskell-lexer-1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 dev-haskell/happy doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Tools for working with derived 'Show' instances and generic inspection of values
+EAPI=5
+HOMEPAGE=http://wiki.github.com/yav/pretty-show
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/haskell-lexer-1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.6.9
+SRC_URI=mirror://hackage/packages/archive/pretty-show/1.6.9/pretty-show-1.6.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b6c1bbf5835d4db9482c8feaea93d953
diff --git a/dev-haskell/pretty-show/Manifest b/dev-haskell/pretty-show/Manifest
deleted file mode 100644
index 0f2d20c85d0a..000000000000
--- a/dev-haskell/pretty-show/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST pretty-show-1.6.12.tar.gz 133535 BLAKE2B 401ddd8dd47759ad4c1d07249e991ce0843c31cf19f63697a4a042dcc02e1790cbe32f499d2b7f5684658c32185c46d84cd6cae52dad5ba8cf8e0b6ca136378a SHA512 849eeb2d939bad7ea38f706ae69beccb9e033135d152f7ff0e8b214c0ea89cd7c1c9c1ccafa1025d098c145ddaff6c82a36b9e899bb7b8ae549d52d178a59e23
-DIST pretty-show-1.6.8.2.tar.gz 133160 BLAKE2B 2e24b32f3e9c303b2cfbd3bb8ce210365f1f4c2494ec4c3ad1d833367bcd9d6f20995eec448e0bcdf570b0300d9449563d41ec29c7c3cfa097ec516547d3bdf5 SHA512 673b1fe7745e299cd9c547aec90daaf870d13e52c7d78b472a71e5b86e22bcc3cf3ee8a4f0a88826ade20ed59fcbc623254b71485e928fe8f283d28edd7b4a6e
-DIST pretty-show-1.6.9.tar.gz 126196 BLAKE2B 70c14fc324b1c9ec54eafd0e44f5a93b6ee3f37958a10be8129811c65124801915d189f4c5bcea72ce8cda91572f4d7706daddb7ae70304ad1a0d13631916505 SHA512 8205182584a03777cb04b83b8ebe2e92bdb17ee801ff9ff2947a860175f7415375ca1fb7b433448b14898addcd0e86bf0f9e0a53a37254322625698bed9952be
-EBUILD pretty-show-1.6.12.ebuild 695 BLAKE2B 000bd16edfe02713f9a2dc627e536d1d6fb9c0dc51f810f5e4911ee235e4d5064be1df5698c2c419489494fbfd6ed5f03520b366ebf7aa4e9978eb55b1bc8c3c SHA512 4b353085000258aaaa4c1778b84f34b60482aeda5d0c49cd29145477e0681b32255ac0812b318082af04240e2cb76e991e2027e66e8962faa1aea5779b96c572
-EBUILD pretty-show-1.6.8.2.ebuild 691 BLAKE2B ea20f526e276c06deeb45d833e3f3176efe90f847a1dea6be5efff94b568fea8c4663d29f372218e1f63a265431cfc00784f053016bb6a5f9ad2e7dc8e25a2d9 SHA512 ea28e364e264a9e968672109362303b4198962c93cc40a72f8838b3d8d211fd98961daed997b1cc46f685849416ff2b7147fb2a61cf698cc1443cf23ba20cfe9
-EBUILD pretty-show-1.6.9.ebuild 697 BLAKE2B f7de920769db403dea3662c67785b4b334e8b8d5e85ccd6e022ebaa4d1105fef88bce83264216c1f404bec669a4ed66571919c0a16537ed440d19ed65449a725 SHA512 1f967cce388a22c9a0dc9ebaf5608df4e09ec1500aeaa2e256603f3d623d5f33fb0baf794086ee1d598c63c6a65f0de2da92e2813ca48852d821bff990e0dd6f
-MISC metadata.xml 617 BLAKE2B f3c5a355f4a9d506198431ba777cf086f33386796d78391651c74d397ab7477011400c72391e80fd06761d1442b4ce029ce05c6d1865d30672b1dac8691721d6 SHA512 79ee76d8f4dbf8a78775f6ae5e9a0833a97f23e67217d32f07660a4a3b3d67355090e02f48fe1de1445d509635dd837753096a899e91f0aebb848c4f036f576a
diff --git a/dev-haskell/pretty-show/metadata.xml b/dev-haskell/pretty-show/metadata.xml
deleted file mode 100644
index 9efae39dd8c0..000000000000
--- a/dev-haskell/pretty-show/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		We provide a library and an executable for working with derived 'Show'
-		instances. By using the library, we can parse derived 'Show' instances into a
-		generic data structure. The @ppsh@ tool uses the library to produce
-		human-readable versions of 'Show' instances, which can be quite handy for
-		debugging Haskell programs.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/pretty-show/pretty-show-1.6.12.ebuild b/dev-haskell/pretty-show/pretty-show-1.6.12.ebuild
deleted file mode 100644
index 5b3d80f85758..000000000000
--- a/dev-haskell/pretty-show/pretty-show-1.6.12.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Tools for working with derived 'Show' instances and generic inspection of values"
-HOMEPAGE="http://wiki.github.com/yav/pretty-show"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/haskell-lexer-1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	dev-haskell/happy
-"
diff --git a/dev-haskell/pretty-show/pretty-show-1.6.8.2.ebuild b/dev-haskell/pretty-show/pretty-show-1.6.8.2.ebuild
deleted file mode 100644
index a3df7d7e914b..000000000000
--- a/dev-haskell/pretty-show/pretty-show-1.6.8.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Tools for working with derived 'Show' instances and generic inspection of values"
-HOMEPAGE="https://wiki.github.com/yav/pretty-show"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/haskell-lexer-1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	dev-haskell/happy
-"
diff --git a/dev-haskell/pretty-show/pretty-show-1.6.9.ebuild b/dev-haskell/pretty-show/pretty-show-1.6.9.ebuild
deleted file mode 100644
index 225463d72aad..000000000000
--- a/dev-haskell/pretty-show/pretty-show-1.6.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Tools for working with derived 'Show' instances and generic inspection of values"
-HOMEPAGE="http://wiki.github.com/yav/pretty-show"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/haskell-lexer-1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	dev-haskell/happy
-"
diff --git a/dev-haskell/prettyclass-1.0.0.0 b/dev-haskell/prettyclass-1.0.0.0
new file mode 100644
index 000000000000..a20c68e7a027
--- /dev/null
+++ b/dev-haskell/prettyclass-1.0.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pretty printing class similar to Show
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/prettyclass
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/1.0.0.0
+SRC_URI=mirror://hackage/packages/archive/prettyclass/1.0.0.0/prettyclass-1.0.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4cefe00e6f5469632a0f606f17f7f7b9
diff --git a/dev-haskell/prettyclass/Manifest b/dev-haskell/prettyclass/Manifest
deleted file mode 100644
index 3a0d6e14dfa9..000000000000
--- a/dev-haskell/prettyclass/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST prettyclass-1.0.0.0.tar.gz 1542 BLAKE2B b1497565728b2a580f4ff9117a62a2e2013888a07a9893ee207e0392a014373cb17eb9eeff3ce3d30a69dc7d2f5ff6d136e4a00b8bdae3533c8f240658bf6bf4 SHA512 f0785e7780f71ee0f8f6b6ca5db6a82f030f75b34f618ff9ee0025032516114769f4cd4e6094b5fefd13e645a7eece9d87b82c2d4c144dddf5093bc2c600af4a
-EBUILD prettyclass-1.0.0.0.ebuild 553 BLAKE2B eddefa6a850a0d08d339ee6000493ea85de12c5de5d6b3316283e5604661707095a74e3a731ff4491754ea014dd902c8350c7de0438636f4f13c65bfe5f6beea SHA512 3abb38f43cc91c49e893e885949ba4c84bcf2c9ddf8f5cbc20182c0a417ead906119043852bbba6806f4056be0ef6552c432f44da6d555c6070aeda7b53e277e
-MISC metadata.xml 453 BLAKE2B 139092d0f8fa3fd37322909088651724ec6b23f1af548c3bedf86db54418d8c0ed5b94bfbbb339d5163b4cb92ef76d217f9af8af79a495eaefc5ad10d0db8cf1 SHA512 99d14083e2f4a0d9fef1c73379d7acde3b802b014ca31e400c322cb0e6320b0166f7d8a16b277fdffcf6382049d81b5d4277d8ed5d6364c3c432bca0366de465
diff --git a/dev-haskell/prettyclass/metadata.xml b/dev-haskell/prettyclass/metadata.xml
deleted file mode 100644
index 0ca938268b7c..000000000000
--- a/dev-haskell/prettyclass/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Pretty printing class similar to Show, based on the HughesPJ
-		pretty printing library.  Provides the pretty printing class
-		and instances for the Prelude types.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/prettyclass/prettyclass-1.0.0.0.ebuild b/dev-haskell/prettyclass/prettyclass-1.0.0.0.ebuild
deleted file mode 100644
index 9680062900ce..000000000000
--- a/dev-haskell/prettyclass/prettyclass-1.0.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pretty printing class similar to Show"
-HOMEPAGE="http://hackage.haskell.org/package/prettyclass"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-0"
diff --git a/dev-haskell/prettyprinter-1.2.0.1 b/dev-haskell/prettyprinter-1.2.0.1
new file mode 100644
index 000000000000..506abe6aeca8
--- /dev/null
+++ b/dev-haskell/prettyprinter-1.2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/semigroups-0.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] dev-haskell/void:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/doctest-0.9 >=dev-haskell/pgp-wordlist-0.1 >=dev-haskell/semigroups-0.6 >=dev-haskell/tasty-0.10 >=dev-haskell/tasty-hunit-0.9 >=dev-haskell/tasty-quickcheck-0.8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A modern, easy to use, well-documented, extensible prettyprinter
+EAPI=6
+HOMEPAGE=https://github.com/quchen/prettyprinter
+IUSE=doc doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-haskell/semigroups-0.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] dev-haskell/void:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.2.0.1
+SRC_URI=mirror://hackage/packages/archive/prettyprinter/1.2.0.1/prettyprinter-1.2.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=06e46946a38ad23cd1273d6c9c22b74c
diff --git a/dev-haskell/prettyprinter/Manifest b/dev-haskell/prettyprinter/Manifest
deleted file mode 100644
index 7156d8682b24..000000000000
--- a/dev-haskell/prettyprinter/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST prettyprinter-1.2.0.1.tar.gz 46373 BLAKE2B 8d71f9dceffd40a228e2911397ecd8cce1ed141f16fbca287b3005693f448c4fb43a974b5ddb7e60d2f33ceed58d69ccd3c6fb4490bff477e3598f414cdc46c6 SHA512 f51e546915d799a07f7b7a60c53f1cd1491535bcad6199341c14aeb96250da85f5527b94ad19e2c297fcf4b02d4561c2eaad1458c4b9c870fb0dcfeb142d9771
-EBUILD prettyprinter-1.2.0.1.ebuild 980 BLAKE2B 6e9859c396a9e9588d0a5a2520a524a90968d6118308335606b3ab9ef919cf2f09e23febb214c6232cc1947d74141c6bc28a2f85cb8d96b4cc15e0b62056717a SHA512 e21a710568ad712b9444ece864e1510b5b7a99552163254927ec935bbc8ea90a51ef7894d7be9d91179b11baa75580afab6991c2b9a0e9873561763a7043be1f
-MISC metadata.xml 386 BLAKE2B 2337a8c68f44a5898b08934636a22d18da0a8b9555cd181b5b8a9b6bdb7d3e0ea081f2fa7d88439619470548bf1d682b5a46a38740ae141e99097863bb09791e SHA512 fc01c4318ddc50ac7cd2a616f98f5248dbe93a2aa631c89b874af6171977b66e326d8f366df0a1badb46096cf6c87f8b614fd6e2747382cef5f442ba05bc73bf
diff --git a/dev-haskell/prettyprinter/metadata.xml b/dev-haskell/prettyprinter/metadata.xml
deleted file mode 100644
index 7759ad5057c1..000000000000
--- a/dev-haskell/prettyprinter/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		A prettyprinter/text rendering engine. Easy to use, well-documented, ANSI terminal backend exists, HTML backend is trivial to implement, no name clashes, Text-based, extensible.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/prettyprinter/prettyprinter-1.2.0.1.ebuild b/dev-haskell/prettyprinter/prettyprinter-1.2.0.1.ebuild
deleted file mode 100644
index 214b9a0cde08..000000000000
--- a/dev-haskell/prettyprinter/prettyprinter-1.2.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A modern, easy to use, well-documented, extensible prettyprinter"
-HOMEPAGE="https://github.com/quchen/prettyprinter"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-haskell/semigroups-0.1:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?]
-	dev-haskell/void:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/doctest-0.9
-		>=dev-haskell/pgp-wordlist-0.1
-		>=dev-haskell/semigroups-0.6
-		>=dev-haskell/tasty-0.10
-		>=dev-haskell/tasty-hunit-0.9
-		>=dev-haskell/tasty-quickcheck-0.8 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag doc buildreadme)
-}
diff --git a/dev-haskell/primitive-0.4.1 b/dev-haskell/primitive-0.4.1
new file mode 100644
index 000000000000..e8fbd578b518
--- /dev/null
+++ b/dev-haskell/primitive-0.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure 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 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=343673e0596af4cb65e513e79bb64bbe
diff --git a/dev-haskell/primitive-0.5.0.1 b/dev-haskell/primitive-0.5.0.1
new file mode 100644
index 000000000000..a8075c5fc74d
--- /dev/null
+++ b/dev-haskell/primitive-0.5.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.12.3:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ed7fae8a596be04013a896bd303ff03d
diff --git a/dev-haskell/primitive-0.5.1.0 b/dev-haskell/primitive-0.5.1.0
new file mode 100644
index 000000000000..67bc560dc7bb
--- /dev/null
+++ b/dev-haskell/primitive-0.5.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=95a38d50caf7be1376d9651c197896ac
diff --git a/dev-haskell/primitive-0.5.4.0 b/dev-haskell/primitive-0.5.4.0
new file mode 100644
index 000000000000..ff35bdfc0ba2
--- /dev/null
+++ b/dev-haskell/primitive-0.5.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3476e97f568351e1c06dea4d1cf3a191
diff --git a/dev-haskell/primitive-0.6.1.0-r1 b/dev-haskell/primitive-0.6.1.0-r1
new file mode 100644
index 000000000000..4acc5bfed9d5
--- /dev/null
+++ b/dev-haskell/primitive-0.6.1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f6be3917122a78c9def2bf46a29ad2ce
diff --git a/dev-haskell/primitive/Manifest b/dev-haskell/primitive/Manifest
deleted file mode 100644
index 4fb7f0b6a6ed..000000000000
--- a/dev-haskell/primitive/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST primitive-0.4.1.tar.gz 9058 BLAKE2B 015266e73c8332d438d0161e05005a0f25be2e6893067b8c1e812a9ff00584a2d8235842f623bf06c7a4171d770ad51f220022c1b59df0be456035a754c04a99 SHA512 72f76569bdf4518c3e27897047fa038e0b056ccc93c273bca91bf40d0d76015727ec81455f6459df3c6f04f07b1b669d7899f5b9d43aba088cc4a9cab03ce03f
-DIST primitive-0.5.0.1.tar.gz 10372 BLAKE2B c8b3feb5228db084b0fd41d06ecbabc31fa4d4d09449e6c0798fdab49ca6d1f9030dca3e77ff5993bdf299361d38bbc57d39228d987aa5ee8c203276ce65fe53 SHA512 f52ea7c3b3c8e01949dfb55e158b770375c718151bdd65b0123278334d21fe219711c0d207318d248958b4f39a93a62c66ca77737c7775e3fe3b053dc20b34a8
-DIST primitive-0.5.1.0.tar.gz 10482 BLAKE2B 2507da63606de91bb4f20db6db156fdb5ec16a065658f71b10a2f4a2e9ffa47b3ff1eaf65603064a904f6b52e6724a604459296011a445e4ca6ca0bf6727f2b2 SHA512 23d0d0afc80e2b1a674d93feb059d8b240a81793ffd53f496562b87d7b4abc605f66549ac7f23774d8c36fdf8a6768f02cf15b962c75b5052358a1c8cd1664de
-DIST primitive-0.5.4.0.tar.gz 11966 BLAKE2B e6127adaf508955903569c86fdb8e0a300645d61faee4f7fe31a51847e7d706fce368e4a94007a207c61bcc59c41d6d8a7480e02f06d04a1f3706a95de0083b6 SHA512 8d0203834f09be52aea6a8f46d556340583ec79f8490e240f660326d670ddd67510caef1c30ee7d7374d88b812a9f5761c1528152212e46b56cd7c744f7aa656
-DIST primitive-0.6.1.0.tar.gz 12857 BLAKE2B a18d7685279f13090284c8f6414e3844f2226a4db4e3bd1722f9e04a11cafb2debb431fb1f7181c77375290610a456bc7634837d8886c9e91638bf139d2768c2 SHA512 7d75602732aae7af4ea5fb6678f669b103c5c40035c2fa2cc27d940e911054722d20f1b53865cfd0b430785baa0843de89de7195bb2d72c5bc1e5aeb4fdc5f82
-EBUILD primitive-0.4.1.ebuild 620 BLAKE2B be50786df07caaa266ea11de251cd29adfb1d5bd09ecec1946480c2ed06ac7c4ad3abb9c0fa4a592bb02a966dbc8a3d5a18aee4c2285e4a0168a78f1d3b8001f SHA512 6e05d5ccecce00f584e8bcbcbdb4918d11b5e93809a98cb7f31fd456c8e3780dcb9f837b1a22386f53bdeedb7a20001cd5c70130a9136dfeec95790111286ac0
-EBUILD primitive-0.5.0.1.ebuild 632 BLAKE2B 84c33c04b5344b0222a3770fbb7ce5ec8623cc955e7f8e246da55c601e99d54962295ebe07b2237a78bdf9b0ad540807538101539f62bf507383f6c5f7e65336 SHA512 97430d60c15a9daceb8294af788ca903856716c3ce395d6fd1e5af72f5cc33312f4ff6cae7d002b96f35e419db5b34a513306aa69a1cba00503aacbd4c9fc3c7
-EBUILD primitive-0.5.1.0.ebuild 643 BLAKE2B dd514d18a2bc016322279e7b4ef5362d008860112b5523b1aae884d3c6016b555e936140a19f4755b8049d60a0570fcff51cf8312c122f4ca10f0af22a4c16ef SHA512 481169f1abc666861cd4855e5478fed01d2690b80a3288a5daba1386c42095641deb26234a7038afa549adea44cdb65010fda7031c46733d31d033d02df58ad0
-EBUILD primitive-0.5.4.0.ebuild 747 BLAKE2B dc356b7e7dc57f83fcadfa4314c9f2fbeb3da4a09ea258eef583250c474601bb17df867421508a1db48b037f453fbad76879434d208e01f23730502d40a871e5 SHA512 b539935ab1aa711cc2131e5400852732562608ab801d58a675029f58e6c70b28e33c87cea1606943bdc14fc4d559870fdfbfdb8a938a974b5b80c0d043add031
-EBUILD primitive-0.6.1.0-r1.ebuild 880 BLAKE2B 7f4d56f0cae790faae7be71950ba538c685f3d8dbae0c10918fc3ff47f8dc2e1eaa3543f80689461ad9b5ad479786423844e6ade1586877f71a2e7102ff30671 SHA512 51ea690ffc4b82ae1a314339e3de25160ef07bac8fbcf75a4cebe8f5c63e4c1dd04d717378508646efe4dd25e32fa9c53156a0b8680d925faf4ccfb63f7c9b3e
-MISC metadata.xml 1013 BLAKE2B ca2e0bc9843f49ef6d42cd1a4e9e55adfee7adfe1fb2d86f6e0b31cfdb685d952940b87c81ba7057ce2c523d16ed9d2085e24a862bcf0c4a1a8bd11312bf08fd SHA512 a0d6b463a62899f7f58a197787d85bd60b3179c2fe3f1a91b17cc521a4d688623680f9cf0a78f1a0baf53093ef52ebf889bdc5642489b0073ae768992b4acea8
diff --git a/dev-haskell/primitive/metadata.xml b/dev-haskell/primitive/metadata.xml
deleted file mode 100644
index cbe5aeac52b8..000000000000
--- a/dev-haskell/primitive/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-	</maintainer>
-	<longdescription>
-		This package provides wrappers for primitive array operations from
-		GHC.Prim.
-		
-		Changes in version 0.4.0.1
-		
-		* Critical bug fix in @fillByteArray@
-		
-		Changes in version 0.4
-		
-		* Support for GHC 7.2 array copying primitives
-		
-		* New in "Data.Primitive.ByteArray": @copyByteArray@,
-		@copyMutableByteArray@, @moveByteArray@, @fillByteArray@
-		
-		* Deprecated in "Data.Primitive.ByteArray": @memcpyByteArray@,
-		@memcpyByteArray'@, @memmoveByteArray@, @memsetByteArray@
-		
-		* New in "Data.Primitive.Array": @copyArray@, @copyMutableByteArray@
-		
-		* New in "Data.Primitive.Addr": @copyAddr@, @moveAddr@
-		
-		* Deprecated in "Data.Primitive.Addr": @memcpyAddr@
-	</longdescription>
-	<upstream>
-		<remote-id type="github">haskell/primitive</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/primitive/primitive-0.4.1.ebuild b/dev-haskell/primitive/primitive-0.4.1.ebuild
deleted file mode 100644
index 90412bfcd3bf..000000000000
--- a/dev-haskell/primitive/primitive-0.4.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.13
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="Wrappers for primitive operations"
-HOMEPAGE="http://code.haskell.org/primitive"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/primitive/primitive-0.5.0.1.ebuild b/dev-haskell/primitive/primitive-0.5.0.1.ebuild
deleted file mode 100644
index 4bb1f41766bd..000000000000
--- a/dev-haskell/primitive/primitive-0.5.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Primitive memory-related operations"
-HOMEPAGE="http://code.haskell.org/primitive"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.12.3:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/primitive/primitive-0.5.1.0.ebuild b/dev-haskell/primitive/primitive-0.5.1.0.ebuild
deleted file mode 100644
index 21eadcde2bda..000000000000
--- a/dev-haskell/primitive/primitive-0.5.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Primitive memory-related operations"
-HOMEPAGE="https://github.com/haskell/primitive"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/primitive/primitive-0.5.4.0.ebuild b/dev-haskell/primitive/primitive-0.5.4.0.ebuild
deleted file mode 100644
index 8498a03cad02..000000000000
--- a/dev-haskell/primitive/primitive-0.5.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Primitive memory-related operations"
-HOMEPAGE="https://github.com/haskell/primitive"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'ghc-prim >= 0.2 && < 0.4' 'ghc-prim >= 0.2 && < 0.5'
-}
diff --git a/dev-haskell/primitive/primitive-0.6.1.0-r1.ebuild b/dev-haskell/primitive/primitive-0.6.1.0-r1.ebuild
deleted file mode 100644
index df932979b54f..000000000000
--- a/dev-haskell/primitive/primitive-0.6.1.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Primitive memory-related operations"
-HOMEPAGE="https://github.com/haskell/primitive"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >= 4.3 && < 4.9' 'base >= 4.3' \
-		'ghc-prim >= 0.2 && < 0.5' 'ghc-prim >= 0.2' \
-		'transformers >= 0.2 && < 0.5' 'transformers >= 0.2'
-}
diff --git a/dev-haskell/process-conduit-1.1.0.0-r1 b/dev-haskell/process-conduit-1.1.0.0-r1
new file mode 100644
index 000000000000..0e5660fa6466
--- /dev/null
+++ b/dev-haskell/process-conduit-1.1.0.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/control-monad-loop-0.1:=[profile?] <dev-haskell/control-monad-loop-0.2:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/shakespeare:=[profile?] >=dev-haskell/shakespeare-text-1.0:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 test? ( >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Conduits for processes
+EAPI=5
+HOMEPAGE=https://github.com/tanakh/process-conduit
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/control-monad-loop-0.1:=[profile?] <dev-haskell/control-monad-loop-0.2:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/shakespeare:=[profile?] >=dev-haskell/shakespeare-text-1.0:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/1.1.0.0
+SRC_URI=mirror://hackage/packages/archive/process-conduit/1.1.0.0/process-conduit-1.1.0.0.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=775c250d86ff9f1a09306e53052eae0e
diff --git a/dev-haskell/process-conduit-1.2.0.1 b/dev-haskell/process-conduit-1.2.0.1
new file mode 100644
index 000000000000..eb8f4cbb0175
--- /dev/null
+++ b/dev-haskell/process-conduit-1.2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/control-monad-loop-0.1:=[profile?] <dev-haskell/control-monad-loop-0.2:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/shakespeare:=[profile?] >=dev-haskell/shakespeare-text-1.0:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/conduit-extra >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Conduits for processes (deprecated)
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/process-conduit
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/control-monad-loop-0.1:=[profile?] <dev-haskell/control-monad-loop-0.2:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/shakespeare:=[profile?] >=dev-haskell/shakespeare-text-1.0:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.0.1
+SRC_URI=mirror://hackage/packages/archive/process-conduit/1.2.0.1/process-conduit-1.2.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9aa4e2feee0218719e112ea07715f22e
diff --git a/dev-haskell/process-conduit/Manifest b/dev-haskell/process-conduit/Manifest
deleted file mode 100644
index dccd4dad2290..000000000000
--- a/dev-haskell/process-conduit/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX process-conduit-1.1.0.0-conduit-1.1.patch 1101 BLAKE2B 88af32409f6d08011814fe05aabbe7d9ebc547e0e113cdd8cd65ea13f676119163a19294803dcf8f0d905e5747e38872a8b0d26b4745c94e57cfd8f036547db7 SHA512 26035f7bae533194455ef48c650230ffe5796c1afa92a811ad1dd3302a833fd5ca04f8dbd87e6d60b9d5abb16ad38fbc8b6496bf918cbb34fa2b8d2079e85f30
-DIST process-conduit-1.1.0.0.tar.gz 3884 BLAKE2B 70792cc3ac8a65e591939782b8ef03e2d339cda469b40ed9858ede5a18a8ee6ab18d72b538fc3a265ebdfb9fcec05e4de020ac96826d2c8264da711e89ecfbdd SHA512 d7390a1083bc3bc5db2ce2bc0ec55f90e6c8bb8d224cc16b52a2e272baf3dceb18ee11eafd3cc306902945b04b2d746738f5a5e88bfd73e5ad0a9f5d4e5914dc
-DIST process-conduit-1.2.0.1.tar.gz 3958 BLAKE2B 5c9ca54c43b99032fea566cbd1b4693bceb8a07ed1121b7ce2e74c034adf7ec39b2874978335a59880f34eceae6dc299886b3e45c865eb16765677e955a26b04 SHA512 f58d37b04523007fcc447b865510f59559608df8c470456f5f5269d04e7104b018451ae260018cf04b03a253e7436ff0fc517c9f0d5cde705cbb8661a868b920
-EBUILD process-conduit-1.1.0.0-r1.ebuild 983 BLAKE2B 74fe351df98a83d3ae782cc7689456088a3d45a11a86946bacdddb34406a472132705b968aeade0f0d4c7ca427a9b4d705cb50521bff9653504eaf1fcccda56b SHA512 f4c038d7923733fb76be53aeff671ecd1ce4c10d9ac4031cbe381182384587ee7e946d7d97b0af289753cdc52a3fef67ec56e6653aa5207dc1b3b494d8b787df
-EBUILD process-conduit-1.2.0.1.ebuild 959 BLAKE2B 99ccb8a20d2fc113175b63000d6ae58f75abd187c1738de3c7ed55295ae55564c2121d42c26fb7fbde7c2e14bf017dfcfe24ca7b197628cea3ad9e8121e38ef1 SHA512 5e8330cf2dc97a37f734ea237d20025201da5872246c331db318354b27542e3798564d0655ca42177c5c6cb265b83684d515e2a93ef5bbaf76564f208c501842
-MISC metadata.xml 495 BLAKE2B 30bee57f6a0ecfc70313769c6523a11f69a24150382c6887bd32cf1731ce31a181abd16dbed045ac3699535149c938c69ed9c0f784fa84820bd365fac4de57da SHA512 fe8762abe81705e982768ecd21e61c1ab2849528d9e75e26cc4c8f92b2a56724cdfb7c90e5895f87a6376dc5b8f5d4621b9ae4f908b5507dc36930c06310c37a
diff --git a/dev-haskell/process-conduit/files/process-conduit-1.1.0.0-conduit-1.1.patch b/dev-haskell/process-conduit/files/process-conduit-1.1.0.0-conduit-1.1.patch
deleted file mode 100644
index e829cc58de0f..000000000000
--- a/dev-haskell/process-conduit/files/process-conduit-1.1.0.0-conduit-1.1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- process-conduit-1.1.0.0-orig/process-conduit.cabal	2014-04-03 18:54:59.000000000 +1100
-+++ process-conduit-1.1.0.0/process-conduit.cabal	2014-07-02 09:45:32.738952743 +1000
-@@ -34,6 +34,7 @@
-                      , text             >= 0.11
-                      , process          >= 1.0
-                      , conduit          >= 1.1
-+                     , conduit-extra    >= 1.1
-                      , resourcet        >= 1.1
-                      , shakespeare-text >= 1.0
-                      , shakespeare
-@@ -48,4 +49,6 @@
-                      , bytestring
-                      , hspec           >= 1.3
-                      , conduit
-+                     , conduit-extra
-                      , process-conduit
-+                     , resourcet
---- process-conduit-1.1.0.0-orig/test.hs	2014-04-03 18:54:59.000000000 +1100
-+++ process-conduit-1.1.0.0/test.hs	2014-07-02 09:51:31.862391926 +1000
-@@ -7,6 +7,7 @@
- import Data.Conduit
- import qualified Data.Conduit.Binary as CB
- import Test.Hspec
-+import Control.Monad.Trans.Resource (runResourceT)
- 
- main :: IO ()
- main = hspec $ do
diff --git a/dev-haskell/process-conduit/metadata.xml b/dev-haskell/process-conduit/metadata.xml
deleted file mode 100644
index 476cab9249fe..000000000000
--- a/dev-haskell/process-conduit/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Conduits for processes.
-		For more details: &lt;https://github.com/tanakh/process-conduit/blob/master/README.md&gt;
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/process-conduit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/process-conduit/process-conduit-1.1.0.0-r1.ebuild b/dev-haskell/process-conduit/process-conduit-1.1.0.0-r1.ebuild
deleted file mode 100644
index dcce3ca34644..000000000000
--- a/dev-haskell/process-conduit/process-conduit-1.1.0.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit base haskell-cabal
-
-DESCRIPTION="Conduits for processes"
-HOMEPAGE="https://github.com/tanakh/process-conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PATCHES=("${FILESDIR}/${PN}-1.1.0.0-conduit-1.1.patch")
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/control-monad-loop-0.1:=[profile?] <dev-haskell/control-monad-loop-0.2:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	>=dev-haskell/shakespeare-text-1.0:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( >=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/process-conduit/process-conduit-1.2.0.1.ebuild b/dev-haskell/process-conduit/process-conduit-1.2.0.1.ebuild
deleted file mode 100644
index 1a9954e6c427..000000000000
--- a/dev-haskell/process-conduit/process-conduit-1.2.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conduits for processes (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/process-conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/control-monad-loop-0.1:=[profile?] <dev-haskell/control-monad-loop-0.2:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	>=dev-haskell/shakespeare-text-1.0:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/conduit-extra
-		>=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/process-extras-0.3.3.6 b/dev-haskell/process-extras-0.3.3.6
new file mode 100644
index 000000000000..62674870796d
--- /dev/null
+++ b/dev-haskell/process-extras-0.3.3.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/listlike-4:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Process extras
+EAPI=5
+HOMEPAGE=https://github.com/seereason/process-extras
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/listlike-4:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.3.6
+SRC_URI=mirror://hackage/packages/archive/process-extras/0.3.3.6/process-extras-0.3.3.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7fb0bed11c89db40c52bc633113e283b
diff --git a/dev-haskell/process-extras/Manifest b/dev-haskell/process-extras/Manifest
deleted file mode 100644
index 6fb36b990f00..000000000000
--- a/dev-haskell/process-extras/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST process-extras-0.3.3.6.tar.gz 6282 BLAKE2B c68906f0ac7c873aa429cecba88505ee55150ef5b39a25a355ddabfac01ccb1072ea737a60ac2523300557b2e10811006cfe4ceb5273e5c7e8c4afb66f4b5317 SHA512 ea275a800da874c40f7dd184281908aa713c2085b528eef9384660f863bf01e7b56c6840a1ae9a06662f90979288172f09b39fb9453049d115f70fd2b4ecf510
-EBUILD process-extras-0.3.3.6.ebuild 597 BLAKE2B 3acb2746a5a4084dc68a5c23c0e04628c2abc4b1165ea3da2d0a2e39ae75d7d2815665cd9e62b7cf57f6d244ff19358ff68d79c4bad5dea69fd30c3593fcd220 SHA512 fb0c13b8b6ed1eafde92d1a4b1031982d871db8db5e9885dddcdd7e73fb8d806cb9ce582259111ca981edb8280996f3e8068c81e8779938670e3153a77e72538
-MISC metadata.xml 477 BLAKE2B c49fc35d518e24c040e7184e7e0c6054a2a7d3abcfd8eeb08e406b39b7d0d0f4c7f9ba73abab85c55f24d751e044b88b3acfd7e887dc0869a11d6abe2c690488 SHA512 2bb853b59d44ce9ab3d6e51ba60dd6e4bd8835512cb3dde9b2a4851f5cd9fb8c1136a90dd346b3d71b093e19354db7efafc8f45a5e018527c8985556ee210d05
diff --git a/dev-haskell/process-extras/metadata.xml b/dev-haskell/process-extras/metadata.xml
deleted file mode 100644
index 4b81f84c00dc..000000000000
--- a/dev-haskell/process-extras/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Extra functionality for the Process library
-		&lt;http://hackage.haskell.org/package/process&gt;.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">seereason/process-extras</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/process-extras/process-extras-0.3.3.6.ebuild b/dev-haskell/process-extras/process-extras-0.3.3.6.ebuild
deleted file mode 100644
index 4fb7a6ad9605..000000000000
--- a/dev-haskell/process-extras/process-extras-0.3.3.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Process extras"
-HOMEPAGE="https://github.com/seereason/process-extras"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/listlike-4:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/profunctor-extras-3.3.3.1 b/dev-haskell/profunctor-extras-3.3.3.1
new file mode 100644
index 000000000000..4fa55c1fc7bf
--- /dev/null
+++ b/dev-haskell/profunctor-extras-3.3.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-3:=[profile?] >=dev-haskell/profunctors-3.2:=[profile?] >=dev-haskell/semigroupoid-extras-3:=[profile?] >=dev-haskell/semigroupoids-3:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[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=Profunctor extras
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/profunctor-extras/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/comonad-3:=[profile?] >=dev-haskell/profunctors-3.2:=[profile?] >=dev-haskell/semigroupoid-extras-3:=[profile?] >=dev-haskell/semigroupoids-3:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/3.3.3.1
+SRC_URI=mirror://hackage/packages/archive/profunctor-extras/3.3.3.1/profunctor-extras-3.3.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0c4574b15c0bd61855c95e8d57c910ef
diff --git a/dev-haskell/profunctor-extras-4.0 b/dev-haskell/profunctor-extras-4.0
new file mode 100644
index 000000000000..8ddfac28be22
--- /dev/null
+++ b/dev-haskell/profunctor-extras-4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/profunctors-4:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3
+DESCRIPTION=This package has been absorbed into profunctors 4.0
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/profunctor-extras/
+IUSE=profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/profunctors-4:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/4.0
+SRC_URI=mirror://hackage/packages/archive/profunctor-extras/4.0/profunctor-extras-4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ae562c973984da22079b759fe6186791
diff --git a/dev-haskell/profunctor-extras/Manifest b/dev-haskell/profunctor-extras/Manifest
deleted file mode 100644
index 498758174308..000000000000
--- a/dev-haskell/profunctor-extras/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST profunctor-extras-3.3.3.1.tar.gz 6493 BLAKE2B e0cedc49c90f91b0dd9f1d44a75824c83e0b4ee8d055cba9bb132c3e4cbfde02a7a850323db3386b883fa299d874c58a2500099dc0dcf51f51f6318025be8896 SHA512 78dc345cf1c7be7846d9c39775c6f0e71251a447461180e54239f406f8583524cf034139e57ca3d9054461c103432220c50f7c2f21403b4f5e3f4878b55788d8
-DIST profunctor-extras-4.0.tar.gz 2588 BLAKE2B 1bee159f740c3e49797756a54ed5e14053d43458316f19e9f9f0e6882f2f07766b6d5aad915f096a8bfc6d1b08269cd349cf5f56a31c1ba8a1f28f9ea9c59857 SHA512 0bf2000b18ccc5d85be28d48199f1e64c6fc8813b0e08b9e1c7bab756ebfe432c3e3c1e2ae87da81e54b1dac183776348a80f089f595ff318f9447d75ff7e358
-EBUILD profunctor-extras-3.3.3.1.ebuild 839 BLAKE2B 1c394518aef85ba0a6c7c45d0339a959da3f70ad2c64cc0620df3160da447c52590c47d4d8245e9c1553c82fcd2eb3dd1a97f1575ffc506ca22098126350204e SHA512 3b58699dea171ad2d4b125aac32e64094190b4fde914f78e722229651c3f99b7ff2c4d7dc476cd9dd77faa407b96073dee4f29eca3a3dd2d86e7857f83ee058b
-EBUILD profunctor-extras-4.0.ebuild 589 BLAKE2B b98e6447fe166dc2fec44a371a47e4251c5944f3a5f307a162cb9872f7a4f0ce46bed47072540c3413fff0c5d862a0615cf03b0992eabcefe18ed086d3e6a9c2 SHA512 b65d2d3de25d46eb8c35e80aa980825b2b465f5be1068d3a6308da6f8212a9bbd95b9394e407b72d63fc9aa4f75989397c295990c42310fd0842b1d39dec9b5d
-MISC metadata.xml 529 BLAKE2B 0e2acdc63a6c88321a75a8ca4bcb47f81f0f7fd3bb04703cdbbc3130eb737f5065854e99194f0173af933daa3a53255360455326927429e4f9f5e176c79c8189 SHA512 85e73e5bfec8223f99ce58263d423d1675dbd893e1bcd8b448094be163376881a3fd63dd842f0a6ab9f4a381e365adeab4987ad1af3337d965fc93cb3b0638b0
diff --git a/dev-haskell/profunctor-extras/metadata.xml b/dev-haskell/profunctor-extras/metadata.xml
deleted file mode 100644
index 41640f988c20..000000000000
--- a/dev-haskell/profunctor-extras/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides a number of utilities and constructions that arise
-		when working with profunctors that require minor extensions to Haskell 98.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/profunctor-extras</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/profunctor-extras/profunctor-extras-3.3.3.1.ebuild b/dev-haskell/profunctor-extras/profunctor-extras-3.3.3.1.ebuild
deleted file mode 100644
index 4268355d00f7..000000000000
--- a/dev-haskell/profunctor-extras/profunctor-extras-3.3.3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Profunctor extras"
-HOMEPAGE="https://github.com/ekmett/profunctor-extras/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3:=[profile?]
-		>=dev-haskell/profunctors-3.2:=[profile?]
-		>=dev-haskell/semigroupoid-extras-3:=[profile?]
-		>=dev-haskell/semigroupoids-3:=[profile?]
-		>=dev-haskell/tagged-0.4.4:=[profile?]
-		>=dev-haskell/transformers-0.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/profunctor-extras/profunctor-extras-4.0.ebuild b/dev-haskell/profunctor-extras/profunctor-extras-4.0.ebuild
deleted file mode 100644
index d04fc221fbb3..000000000000
--- a/dev-haskell/profunctor-extras/profunctor-extras-4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="This package has been absorbed into profunctors 4.0"
-HOMEPAGE="https://github.com/ekmett/profunctor-extras/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/profunctors-4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/profunctors-3.3.0.1 b/dev-haskell/profunctors-3.3.0.1
new file mode 100644
index 000000000000..f84eb21b6c88
--- /dev/null
+++ b/dev-haskell/profunctors-3.3.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND==dev-haskell/comonad-3*:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[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=Haskell 98 Profunctors
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/profunctors/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND==dev-haskell/comonad-3*:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/3.3.0.1
+SRC_URI=mirror://hackage/packages/archive/profunctors/3.3.0.1/profunctors-3.3.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4c50586b6a01dc0ae4fcaaecc6014d0a
diff --git a/dev-haskell/profunctors-4.0.4 b/dev-haskell/profunctors-4.0.4
new file mode 100644
index 000000000000..90dcbd38f58c
--- /dev/null
+++ b/dev-haskell/profunctors-4.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell 98 Profunctors
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/profunctors/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/4.0.4
+SRC_URI=mirror://hackage/packages/archive/profunctors/4.0.4/profunctors-4.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3cc8c0af3f24ed9e8a017961d109b821
diff --git a/dev-haskell/profunctors-4.3.2 b/dev-haskell/profunctors-4.3.2
new file mode 100644
index 000000000000..e4669ed39418
--- /dev/null
+++ b/dev-haskell/profunctors-4.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell 98 Profunctors
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/profunctors/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/4.3.2
+SRC_URI=mirror://hackage/packages/archive/profunctors/4.3.2/profunctors-4.3.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0581b8de4bcba85ff2cfa655f112a0fd
diff --git a/dev-haskell/profunctors-4.4.1 b/dev-haskell/profunctors-4.4.1
new file mode 100644
index 000000000000..5fb45b1f8808
--- /dev/null
+++ b/dev-haskell/profunctors-4.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell 98 Profunctors
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/profunctors/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/4.4.1
+SRC_URI=mirror://hackage/packages/archive/profunctors/4.4.1/profunctors-4.4.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dbc52c424acdcc5568005c5226ae475b
diff --git a/dev-haskell/profunctors-5.1.2 b/dev-haskell/profunctors-5.1.2
new file mode 100644
index 000000000000..f8212d6fdf0b
--- /dev/null
+++ b/dev-haskell/profunctors-5.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell 98 Profunctors
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/profunctors/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/5.1.2
+SRC_URI=mirror://hackage/packages/archive/profunctors/5.1.2/profunctors-5.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=caabf5053ea5c6ea3fbe2c9cbecb11a9
diff --git a/dev-haskell/profunctors-5.2 b/dev-haskell/profunctors-5.2
new file mode 100644
index 000000000000..e0c7b90d7ae9
--- /dev/null
+++ b/dev-haskell/profunctors-5.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-orphans-0.4:=[profile?] <dev-haskell/base-orphans-0.6:=[profile?] >=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell 98 Profunctors
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/profunctors/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-orphans-0.4:=[profile?] <dev-haskell/base-orphans-0.6:=[profile?] >=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/5.2
+SRC_URI=mirror://hackage/packages/archive/profunctors/5.2/profunctors-5.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=215a8ec6546c831ffe17dcdf847e5aba
diff --git a/dev-haskell/profunctors/Manifest b/dev-haskell/profunctors/Manifest
deleted file mode 100644
index 104badde021a..000000000000
--- a/dev-haskell/profunctors/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-DIST profunctors-3.3.0.1.tar.gz 6480 BLAKE2B 11589d6b9368d571d10f82c366829dd36012dc0cc738db20d4658c978416b94b937a0a9b11a6971dbb5c1db298de7ba7dd9e61eee3954c5541b6f451796fb970 SHA512 113d96a635e0644dd097bace3a5b2e58892a8fe47fbe614f3178ffa554486f177b4c512ad2301a75d0651156b976e43d545a596bc2a9b1763b1ef96f270bbeff
-DIST profunctors-4.0.4.tar.gz 10516 BLAKE2B 8aa3cbdc5b30eeb933a7197539c7f0d959156c300198cd2d1fe65107d79c9118d21515afcf753e7e86520509583a59b6676910de14713cac742d58806dcf2a62 SHA512 c282052ca8d59a99303c0ac4b55c3634cb496bb70738699d179d35683d8fab1a7d60e6027221ca534b946d23424b932c7a6280247b09d79d34da8f6465ed86e3
-DIST profunctors-4.3.2.tar.gz 15816 BLAKE2B e898cf6ef1814755bfad4e89b38df1b5692b3da0dd0966a9aa7a584b7515a6f1ec06fc3d290c8766aa7b673c68576c115e0453ed3cf99b1e6b008c93d650655d SHA512 42fbed0bbe39adfb1092d92559c79224d950ddec03acb2400686d0aee5a2ddd1a978c379202435afce5e9e124bc769a0baa407d4e77e4bea82f5694aa8559e27
-DIST profunctors-4.4.1.tar.gz 16997 BLAKE2B 576fcc51a5d06369e4a6eb546b0762acc043f21112cc742fbf15c1b17c2a5de8de91f673024db95912da45bef1ed6d25df9dca8998735e2d9b16fccf1f3726c7 SHA512 66c6a81e2109f7c2f755063b06f54444bd932c679c701880c0ec1a8ee8a50c63b4bab67f7341af745c0a77e362ff74de9da8116e2641d5f99dd59250657b7f50
-DIST profunctors-5.1.2.tar.gz 18845 BLAKE2B 7495e7897dfa191dec2c1b62381f4488c37222d4e989f99a6f69e41ee8852dee6161a0df1f959637b6fa1e3c5434629c87c809b904b69d74065163220df4069d SHA512 420c3c7beeb17ec42354fd805045bbcd26d406cf4b37a5f70f1f2fd5185f309b97138008959b5a028ff79144562316221c1605917a1d784315d618c1d61b37a2
-DIST profunctors-5.2.tar.gz 23236 BLAKE2B f81d0a08c8172cae7566710dd33d183dbbe92eec5a8589c649315c3103c82c97099d5c23a0eebcaecc39fb487d73aa453bc426a054ff875e4749782933ce8e12 SHA512 e158bfdc681913c131daa766138474654b56ec8e58944995b614ebeb11460458ae8409cfaf9a7398beb759e0f88b2e5139f9a53deffd3592bed859faa5b695fa
-EBUILD profunctors-3.3.0.1.ebuild 647 BLAKE2B 2108a43c558f05d2f8b23a5bd56949282413024a71e5d8feb0ceed9271c46c323dde2fa362e4312ca7385bb030553e2cbb1dd38cc6618be7730df2c302edd4c5 SHA512 a23352b1109dca25072cf97ae1841ffcf9e00d54557b5527082b365765c525c72761c1a2e65f667756c65b0e1fb7ed2aaed05396431a1145526bea698f13bb10
-EBUILD profunctors-4.0.4.ebuild 850 BLAKE2B de20144b1b4017e7f410483a19552815db8da93e029dc59c6dbdf965be3f85d42e43a53554e452c472520a8302788402e94002a22d7f55fd882839ac23ac855f SHA512 8d14e7f941865cc6bf2085384837c49706ef8231ddca0ef053b5c26ff0aa634426cb7f343f6d5d0c39c0724dcf64814d241d6279b45cc9a43915418cd0e238dd
-EBUILD profunctors-4.3.2.ebuild 935 BLAKE2B bf95ba7ca0ee8837d8e91e3cbe695fb24d22b49b19604c19e6e41639b00589ccf858642f6f112302162bfde04b1ad92ae1643407d771296236fa21a8554e171a SHA512 138d43aaf5fb9b80d8a97faf8abdb0a901f4e73c711f1e106bfef1e3c837d68c5e1deaca6e2d2cda2a8e7769adf871b15064552f80bc67bcc3ebea344c63f325
-EBUILD profunctors-4.4.1.ebuild 933 BLAKE2B 95c5e776f856a10a352bbdd1b4cc762b5bb3775e861aac0311a2c628bcdc9e50f3f7499cf18f86c06c35da7bd39818d99a77401b8a6de26f21a1e5b291ecda88 SHA512 3b8142d7c02c37046e54af4c5a4a686da4e1ff1b3bb670577b3b4932174c6ee4101afae17eade1b3f410e0679bb6bc81bc5577d1e28034505e0900a3584ca682
-EBUILD profunctors-5.1.2.ebuild 1011 BLAKE2B 832d1a29625a56d7df842e1f788836cd7ed0246526aac9bb9e872ea96c03f7f8cd9f9aee856f0a8c78488dcb1f6b55e6127f5e26e1c40127910973a90d44238d SHA512 2762c635753360aa633aff8fded4eec745f1dbe5ad78f1f7a27c69658e488008307484ebe0d46df4e1a312a363290bccb9cce1c623125554ac3a2146271e0e6d
-EBUILD profunctors-5.2.ebuild 1099 BLAKE2B 2b1005740d841d2176ea85f6cbd8a028696a8db8388607dd7ca9653b39e0ed54f388e4f375af074655f7da21748e1f3ace31d6b48ed32e5054b9c770136734ff SHA512 c61556ea0d460948b5770aac419090af0914a9354188a227d07e8528dca73c498af3c65bd1fd447d934aebfd5520350c6224914abe5d876af6015b4aa4ae170b
-MISC metadata.xml 396 BLAKE2B 59cd2345f6fa525365975734826b7134123743d4ccf9495f12c7b6de3acbcfa4f8859430393fe732ca877d6eb305549becc7644f22e82f027a3b94c7a7a79871 SHA512 cea3941e4e5bd88ad72b8edafc079775c13321105c63fd9bb2da44e3e660915f792513d958d021bc8f51572f076348a593a3d5ef17d59ce180fb30a2e1415458
diff --git a/dev-haskell/profunctors/metadata.xml b/dev-haskell/profunctors/metadata.xml
deleted file mode 100644
index 1bdbce48abbb..000000000000
--- a/dev-haskell/profunctors/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haskell 98 Profunctors
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/profunctors</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/profunctors/profunctors-3.3.0.1.ebuild b/dev-haskell/profunctors/profunctors-3.3.0.1.ebuild
deleted file mode 100644
index 64db968e489c..000000000000
--- a/dev-haskell/profunctors/profunctors-3.3.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 Profunctors"
-HOMEPAGE="https://github.com/ekmett/profunctors/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/comonad-3*:=[profile?]
-		>=dev-haskell/tagged-0.4.4:=[profile?]
-		<dev-haskell/tagged-1:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/profunctors/profunctors-4.0.4.ebuild b/dev-haskell/profunctors/profunctors-4.0.4.ebuild
deleted file mode 100644
index 1de24ff2411f..000000000000
--- a/dev-haskell/profunctors/profunctors-4.0.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 Profunctors"
-HOMEPAGE="https://github.com/ekmett/profunctors/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/profunctors/profunctors-4.3.2.ebuild b/dev-haskell/profunctors/profunctors-4.3.2.ebuild
deleted file mode 100644
index 7edb586ae191..000000000000
--- a/dev-haskell/profunctors/profunctors-4.3.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 Profunctors"
-HOMEPAGE="https://github.com/ekmett/profunctors/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/profunctors/profunctors-4.4.1.ebuild b/dev-haskell/profunctors/profunctors-4.4.1.ebuild
deleted file mode 100644
index 6b785e9654cb..000000000000
--- a/dev-haskell/profunctors/profunctors-4.4.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 Profunctors"
-HOMEPAGE="https://github.com/ekmett/profunctors/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/profunctors/profunctors-5.1.2.ebuild b/dev-haskell/profunctors/profunctors-5.1.2.ebuild
deleted file mode 100644
index 7abfa7beea16..000000000000
--- a/dev-haskell/profunctors/profunctors-5.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 Profunctors"
-HOMEPAGE="https://github.com/ekmett/profunctors/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/profunctors/profunctors-5.2.ebuild b/dev-haskell/profunctors/profunctors-5.2.ebuild
deleted file mode 100644
index 2ddf9615f506..000000000000
--- a/dev-haskell/profunctors/profunctors-5.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 Profunctors"
-HOMEPAGE="https://github.com/ekmett/profunctors/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-orphans-0.4:=[profile?] <dev-haskell/base-orphans-0.6:=[profile?]
-	>=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/project-template-0.2.0 b/dev-haskell/project-template-0.2.0
new file mode 100644
index 000000000000..e37af3d0c76a
--- /dev/null
+++ b/dev-haskell/project-template-0.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/resourcet-0.4.3:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Specify Haskell project templates and generate files
+EAPI=5
+HOMEPAGE=https://github.com/fpco/haskell-ide
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/resourcet-0.4.3:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.0
+SRC_URI=mirror://hackage/packages/archive/project-template/0.2.0/project-template-0.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=653579bee3043135e9736b1ade1390ea
diff --git a/dev-haskell/project-template/Manifest b/dev-haskell/project-template/Manifest
deleted file mode 100644
index 9f3c2b2e2b43..000000000000
--- a/dev-haskell/project-template/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST project-template-0.2.0.tar.gz 8251 BLAKE2B d8f15dbb5ffb221dbcfff8152ecbba1701cca7c70a4e5c1c62a4603de15ea028b78035d8b0a97550aed6a4eba0fe8f213b0fe3d957cb259da79f73dbb90d3dfa SHA512 923c0d9e5cac14c05474adc743cfb8030ed8e08e69c4eb35b77c2cb1c64b44f10058693d1a5880ba983040ea9dbf1f28f815cd274a75de302f3afdb928210cad
-EBUILD project-template-0.2.0.ebuild 947 BLAKE2B 5640df1ad2c10ef0956737f1fab20a0b718734b8b13d75160691b4be648ace6a44dc4c3695edff3fca49559e7c49f73e1e1224e49ad22a8865f547f8cb69b4cc SHA512 ef33955e13e174f60d6412e2aae7e67a453e0d656b3b6953ba5bb5c77327ee51d3e1805518fc065deedf25d737efcdc6ec989eea48f60e9ca739706ba43553e3
-MISC metadata.xml 473 BLAKE2B 44833b539388eff5933fd11cfbd44e13e8ab4e2467db43abd30f3dd1ad1321d138fefa5f8159addae0055549dc2b9079246291c8d4e2d1376f578e65d660fecd SHA512 01ad6354d405c737c1e54aef0ff5f3d643c2abe73239a0e3663c7d23d31bbf3cc8f187c98a77393ad13df105e344af384bce6e33570e7a4d60aa2f7e1b307de0
diff --git a/dev-haskell/project-template/metadata.xml b/dev-haskell/project-template/metadata.xml
deleted file mode 100644
index 7d1ebfc1027f..000000000000
--- a/dev-haskell/project-template/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		See initial blog post for explanation: &lt;http://www.yesodweb.com/blog/2012/09/project-templates&gt;
-	</longdescription>
-	<upstream>
-		<remote-id type="github">fpco/haskell-ide</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/project-template/project-template-0.2.0.ebuild b/dev-haskell/project-template/project-template-0.2.0.ebuild
deleted file mode 100644
index eb5556792443..000000000000
--- a/dev-haskell/project-template/project-template-0.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Specify Haskell project templates and generate files"
-HOMEPAGE="https://github.com/fpco/haskell-ide"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?]
-	>=dev-haskell/resourcet-0.4.3:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/psqueue-1.1-r1 b/dev-haskell/psqueue-1.1-r1
new file mode 100644
index 000000000000..f85b35363277
--- /dev/null
+++ b/dev-haskell/psqueue-1.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Priority Search Queue
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/PSQueue
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1
+SRC_URI=mirror://hackage/packages/archive/PSQueue/1.1/PSQueue-1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=74b363eb36562c24bf026fb51aba3081
diff --git a/dev-haskell/psqueue/Manifest b/dev-haskell/psqueue/Manifest
deleted file mode 100644
index b2554cb6438c..000000000000
--- a/dev-haskell/psqueue/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PSQueue-1.1.tar.gz 6280 BLAKE2B 5810404fa4cb93814987215b8ab4177540647ddb4e2d8678d53529e2539edb441fcc25cff26e9037ca6fb37c709b9dfd4e34a19d0d716e10270849ea297fda81 SHA512 34fbd599b7fc47aef8952db79c848f4b50716d2d900b1d8274733ad4c7382d41a0407159e89af9828355c618412c626e4384f2e7461396b51cf866d9b8cfdb0d
-EBUILD psqueue-1.1-r1.ebuild 602 BLAKE2B e4017909cd44cff970620247b716313f89215d2625f71ca340e3384111267c74bbc64290e58c19eda5019ed9bd9c22b85ff92b7894409508bb43f3f10327c674 SHA512 9d717926e0219b292654589d29c9ca08403ccb47f4245109403c83f46563ba0da8bd8f8dcf0d2929ecf53a965eaae327302b3f4b803232c8021653e9f529dad1
-MISC metadata.xml 691 BLAKE2B 78baa032bd5a89295ca70ddf36cf475c41f60a265f714814dcb53c066e69eec6ab8f02f5776f26af6c0f96d5419dbe3244027a87ccf1689da7a015fa458a3f47 SHA512 98fedd95dda5a745ff464cff72dde0571a7a2156f8c9cde1124e3789b71059ac117d955d3891a9356cd78ff4cd2b9c5c9712ed7668637612e935062a40735fb9
diff --git a/dev-haskell/psqueue/metadata.xml b/dev-haskell/psqueue/metadata.xml
deleted file mode 100644
index 63915bdba3bc..000000000000
--- a/dev-haskell/psqueue/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A /priority search queue/ efficiently supports the
-		opperations of both a search tree and a priority queue. A
-		'Binding' is a product of a key and a priority.  Bindings
-		can be inserted, deleted, modified and queried in
-		logarithmic time, and the binding with the least priority
-		can be retrieved in constant time.  A queue can be built
-		from a list of bindings, sorted by keys, in linear time.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/psqueue/psqueue-1.1-r1.ebuild b/dev-haskell/psqueue/psqueue-1.1-r1.ebuild
deleted file mode 100644
index b71627525966..000000000000
--- a/dev-haskell/psqueue/psqueue-1.1-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="PSQueue"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Priority Search Queue"
-HOMEPAGE="http://hackage.haskell.org/package/PSQueue"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/psqueues-0.2.0.3 b/dev-haskell/psqueues-0.2.0.3
new file mode 100644
index 000000000000..6d0304607567
--- /dev/null
+++ b/dev-haskell/psqueues-0.2.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9 dev-haskell/tagged >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pure priority search queues
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/psqueues
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.0.3
+SRC_URI=mirror://hackage/packages/archive/psqueues/0.2.0.3/psqueues-0.2.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8f5aab730b4623c9f69fd4f3f771f3be
diff --git a/dev-haskell/psqueues-0.2.2.1 b/dev-haskell/psqueues-0.2.2.1
new file mode 100644
index 000000000000..27f7e9a1cc15
--- /dev/null
+++ b/dev-haskell/psqueues-0.2.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9 dev-haskell/tagged >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pure priority search queues
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/psqueues
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.2.1
+SRC_URI=mirror://hackage/packages/archive/psqueues/0.2.2.1/psqueues-0.2.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=35d0bc19f955e397d036d793c2c79611
diff --git a/dev-haskell/psqueues-0.2.2.2 b/dev-haskell/psqueues-0.2.2.2
new file mode 100644
index 000000000000..03db4c0ce768
--- /dev/null
+++ b/dev-haskell/psqueues-0.2.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.10 dev-haskell/tagged >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pure priority search queues
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/psqueues
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.2.2
+SRC_URI=mirror://hackage/packages/archive/psqueues/0.2.2.2/psqueues-0.2.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5980932b6aaef1ba08f33b8386127acd
diff --git a/dev-haskell/psqueues-0.2.2.3 b/dev-haskell/psqueues-0.2.2.3
new file mode 100644
index 000000000000..826d0a16b4c8
--- /dev/null
+++ b/dev-haskell/psqueues-0.2.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6 >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.10 dev-haskell/tagged >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pure priority search queues
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/psqueues
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.2.3
+SRC_URI=mirror://hackage/packages/archive/psqueues/0.2.2.3/psqueues-0.2.2.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b3d258c2a2b53161496ff2f80c932909
diff --git a/dev-haskell/psqueues/Manifest b/dev-haskell/psqueues/Manifest
deleted file mode 100644
index e3170cbbf7c0..000000000000
--- a/dev-haskell/psqueues/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST psqueues-0.2.0.3.tar.gz 23782 BLAKE2B 4f756e1c394d9e88381f22fa61e27a9ca38054e124022d78a7433af85a8694b77a8a91dd44b9566ec7fcc8c2b47aa51a82dab2808a7c50db2017bea6c67543ad SHA512 2af3fef2786ce61289f806fd483d1995a29f1a7f85eb918ae69e4873450c4b19e8c76f0e6f86f9e6fe7065b9cfb4672f48af2366bc2a537ed42b0e5dacb8a5a0
-DIST psqueues-0.2.2.1.tar.gz 25605 BLAKE2B 3bcece8b6652045ddbdba3a2a0ae78324c1c54d67f39fb63f1915e32878e913c1e86f44959ee8867b1b2c8f5ad588fc6aaf98aac7975e8c032adb36b9e85be86 SHA512 b34ea7301a61760e6487441bf3251ca1f31be88489cf75bbf81049bb74a79e31e9933e1ad5378dc3715e763a1ac4ccd6130e03b877a4ceebcde9f4a3be6fcc8c
-DIST psqueues-0.2.2.2.tar.gz 25622 BLAKE2B 71db99c8fdc93c243f1aacc2fafc1fafa7d8b9192baed25487107f9025e80cb297821c150e5300444d722ed4516e2eef15558da801e1d478f896a899576e71c0 SHA512 0ecaea1fa9e4546f39b3e936422a3fc3c24f3a5f4a5a70c2503038102dc7f7586add40b4efcd3c26e1ded6df6dd368f161664e7ce7790d74da13165c2684582a
-DIST psqueues-0.2.2.3.tar.gz 25624 BLAKE2B 26be1d6c592c1ee41b95a81143253b95143cb2e8ec86344f370ba23be1099ae94d4eede42db65a51b58d92dff0f46f54d8fd9550b3fd5eb1f1aa736231899edb SHA512 7753f5beeccf32841f6be1294f9ddf8627fafddcae5d09784077b41864016247d8fc4bcb901056ea804ecbe3ab93a15d9de221e5623aeafd9107edc2b402121b
-EBUILD psqueues-0.2.0.3.ebuild 1008 BLAKE2B b9d2bb0a3eb0e1fb826b53ce187a6ba1885898c1a7422944a86cfd400b5b7af261e4c1fc52550b5199c66ca7139266f5dc591d6c9a9ce0f7718d0b4b75b661bf SHA512 ebafcfce7ce9a37bcb41b9e82674a9d9fa2cba5954c850ea6fdd438d7b021948c421017a6583acc25704ce09d0f175f6cd02e4aeb69ab510846d4a0982469b23
-EBUILD psqueues-0.2.2.1.ebuild 1008 BLAKE2B 9f3c8883f1e990fb395d893d0a5d4ee1fc2e96eff6f669c549d278eb85ad4be81d7e106b61bc0616189e4bbf7a92d92ea848b1770f3738f35c755b522d453114 SHA512 7201de6d4128d4bac6bd665b7f56d7a0cfc27f7ff749e7777aad9fc5369f3f1e0b37f774a54bda6c0166401753a6482f7e55e6adb7cad2fe1b0031010243e391
-EBUILD psqueues-0.2.2.2.ebuild 1007 BLAKE2B c3e141dc612f0807e648e98deb53783b9a48e4a3957fa7b7b424bf8e0eef294aa2f374379300db9ccd640d3789dde58be9a0a252944700ba0263b1f8830666f5 SHA512 bd6710f18808f77aff86d61b7c05ceee8a29056b1599c357051bc0c0774e4615b25ec8a7743f3347b0a7bd4ceb340a4636146ae89bb9f120fc9b065fa3bbd498
-EBUILD psqueues-0.2.2.3.ebuild 1009 BLAKE2B cfddbb094d61fffbe11dbe26c5743b0131aa42349e6b3297c40f051e9cfa7026b51da51f8ae899766bd9b7abf0312e75d48a12466d8d3a5cd8d9ca18bd659780 SHA512 35f7dbab9286175c5984da3ecaa2be75d8f20027463226a3d15ed673da5455b25b9b6a08a14dcd7369b5394e9ffdcb6d5d16f752ef2faed7af81466eeead8c23
-MISC metadata.xml 2189 BLAKE2B c4e3a8a4a791e9cff160cccefd6332348afcc9faae5c08dde60d07a3fe34952769a9999f091eff52e50d1581ee3df4d50b30855c1bad7b472490e37d9581f7aa SHA512 ba3919a870ed42a1a440995a6337247f6c984d67f3065371eb72c6301a1e316b39fda29cef5814628e54921a849bbc27033ddf7c2f3fc1bd7d3750da993ed94e
diff --git a/dev-haskell/psqueues/metadata.xml b/dev-haskell/psqueues/metadata.xml
deleted file mode 100644
index 4860915e4a9d..000000000000
--- a/dev-haskell/psqueues/metadata.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The psqueues package provides
-		&lt;https://en.wikipedia.org/wiki/Priority_queue Priority Search Queues&gt; in
-		three different flavors.
-		
-		* @OrdPSQ k p v@, which uses the @Ord k@ instance to provide fast insertion,
-		deletion and lookup. This implementation is based on Ralf Hinze's
-		&lt;http://citeseer.ist.psu.edu/hinze01simple.html A Simple Implementation Technique for Priority Search Queues&gt;.
-		Hence, it is similar to the
-		&lt;http://hackage.haskell.org/package/PSQueue PSQueue&gt; library, although it is
-		considerably faster and provides a slightly different API.
-		
-		* @IntPSQ p v@ is a far more efficient implementation. It fixes the key type
-		to @Int@ and uses a &lt;https://en.wikipedia.org/wiki/Radix_tree radix tree&gt;
-		(like @IntMap@) with an additional min-heap property.
-		
-		* @HashPSQ k p v@ is a fairly straightforward extension of @IntPSQ@: it
-		simply uses the keys' hashes as indices in the @IntPSQ@. If there are any
-		hash collisions, it uses an @OrdPSQ@ to resolve those. The performance of
-		this implementation is comparable to that of @IntPSQ@, but it is more widely
-		applicable since the keys are not restricted to @Int@, but rather to any
-		@Hashable@ datatype.
-		
-		Each of the three implementations provides the same API, so they can be used
-		interchangeably. The benchmarks show how they perform relative to one
-		another, and also compared to the other Priority Search Queue
-		implementations on Hackage:
-		&lt;http://hackage.haskell.org/package/PSQueue PSQueue&gt;
-		and
-		&lt;http://hackage.haskell.org/package/fingertree-psqueue fingertree-psqueue&gt;.
-		
-		&lt;&lt;http://i.imgur.com/KmbDKR6.png&gt;&gt;
-		
-		&lt;&lt;http://i.imgur.com/ClT181D.png&gt;&gt;
-		
-		Typical applications of Priority Search Queues include:
-		
-		* Caches, and more specifically LRU Caches;
-		
-		* Schedulers;
-		
-		* Pathfinding algorithms, such as Dijkstra's and A*.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/psqueues/psqueues-0.2.0.3.ebuild b/dev-haskell/psqueues/psqueues-0.2.0.3.ebuild
deleted file mode 100644
index 619a89d54263..000000000000
--- a/dev-haskell/psqueues/psqueues-0.2.0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure priority search queues"
-HOMEPAGE="http://hackage.haskell.org/package/psqueues"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9
-		dev-haskell/tagged
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/psqueues/psqueues-0.2.2.1.ebuild b/dev-haskell/psqueues/psqueues-0.2.2.1.ebuild
deleted file mode 100644
index 2cee5b95e57c..000000000000
--- a/dev-haskell/psqueues/psqueues-0.2.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure priority search queues"
-HOMEPAGE="http://hackage.haskell.org/package/psqueues"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9
-		dev-haskell/tagged
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/psqueues/psqueues-0.2.2.2.ebuild b/dev-haskell/psqueues/psqueues-0.2.2.2.ebuild
deleted file mode 100644
index abb5f755813a..000000000000
--- a/dev-haskell/psqueues/psqueues-0.2.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure priority search queues"
-HOMEPAGE="http://hackage.haskell.org/package/psqueues"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.10
-		dev-haskell/tagged
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/psqueues/psqueues-0.2.2.3.ebuild b/dev-haskell/psqueues/psqueues-0.2.2.3.ebuild
deleted file mode 100644
index b38a9f511c30..000000000000
--- a/dev-haskell/psqueues/psqueues-0.2.2.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure priority search queues"
-HOMEPAGE="http://hackage.haskell.org/package/psqueues"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6
-		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.10
-		dev-haskell/tagged
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/publicsuffixlist-0.1 b/dev-haskell/publicsuffixlist-0.1
new file mode 100644
index 000000000000..6f7081c2a28a
--- /dev/null
+++ b/dev-haskell/publicsuffixlist-0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/cereal:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= create? ( >=dev-haskell/conduit-1.0.0:=[profile?] <dev-haskell/conduit-2.0.0:=[profile?] >=dev-haskell/idna-0.1.2:=[profile?] <dev-haskell/idna-1.0:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit !create? ( >=dev-haskell/idna-0.1.1 <dev-haskell/idna-1.0 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Is a given string a domain suffix?
+EAPI=5
+HOMEPAGE=https://hackage.haskell.org/package/publicsuffixlist
+IUSE=create runtimelist doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/cereal:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= create? ( >=dev-haskell/conduit-1.0.0:=[profile?] <dev-haskell/conduit-2.0.0:=[profile?] >=dev-haskell/idna-0.1.2:=[profile?] <dev-haskell/idna-1.0:=[profile?] )
+SLOT=0/0.1
+SRC_URI=mirror://hackage/packages/archive/publicsuffixlist/0.1/publicsuffixlist-0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=66dc663ff746809c35eb442788e9b4b9
diff --git a/dev-haskell/publicsuffixlist/Manifest b/dev-haskell/publicsuffixlist/Manifest
deleted file mode 100644
index 4db0183c7d79..000000000000
--- a/dev-haskell/publicsuffixlist/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST publicsuffixlist-0.1.tar.gz 72704 BLAKE2B e8cf5ec65eccc7a7b335d753057a3ccd877691cd760cabf6b9fdbea5bb595d2051021799756f93048a9b144cae6f2721370df7d869c7cb38fbf00f3d7b6ed6d3 SHA512 ca9035f33eaeb222684574e3be2dfb25d60fb840cf5e7684d816cbf696f90782e86caaf7d39b826e00b444739624432a0c02b23890a17864c416afb2bbcd7dc3
-EBUILD publicsuffixlist-0.1.ebuild 1110 BLAKE2B 26817229d1ea88a06a2858d871029c42ea82880aecfdb308a5dc6e90bf1e1a57c0d519e8034f7ac5511792fb87a0680b9e0f11d8edc593c1e64b5ad8e6084d4c SHA512 e9df2cf313f6df7046e5132e306bf91611a3922faebd161c3ba85831783c66a36de54a58cacf938e2fffcbb1fa6892aa54ea33e40fcf6a33a013f098828bc910
-MISC metadata.xml 616 BLAKE2B 5e486036cab3764ea11c7c8f1f866fa0ed13d6653f03cfd2410bea0c9aea9242bc707073566e289700f2e9f86f3c4e32acf7fc44f8fe553184b1d0f739734587 SHA512 dda2d7217b70cab89caf29508ca4e56ff09f34637472fc326eef046be77a04391fdeb8b48500083bbf00c86f3225045f6d167a81fd3f05402f43b068feaec918
diff --git a/dev-haskell/publicsuffixlist/metadata.xml b/dev-haskell/publicsuffixlist/metadata.xml
deleted file mode 100644
index f774b8c7dfc7..000000000000
--- a/dev-haskell/publicsuffixlist/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Is a given string a domain suffix?
-	</longdescription>
-	<use>
-		<flag name="create">export Network.PublicSuffixList.Create module</flag>
-		<flag name="runtimelist">read suffix list from dist at startup instead of embedding list into library</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">litherum/publicsuffixlist</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/publicsuffixlist/publicsuffixlist-0.1.ebuild b/dev-haskell/publicsuffixlist/publicsuffixlist-0.1.ebuild
deleted file mode 100644
index f7548d48ed51..000000000000
--- a/dev-haskell/publicsuffixlist/publicsuffixlist-0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Is a given string a domain suffix?"
-HOMEPAGE="https://hackage.haskell.org/package/publicsuffixlist"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="create runtimelist"
-
-RDEPEND="dev-haskell/cereal:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	create? ( >=dev-haskell/conduit-1.0.0:=[profile?] <dev-haskell/conduit-2.0.0:=[profile?]
-			>=dev-haskell/idna-0.1.2:=[profile?] <dev-haskell/idna-1.0:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		!create? ( >=dev-haskell/idna-0.1.1 <dev-haskell/idna-1.0 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag create create) \
-		$(cabal_flag runtimelist runtimelist)
-}
diff --git a/dev-haskell/punycode-2.0 b/dev-haskell/punycode-2.0
new file mode 100644
index 000000000000..fd647b05de70
--- /dev/null
+++ b/dev-haskell/punycode-2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/cereal:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/encoding dev-haskell/hunit dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Encode unicode strings to ascii forms according to RFC 3492
+EAPI=5
+HOMEPAGE=https://github.com/litherum/punycode
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/cereal:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:=
+RESTRICT=test
+SLOT=0/2.0
+SRC_URI=mirror://hackage/packages/archive/punycode/2.0/punycode-2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cd40a560c08853be7b7121f2becb66ae
diff --git a/dev-haskell/punycode/Manifest b/dev-haskell/punycode/Manifest
deleted file mode 100644
index 9871b43d0457..000000000000
--- a/dev-haskell/punycode/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST punycode-2.0.tar.gz 6243 BLAKE2B b6a0b5123ea3dbd8b8c28ea56b4cf7425962011224549ece1c3c2c5b6a951e7e8c76c46f33a548f43ec650a42ef98f373769f623b4094ab6e222f5e2b91ce621 SHA512 106ee29667582f0341b993b8fd888046e70aff02bf9a31fb883488ed0f1fe346ae6dacd60ceacf088c056b50cb99d633322f066be391585af9c37fd8e5e4ff44
-EBUILD punycode-2.0.ebuild 792 BLAKE2B e563db2b1ba1044f35fd7f57a747f4d407d48030a01459b94901177f0ad4bcd6e11ac7e41a08fcf4240a777ff320a474b4ec0dbd8bf8bd933fa77819b9d97842 SHA512 e0da9722ae6ced37aaa46e32ef5dcdead94195561718c30d68975573eaf05383442fd6a71915c1ed6ac503600c80f50f4939fc81c58855c6fb4183cb9e8dc2c5
-MISC metadata.xml 640 BLAKE2B 471d4516143eb307d40d70cc7675bc6021ead59615a2f27dadad6daa7214225dc74ec87d192779bef70f74aa83da849b6a66faa4bb8185dd5935deae8fcaf4e9 SHA512 8b6a12f34e2649b090b1effb5acdf18f600132a879393560d0d99b9f887047efb2804bb36a244da51def9c3e662de5604f1bbe93d896bcc3c0ffb376edaaa149
diff --git a/dev-haskell/punycode/metadata.xml b/dev-haskell/punycode/metadata.xml
deleted file mode 100644
index 73a13817ca69..000000000000
--- a/dev-haskell/punycode/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Encode unicode strings to ascii forms according to RFC 3492. It is written in pure Haskell, as opposed to gnuidn's Data.Text.IDN.Punycode. Please note that Data.Encoding.BootString from the 'encoding' package also contains an implementation of the Punycode algorithm.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">litherum/punycode</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/punycode/punycode-2.0.ebuild b/dev-haskell/punycode/punycode-2.0.ebuild
deleted file mode 100644
index 6c7cdca0629d..000000000000
--- a/dev-haskell/punycode/punycode-2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Encode unicode strings to ascii forms according to RFC 3492"
-HOMEPAGE="https://github.com/litherum/punycode"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RESTRICT=test # runs slow, finds error
-
-RDEPEND="dev-haskell/cereal:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		dev-haskell/text:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/encoding
-			dev-haskell/hunit
-			dev-haskell/quickcheck
-		)"
diff --git a/dev-haskell/puremd5-2.1.2.1 b/dev-haskell/puremd5-2.1.2.1
new file mode 100644
index 000000000000..85161d34d9fb
--- /dev/null
+++ b/dev-haskell/puremd5-2.1.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/binary-0.4.0[profile?] >=dev-haskell/cereal-0.2[profile?] dev-haskell/crypto-api[profile?] dev-haskell/tagged[profile?] >=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Haskell-only implementation of the MD5 digest (hash) algorithm
+EAPI=4
+HOMEPAGE=http://hackage.haskell.org/package/pureMD5
+IUSE=doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/binary-0.4.0[profile?] >=dev-haskell/cereal-0.2[profile?] dev-haskell/crypto-api[profile?] dev-haskell/tagged[profile?] >=dev-lang/ghc-6.10.1
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/pureMD5/2.1.2.1/pureMD5-2.1.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9012f2229fbc2d619d8c08ddc0a81317
diff --git a/dev-haskell/puremd5-2.1.3 b/dev-haskell/puremd5-2.1.3
new file mode 100644
index 000000000000..50919c976dab
--- /dev/null
+++ b/dev-haskell/puremd5-2.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/binary-0.4.0:=[profile?] >=dev-haskell/cereal-0.2:=[profile?] dev-haskell/crypto-api:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/crypto-api-tests dev-haskell/pretty-hex dev-haskell/quickcheck >=dev-haskell/test-framework-0.8 dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Haskell-only implementation of the MD5 digest (hash) algorithm
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/pureMD5
+IUSE=test doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/binary-0.4.0:=[profile?] >=dev-haskell/cereal-0.2:=[profile?] dev-haskell/crypto-api:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.1.3
+SRC_URI=mirror://hackage/packages/archive/pureMD5/2.1.3/pureMD5-2.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b9f812219ee802c3fdb849e5f5fff6ae
diff --git a/dev-haskell/puremd5/Manifest b/dev-haskell/puremd5/Manifest
deleted file mode 100644
index 706eb40ee334..000000000000
--- a/dev-haskell/puremd5/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST pureMD5-2.1.2.1.tar.gz 5824 BLAKE2B f8fba14301bc4aa12c8c8628cc368ea0cc63e8d0888a7c5d9a1d669f8a2944192ad74c2a4c7ee82cb30787fa463c24cb6e6a4822eab95e9b803dd49a81c37eaf SHA512 8a9e8957e4fcea2ec7db014f1dfd153bc00589caf63fa12546b0594a35bbd7bd800decee1a990106515c817dd30f2565454d1e53f2bef87dcf606cc191a0e428
-DIST pureMD5-2.1.3.tar.gz 6719 BLAKE2B 7b315ee2d475e3c4d393bf02615162f04481c266af5a0d165bc1808cb446248cbae02c5b9b40e69b8027490201a92c39f8882634f3291e606e90136659a0b4a1 SHA512 4be26ab8383bc51aaefb2e22cd758945eab00d1ca9612fc0a1b6ba1a581ea7dca55580f50c11dd60c72aeb1f3c418c73c52df34a1be168d878602540394201dc
-EBUILD puremd5-2.1.2.1.ebuild 793 BLAKE2B cf4d2099a8e2ddd4a069a7d83ea98d64a04b878856acdb0a400d8d7c50bcc81fdeb7eb8e701438f4faf27bd6a926481789bcc99941323e4ebc378721e11a4ce2 SHA512 543f9fc1631bde1eacb460ce4f3f4de278d7df2e28d4c5bdec9ebeeba9c89c2b8759fbe232a70443865d8b1f46f77ab1dcde0a0b7fc989d42f4af61e8f04d3b1
-EBUILD puremd5-2.1.3.ebuild 1051 BLAKE2B a7a5494dab5af9d704c92e53a507d07340500bd6b347ef1a16a09cffdda89fb0744098b996c00b7fce825d98ce5f0c195923f45dcbcf2f4abc407368b2e2c825 SHA512 57596ea42e1ea86893a6a50101665f64724091dcba73760a38a6edbcc1de0ae0c84fe11ba8e19232f1f66ef628c719347a76f7c97b23a44cdc6c9c593587084b
-MISC metadata.xml 409 BLAKE2B 15eb0f35211933def995d2fae75c8dc314d7631253281407c163dc4165b2150717fc5e07f26b3f372d76227a58b4363156c11f012fe3856fecc6c23210a5a8f5 SHA512 4ba01f7301f2151bebf117ee4b322debc50d0a17f16b52d14267818fc4fb3716b7981a251a7c39b13dfab45cb02fa464b24dc0afa1dc73fecddfe81341d65797
diff --git a/dev-haskell/puremd5/metadata.xml b/dev-haskell/puremd5/metadata.xml
deleted file mode 100644
index caefc9e8d1cc..000000000000
--- a/dev-haskell/puremd5/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A Haskell-only implementation of the MD5 digest (hash) algorithm.  This now supports
-		the crypto-api class interface.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/puremd5/puremd5-2.1.2.1.ebuild b/dev-haskell/puremd5/puremd5-2.1.2.1.ebuild
deleted file mode 100644
index ac80f93da8ed..000000000000
--- a/dev-haskell/puremd5/puremd5-2.1.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="pureMD5"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Haskell-only implementation of the MD5 digest (hash) algorithm"
-HOMEPAGE="http://hackage.haskell.org/package/pureMD5"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4.0[profile?]
-		>=dev-haskell/cereal-0.2[profile?]
-		dev-haskell/crypto-api[profile?]
-		dev-haskell/tagged[profile?]
-		>=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/puremd5/puremd5-2.1.3.ebuild b/dev-haskell/puremd5/puremd5-2.1.3.ebuild
deleted file mode 100644
index 72110c02e7c8..000000000000
--- a/dev-haskell/puremd5/puremd5-2.1.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="pureMD5"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Haskell-only implementation of the MD5 digest (hash) algorithm"
-HOMEPAGE="http://hackage.haskell.org/package/pureMD5"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-haskell/binary-0.4.0:=[profile?]
-	>=dev-haskell/cereal-0.2:=[profile?]
-	dev-haskell/crypto-api:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/crypto-api-tests
-		dev-haskell/pretty-hex
-		dev-haskell/quickcheck
-		>=dev-haskell/test-framework-0.8
-		dev-haskell/test-framework-quickcheck2 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test test)
-}
diff --git a/dev-haskell/pwstore-fast-2.4.4 b/dev-haskell/pwstore-fast-2.4.4
new file mode 100644
index 000000000000..bd629aafb4f9
--- /dev/null
+++ b/dev-haskell/pwstore-fast-2.4.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] >=dev-haskell/cryptohash-0.6:=[profile?] >=dev-haskell/random-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Secure password storage
+EAPI=5
+HOMEPAGE=https://github.com/PeterScott/pwstore
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] >=dev-haskell/cryptohash-0.6:=[profile?] >=dev-haskell/random-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.4.4
+SRC_URI=mirror://hackage/packages/archive/pwstore-fast/2.4.4/pwstore-fast-2.4.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5df9b8a44283121d1dd70f54d1530587
diff --git a/dev-haskell/pwstore-fast/Manifest b/dev-haskell/pwstore-fast/Manifest
deleted file mode 100644
index 86638db6c5aa..000000000000
--- a/dev-haskell/pwstore-fast/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pwstore-fast-2.4.4.tar.gz 8901 BLAKE2B 27e26a1c934264ea18797c6e5c9bd91dacd00e02ee67a0ec7e39dd51fa10c37b9999b1698800ffdfc7954aced9f3d076a94cc5d423b022af5d0168862e81415a SHA512 707381466d22b9d4cb45884be1df0c1567b11c1ed698b19c968f72b0b68898aa384df5f7c12fb5944ebc2bbcf28fd22c4cefed696d37503ac8b39ab9cdebb0f1
-EBUILD pwstore-fast-2.4.4.ebuild 737 BLAKE2B b7bce11efd4286eb2773ef1a581776b372f0e2119e4ac289779e72b17d19835cd9cb6400646d197fffde2e89d29eda14ee5cb934f6aab148805ad32de8548063 SHA512 ff2d50466512c7b691deb8b383fc6ec2b75ac1079d8b86d4b49407ac37733b410c37ca657a3dc1b41fa635c2fbb44ca9fe08128dc624018d7bbdc801abaf5cce
-MISC metadata.xml 761 BLAKE2B e0ae65cafc745bda3d084a2735eda2dfdf5f8ce15d58d97e959c630cb3b4d5cee2117413146838385ac569360fb14e4eb78cbbd720b1da0740ec97f30a6e0c79 SHA512 634067afe08b6634214fb6207f62a30899493a0b0362b92388b4280aaa0d359df70b01145dbc4c15059d7d808409549b56b050385c2eb953fc2341546c3283eb
diff --git a/dev-haskell/pwstore-fast/metadata.xml b/dev-haskell/pwstore-fast/metadata.xml
deleted file mode 100644
index cdbf6fd8bacc..000000000000
--- a/dev-haskell/pwstore-fast/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		To store passwords securely, they should be salted,
-		then hashed with a slow hash function. This library
-		uses PBKDF1-SHA256, and handles all the details.
-		It uses the cryptohash package for speed; if you need
-		a pure Haskell library, pwstore-purehaskell has the
-		exact same API, but uses only pure Haskell. It is
-		about 25 times slower than this package, but still
-		quite usable.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">PeterScott/pwstore</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/pwstore-fast/pwstore-fast-2.4.4.ebuild b/dev-haskell/pwstore-fast/pwstore-fast-2.4.4.ebuild
deleted file mode 100644
index fb207376e687..000000000000
--- a/dev-haskell/pwstore-fast/pwstore-fast-2.4.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Secure password storage"
-HOMEPAGE="https://github.com/PeterScott/pwstore"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?]
-	>=dev-haskell/binary-0.5:=[profile?]
-	>=dev-haskell/byteable-0.1:=[profile?]
-	>=dev-haskell/cryptohash-0.6:=[profile?]
-	>=dev-haskell/random-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/quickcheck-1.2.0.1 b/dev-haskell/quickcheck-1.2.0.1
new file mode 100644
index 000000000000..359671daa601
--- /dev/null
+++ b/dev-haskell/quickcheck-1.2.0.1
@@ -0,0 +1,13 @@
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=93941175968bc466e2d36fad7d4ae4ca
diff --git a/dev-haskell/quickcheck-1.2.0.1-r1 b/dev-haskell/quickcheck-1.2.0.1-r1
new file mode 100644
index 000000000000..dd2215692a3b
--- /dev/null
+++ b/dev-haskell/quickcheck-1.2.0.1-r1
@@ -0,0 +1,13 @@
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cac0c547bbcba7c655c09ed8b09694a7
diff --git a/dev-haskell/quickcheck-2.6 b/dev-haskell/quickcheck-2.6
new file mode 100644
index 000000000000..20d147da572a
--- /dev/null
+++ b/dev-haskell/quickcheck-2.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/extensible-exceptions:=[profile?] dev-haskell/random:=[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=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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=612e7c2070f533429f5c59dae81cbb98
diff --git a/dev-haskell/quickcheck-2.7.6 b/dev-haskell/quickcheck-2.7.6
new file mode 100644
index 000000000000..23c8a9137d36
--- /dev/null
+++ b/dev-haskell/quickcheck-2.7.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/random:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=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=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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=aea3a53a98a7cea446169d9af2676231
diff --git a/dev-haskell/quickcheck-2.8.1 b/dev-haskell/quickcheck-2.8.1
new file mode 100644
index 000000000000..a45be5e28d09
--- /dev/null
+++ b/dev-haskell/quickcheck-2.8.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/random:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=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=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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f1533015ff3bb0bda2e5d103fe50f89b
diff --git a/dev-haskell/quickcheck-2.8.2 b/dev-haskell/quickcheck-2.8.2
new file mode 100644
index 000000000000..48db74c4af7f
--- /dev/null
+++ b/dev-haskell/quickcheck-2.8.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/random:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=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=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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=856a02df34ae5ca320f724c83a09bc45
diff --git a/dev-haskell/quickcheck-2.9.2 b/dev-haskell/quickcheck-2.9.2
new file mode 100644
index 000000000000..0612e0ac7c82
--- /dev/null
+++ b/dev-haskell/quickcheck-2.9.2
@@ -0,0 +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 )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c9988b8860dcb5263d81e55f21a7c359
diff --git a/dev-haskell/quickcheck-instances-0.3.11 b/dev-haskell/quickcheck-instances-0.3.11
new file mode 100644
index 000000000000..5e268c84774f
--- /dev/null
+++ b/dev-haskell/quickcheck-instances-0.3.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/quickcheck-2.1:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?] >=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Common quickcheck instances
+EAPI=5
+HOMEPAGE=https://github.com/aslatter/qc-instances
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/quickcheck-2.1:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?] >=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.11
+SRC_URI=mirror://hackage/packages/archive/quickcheck-instances/0.3.11/quickcheck-instances-0.3.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9b1e36c0dc3878e908b80e01011dc4b5
diff --git a/dev-haskell/quickcheck-instances-0.3.12 b/dev-haskell/quickcheck-instances-0.3.12
new file mode 100644
index 000000000000..f6dd7d92f5a3
--- /dev/null
+++ b/dev-haskell/quickcheck-instances-0.3.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/quickcheck-2.1:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Common quickcheck instances
+EAPI=5
+HOMEPAGE=https://github.com/aslatter/qc-instances
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/quickcheck-2.1:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.12
+SRC_URI=mirror://hackage/packages/archive/quickcheck-instances/0.3.12/quickcheck-instances-0.3.12.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=637acb42bcff3ba881eedf28191d74f7
diff --git a/dev-haskell/quickcheck-instances-0.3.12-r1 b/dev-haskell/quickcheck-instances-0.3.12-r1
new file mode 100644
index 000000000000..cb61b85838d8
--- /dev/null
+++ b/dev-haskell/quickcheck-instances-0.3.12-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/quickcheck-2.1:2=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Common quickcheck instances
+EAPI=5
+HOMEPAGE=https://github.com/aslatter/qc-instances
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/quickcheck-2.1:2=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.12
+SRC_URI=mirror://hackage/packages/archive/quickcheck-instances/0.3.12/quickcheck-instances-0.3.12.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3862a536853385c94cd9876223e66951
diff --git a/dev-haskell/quickcheck-instances/Manifest b/dev-haskell/quickcheck-instances/Manifest
deleted file mode 100644
index c220d2971b8e..000000000000
--- a/dev-haskell/quickcheck-instances/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST quickcheck-instances-0.3.11.tar.gz 6024 BLAKE2B 72b1b2eed0906aa79f557ef158de922714ab80433fe9b6659a80287de3899e935933f35d23d28dfa7b63333084a1cf4907c4fe8718a14636bd155814ad8bf258 SHA512 a19c97810df7a028af5c6190f62bd9c858444ba210bd016eeb37b402aa9ff942a3538263b80d89a9c156189220ce32058fb81b384c1317f96df527654cb59818
-DIST quickcheck-instances-0.3.12.tar.gz 6437 BLAKE2B 28df5a7872e549f55bb09daf9983a0a447e7730babb4ded4b439acd9cb1166c5a57853197438a9acebce926c0bac87f4a737fcf927799748457737db43afb84d SHA512 471e9e4324ca6d655283d8ed149587bdad981684dce9dc5db5db417fb7614d3a1b6d41388af228e4d600b989d2e14e0496af63c09275cce3f132db7d71c35f98
-EBUILD quickcheck-instances-0.3.11.ebuild 955 BLAKE2B 16cd34d505d1b2ddcafaf4073dce211177ef053421682b28fbcc4cb9d6ec235b987de58d54d08f80495a5c797c8ab1827a5b2f7ab6520d87055ccb7c7fe0150d SHA512 2ecfe7267ef8cb330b4777ecd6927d318f0309c3066baa7368d80fd2773dfeed81434002f5ed84c024ba47982f4425af01d8a9f55afaebf757afdcd34eb54e0b
-EBUILD quickcheck-instances-0.3.12-r1.ebuild 1167 BLAKE2B 9d42ee04cc5614b6c0b532dbde42f703b9aa2b47d569de70b520b14b1933729950acdd79939fdb78d2add64869d9a75aa51519341d2cce84c3a289ee31e0709c SHA512 ac7bda632bb435fbc6db4ea37fe23e721d8a72e95a276d3ea8b4246e2679b2927d9f9aac60671d4c81d7783f1dd22be216abfac27c57596de762ef5aca839e14
-EBUILD quickcheck-instances-0.3.12.ebuild 1114 BLAKE2B eeee4b195e22832e229de34b80b31787223344d5c2ba7dd4afaeaa4176a1329d1d41dc38954f07b8e562c024fa3347bd2f3ba696cf33f5f00ff308f7a6cb1ca8 SHA512 3853422165e28a6494598a7ca11b74d0ab6e3a03342f8040dfc75d2818c2ae6d09f438385f673fc5858c598f8caef1909c0dad5ae572c0a720b1e41c050586c6
-MISC metadata.xml 839 BLAKE2B d4e97fd85081d8e42a6ee21b0a7b57d7f12c8a7660805a123c73236276d9ac35c2cfbf337c5de429ef4f52e88d386e074e587435e0abe593d5f5249004abacb4 SHA512 27a6d53be280a86b6adae1b34861ee9bf6916aef62968a2944975998d66e8597356c61239175bb06f2b71c9def7bb98234974ac11f54ff3b76b03993c4c87724
diff --git a/dev-haskell/quickcheck-instances/metadata.xml b/dev-haskell/quickcheck-instances/metadata.xml
deleted file mode 100644
index 210e6b2ee28f..000000000000
--- a/dev-haskell/quickcheck-instances/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		QuickCheck instances.
-		
-		The goal is to supply QuickCheck instances for
-		types provided by the Haskell Platform.
-		
-		Since all of these instances are provided as
-		orphans, I recommend that you do not use this library
-		within another library module, so that you don't
-		impose these instances on down-stream consumers of
-		your code.
-		
-		For information on writing a test-suite with Cabal
-		see &lt;http://www.haskell.org/cabal/users-guide/#test-suites&gt;
-	</longdescription>
-	<upstream>
-		<remote-id type="github">aslatter/qc-instances</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.11.ebuild b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.11.ebuild
deleted file mode 100644
index 42ed598d25fd..000000000000
--- a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.11.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Common quickcheck instances"
-HOMEPAGE="https://github.com/aslatter/qc-instances"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/quickcheck-2.1:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?]
-	>=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.12-r1.ebuild b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.12-r1.ebuild
deleted file mode 100644
index e490930beedb..000000000000
--- a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.12-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Common quickcheck instances"
-HOMEPAGE="https://github.com/aslatter/qc-instances"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/quickcheck-2.1:2=[profile?]
-	>=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck >= 2.1 && < 2.9' 'QuickCheck >= 2.1'
-}
diff --git a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.12.ebuild b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.12.ebuild
deleted file mode 100644
index e524e1f4f29a..000000000000
--- a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.12.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Common quickcheck instances"
-HOMEPAGE="https://github.com/aslatter/qc-instances"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/quickcheck-2.1:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?]
-	>=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/quickcheck-io-0.1.1-r1 b/dev-haskell/quickcheck-io-0.1.1-r1
new file mode 100644
index 000000000000..f6ab64ce21a7
--- /dev/null
+++ b/dev-haskell/quickcheck-io-0.1.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Use HUnit assertions as QuickCheck properties
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/quickcheck-io
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.1
+SRC_URI=mirror://hackage/packages/archive/quickcheck-io/0.1.1/quickcheck-io-0.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=77eb79913c2344070626cd78fbbc699d
diff --git a/dev-haskell/quickcheck-io-0.1.2 b/dev-haskell/quickcheck-io-0.1.2
new file mode 100644
index 000000000000..fceec49b3aa2
--- /dev/null
+++ b/dev-haskell/quickcheck-io-0.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Use HUnit assertions as QuickCheck properties
+EAPI=5
+HOMEPAGE=https://github.com/hspec/quickcheck-io#readme
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.2
+SRC_URI=mirror://hackage/packages/archive/quickcheck-io/0.1.2/quickcheck-io-0.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7ef0e43ac58d8c999d931113a9c67c5b
diff --git a/dev-haskell/quickcheck-io-0.1.4 b/dev-haskell/quickcheck-io-0.1.4
new file mode 100644
index 000000000000..606eeff86a85
--- /dev/null
+++ b/dev-haskell/quickcheck-io-0.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Use HUnit assertions as QuickCheck properties
+EAPI=6
+HOMEPAGE=https://github.com/hspec/quickcheck-io#readme
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:2=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.4
+SRC_URI=mirror://hackage/packages/archive/quickcheck-io/0.1.4/quickcheck-io-0.1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=97c869ad7610b1932c62bf0e797f7654
diff --git a/dev-haskell/quickcheck-io/Manifest b/dev-haskell/quickcheck-io/Manifest
deleted file mode 100644
index 9366f6f86193..000000000000
--- a/dev-haskell/quickcheck-io/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST quickcheck-io-0.1.1.tar.gz 1646 BLAKE2B 5265db0739e4d2b5fdc06b7d087b0d04870046feafd52cbfe87a458578ea93cf0d19359ff05e3aab1f676c890d5f9a05dccfda44176a4d0c2b1f19befc1969a2 SHA512 440e15d8600f7b0f662cacf176dfb1c00371add4204fad3ffcf56e092d92b3405a2e5a0a6e03b265c83dbc2ff18f3f47213e8086164840d5c8da35b575ebb007
-DIST quickcheck-io-0.1.2.tar.gz 1784 BLAKE2B dc3360c61cb5c6e8f69b9a7e92dc99590cf55c0ab68b4af82cadd3e128abd8e2d902d5958bc7f9cf50a2e058be4c72ff334eedc50c49b65470cee00d9e9e50d4 SHA512 3a3f1ff1bb8fc4924396cc6ba7dc827f41f2d7186707c78325eca3fea5bafa0257cad4d69debae0d7847c10dff88281fa3c9bd63e1882a1fad7c1f3448132835
-DIST quickcheck-io-0.1.4.tar.gz 1808 BLAKE2B 02772839b9934f0a98d7cec02d34b6280adf73440881ee03a6546707547f68cc25a844525a247419144ea96a51d7630c36cb55a36c7fffbfb5c0729e2f638618 SHA512 791e9ddaf973238adb7049163682e3ca7caee3f676f2534e68c0dd84ad9059eebfa3e6544531cb346e2c114586fde6d81247d867e101a8017d48bfaf58841380
-EBUILD quickcheck-io-0.1.1-r1.ebuild 645 BLAKE2B dffd1264025abd1c93a5037ef1c27f7d3365e6a453a1e354ab1b1d985d8d7ad18fa845954321cf11576903fb120a1eff5abcb2dcaabb107a63515628d9be59ef SHA512 871ceea7265687ccd7fc7377bcee56c28a2472f579f72ecfaf6192131cdea1b17ce65575860c531624293aa984263762fc2a95a9c76104a9e03a917dc433959a
-EBUILD quickcheck-io-0.1.2.ebuild 647 BLAKE2B d0ce0ce8395cedae1c1e050b93109e1e7dd79205bb49ed7f1b309fcfc026349266eff2b473d66c02ab65f286f1d8bae4c0ed6342c0a5d65e5020c5dcdf2fdf26 SHA512 cd1b5a86e0479f0f0be4825ec97136b46cd90d8950b253a967038873a6503273613c63011033042d5b4811bba794c84985aaa763d942a31f7c9143879f6c8831
-EBUILD quickcheck-io-0.1.4.ebuild 643 BLAKE2B 4042a5f919e4ec8da0c61172be7a339eebfc90515aaf03e6b10ab0d845e46ad5cbc28d8c8b9504ad738edfef7a09f2069ebb022b4ad6a2a24e27d5d27d60fedb SHA512 9f5256957baf5f59adddec82fbdf0200cdb6dd19f552db8c19dfff4089b8666cd2fff444b0e5add5a43f84fd493be0c01f0ad47dd650c18083f08cad332c3934
-MISC metadata.xml 483 BLAKE2B 87b16eefe2052cac2bda82073ea123fad841566592ecdaf48648a5bc397bd61da7e20834a21d90f4e3275b567dba02999b0fb33508806b70a897669819292e42 SHA512 d5f62058fd6c574a87e4c87fec15f0718302019c3a682a616a4ddb7b97b2b12544cc801806ba0e823f61e488b68f701a264a99c5ace84a66b4b1c8658a20a7c9
diff --git a/dev-haskell/quickcheck-io/metadata.xml b/dev-haskell/quickcheck-io/metadata.xml
deleted file mode 100644
index 601e4db9c3b8..000000000000
--- a/dev-haskell/quickcheck-io/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides an orphan instance that allows you to
-		use HUnit assertions as QuickCheck properties.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">hspec/quickcheck-io</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/quickcheck-io/quickcheck-io-0.1.1-r1.ebuild b/dev-haskell/quickcheck-io/quickcheck-io-0.1.1-r1.ebuild
deleted file mode 100644
index 6e1c797a3d46..000000000000
--- a/dev-haskell/quickcheck-io/quickcheck-io-0.1.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Use HUnit assertions as QuickCheck properties"
-HOMEPAGE="http://hackage.haskell.org/package/quickcheck-io"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/quickcheck-io/quickcheck-io-0.1.2.ebuild b/dev-haskell/quickcheck-io/quickcheck-io-0.1.2.ebuild
deleted file mode 100644
index ff5e3aad395c..000000000000
--- a/dev-haskell/quickcheck-io/quickcheck-io-0.1.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Use HUnit assertions as QuickCheck properties"
-HOMEPAGE="https://github.com/hspec/quickcheck-io#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/quickcheck-io/quickcheck-io-0.1.4.ebuild b/dev-haskell/quickcheck-io/quickcheck-io-0.1.4.ebuild
deleted file mode 100644
index 2da85b7d3ee2..000000000000
--- a/dev-haskell/quickcheck-io/quickcheck-io-0.1.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Use HUnit assertions as QuickCheck properties"
-HOMEPAGE="https://github.com/hspec/quickcheck-io#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/quickcheck-unicode-1.0.0.1 b/dev-haskell/quickcheck-unicode-1.0.0.1
new file mode 100644
index 000000000000..a6a883698790
--- /dev/null
+++ b/dev-haskell/quickcheck-unicode-1.0.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/quickcheck-2.7:2=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generator and shrink functions for testing Unicode-related software
+EAPI=5
+HOMEPAGE=https://github.com/bos/quickcheck-unicode
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/quickcheck-2.7:2=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.0.1
+SRC_URI=mirror://hackage/packages/archive/quickcheck-unicode/1.0.0.1/quickcheck-unicode-1.0.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2b558735d74b6bee3dfc6e7596d33cea
diff --git a/dev-haskell/quickcheck-unicode/Manifest b/dev-haskell/quickcheck-unicode/Manifest
deleted file mode 100644
index e911c0e0ed4a..000000000000
--- a/dev-haskell/quickcheck-unicode/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST quickcheck-unicode-1.0.0.1.tar.gz 3145 BLAKE2B 04c87c9deee25a9eca10b916f0073ea91a348ba901ad0b85d6b5e82f915f003d1260d91271571f6ada077933683df8a3aec8109d4423f92fe4175f3f7e7b9ce9 SHA512 93ca26350243f509027c41279474b45679af445f19a2454ca4c4e980d0ba76f8ea5a6091197d575093af67e08461d6ca436270496d985d1a33fb6d958fcae371
-EBUILD quickcheck-unicode-1.0.0.1.ebuild 621 BLAKE2B 2a3404e2533f0c4d9169652a59513d66845e741610f0a3c691f5da90af3384f83485a3af4aeb8adf5246b4219f27e6bc2193a27186237e0ae537f8dc28df0279 SHA512 473178c0aaddc85bd68fb3c507e4aeb23dc5bd76a3cc41e23d58408eebec79d0aee22ea98d7830c3dde6561188cb490c2724b9ecf470ea716e64bc475abedab6
-MISC metadata.xml 448 BLAKE2B 74f70c616816cd7cbe1882cc863a3a7fe2134f93cf99f01c6609c09529b72f25298cc4565cd4f357a81c838b215f70fb55c67906d8e0e26d777f9bf6b4874d8c SHA512 e318d18f4546472fae359c4ed060751a17cf307e7daad7ac1b554d7b86d924fe2ccba3cf7f46e182c696c89aeb8101419a81e533e12ba660417bde2f73697054
diff --git a/dev-haskell/quickcheck-unicode/metadata.xml b/dev-haskell/quickcheck-unicode/metadata.xml
deleted file mode 100644
index ab1e4f216a15..000000000000
--- a/dev-haskell/quickcheck-unicode/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Generator and shrink functions for testing
-		Unicode-related software.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bos/quickcheck-unicode</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.0.1.ebuild b/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.0.1.ebuild
deleted file mode 100644
index fb43f6100224..000000000000
--- a/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generator and shrink functions for testing Unicode-related software"
-HOMEPAGE="https://github.com/bos/quickcheck-unicode"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/quickcheck-2.7:2=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/quickcheck/Manifest b/dev-haskell/quickcheck/Manifest
deleted file mode 100644
index 1bbd146afedd..000000000000
--- a/dev-haskell/quickcheck/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-AUX quickcheck-1.2.0.1-ghc-7.10.patch 468 BLAKE2B dfb8fba1c756f457c286632fd3e948d9f921697d2ba2f71bc6b7582766b5643bfdeaa002b0b1825c48ed88df379a4a0ca74bf57011f3683d39a9f2e251074900 SHA512 fdc19add37a05817e6d847a6d1acd8452063b7d314351a56a6f5945f0481796379aab1de7f9d117a1b0108590eedeb685cd8551d408cdd7bce28a1388d9900fe
-DIST QuickCheck-1.2.0.1.tar.gz 8874 BLAKE2B 07b89c9a60f5f9cec23662acbad575374255af87719fbe320e5b6cf3f108547df085b48eefa4931f90915e7a9bce74640110a0e24afcdabb3ad7ca3a8ec359e9 SHA512 759f3107878b1e32732dad8583b99303276393649fb7eba8e0f452d438133075f986a3d8457684b024f642ed72b5e1600cbef73706cb8897f76112976c61ae64
-DIST QuickCheck-2.6.tar.gz 26466 BLAKE2B e8b4ba40cb403fe487fe483a133be8b951e36ab1ebe748a32dc22eb490e7f9b5e15da010353777651e65668e8cf5cc4c9919d28becde28238a0ff3ed8292779f SHA512 17cfa7b9ee2fa3e31b48ed3609d5e3bb2316b99251e45e56d377a198d8cb429696e25ecb35ef1bf5cac7e313381274c646393697604f1feefe225fc692e01166
-DIST QuickCheck-2.7.6.tar.gz 34513 BLAKE2B e8f8252655426896f899162f374f447960c95ec5d57ec08d23f64fa3ac59040864a13bd455e14d58940c4015e0ca537e08723602a6114ba6aed1f7aafe5a01a7 SHA512 21e17fbe6dfc2425a948c789ac7d519cfb21c48df68b63de68e6af192d9642d24e1e46ba0b356767e2a10461a3032a4742a6608248574ae458fd2f03649f0451
-DIST QuickCheck-2.8.1.tar.gz 38999 BLAKE2B 6c53c760cfe9ac686f9b41a3a440b25cf84f52246bf4a42652eaf1cb3938586566cb597d2ee8f2ed632b4e31d0fa45ce2479e1573cef30e64ef19f06349fc6b8 SHA512 def1f7141b80be5b508e396c069f6f270c9b890b0ce03df41e058092e6dad28ed8c838734814066307777e6b8b93f154d1b0bf9b4a7052318ec018ef0901c1ef
-DIST QuickCheck-2.8.2.tar.gz 39725 BLAKE2B a817a03677fd44fe9554e54b86ba71ba32338845c397e1debd9bc128200f1351acc6262deb1e2b2d26a9c75811b688220c2a02813e7f4ea898953679caa6ba9a SHA512 661b9e5285f56f69f8807ad0679ca4e18d0ac648233d5f6cbcfda548fcfcf3bc1b790c409f66fdf67cc4a3b769a248b43b0cd1abd103ae6d9a596978c5af4aba
-DIST QuickCheck-2.9.2.tar.gz 43417 BLAKE2B e4721bdee29b2e6d4f349758c6355a633fa60574c34fe59a6f7698a4e59ebeec4ad9d01ecd9324723f9495b2819606588c235c74f6243e688d96c4380fec09a9 SHA512 7b8bad1995e6ce5484f627f9edab91cb8d124b63444e9f62b613b0d1558c2639101dd30d6c455e7f66ffa613f704aeead89faceea56eb411ba8ed15472edb917
-EBUILD quickcheck-1.2.0.1-r1.ebuild 741 BLAKE2B 414adc63991c67d5c877728fbcf34bbad4c38653d2bcae1e92c746372a556594af2ed6a86bd557f02a8394cac14c7a6a3f5f206ec6a59863c3074055ccce25b1 SHA512 ff5163195fb939d9a646c9924e606251edeaad59438c05d01663d4735510c8417af537a4fa8ab43ef43edceaf90bd4778682fca84dffa0fdffbb48b9b4b33b7a
-EBUILD quickcheck-1.2.0.1.ebuild 656 BLAKE2B 11ac8c35d92b46178b1340e8555f0d3e3bcebd45777397727b8502dd6850d71b45fff32c3b66047f63d793e5f80f19e728ffbc6021a7c13045aa145a646d8a13 SHA512 36372ca0c92df6987d1cfc905fa8866ab0652973343ae4d16a2c428c458e8e6d5484e4e63e2e37fb153ed9ae607d091988af36742fc9542571b14c57160ee9df
-EBUILD quickcheck-2.6.ebuild 866 BLAKE2B 8de9d32200177394ebf53e8573080ab4251e7f3ea1e048d93bb5c58e058fa84e37c274a54879043b600f0c940ce3eacfaf74d5b566f27d3633d2941e6b984f1f SHA512 679296c9ff46cbc169e665cb024774bb651dbef9d409fb6c1c30ac43c23ebf4f03047faa9143a731636eb171831f16225f62b861ca5b26fde47b86555c0fd6bf
-EBUILD quickcheck-2.7.6.ebuild 1094 BLAKE2B bead8e1f98549cc2cf1d17f453dc74db3f921b594728f6cddb1510264c1c2b134378ee709545db25042182cb3f777155ad29aa7b3a67b0d72d2489f60fd7e2d0 SHA512 05dfbd5dd27e22ea22e29da3c97ea3541845f8ff203c6a28dd739734deff105bb3d87a3079bb868907d9efe2390c7deb8ec50e60ec845c1f51a45c455884966e
-EBUILD quickcheck-2.8.1.ebuild 1094 BLAKE2B c107f3af21bf92cae2d88eb0573bed17f1ae2fda98a61d3897388fd6570024362b76b95bb46246d54400c02f9055384b26cd28a89cb4c0cd17af9f0e8d62846a SHA512 0181869832398104e2e206295464d979e166f7a343aa4343007a174cab6a231755992b5de2b8a707071460a87854d13d22367c2037ca421dadc63c0f275a0512
-EBUILD quickcheck-2.8.2.ebuild 1144 BLAKE2B 4132bdebc063c49ca7a4645551285f23342e1bf5cd8d491c449c30affbf7be88d53b5aa422c6fef5b5472c621f670eda445fdc2f67f6e1cfb7feb9834d0c34bd SHA512 f57011c8709180fbfe1933f594b0eb3c4bfc38a1a4cd50e182f4d3014627cec8d437b3b45955099fdd0e850e8d1a9c6b5d36a7c462bf4915b287819f1b0f5528
-EBUILD quickcheck-2.9.2.ebuild 1167 BLAKE2B 16c013e8d11cf0c07393e0b2a2a4ea3d97f5f748b15e737d3f41347f6813ceafee4d8fa793f4fe4ea8d217fce8d0bcf0fe690d42bf269083caf81818f007ca20 SHA512 b8ec5babb5ed6908961886847088f8776b1fbce534d88ed879b5a21533277185e62a8180d072e040e84c5b5632237b4b62019e696624cd7ae136aaa5afa3914f
-MISC metadata.xml 1017 BLAKE2B 926c4da3f4784610cb5283a45a3aa45ea4f32714164baece40eb1d8149bcbfa076c7d7f89bf12b080ff16b70aed4b14d238e072dde6cf18aa2cbf0849aec40da SHA512 ad664254669975c7f128bca939f1719da58e8c443bf9d5446b5e3223b0fe3b356daba8325e78f639bc8048cb846c37f4e5f27f842803a9a63206a31760c392ab
diff --git a/dev-haskell/quickcheck/files/quickcheck-1.2.0.1-ghc-7.10.patch b/dev-haskell/quickcheck/files/quickcheck-1.2.0.1-ghc-7.10.patch
deleted file mode 100644
index 61056fc3ef46..000000000000
--- a/dev-haskell/quickcheck/files/quickcheck-1.2.0.1-ghc-7.10.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Test/QuickCheck.hs b/Test/QuickCheck.hs
-index 1f8b3b9..27138ab 100644
---- a/Test/QuickCheck.hs
-+++ b/Test/QuickCheck.hs
-@@ -75 +75,2 @@ import Data.List( group, sort, intersperse )
--import Control.Monad( liftM2, liftM3, liftM4 )
-+import Control.Applicative
-+import Control.Monad( liftM2, liftM3, liftM4, ap )
-@@ -115,0 +117,4 @@ instance Functor Gen where
-+instance Applicative Gen where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
diff --git a/dev-haskell/quickcheck/metadata.xml b/dev-haskell/quickcheck/metadata.xml
deleted file mode 100644
index d5aff4a020bb..000000000000
--- a/dev-haskell/quickcheck/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="template_haskell">Enable additional test modules requiring Template Haskell support.</flag>
-	</use>
-	<longdescription>
-		QuickCheck is a library for random testing of program properties.
-		
-		The programmer provides a specification of the program, in
-		the form of properties which functions should satisfy, and
-		QuickCheck then tests that the properties hold in a large number
-		of randomly generated cases.
-		
-		Specifications are expressed in
-		Haskell, using combinators defined in the QuickCheck library.
-		QuickCheck provides combinators to define properties, observe
-		the distribution of test data, and define test
-		data generators.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">nick8325/quickcheck</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/quickcheck/quickcheck-1.2.0.1-r1.ebuild b/dev-haskell/quickcheck/quickcheck-1.2.0.1-r1.ebuild
deleted file mode 100644
index 9d10d8cdc008..000000000000
--- a/dev-haskell/quickcheck/quickcheck-1.2.0.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CABAL_FEATURES="lib profile haddock"
-inherit eutils haskell-cabal
-
-MY_PN="QuickCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Automatic testing of Haskell programs"
-HOMEPAGE="https://github.com/nick8325/quickcheck"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.6.1
-	dev-haskell/random:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-}
diff --git a/dev-haskell/quickcheck/quickcheck-1.2.0.1.ebuild b/dev-haskell/quickcheck/quickcheck-1.2.0.1.ebuild
deleted file mode 100644
index 1b9371e4be15..000000000000
--- a/dev-haskell/quickcheck/quickcheck-1.2.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
-
-MY_PN="QuickCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Automatic testing of Haskell programs"
-HOMEPAGE="https://github.com/nick8325/quickcheck"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.6.1
-		dev-haskell/random"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/quickcheck/quickcheck-2.6.ebuild b/dev-haskell/quickcheck/quickcheck-2.6.ebuild
deleted file mode 100644
index e362bb8b3e28..000000000000
--- a/dev-haskell/quickcheck/quickcheck-2.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="QuickCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Automatic testing of Haskell programs"
-HOMEPAGE="https://github.com/nick8325/quickcheck"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux"
-IUSE="+template_haskell"
-
-RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
-		dev-haskell/random:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag template_haskell templatehaskell)
-}
diff --git a/dev-haskell/quickcheck/quickcheck-2.7.6.ebuild b/dev-haskell/quickcheck/quickcheck-2.7.6.ebuild
deleted file mode 100644
index 0d9bfb69fc61..000000000000
--- a/dev-haskell/quickcheck/quickcheck-2.7.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-#hackport: flags: +base4,-base3,templatehaskell:template_haskell
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="QuickCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Automatic testing of Haskell programs"
-HOMEPAGE="https://github.com/nick8325/quickcheck"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux"
-IUSE="+template_haskell"
-
-RDEPEND="dev-haskell/random:=[profile?]
-	>=dev-haskell/tf-random-0.4:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-base3 \
-		--flag=base4 \
-		$(cabal_flag template_haskell templatehaskell)
-}
diff --git a/dev-haskell/quickcheck/quickcheck-2.8.1.ebuild b/dev-haskell/quickcheck/quickcheck-2.8.1.ebuild
deleted file mode 100644
index b6f22e236bdc..000000000000
--- a/dev-haskell/quickcheck/quickcheck-2.8.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: +base4,-base3,templatehaskell:template_haskell
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="QuickCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Automatic testing of Haskell programs"
-HOMEPAGE="https://github.com/nick8325/quickcheck"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux"
-IUSE="+template_haskell"
-
-RDEPEND="dev-haskell/random:=[profile?]
-	>=dev-haskell/tf-random-0.4:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-base3 \
-		--flag=base4 \
-		$(cabal_flag template_haskell templatehaskell)
-}
diff --git a/dev-haskell/quickcheck/quickcheck-2.8.2.ebuild b/dev-haskell/quickcheck/quickcheck-2.8.2.ebuild
deleted file mode 100644
index 23670805e165..000000000000
--- a/dev-haskell/quickcheck/quickcheck-2.8.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +base4,-base3,templatehaskell:template_haskell
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="QuickCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Automatic testing of Haskell programs"
-HOMEPAGE="https://github.com/nick8325/quickcheck"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux"
-IUSE="+template_haskell"
-
-RESTRICT=test # to avoid test circular depends
-
-RDEPEND="dev-haskell/random:=[profile?]
-	>=dev-haskell/tf-random-0.4:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-base3 \
-		--flag=base4 \
-		$(cabal_flag template_haskell templatehaskell)
-}
diff --git a/dev-haskell/quickcheck/quickcheck-2.9.2.ebuild b/dev-haskell/quickcheck/quickcheck-2.9.2.ebuild
deleted file mode 100644
index 87803b71b443..000000000000
--- a/dev-haskell/quickcheck/quickcheck-2.9.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: +base4,-base3,templatehaskell:template_haskell
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="QuickCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Automatic testing of Haskell programs"
-HOMEPAGE="https://github.com/nick8325/quickcheck"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux"
-IUSE="+template_haskell"
-
-RESTRICT=test # to avoid test circular depends
-
-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:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( template_haskell? ( >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-base3 \
-		--flag=base4 \
-		$(cabal_flag template_haskell templatehaskell)
-}
diff --git a/dev-haskell/random-1.0.1.1-r1 b/dev-haskell/random-1.0.1.1-r1
new file mode 100644
index 000000000000..6e0ad5224134
--- /dev/null
+++ b/dev-haskell/random-1.0.1.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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=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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=402bf978cea3cef9d0cf4967a076b962
diff --git a/dev-haskell/random-1.1 b/dev-haskell/random-1.1
new file mode 100644
index 000000000000..560b335d951d
--- /dev/null
+++ b/dev-haskell/random-1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b0ebbdd2d280b53c0892f50e31f23a57
diff --git a/dev-haskell/random/Manifest b/dev-haskell/random/Manifest
deleted file mode 100644
index 6dca33a35b36..000000000000
--- a/dev-haskell/random/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST random-1.0.1.1.tar.gz 8699 BLAKE2B 0a17331887ff1b16cf86ba914984581daaf38ba51daf51382393254b1d9ab77849c8f428088cc97128b02eee35074dfa29ae1cf077f4ad29cee726ec5319202a SHA512 dc2f76e87a497d6f5196a8829027d5a9f0eaa2907995f432e26a1594c287c90884253a994fc4a325b0c05c97816e3c3b940a97ccb50d31917a87a99200f1ebff
-DIST random-1.1.tar.gz 10870 BLAKE2B e26794bf5dd05b39bdd92afb55abde54d35ff4f7116753ff8b901c8cc18ea71a73fbcb5fc7c1c4a2d35f33ebcf1a3dbbdc0018cb2f8fb1978c35960b95e90606 SHA512 7f128b1c88adfe7ee6405578d3c999bb77e9e3c21e16f82a5197c0ad1d6731851e99e08d8169c6a8b1068ad8a1614c1c0ef8c04c1958337a6e325f1de0c718a3
-EBUILD random-1.0.1.1-r1.ebuild 640 BLAKE2B a53f844af4d8cadc26be80a4fce68b0a28457a4ac52f023eef66d9f807f4a3211721705c25e6119c07d40884eb32632eadd9dfe13197d3c73be901054a5c5d16 SHA512 9fc1d9761ffea5f797ec13098780f3f56165e13f37fa2500b566bc654512a685054ac8ebbf50fb0735845000479cbe0217ba4c13c0eac2d60d84bc4196f454e2
-EBUILD random-1.1.ebuild 661 BLAKE2B 357bffad0d897d2417a1fc9601a04b355012381cc205f00a07d894fc2ca39c0dcf33f08514eb2c265485c7299df0114ecdc096d10143aaab8764789e9cc64066 SHA512 d3833dfeb135b7eb483660a6a452cdacf1550edd29a9d32680112c4864e9ae9171ed0ebe294125f66984702e64817abbd285869fe29926d7b263932a0f7fc203
-MISC metadata.xml 337 BLAKE2B fb727368f8ec897eb08ab8e7d2eeba83eb8885d7936358521a87ce1f2337d477214adb0e63f03643ed8713b8f2ff02ded3eab4ade29acf2591b6d6e436df412b SHA512 665ba0d269a467d92b9dc56c00681c1af8a7c914850b6a16d55bece4f55170420dad1b03134f3b796c36de39af2ac9c68d53c44b54acea719271cc2c8375ccc9
diff --git a/dev-haskell/random/metadata.xml b/dev-haskell/random/metadata.xml
deleted file mode 100644
index 1d905554c62c..000000000000
--- a/dev-haskell/random/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides a random number library.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/random/random-1.0.1.1-r1.ebuild b/dev-haskell/random/random-1.0.1.1-r1.ebuild
deleted file mode 100644
index 208b2342f8a4..000000000000
--- a/dev-haskell/random/random-1.0.1.1-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="random number library"
-HOMEPAGE="http://hackage.haskell.org/package/random"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/random/random-1.1.ebuild b/dev-haskell/random/random-1.1.ebuild
deleted file mode 100644
index 5a4c498f2ca0..000000000000
--- a/dev-haskell/random/random-1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="random number library"
-HOMEPAGE="http://hackage.haskell.org/package/random"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/ranges-0.2.4-r1 b/dev-haskell/ranges-0.2.4-r1
new file mode 100644
index 000000000000..10b2a4a8a4a8
--- /dev/null
+++ b/dev-haskell/ranges-0.2.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Ranges and various functions on them
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/ranges
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.4
+SRC_URI=mirror://hackage/packages/archive/ranges/0.2.4/ranges-0.2.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=268717f58304e3cf7e0e557c510df7e9
diff --git a/dev-haskell/ranges/Manifest b/dev-haskell/ranges/Manifest
deleted file mode 100644
index 5a1f734a515a..000000000000
--- a/dev-haskell/ranges/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ranges-0.2.4.tar.gz 2244 BLAKE2B 5aa880d0dd101924ecdf1f5c6e22ed71b795ac3d7f07155e49c3a462437527e4d3bce279b02758940257bc14de8cd9a6bee69c62a7d6b67820a92882e8d03778 SHA512 384982a7a3d9a2cf5e8cd525a4175671258869ed9bf676e607e02158daa5e658b5924559a9e223d121039efe9f097516d04703d39dba9cdf6bd53bf7b240f18e
-EBUILD ranges-0.2.4-r1.ebuild 545 BLAKE2B 377d651ca11d075b3ac475b010ea7fcf6cf2ff7d096bcb8cd85ac876ccf94fd71c5d0baf08e8f4b7b420218696308563938fe9299dc2b96f5ce8b92b08146e70 SHA512 7bf1a7a4d428da733055178d8f0a6829858c3e70e4022c0ec8f1a8409820d7584b12ad990ad898950c0a7a8026d726e3ba505c017930345026c47b5f7b281316
-MISC metadata.xml 402 BLAKE2B d78932d672cbd64e592cc6127dc0c4739153ee8064bfd05b3b20ff9f1ef225630ead2441e0a9736dc12ab301cb96b6721e2afb57a519b43558a471871a3a579c SHA512 97c7902d3022020b4bcbff2f3ac50e7c33f95648e4b87ce9f9366d2e4b818f8c480d7b214ab96a7e99252753f8ff6d051b5b2b33cc77b4176478526ebb2e9c32
diff --git a/dev-haskell/ranges/metadata.xml b/dev-haskell/ranges/metadata.xml
deleted file mode 100644
index 7436202fba1d..000000000000
--- a/dev-haskell/ranges/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Ranges and some functions allowing things like fast membership
-		lookup on ranges with holes in them and so on.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/ranges/ranges-0.2.4-r1.ebuild b/dev-haskell/ranges/ranges-0.2.4-r1.ebuild
deleted file mode 100644
index b005ec552473..000000000000
--- a/dev-haskell/ranges/ranges-0.2.4-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Ranges and various functions on them"
-HOMEPAGE="http://hackage.haskell.org/package/ranges"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
diff --git a/dev-haskell/raw-strings-qq-1.1 b/dev-haskell/raw-strings-qq-1.1
new file mode 100644
index 000000000000..0019edd7b6dc
--- /dev/null
+++ b/dev-haskell/raw-strings-qq-1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Raw string literals for Haskell
+EAPI=5
+HOMEPAGE=https://github.com/23Skidoo/raw-strings-qq
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1
+SRC_URI=mirror://hackage/packages/archive/raw-strings-qq/1.1/raw-strings-qq-1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ef4e915cc116320f2291435211be46ad
diff --git a/dev-haskell/raw-strings-qq/Manifest b/dev-haskell/raw-strings-qq/Manifest
deleted file mode 100644
index 438372af32e9..000000000000
--- a/dev-haskell/raw-strings-qq/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST raw-strings-qq-1.1.tar.gz 3505 BLAKE2B faa8ec645a0515b35766677050ae236a702783b39de93a178f2d445dad1fe24a7222ee3c70aa675bb45d21e560e161db8d6101760c163e1dc39ba9e9c780e616 SHA512 9daf7acad6619c9d077b49591003f2c42baca060b20202f597c7468da765a59add2b78b90d634bbf785e299fb85d39dba242d070e15ec208391059e64850acbc
-EBUILD raw-strings-qq-1.1.ebuild 585 BLAKE2B dae7a80b759c15e9745a48eb3421c8cd8603286db878eaac000202ac04611b3adb53c8ba7e22d0aec8173ff343c8eefcb12cf1e628f7102a68119f7485ea93e8 SHA512 a841c9a4adc8137040a6f9d275415e71d20f4ae11b69083da2192c3c21c5ce77e4d59d8e9373aa16ef497da3c8ab909de7b9f4cc23099a950756d018fef77f56
-MISC metadata.xml 792 BLAKE2B 2e914b1a098090b9001e21184d44d7fc5195799cda192325fe3c0d54f049731869d75671601745eef2cd63007d0c1beedc8993c879dbc4c812cbf42fbe65c0b8 SHA512 744697fa2e64edf40cf958168695f8c4f367400e0b174de8fd73911a50aed2848e19497126804cd097ccfd9453bf216d670c0504c87f4cbde913a6c3e11068d1
diff --git a/dev-haskell/raw-strings-qq/metadata.xml b/dev-haskell/raw-strings-qq/metadata.xml
deleted file mode 100644
index 5ad95befed52..000000000000
--- a/dev-haskell/raw-strings-qq/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A quasiquoter for raw string literals - that is, string literals that don't
-		recognise the standard escape sequences (such as @\'\\n\'@). Basically, they
-		make your code more readable by freeing you from the responsibility to
-		escape backslashes. They are useful when working with regular expressions,
-		DOS/Windows paths and markup languages (such as XML).
-		
-		See @examples/RawRegex.hs@ for a usage example.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">23Skidoo/raw-strings-qq</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/raw-strings-qq/raw-strings-qq-1.1.ebuild b/dev-haskell/raw-strings-qq/raw-strings-qq-1.1.ebuild
deleted file mode 100644
index 193ab967316e..000000000000
--- a/dev-haskell/raw-strings-qq/raw-strings-qq-1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Raw string literals for Haskell"
-HOMEPAGE="https://github.com/23Skidoo/raw-strings-qq"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit )
-"
diff --git a/dev-haskell/readable-0.3.1 b/dev-haskell/readable-0.3.1
new file mode 100644
index 000000000000..f8f4c9d06992
--- /dev/null
+++ b/dev-haskell/readable-0.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Reading from Text and ByteString
+EAPI=6
+HOMEPAGE=https://github.com/mightybyte/readable
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.1
+SRC_URI=mirror://hackage/packages/archive/readable/0.3.1/readable-0.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f1e2a597750b0ca60269c496f3477c47
diff --git a/dev-haskell/readable/Manifest b/dev-haskell/readable/Manifest
deleted file mode 100644
index 54beb0de92a6..000000000000
--- a/dev-haskell/readable/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST readable-0.3.1.tar.gz 2907 BLAKE2B af3dab05bb8eba05bca049cb8991e3b46c38e8a4bab73f81c4c2fd4fb62f9e4134071eac0f69d4354be6b02df70ddfe1bd2a7bf59407434ba265371d0006c979 SHA512 237467c4b6dfef9fe090c53e45a1f4261e34fc947b16878575c2b1d2b93400a67678bfde3ad8500f82c56a4b87c5b45e561304c9936572a033d7b295740fb3be
-EBUILD readable-0.3.1.ebuild 609 BLAKE2B c9565858c3e3f7b0b86e71fb85cb1373f65332c366d00d1c6953a894d85f2e61472e9781caabd89fdcdd63cfc9763bbe88973252f51aafbde4a8d8b4d5695175 SHA512 62dfa634cdc097eb06079c883b19d4d2b0b7a3d3c76da82065881b079c33f83d223ee212924013648336e0dc4f894d856d29abf29eb9a7e0f5d52619b5c4cdd9
-MISC metadata.xml 520 BLAKE2B 0740e50bc1efe8ae2f00b5efc2764524169c2c69e8f123450fbba70f460663e53bf7eee6f09031073cbc895ac1ff13b864ae474f4c3e25a5996482c7ea1c5f5b SHA512 5894bd6c4786ef89307780801a4278a528476dac4effb186b7c8cd4ef1bfa1b41e9c54d132acbfc476c6d5d7b617fd29187ba8bf640b8a85455e3c76da8e1d3d
diff --git a/dev-haskell/readable/metadata.xml b/dev-haskell/readable/metadata.xml
deleted file mode 100644
index f4857ab56a2a..000000000000
--- a/dev-haskell/readable/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Provides a Readable type class for reading data types from ByteString and
-		Text.  Also includes efficient implementations for common data types.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">mightybyte/readable</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/readable/readable-0.3.1.ebuild b/dev-haskell/readable/readable-0.3.1.ebuild
deleted file mode 100644
index 50cd557e24e2..000000000000
--- a/dev-haskell/readable/readable-0.3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Reading from Text and ByteString"
-HOMEPAGE="https://github.com/mightybyte/readable"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/readargs-1.2.2 b/dev-haskell/readargs-1.2.2
new file mode 100644
index 000000000000..a6cbb89fcf8d
--- /dev/null
+++ b/dev-haskell/readargs-1.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.11.1.13:=[profile?] <dev-haskell/text-12:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple command line argument parsing
+EAPI=5
+HOMEPAGE=https://github.com/rampion/ReadArgs
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.11.1.13:=[profile?] <dev-haskell/text-12:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.2
+SRC_URI=mirror://hackage/packages/archive/ReadArgs/1.2.2/ReadArgs-1.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b06758dedf53bee6d33d10e0d4f9671d
diff --git a/dev-haskell/readargs-1.2.3 b/dev-haskell/readargs-1.2.3
new file mode 100644
index 000000000000..7c37471c2efb
--- /dev/null
+++ b/dev-haskell/readargs-1.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.11.1.13:=[profile?] <dev-haskell/text-12:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 <dev-haskell/hspec-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple command line argument parsing
+EAPI=6
+HOMEPAGE=https://github.com/rampion/ReadArgs
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.11.1.13:=[profile?] <dev-haskell/text-12:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.3
+SRC_URI=mirror://hackage/packages/archive/ReadArgs/1.2.3/ReadArgs-1.2.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=57381359ddca07f28704080def120af9
diff --git a/dev-haskell/readargs/Manifest b/dev-haskell/readargs/Manifest
deleted file mode 100644
index 988c4af12670..000000000000
--- a/dev-haskell/readargs/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST ReadArgs-1.2.2.tar.gz 5102 BLAKE2B 4c1cefa9bc207d8e8473fb0e02aa5cdfef66c8b5135227ef83071325fc11f391226a15ff66e8adfa4ac6b83ebe276139a22e60df9a380c174cfb51ca0680aa5f SHA512 d6a50b4f3b97932f2edb67eb5d2af01f057b17f991f499c01c5005738cf96a55dc08453250e61a1dbbebad9c0a75c53e1caf0fbce00da5eb6c00e214595c331b
-DIST ReadArgs-1.2.3.tar.gz 5100 BLAKE2B 8d0ee19cb417a0159b9a0488f30d11319c7ce278713bbf6c0531385b6c337c2aad5f85a3d22e8559c8b13b3a89a9f42174cb53fe6e4ae2190740845c9c70002b SHA512 6fd78b26c6c0d7d2f40f1b4eef248eb55d8dc91668b578b2cf88132a364dd7741f6f4d389aeb0c80bdca7cb5dfc1524228113495a2ea3595b888eb27fb8d2dff
-EBUILD readargs-1.2.2.ebuild 908 BLAKE2B 43ce71d1b0cf80bc6eb3d33850c83c11211a0c8c7b25f6d76c1a8a1a1780eafb0425446f2981fadc59836de002e29836af5b2ee45a40e110cc0fd0f111c9ee9b SHA512 1c15e342491b6670e976b2152986cd638bd59f6a68af6fb7398ad4812baa41128fa6f7884aeaf507c83c44b7ab8002901206b6098e253a542ffcd16e59f96d67
-EBUILD readargs-1.2.3.ebuild 849 BLAKE2B a36a8b0a0612ea6284bfb1667fcb36315e45bf8f234aab7cd9862bd5f6b53afdcd4f108db3c76be6e8359e54d09457837d73f2add9d683f9e8155eeccea1e392 SHA512 ac8c42f71fdf95a384d1f04ad77830f746510d89fefeaf2c106d66c6abcfd34adf752154845ee680cc3bd634df03e806c4029327244511fc505916617503d0be
-MISC metadata.xml 2275 BLAKE2B 9fc785a8e06669573e324610295248fb18d840cd2b3dc5559c7e6d8ad0913467ab6b9d4baf8f8730121d59bc2f015ec04ce02308a8642ee72aae5f4386d5cdce SHA512 2dcfd9f5759761acb811e99f033d06ac57db2bbd7f9c8980fbf865ac864c815f769bd9e635ff4eafba8b1066918fa729ac4b0da5df605b9dae5a9c428d7c2710
diff --git a/dev-haskell/readargs/metadata.xml b/dev-haskell/readargs/metadata.xml
deleted file mode 100644
index f863232f251c..000000000000
--- a/dev-haskell/readargs/metadata.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		ReadArgs provides the @readArgs@ IO action, which lets you tell the compiler
-		to parse the command line arguments to fit the type signature you give.
-		
-		For example @(a :: Int, b :: String, c :: Float) &lt;- readArgs@ would
-		parse the first runtime argument as an @Int@, the second as a @String@ (no
-		quotes required) and the third as a @Float@.
-		
-		If the runtime arguments are incompatible with the type signature,
-		then a simple usage statement is given of the types needed.
-		
-		Continuing the previous example, if it was used in a
-		program named @Example@, the error message for the above
-		action would be:
-		
-		@
-		usage: Example Int String Float
-		@
-		
-		Any type that has both @Typeable@ and @Read@ instances
-		can be used. @Char@, @String@, and @Text@ are handled specially so that
-		command line arguments for both do not require quotes (as their
-		@Read@ instances do). A special instance is provided for @FilePath@ so
-		that no constructor or quotes are required.
-		
-		@readArgs@ also supports optional arguments and variadic arguments.
-		Optional arguments are specified using @Maybe@, and variadic arguments
-		using a list.  @(a :: Int, b :: Maybe String, c :: [Float]) &lt;- readArgs@
-		would successfully parse any of the following sets of command line arguments:
-		
-		@
-		Example 1
-		Example 1 2 3 4
-		Example 1 foo
-		Example 1 foo 2 3 4
-		@
-		
-		But not
-		
-		@
-		Example
-		Example foo
-		Example 1.0
-		@
-		
-		Usage statements for optional and variadic arguments use command-line
-		parlance:
-		
-		@
-		usage: Example Int [String] [Float..]
-		@
-		
-		Note that both optional and variadic parsers are greedy by default
-		(so @Example 1 2 3 4@ was parsed as @(1, "2", [3.0,4.0])@.  They
-		may both be made non-greedy through use of the @NonGreedy@ constructor:
-		
-		@
-		( a :: Int
-		, NonGreedy b :: NonGreedy Maybe String
-		, NonGreedy c :: NonGreedy [] Float
-		) &lt;- readArgs
-		@
-	</longdescription>
-	<upstream>
-		<remote-id type="github">rampion/ReadArgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/readargs/readargs-1.2.2.ebuild b/dev-haskell/readargs/readargs-1.2.2.ebuild
deleted file mode 100644
index 7973976779b2..000000000000
--- a/dev-haskell/readargs/readargs-1.2.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ReadArgs"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple command line argument parsing"
-HOMEPAGE="https://github.com/rampion/ReadArgs"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	>=dev-haskell/text-0.11.1.13:=[profile?] <dev-haskell/text-12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cabal_chdeps \
-		'hspec >= 1.3 && < 2.1' 'hspec >= 1.3'
-}
diff --git a/dev-haskell/readargs/readargs-1.2.3.ebuild b/dev-haskell/readargs/readargs-1.2.3.ebuild
deleted file mode 100644
index ea206c616eeb..000000000000
--- a/dev-haskell/readargs/readargs-1.2.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ReadArgs"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple command line argument parsing"
-HOMEPAGE="https://github.com/rampion/ReadArgs"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	>=dev-haskell/text-0.11.1.13:=[profile?] <dev-haskell/text-12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3 <dev-haskell/hspec-3 )
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/readline-1.0.3.0 b/dev-haskell/readline-1.0.3.0
new file mode 100644
index 000000000000..538b67a90a94
--- /dev/null
+++ b/dev-haskell/readline-1.0.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An interface to the GNU readline library
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/readline
+IUSE=doc hscolour profile
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/1.0.3.0
+SRC_URI=mirror://hackage/packages/archive/readline/1.0.3.0/readline-1.0.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fd1e37c15734012e40c6f8b37ce52995
diff --git a/dev-haskell/readline/Manifest b/dev-haskell/readline/Manifest
deleted file mode 100644
index bc92e2cca48d..000000000000
--- a/dev-haskell/readline/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST readline-1.0.3.0.tar.gz 52261 BLAKE2B 2b474efd091be91c46f121b144de719531943aba17d7cf845b2960b3f3dea77905a5838c8b7ab26975628763041321c0cd1aa8c34114205228466fb41c357e8e SHA512 30a8705323fe0185cadccd8ddf7069ce70007a8fc29761f31d0a4d585a5f3b622c9ae71d41577a7eec3a1c6f78949f9c56695df3a7986abef228e7ceb7375520
-EBUILD readline-1.0.3.0.ebuild 589 BLAKE2B 47ce5c97f2114615ceb6c8ef46fecf6b7bf806f1f33a95090bcf09cf6e556feaab4a8d6f1b9e00841cbc26c98ceb7b36c1cd0e2288397ae3951b763121a72034 SHA512 ee7911dec61df0fde1e513ef41ec60e3991cb31f349fc471c709a798942bf71aaffbfe68a811c6a9c93f9fcc35a76b429c4f04206b7ac79a4bf914bb10a43042
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/readline/metadata.xml b/dev-haskell/readline/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/readline/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/readline/readline-1.0.3.0.ebuild b/dev-haskell/readline/readline-1.0.3.0.ebuild
deleted file mode 100644
index ac955840c07a..000000000000
--- a/dev-haskell/readline/readline-1.0.3.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="An interface to the GNU readline library"
-HOMEPAGE="http://hackage.haskell.org/package/readline"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/recaptcha-0.1.0.3 b/dev-haskell/recaptcha-0.1.0.3
new file mode 100644
index 000000000000..2e2b07c59f5c
--- /dev/null
+++ b/dev-haskell/recaptcha-0.1.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/http-3001.1.4:=[profile?] >=dev-haskell/xhtml-3000.0:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Functions for using the reCAPTCHA service in web applications
+EAPI=5
+HOMEPAGE=https://github.com/jgm/recaptcha/tree/master
+IUSE=+network-uri doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/http-3001.1.4:=[profile?] >=dev-haskell/xhtml-3000.0:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/0.1.0.3
+SRC_URI=mirror://hackage/packages/archive/recaptcha/0.1.0.3/recaptcha-0.1.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4a3ede299dcb9e2076e34768eba70796
diff --git a/dev-haskell/recaptcha/Manifest b/dev-haskell/recaptcha/Manifest
deleted file mode 100644
index 0acbf27ef8e0..000000000000
--- a/dev-haskell/recaptcha/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST recaptcha-0.1.0.3.tar.gz 2742 BLAKE2B 574c4f96fd3a1994f8aef67ebf472b49461d9231d787e5e7cc61a659fbbf9f3306147bcd89d2c371fc1ba28accb98cddc81281e1e11314ede59f9ecdaa8ea3ef SHA512 acfb3a14a48e068762fa5b6032dba298b0ac7a674753337c94f1665e6abb24a6761416a6a1cc35b6d05c71cf272e6b0f7c938678233eec33b61b4e053af17b2e
-EBUILD recaptcha-0.1.0.3.ebuild 996 BLAKE2B a7573a44c15702070c675cfc3b31aa6655bbcf7726c9559b36a7bef8cdecd2303ef00416b0d328432a6840b0772aa9af9018f72e8125d3c8f472662adaf3debf SHA512 7d5e3637a7c68cc0391314321947c6049746f46b0e5e06325449805d2183bd6b82308ae3891793f37299b088ed144dbea2e65bbcf954bf6214bb15e3e13678b6
-MISC metadata.xml 671 BLAKE2B ee3c232b493e6e3f46cecbf461b329b1d9382ee4913656ed8414544102c6f4c64715999b8896a3a3a6cb7ccc53281f8520445782d33c63eff0195a370567ec12 SHA512 985e26f885a42f0a53dd56e9e8bf1fb4cca2a94a3fc26065ef90071bb7bc9ac9e1a3166ccfa55c5039706ab0ef284033b81c96c2eef18bcaf8390f0a4072ec83
diff --git a/dev-haskell/recaptcha/metadata.xml b/dev-haskell/recaptcha/metadata.xml
deleted file mode 100644
index 2b52257bb2ec..000000000000
--- a/dev-haskell/recaptcha/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		reCAPTCHA (http://recaptcha.net/) is a service that provides
-		captchas for preventing automated spam in web applications.
-		recaptcha-hs provides functions for using reCAPTCHA in Haskell
-		web applications.
-	</longdescription>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">jgm/recaptcha</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/recaptcha/recaptcha-0.1.0.3.ebuild b/dev-haskell/recaptcha/recaptcha-0.1.0.3.ebuild
deleted file mode 100644
index 15561ac60009..000000000000
--- a/dev-haskell/recaptcha/recaptcha-0.1.0.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Functions for using the reCAPTCHA service in web applications"
-HOMEPAGE="https://github.com/jgm/recaptcha/tree/master"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/http-3001.1.4:=[profile?]
-	>=dev-haskell/xhtml-3000.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/reducers-3.10.3.2 b/dev-haskell/reducers-3.10.3.2
new file mode 100644
index 000000000000..2f800e260168
--- /dev/null
+++ b/dev-haskell/reducers-3.10.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?] >=dev-haskell/hashable-1.1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/text-0.11.1.5:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/unordered-containers-0.1.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Semigroups, specialized containers and a general map/reduce framework
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/reducers/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?] >=dev-haskell/hashable-1.1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/text-0.11.1.5:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/unordered-containers-0.1.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/3.10.3.2
+SRC_URI=mirror://hackage/packages/archive/reducers/3.10.3.2/reducers-3.10.3.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c6330b37f0974a7e2d4930a84d748729
diff --git a/dev-haskell/reducers-3.12.1-r1 b/dev-haskell/reducers-3.12.1-r1
new file mode 100644
index 000000000000..a553c0e3f7ac
--- /dev/null
+++ b/dev-haskell/reducers-3.12.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?] >=dev-haskell/hashable-1.1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/text-0.11.1.5:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/unordered-containers-0.1.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Semigroups, specialized containers and a general map/reduce framework
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/reducers/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?] >=dev-haskell/hashable-1.1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/text-0.11.1.5:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/unordered-containers-0.1.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/3.12.1
+SRC_URI=mirror://hackage/packages/archive/reducers/3.12.1/reducers-3.12.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9b12e3d54a2551655ee73722340b574a
diff --git a/dev-haskell/reducers/Manifest b/dev-haskell/reducers/Manifest
deleted file mode 100644
index 90596df2b1cd..000000000000
--- a/dev-haskell/reducers/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST reducers-3.10.3.2.tar.gz 10934 BLAKE2B 012e849fa7b5a3d44ee26fe8c31dd8684df55dd9bbc4880978cbcfb6dfc05494be2663071f8c06005a90d91cf7737deadeff76728aec6166e989f3657810b7d5 SHA512 fb367dd45cd61ef9f4c0208c68b0b1f5a76fcb136730a5ba7a4a2e3feb56c8cfc3e6d8d4980f68fa466d63e2f65f08ff9305d01a10d581331045cf4ab0e24684
-DIST reducers-3.12.1.tar.gz 11538 BLAKE2B fbb5cc958084524cc1c00a8fc04afa4e052411f3c6b99e3961942354c35ad5df92e31510b4bc092ea5dbdfc4619ee2bcd3e1cf9c0fe85ccac38a6e62a0928cd9 SHA512 56ebaff2f10e8982e420d6f9cbdf1db1b4a75e609d5c5b629815b248b238b1ca1fd6039e47b784ca6555462f4977631b0d40b84c0454cfe19b0fe1c2f8dc96a6
-EBUILD reducers-3.10.3.2.ebuild 1173 BLAKE2B 671ceef99dea1c9aa5b9710cad285d309f9e9fbb61a53b86228ad2b6445c0a9f0c63613d6912772531c07db58df2f3f1a7576b6c193bf9cb1d256091930ab8d5 SHA512 454e22e6e1ece327c5f738f0ee554a90d1953748799b1781dfbc9488fcb384afb3a57ae1f8d7f91c3c8b51d3c724fe72c3b59d655ef76e818d11902811e29f30
-EBUILD reducers-3.12.1-r1.ebuild 1242 BLAKE2B f44d11554da447e78b5531f818a0a4911cabb04edfba20e26ac255be62bb2f82643d038f89eaaea3b323c04d790618cbaeb455442d3353c95ece6e32c2b8fa27 SHA512 55fcaedcdc1c0cf3f195da37cf5bd58059605fe729d5cc130584b47234f08cd74fe4852d214cb351b7301013f71d3f610acd89c6e1fb23abec874e88b6aa6d2a
-MISC metadata.xml 440 BLAKE2B 6313bbacc5c7debef61bd0e21dccbb13407e9f78367e9fd2a441fa6747fdf3aba1dc74832b1d6e58b5ffe2f814f9e23c232c7076f727a15a71a440741bd79e11 SHA512 965a145143129f1925231cba9c298a8ce978c3e1bb7af2f898039243c71258c15fb3fc07c1a2f4a04c61e7d41c69090eedd6ad9e7da096769f57b1b0d8e76df8
diff --git a/dev-haskell/reducers/metadata.xml b/dev-haskell/reducers/metadata.xml
deleted file mode 100644
index b1ef0981e965..000000000000
--- a/dev-haskell/reducers/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Semigroups, specialized containers and a general map/reduce framework
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/reducers</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/reducers/reducers-3.10.3.2.ebuild b/dev-haskell/reducers/reducers-3.10.3.2.ebuild
deleted file mode 100644
index 405f5b03f78d..000000000000
--- a/dev-haskell/reducers/reducers-3.10.3.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroups, specialized containers and a general map/reduce framework"
-HOMEPAGE="https://github.com/ekmett/reducers/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?]
-	>=dev-haskell/hashable-1.1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/text-0.11.1.5:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/unordered-containers-0.1.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/reducers/reducers-3.12.1-r1.ebuild b/dev-haskell/reducers/reducers-3.12.1-r1.ebuild
deleted file mode 100644
index ecfe9316cf64..000000000000
--- a/dev-haskell/reducers/reducers-3.12.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroups, specialized containers and a general map/reduce framework"
-HOMEPAGE="https://github.com/ekmett/reducers/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?]
-	>=dev-haskell/hashable-1.1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/text-0.11.1.5:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.1.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'transformers           >= 0.2      && < 0.5' 'transformers           >= 0.2'
-}
diff --git a/dev-haskell/refact-0.3.0.2 b/dev-haskell/refact-0.3.0.2
new file mode 100644
index 000000000000..94f0e5e7d961
--- /dev/null
+++ b/dev-haskell/refact-0.3.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Specify refactorings to perform with apply-refact
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/refact
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.0.2
+SRC_URI=mirror://hackage/packages/archive/refact/0.3.0.2/refact-0.3.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a479a4d797c1a5cbff3a0b63282d5e5c
diff --git a/dev-haskell/refact/Manifest b/dev-haskell/refact/Manifest
deleted file mode 100644
index 2345d044b022..000000000000
--- a/dev-haskell/refact/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST refact-0.3.0.2.tar.gz 2345 BLAKE2B d92132b057030175eae17cf858349e6e8c86fa02c33651f74b385fe0a2ebec1260ec99993bbb38748af0dafb3bb46b61057195fc4883e93886cf39645d91dfc5 SHA512 18f35a3f563288815645c4ef8e557a08bd9038aca0b3d9af391f9f71b39bbf779b725f037fa682a23e38e31cf7b8e0f4ae412e2af2ec3639c4b2c47a05a45a6e
-EBUILD refact-0.3.0.2.ebuild 563 BLAKE2B 831c8d68cf11869e19eb32dd52221128b435d34bdba68614b22efc0309f6e937e2d840edd6a0d246a004facfd04c15d3970b295ce7e47ae5d9e49ca4a687d204 SHA512 07d725e9149de422798f127bc4e3f533f992771314a8f79648def155b0203e8b319a6aca50925660156e5489b23f4aa60aa6c2e365a674629a724584b575d290
-MISC metadata.xml 471 BLAKE2B c532a57917bb5b97313b3f3709ab628cb316396468774636e0e15cfcb354c843f748c246504d9c8c6835db4522cf1478be35f692e5593d733bade99e4fd75f71 SHA512 d1175bb42d06db38fa10eff4a1cbe88a29e08616b3046d0224b93df11fb3cc4ac3ca638ab5bfa32a7d06fa36a145f37adec1da823c572f0aab940dbd6e31affd
diff --git a/dev-haskell/refact/metadata.xml b/dev-haskell/refact/metadata.xml
deleted file mode 100644
index ddc3a11c7614..000000000000
--- a/dev-haskell/refact/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library provides a datatype which can be interpreted by apply-refact. It exists
-		as a seperate library so that applications can specify refactorings without depending on GHC.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/refact/refact-0.3.0.2.ebuild b/dev-haskell/refact/refact-0.3.0.2.ebuild
deleted file mode 100644
index 724b9fe9b41e..000000000000
--- a/dev-haskell/refact/refact-0.3.0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Specify refactorings to perform with apply-refact"
-HOMEPAGE="http://hackage.haskell.org/package/refact"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/reflection-1.3.2 b/dev-haskell/reflection-1.3.2
new file mode 100644
index 000000000000..01b25c3cce6c
--- /dev/null
+++ b/dev-haskell/reflection-1.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Reifies arbitrary terms into types that can be reflected back into terms
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/reflection
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.3.2
+SRC_URI=mirror://hackage/packages/archive/reflection/1.3.2/reflection-1.3.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5f92fbb20deb1565d7ebaeeecdb82438
diff --git a/dev-haskell/reflection-1.4 b/dev-haskell/reflection-1.4
new file mode 100644
index 000000000000..22260a28e8b1
--- /dev/null
+++ b/dev-haskell/reflection-1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Reifies arbitrary terms into types that can be reflected back into terms
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/reflection
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.4
+SRC_URI=mirror://hackage/packages/archive/reflection/1.4/reflection-1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0812257e5c49259722efb50be22fa08d
diff --git a/dev-haskell/reflection-1.5.2.1 b/dev-haskell/reflection-1.5.2.1
new file mode 100644
index 000000000000..31a19803d8b5
--- /dev/null
+++ b/dev-haskell/reflection-1.5.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Reifies arbitrary terms into types that can be reflected back into terms
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/reflection
+IUSE=+template-haskell doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.5.2.1
+SRC_URI=mirror://hackage/packages/archive/reflection/1.5.2.1/reflection-1.5.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=574018b812ea8b2155fce327966967d9
diff --git a/dev-haskell/reflection-2.1.2 b/dev-haskell/reflection-2.1.2
new file mode 100644
index 000000000000..8f5d461b3470
--- /dev/null
+++ b/dev-haskell/reflection-2.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Reifies arbitrary terms into types that can be reflected back into terms
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/reflection
+IUSE=+template-haskell doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.1.2
+SRC_URI=mirror://hackage/packages/archive/reflection/2.1.2/reflection-2.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2f81282ba08321afa639adfb373ac2d2
diff --git a/dev-haskell/reflection/Manifest b/dev-haskell/reflection/Manifest
deleted file mode 100644
index 673237b5d3be..000000000000
--- a/dev-haskell/reflection/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST reflection-1.3.2.tar.gz 8530 BLAKE2B c9ea1c0cb948596dc11d42191cf413280c821c162d1c9dd99eb2a19c355da9044b27614c0ea2691d46878e37ae6c9a1cd0e0045f7c5b327e90373967cad86a28 SHA512 bf055f9f3c9b8bfe3922dbd864cd027aa3f9a3bcd222eca7bd91b167bd5d3f7c3cbcc16d2dbed617de165769e62ce50a1185c538b8b821cdfbdd17c675f4d1e3
-DIST reflection-1.4.tar.gz 9123 BLAKE2B 7e1bb6fa2fe483a6e0dcc50e3720a594599cb5c3f5e909eb0a481fb15a9710f2254ba276bf3e3d325fe295c0388a4acdaec3257c77f8ba9f1a75bf5debadb8c0 SHA512 c4f64624da226d1fdce39380a691c6a9a159c6ff728367f386f5be718f38d3efe162af4d59d3fed76faf43ce8a72616617cb0460ddd5a8844b4369469c4b21a8
-DIST reflection-1.5.2.1.tar.gz 11199 BLAKE2B 3450c8ab831a0d56ba785b7804c411b21cbf1d216376dfd7e628bf63345700851371aa2a6105080ba4c0019f71a2b542b7a0d1cd2ade47653dfba1f348cdf6f1 SHA512 53db1e6a0143af9038d191d0329df4b88004eac1d04732e33acbab41efd9676946e0bcad14a658245e26095f5f560db9c051ba3db0930cb784bc228d51c24d3c
-DIST reflection-2.1.2.tar.gz 14334 BLAKE2B 8f565439e931c00f727dde18468faaaaaf73a61a68eb62fffb850667bd8ae8fe9680ca3009478bedc2871e4d39b2216b5651eda9c13f6b563da5ad3329dccaab SHA512 759ad3afa304adc1ca0509450429946d3f6f7a89c98344ba9bceedf2352e4c89a0d5ab00feb2e5f1e17d062c43c7673fe119e4f4ac61fcebb83f9b21c180e06d
-EBUILD reflection-1.3.2.ebuild 658 BLAKE2B fd5ed87c6772eb021760bd6e4965e30ebbabdc6b84d861f5f61e27e488aac9e59b09364b16ea0a4153f3e42476021cdf3263f65b33cd69d393f8bc6604fa7c3a SHA512 577b749013a78b34a3713ff90cd2ff966ef74f51b2519ea6249a0f306a40b92d38b786dd505ac822d7d75785413822555edf1de757b36a10564467572bc04169
-EBUILD reflection-1.4.ebuild 747 BLAKE2B 09ac9567a9eda2f2a9ec7b395705ded89c0f9666e2d1671f9450307168bdb11fb077c31fcc0d53a2b3f076a9ce64cb10489e415cf7eb2605f3dd99646ede995d SHA512 f47dd762504454b36b6624942a592e38cfafbebb66ff8dd35b98252290f217701a48afe9e00961dc5e68471efdd8f28a9c187670716b65ee0ee4086c054c70aa
-EBUILD reflection-1.5.2.1.ebuild 813 BLAKE2B 9fca6cc81994f9c6d0aeb9a701d8c655f1e8c3d3a983f90dff17e40e7da51e7a821c23dc2872ee29016842ea8ed8d118ac504e878294157af25644f12f0482bd SHA512 24f9e7644ac6eb7dbb21c19269592bf3de029f39bfa1ea24234b80a6c3dab6a7fb7048d22d7360615ed38e8ec7504c2f8feab14fa5b55bb7a6b145c4300d126d
-EBUILD reflection-2.1.2.ebuild 813 BLAKE2B 356f8b9201db26cab09fc71554aa9be023bc6986a168f3170a888121f57b796b05e1a98ebf5f284de98cf465e7c1cdb715e356f8aee27065ee2f8ca82402e73f SHA512 667887df4d6f716b329aac4669ffcfdd2b81ee81f8a7864d57196ed92b83b7f444c6c4d1092a1993580d4ff1f9d1bd4aca1fff6d23b0772bfa12546d096efc12
-MISC metadata.xml 1993 BLAKE2B 24bce26fb7fbf2494ba2e5b5ac22623d73a1852e04aaefbcd3929ad22486790d7040e90b341de8e4f38952237ed6f7b1fee98db938caa443b4efca60c1f66d39 SHA512 eff155a85567f88de01d1232814c47444757d736e8237200b3043d40fa4f67d7cdf0e09b5614ed29c04bf81ab12cc3a5be0a258bf7db51813b4d58f4d137667e
diff --git a/dev-haskell/reflection/metadata.xml b/dev-haskell/reflection/metadata.xml
deleted file mode 100644
index 0845fb397e13..000000000000
--- a/dev-haskell/reflection/metadata.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides an implementation of the ideas presented in the paper
-		\"Functional Pearl: Implicit Configurations\" by Oleg Kiselyov and
-		Chung-chieh Shan. However, the API has been streamlined to improve performance.
-		
-		The original paper can be obtained from
-		&lt;http://www.cs.rutgers.edu/~ccshan/prepose/prepose.pdf&gt;.
-		
-		/Changes in 1.1.6/:
-		
-		* Relaxed an unnecessary strictness annotation in the fast implementation
-		
-		/Changes in 1.1.5/:
-		
-		* Both implementations now work on Hugs; the fast implementation ascends
-		from the ranks of completely unportable black magic to being merely
-		/mostly/ unportable black magic.
-		
-		/Changes from 0.5 to 1.1/:
-		
-		* Much faster implementation available that is about 50 /times/ faster than
-		0.9 and which runs purely on black magic. This version is now used by
-		default. To turn it off install with the @slow@ flag. If you encounter a
-		problem with the implementation, please contact the author.
-		
-		* Removed @ReifiedNum@, @reflectNum@, and @reifyIntegral@; @reify@ and
-		@reflect@ are about 3 orders of magnitude faster than the special case
-		combinators were.
-		
-		/Changes in 0.5/:
-		
-		* Generalized the type signatures in reflect to allow you to pass any type
-		with kind @* -&gt; *@ wrapped around the desired type as the phantom type
-		argument rather than just a @Proxy@.
-		
-		/Changes in 0.4/:
-		
-		* Converted from `Data.Tagged` to using `Data.Proxy` for reflection. This
-		reduces the need for helper functions and scoped type variables in user
-		code.
-	</longdescription>
-	<use>
-		<flag name="template-haskell">Enable template haskell.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ekmett/reflection</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/reflection/reflection-1.3.2.ebuild b/dev-haskell/reflection/reflection-1.3.2.ebuild
deleted file mode 100644
index bb20a85fae04..000000000000
--- a/dev-haskell/reflection/reflection-1.3.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Reifies arbitrary terms into types that can be reflected back into terms"
-HOMEPAGE="https://github.com/ekmett/reflection"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/tagged-0.4.4:=[profile?]
-		<dev-haskell/tagged-1:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10"
diff --git a/dev-haskell/reflection/reflection-1.4.ebuild b/dev-haskell/reflection/reflection-1.4.ebuild
deleted file mode 100644
index e74ff197f6dd..000000000000
--- a/dev-haskell/reflection/reflection-1.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-#hackport: flags: -slow
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Reifies arbitrary terms into types that can be reflected back into terms"
-HOMEPAGE="https://github.com/ekmett/reflection"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-slow
-}
diff --git a/dev-haskell/reflection/reflection-1.5.2.1.ebuild b/dev-haskell/reflection/reflection-1.5.2.1.ebuild
deleted file mode 100644
index 2c8ecd06197a..000000000000
--- a/dev-haskell/reflection/reflection-1.5.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -slow
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Reifies arbitrary terms into types that can be reflected back into terms"
-HOMEPAGE="https://github.com/ekmett/reflection"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+template-haskell"
-
-RDEPEND=">=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-slow \
-		$(cabal_flag template-haskell template-haskell)
-}
diff --git a/dev-haskell/reflection/reflection-2.1.2.ebuild b/dev-haskell/reflection/reflection-2.1.2.ebuild
deleted file mode 100644
index 5e86f46c45bc..000000000000
--- a/dev-haskell/reflection/reflection-2.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -slow
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Reifies arbitrary terms into types that can be reflected back into terms"
-HOMEPAGE="https://github.com/ekmett/reflection"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+template-haskell"
-
-RDEPEND=">=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-slow \
-		$(cabal_flag template-haskell template-haskell)
-}
diff --git a/dev-haskell/regex-applicative-0.3.3 b/dev-haskell/regex-applicative-0.3.3
new file mode 100644
index 000000000000..628fb2c40778
--- /dev/null
+++ b/dev-haskell/regex-applicative-0.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/smallcheck-1.0 dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-smallcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Regex-based parsing with applicative interface
+EAPI=5
+HOMEPAGE=https://github.com/feuerbach/regex-applicative
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.3
+SRC_URI=mirror://hackage/packages/archive/regex-applicative/0.3.3/regex-applicative-0.3.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ca88c436fe7a8e28e21c0e19b83cb5d4
diff --git a/dev-haskell/regex-applicative-text-0.1.0.1 b/dev-haskell/regex-applicative-text-0.1.0.1
new file mode 100644
index 000000000000..3242e28f157e
--- /dev/null
+++ b/dev-haskell/regex-applicative-text-0.1.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/regex-applicative-0.3:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=regex-applicative on text
+EAPI=6
+HOMEPAGE=https://github.com/phadej/regex-applicative-text#readme
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/regex-applicative-0.3:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0.1
+SRC_URI=mirror://hackage/packages/archive/regex-applicative-text/0.1.0.1/regex-applicative-text-0.1.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=161f9a622f97d2c8199b1b498b24e939
diff --git a/dev-haskell/regex-applicative-text/Manifest b/dev-haskell/regex-applicative-text/Manifest
deleted file mode 100644
index 1e84d876bd97..000000000000
--- a/dev-haskell/regex-applicative-text/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST regex-applicative-text-0.1.0.1.tar.gz 3975 BLAKE2B 87623f18720173712b8245c86902a30471779e27a5a2e8a938934f5a1b6cd8ec9f41e480f82cebd29db2c9e383e983a6f6ba03856e509fb30a67c51b158707a7 SHA512 8ee1d581498e047a7b759476ce98c43c19656b767790b0f12b8485bc212a71c7115cee5c3e5089392995bc71851025093c406bce9d8ac3c5962675ae06fa4339
-EBUILD regex-applicative-text-0.1.0.1.ebuild 677 BLAKE2B 221571896980a1524900b39fed41dfb4c71908666f4a4841f72268dc4c93297da615cf994350f7164d4750e4bca7cea6e6ec01999fa8c0f050b49deca3c34808 SHA512 5fad4afd8cd24578e35ac26802fc235cc340b8c75bff6d4880c60924c0433fc62438b3d959e184c9f331a4e76795a9712a12c9f2c7d611d6a55dc089ffcb831c
-MISC metadata.xml 345 BLAKE2B 6704253b4f88074897e127230e324c3a73e121e9724bbadcae265f479bb3b6f906d4eb3d51e4146097355a26359544d3939477eebee94d769a980986d1d6c9f6 SHA512 4b3eebf8920a71985f656c1f4c896da4d102473a1031473acd08405c58e8c5a1ca3c34f38f82846eeb667ac6d1f4626354ffd094550fd953d4fa03549070245d
diff --git a/dev-haskell/regex-applicative-text/metadata.xml b/dev-haskell/regex-applicative-text/metadata.xml
deleted file mode 100644
index f7c350d52710..000000000000
--- a/dev-haskell/regex-applicative-text/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Wrapped regex-applicative primitives to work with Text
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/regex-applicative-text/regex-applicative-text-0.1.0.1.ebuild b/dev-haskell/regex-applicative-text/regex-applicative-text-0.1.0.1.ebuild
deleted file mode 100644
index af47c8861f1d..000000000000
--- a/dev-haskell/regex-applicative-text/regex-applicative-text-0.1.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="regex-applicative on text"
-HOMEPAGE="https://github.com/phadej/regex-applicative-text#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/regex-applicative-0.3:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/regex-applicative/Manifest b/dev-haskell/regex-applicative/Manifest
deleted file mode 100644
index d0dc861b919b..000000000000
--- a/dev-haskell/regex-applicative/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST regex-applicative-0.3.3.tar.gz 13834 BLAKE2B 690d9fe8b44d26cf2332f5474bd1faacec9bae68d72a9dd04836e7bf3519e2dad6a9277f96c9f3dd908091d90408a7dad8d654e60dbb29831267489169ef5192 SHA512 02358efaa912efd232654a404ef5f7cf825b8852bf2c59fd59122047044fcab5ae28bf26de6818b337d917c594fbe165eec917d88b02723e0b181fe2b57ffbe8
-EBUILD regex-applicative-0.3.3.ebuild 729 BLAKE2B 789f11ed150d6e6af536e214d4e9c53ccee294fe4af9eb68d8cf466e15e8661d43f8e9516d5368bd65397c99136f361710003a6efccff756f3db911b1d3b6ec0 SHA512 5cb3a34dfe9ffd92b9013bb8d86d41f17f62e0e8d42b918fcd0fe23099b7b44af989b96c1b2a8a13afd416504c2d2140b793dfdfcc3de245ec1f489d94a9064d
-MISC metadata.xml 512 BLAKE2B b507deb53b3f4dc832954d0ab59f0d2544d66f32272566dee429fdd4a0a241eae1b39e54fa90721f60e1d437234c20ad43b606b66433bd4eca488527264c9f88 SHA512 f13a38cdc4aaaeb47d1e7f3ab579e69431e9664c9b44b823bc4b8cf327eb7356a938aefee219238410ace03089acbc67fbb4542dac0cdf099d5575d6f37528b0
diff --git a/dev-haskell/regex-applicative/metadata.xml b/dev-haskell/regex-applicative/metadata.xml
deleted file mode 100644
index ca093b1a6de5..000000000000
--- a/dev-haskell/regex-applicative/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		regex-applicative is a Haskell library for parsing using regular expressions.
-		Parsers can be built using Applicative interface.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">feuerbach/regex-applicative</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/regex-applicative/regex-applicative-0.3.3.ebuild b/dev-haskell/regex-applicative/regex-applicative-0.3.3.ebuild
deleted file mode 100644
index 8661c88a2cb5..000000000000
--- a/dev-haskell/regex-applicative/regex-applicative-0.3.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Regex-based parsing with applicative interface"
-HOMEPAGE="https://github.com/feuerbach/regex-applicative"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/smallcheck-1.0
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-smallcheck )
-"
diff --git a/dev-haskell/regex-base-0.93.2-r1 b/dev-haskell/regex-base-0.93.2-r1
new file mode 100644
index 000000000000..7df9b12c68bd
--- /dev/null
+++ b/dev-haskell/regex-base-0.93.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6931c88543c259b57f07f37a005d5235
diff --git a/dev-haskell/regex-base/Manifest b/dev-haskell/regex-base/Manifest
deleted file mode 100644
index 2eed1c8b4df4..000000000000
--- a/dev-haskell/regex-base/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST regex-base-0.93.2.tar.gz 9156 BLAKE2B 160f749c5c5e4c9911c18a4ad3dbe46865c9872f419457387e249747c5aade2cd2afae1f80757d3c0788398f332ea243f35e826f77f220517480ae4b42928a21 SHA512 4f6269cb1c1fefa2164d999e2e787118edc5fd88e356535e50f143d0b98de4fa1854959955e183aed27a77335b81063a2385bb6bdeb8cb80e7fdd812ab96d22a
-EBUILD regex-base-0.93.2-r1.ebuild 757 BLAKE2B 0f298a7a1ed38ba9cdd2fdef63498afa8b7cb21b783d8e3378657007ea600199d2df33e76dc5a555d3615c4c5308f66e2258a42e9424a02a1f30dfcb8d4ed772 SHA512 bb0258e0e468ecb03ac548d77e324b9159ebbffd220b4a8e42b8078d8041fa7a47490a4290ddbc2d40ca48e7602800f229817673a866b73097d5aca32d5cbd89
-MISC metadata.xml 307 BLAKE2B 5ab47214d8394b181d6154e5a14f96b81e75ffcaac86044ce2b8829919c57130578dbf2630bc9920b3871e945461bcdb4b1f24a5a1c71247cf8ddad2e28129a3 SHA512 c86869a5bc6099f9458564de2b1aa31002fe4bcbcfc3a5e87f524f38f4e25933e3eef11979d19276a10208bf8338fdcd20edb3cb26d8a13ace39cac6634f47a9
diff --git a/dev-haskell/regex-base/metadata.xml b/dev-haskell/regex-base/metadata.xml
deleted file mode 100644
index 5f096d14b333..000000000000
--- a/dev-haskell/regex-base/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">lazy-regex</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/regex-base/regex-base-0.93.2-r1.ebuild b/dev-haskell/regex-base/regex-base-0.93.2-r1.ebuild
deleted file mode 100644
index b6f962d85120..000000000000
--- a/dev-haskell/regex-base/regex-base-0.93.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="https://sourceforge.net/projects/lazy-regex"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=splitbase \
-		--flag=newbase
-}
diff --git a/dev-haskell/regex-compat-0.95.1-r1 b/dev-haskell/regex-compat-0.95.1-r1
new file mode 100644
index 000000000000..774da5ae96d0
--- /dev/null
+++ b/dev-haskell/regex-compat-0.95.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/regex-base-0.93:=[profile?] >=dev-haskell/regex-posix-0.95.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6fc07705e0c7f671580ad050e63bbc8b
diff --git a/dev-haskell/regex-compat-tdfa-0.95.1.4 b/dev-haskell/regex-compat-tdfa-0.95.1.4
new file mode 100644
index 000000000000..85905611a5e1
--- /dev/null
+++ b/dev-haskell/regex-compat-tdfa-0.95.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/regex-base-0.93:=[profile?] >=dev-haskell/regex-tdfa-1.1.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Unicode Support version of Text.Regex, using regex-tdfa
+EAPI=5
+HOMEPAGE=https://hub.darcs.net/shelarcy/regex-compat-tdfa
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/regex-base-0.93:=[profile?] >=dev-haskell/regex-tdfa-1.1.0:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.95.1.4
+SRC_URI=mirror://hackage/packages/archive/regex-compat-tdfa/0.95.1.4/regex-compat-tdfa-0.95.1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7502ce0e90dc49871bf880a9fac5d7fd
diff --git a/dev-haskell/regex-compat-tdfa/Manifest b/dev-haskell/regex-compat-tdfa/Manifest
deleted file mode 100644
index fe3353aefd59..000000000000
--- a/dev-haskell/regex-compat-tdfa/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST regex-compat-tdfa-0.95.1.4.tar.gz 4146 BLAKE2B 1749307b8a7bfb1f0a0137febf425191d225bcdfbb0517034ea31e11e648eac128f16cc1951f9471e9f22efeb296c1c32344a375c16381ef823e0fc4674e730f SHA512 7e387a7713ff8e43cfce4262b1288b85f8b60729162a842186bf6a7e1078dfb9e26013087ff7e9bcf81521f8c352926873bb280b9df57b016aef2ca4ce70aa14
-EBUILD regex-compat-tdfa-0.95.1.4.ebuild 665 BLAKE2B 663f8cf1d19a13c215f8a985289d109a80e1add68486d46aab9b29f6d57ea31b6067b6b099efabef01c213ac99d99148566b469eaca8a1492428c35fde0114e3 SHA512 0a34409ccdebe7a173a534f261549070e2fc16951390e3769bfa3ebcd47604d49feed1541c53177b357d665a0ac2e191f9331f7f4918045f88113e42fa803d62
-MISC metadata.xml 549 BLAKE2B 511813338e5239e4654ef23d0eb6c138567ced27e54732fd4d38da52c2f212b6ea8f708581e5d3bab0d4bb216099778422e486e23a3bcda95496a97b97d8cc93 SHA512 45610a989f730058dbf3d330daceea8d71f5ce57a9fa2ce8af56dd97d4faabb58e09d92c493bf7d7051a085f53eaa14dc03fef51b14bcee5e0e2bfb337a2fb6a
diff --git a/dev-haskell/regex-compat-tdfa/metadata.xml b/dev-haskell/regex-compat-tdfa/metadata.xml
deleted file mode 100644
index a4dbf2954c3f..000000000000
--- a/dev-haskell/regex-compat-tdfa/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		One module layer over regex-tdfa to replace Text.Regex.
-		
-		regex-compat can't use Unicode characters correctly because
-		of using regex-posix. This is not good for Unicode users.
-		
-		I modified regex-compat to use regex-tdfa for solving today's
-		problem.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild b/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild
deleted file mode 100644
index 6804316e4152..000000000000
--- a/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Unicode Support version of Text.Regex, using regex-tdfa"
-HOMEPAGE="https://hub.darcs.net/shelarcy/regex-compat-tdfa"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/regex-base-0.93:=[profile?]
-	>=dev-haskell/regex-tdfa-1.1.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/regex-compat/Manifest b/dev-haskell/regex-compat/Manifest
deleted file mode 100644
index 599d93ff1e71..000000000000
--- a/dev-haskell/regex-compat/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST regex-compat-0.95.1.tar.gz 3968 BLAKE2B 5c1bf6b9e7aa148cf7b033f08a9d32d7e508e73da88e7c6b2d27b2549dc7e44e287ca3010bffb37fd3fd1d7dbf4060a2772f64e1ecf531ffb5f18098db63b0d2 SHA512 9fb38b001a4cdca5b3630d88e8fcb2f359f6e8dd49fbe13d5e2a1c99b4978b33ce639b344445b27daf68abbae1cf2c9905d48ff68a81e02b4e54aa92dea956e2
-EBUILD regex-compat-0.95.1-r1.ebuild 854 BLAKE2B d24913f9a9424895b6db00d90ab376f55f0e5410d850a360cfb5467d44b42eb708886fb4dfbb8821fe9a0721a885e68b0827f5c90551700dab748fad8db32350 SHA512 fb1aef07b775ecec47c879509be08f191811af3194323629aa166867271f7d06d13a223b0e0b9cfdbedd90a5bbfcb04bbdd5e18bd833c52eac760eb7cb6f2332
-MISC metadata.xml 307 BLAKE2B 5ab47214d8394b181d6154e5a14f96b81e75ffcaac86044ce2b8829919c57130578dbf2630bc9920b3871e945461bcdb4b1f24a5a1c71247cf8ddad2e28129a3 SHA512 c86869a5bc6099f9458564de2b1aa31002fe4bcbcfc3a5e87f524f38f4e25933e3eef11979d19276a10208bf8338fdcd20edb3cb26d8a13ace39cac6634f47a9
diff --git a/dev-haskell/regex-compat/metadata.xml b/dev-haskell/regex-compat/metadata.xml
deleted file mode 100644
index 5f096d14b333..000000000000
--- a/dev-haskell/regex-compat/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">lazy-regex</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/regex-compat/regex-compat-0.95.1-r1.ebuild b/dev-haskell/regex-compat/regex-compat-0.95.1-r1.ebuild
deleted file mode 100644
index f9a70e7a24ee..000000000000
--- a/dev-haskell/regex-compat/regex-compat-0.95.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: +newbase,+splitbase
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="https://sourceforge.net/projects/lazy-regex"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-haskell/regex-base-0.93:=[profile?]
-	>=dev-haskell/regex-posix-0.95.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=newbase \
-		--flag=splitbase
-}
diff --git a/dev-haskell/regex-pcre-0.94.4-r1 b/dev-haskell/regex-pcre-0.94.4-r1
new file mode 100644
index 000000000000..2cbb505e6ef1
--- /dev/null
+++ b/dev-haskell/regex-pcre-0.94.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/regex-base-0.93:=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/libpcre >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Replaces/Enhances Text.Regex
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/regex-pcre
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/regex-base-0.93:=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/libpcre
+SLOT=0/0.94.4
+SRC_URI=mirror://hackage/packages/archive/regex-pcre/0.94.4/regex-pcre-0.94.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a41d46e2eb19eb90d1d7946a34ee22d2
diff --git a/dev-haskell/regex-pcre-builtin-0.94.4.8.8.35 b/dev-haskell/regex-pcre-builtin-0.94.4.8.8.35
new file mode 100644
index 000000000000..9995e8c2e81c
--- /dev/null
+++ b/dev-haskell/regex-pcre-builtin-0.94.4.8.8.35
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/regex-base-0.93:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Replaces/Enhances Text.Regex
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/regex-pcre
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/regex-base-0.93:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.94.4.8.8.35
+SRC_URI=mirror://hackage/packages/archive/regex-pcre-builtin/0.94.4.8.8.35/regex-pcre-builtin-0.94.4.8.8.35.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=de58fa20c2da017eb97fc3eb947e3d7c
diff --git a/dev-haskell/regex-pcre-builtin/Manifest b/dev-haskell/regex-pcre-builtin/Manifest
deleted file mode 100644
index a02ca5739a7d..000000000000
--- a/dev-haskell/regex-pcre-builtin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST regex-pcre-builtin-0.94.4.8.8.35.tar.gz 311974 BLAKE2B d1c6f7b1f981d09e661db37035142a0097954ab23792bfa666e6b000dbda1c8d30dda27fb25c56828a57d5a2721b2e15d6319919f04f9bf95581af9f137f55a9 SHA512 6248cfc151db709284d0218630787dbfee0763f8f94c0c8b1a51469dfe47cfe550f67546c04e1aefcd61ba3db412e2051795b88bdb025e7518feeae82ba7860c
-EBUILD regex-pcre-builtin-0.94.4.8.8.35.ebuild 714 BLAKE2B 8cfef07275c0af86aef5e89da18d7a8e70eae185ebe66a6e3185bbb89fe16694c5b798c9af79461380db1ffe4fc8f0b667839cda53308120f7201d30f8436991 SHA512 88ada20bb01b52463dc487d6004bbb5541367c5129db9c740c67c5d189121de3f0329ca6e7060fdd80bc34ceac87002ef6861f961e808614980bcd74c108e88c
-MISC metadata.xml 329 BLAKE2B 976807788f790a7c988deab4ac793f965df6fd91bde2ea438899e03fec30910c197b89209fdfa22deac55b3ebd3c75157bd96fdc6a331dc19fcbcc78e8ceab03 SHA512 bc36f5519e6ee52f34e5f2c92d222be1ec0206141ac4e3c92da40a7b999cfff4ba5111b6d2908d272e8ef87aa259f92118f28f9a36404f5682ce5e7be7a23ca1
diff --git a/dev-haskell/regex-pcre-builtin/metadata.xml b/dev-haskell/regex-pcre-builtin/metadata.xml
deleted file mode 100644
index 7ab771da5d9b..000000000000
--- a/dev-haskell/regex-pcre-builtin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">lazy-regex</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.94.4.8.8.35.ebuild b/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.94.4.8.8.35.ebuild
deleted file mode 100644
index 7a1c0c3b1c45..000000000000
--- a/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.94.4.8.8.35.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-#hackport: flags: +newbase,+splitbase
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="http://hackage.haskell.org/package/regex-pcre"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/regex-base-0.93:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=newbase \
-		--flag=splitbase
-}
diff --git a/dev-haskell/regex-pcre/Manifest b/dev-haskell/regex-pcre/Manifest
deleted file mode 100644
index b7f47577a6aa..000000000000
--- a/dev-haskell/regex-pcre/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST regex-pcre-0.94.4.tar.gz 10814 BLAKE2B c6d634e240194d1099b4b6126fedb00bafb9f6118c9b11fff87d862b45e84b87005c6b2337871b17687dc63d15a74203b820aa04dffbae9517af34cc27dce71f SHA512 b14db2fb88f9a70b60cfac0ecc242554929d03982b7ffef18e36a2a8ddbef3bbc3f7f1ccb549aa805aec43f30b3ca22856d2e4315dba15e9c22ed34638dba92e
-EBUILD regex-pcre-0.94.4-r1.ebuild 737 BLAKE2B c25c49537294fdb903ebc0bf36474dd0cb3f89d612cce849eb17c33f1e35b2b42f4826e45b3861fc6077d036ea63803b8fff8fbe1e8278fdcb73cc452d70ac5d SHA512 cccadc08d040158ee3952960f23197a8333da9bd0e42019a61e6f9673db6743029896552218221130d042394480178c5c4621c6f80c5801c9e515c8dc0caeee1
-MISC metadata.xml 349 BLAKE2B 2a3c999e20b1e6ea4b1da5b942f84f326f93f5157df07d21c989d792b44d9ef9f26a31bed0004fa7445367fda8b3d1c7fe6734794437c96b62690798ff868978 SHA512 935f429a9ec311d5d4a6d78f30852946dc2857c6018beddd9b2e0a3e035c0e1213b5e2024828622f1ec2777be9b9ecd0dba41fd97e53cbbdafb8868983d7b432
diff --git a/dev-haskell/regex-pcre/metadata.xml b/dev-haskell/regex-pcre/metadata.xml
deleted file mode 100644
index 5c2ed0938046..000000000000
--- a/dev-haskell/regex-pcre/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The PCRE backend to accompany regex-base, see www.pcre.org
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/regex-pcre/regex-pcre-0.94.4-r1.ebuild b/dev-haskell/regex-pcre/regex-pcre-0.94.4-r1.ebuild
deleted file mode 100644
index b41c912c44c9..000000000000
--- a/dev-haskell/regex-pcre/regex-pcre-0.94.4-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-#hackport: flags: +newbase,+splitbase
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="http://hackage.haskell.org/package/regex-pcre"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/regex-base-0.93:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	dev-libs/libpcre
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=newbase \
-		--flag=splitbase
-}
diff --git a/dev-haskell/regex-posix-0.95.2 b/dev-haskell/regex-posix-0.95.2
new file mode 100644
index 000000000000..1ddfbdf812c1
--- /dev/null
+++ b/dev-haskell/regex-posix-0.95.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-haskell/regex-base-0.93[profile?] >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=191812200b3f3469ea89cc9d9ca76f51
diff --git a/dev-haskell/regex-posix/Manifest b/dev-haskell/regex-posix/Manifest
deleted file mode 100644
index eddd0a8e58c5..000000000000
--- a/dev-haskell/regex-posix/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX regex-posix-0.95.1-ghc-7.5.patch 554 BLAKE2B ceec0b6593f49a6ec9965c988e8b440a87ee11b5bc1e210d4466c8a84bc8044c34fcda91b8a359b763b9ef47b697f59fe1bdf5711f9a71ea2a33e00bbb717c44 SHA512 ea77dfc50967f5d3c8beb82ece23a1c48168fa59c08d7ce58b16c22c708fb4e49c76ab8b8aac0ef5306a2babb8666385f916295bd77f57b149cad5991ebb5516
-DIST regex-posix-0.95.2.tar.gz 42916 BLAKE2B 3b0192bf2eac5cf2376a5cfd73be4f138be2074fd3b80fe43c659015a2a731a61f1cf6537dd207c36e8fa893737b30f61516f23e815a8da52dc8866b36fc58d0 SHA512 2d22951f0302de144483d2c11d0711dc2cbd2fc6a0eac0126011eaa6f577837ae8c2a9516badb4beed6c18311241458dd6ad9f82a11d6f3763891880ebbc8c41
-EBUILD regex-posix-0.95.2.ebuild 684 BLAKE2B 30ce2e8cc3be54f65142b784bc47149499a046a9cc56d787145fa3670d5b51c91ff481925a646b659687f0bdab6c37c77f4ff15a0df6774d0f19aabfdffaa0a1 SHA512 92c3b8580784baffc72482db654fb46d589f665a4f044d09000e81fc93780aab4011423fa9763e5b11cd859b68f711d65b82235b8d17255def74e7433568d0f1
-MISC metadata.xml 409 BLAKE2B 521ecdf88b2947d4a498d4efd608950ac471dd05d501d767e047711f77c4847e0ce1d32d5710ce274d77591e2b7da7ea60f1e71a797e3b22166b531d67108f9e SHA512 7268260f6f6f43ac70640d2dcdedf01bb465c7e5d34c0aec154e67be1e1a13560be1653c6a47e38cd9aed0fa02fcbc64ecb3fc9cd13ab4221968d9c9f5965626
diff --git a/dev-haskell/regex-posix/files/regex-posix-0.95.1-ghc-7.5.patch b/dev-haskell/regex-posix/files/regex-posix-0.95.1-ghc-7.5.patch
deleted file mode 100644
index e0de5a751637..000000000000
--- a/dev-haskell/regex-posix/files/regex-posix-0.95.1-ghc-7.5.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- regex-posix-0.95.1-orig/Text/Regex/Posix/Wrap.hsc	2011-05-10 01:55:41.000000000 +1000
-+++ regex-posix-0.95.1/Text/Regex/Posix/Wrap.hsc	2012-05-13 18:06:06.314466286 +1000
-@@ -133,6 +133,9 @@
- import Foreign.Marshal.Alloc(mallocBytes)
- import Foreign.C(CSize,CInt,CChar)
- import Foreign.C.String(peekCAString, CString)
-+#if (__GLASGOW_HASKELL__>=705)
-+import Foreign.C.Types(CInt(..), CSize(..))
-+#endif
- import Text.Regex.Base.RegexLike(RegexOptions(..),RegexMaker(..),RegexContext(..),MatchArray)
- import qualified System.IO.Error as IOERROR(try)
- 
diff --git a/dev-haskell/regex-posix/metadata.xml b/dev-haskell/regex-posix/metadata.xml
deleted file mode 100644
index 8bfefc76efaa..000000000000
--- a/dev-haskell/regex-posix/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The posix regex backend for regex-base
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">lazy-regex</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/regex-posix/regex-posix-0.95.2.ebuild b/dev-haskell/regex-posix/regex-posix-0.95.2.ebuild
deleted file mode 100644
index 5b6881c88ed0..000000000000
--- a/dev-haskell/regex-posix/regex-posix-0.95.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit base haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="https://sourceforge.net/projects/lazy-regex"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-haskell/regex-base-0.93[profile?]
-		>=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-PATCHES=("${FILESDIR}/${PN}-0.95.1-ghc-7.5.patch")
diff --git a/dev-haskell/regex-tdfa-1.2.0 b/dev-haskell/regex-tdfa-1.2.0
new file mode 100644
index 000000000000..df84df3c9e2a
--- /dev/null
+++ b/dev-haskell/regex-tdfa-1.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/regex-base-0.93.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Replaces/Enhances Text.Regex
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/regex-tdfa
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/regex-base-0.93.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.0
+SRC_URI=mirror://hackage/packages/archive/regex-tdfa/1.2.0/regex-tdfa-1.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f505ac89bbea623093923a7c296eb07c
diff --git a/dev-haskell/regex-tdfa-1.2.1 b/dev-haskell/regex-tdfa-1.2.1
new file mode 100644
index 000000000000..3eff91810473
--- /dev/null
+++ b/dev-haskell/regex-tdfa-1.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/regex-base-0.93.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Replaces/Enhances Text.Regex
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/regex-tdfa
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/regex-base-0.93.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.1
+SRC_URI=mirror://hackage/packages/archive/regex-tdfa/1.2.1/regex-tdfa-1.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ccdfab170e8dc9551d77c0501243a02f
diff --git a/dev-haskell/regex-tdfa-1.2.2 b/dev-haskell/regex-tdfa-1.2.2
new file mode 100644
index 000000000000..6eb81f8c9883
--- /dev/null
+++ b/dev-haskell/regex-tdfa-1.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/regex-base-0.93.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Replaces/Enhances Text.Regex
+EAPI=6
+HOMEPAGE=https://github.com/ChrisKuklewicz/regex-tdfa
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/regex-base-0.93.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.2
+SRC_URI=mirror://hackage/packages/archive/regex-tdfa/1.2.2/regex-tdfa-1.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7a52d3bf9bda7fcb55a2c0d344ddbb2c
diff --git a/dev-haskell/regex-tdfa-rc-1.1.8.3 b/dev-haskell/regex-tdfa-rc-1.1.8.3
new file mode 100644
index 000000000000..9a876260ba3f
--- /dev/null
+++ b/dev-haskell/regex-tdfa-rc-1.1.8.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/regex-base-0.93.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Replaces/Enhances Text.Regex (fork by Roman Cheplyaka)
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/regex-tdfa-rc
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/regex-base-0.93.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.8.3
+SRC_URI=mirror://hackage/packages/archive/regex-tdfa-rc/1.1.8.3/regex-tdfa-rc-1.1.8.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9bbb5824423faa741aa16bc1fde72780
diff --git a/dev-haskell/regex-tdfa-rc/Manifest b/dev-haskell/regex-tdfa-rc/Manifest
deleted file mode 100644
index 351f26cf126b..000000000000
--- a/dev-haskell/regex-tdfa-rc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST regex-tdfa-rc-1.1.8.3.tar.gz 65728 BLAKE2B 19d0147fbea30d2ffe595fb0e2108662b87f30d4d8321d362f5e043bc5b194efcc4a7ed6732b2f84b218fe945be1b841e363ae43c5f3d4e84301e4f9416a980a SHA512 2664e70029548704a2086759a3f05fa34cca1034493451175ee2264d91e9fcd10605c115c51d0bbab77143eb43a62ea6677fda1716d6f500e2ae881d5e9afc02
-EBUILD regex-tdfa-rc-1.1.8.3.ebuild 672 BLAKE2B 72d966d1e78430c776375ff2271f7cc164188945a4bd6786770a0866479d14919197668c1ad912595f10e4d56a801a31f4628dbf9bfe205a13145003456e90e0 SHA512 a66ef350eb9fa03b27d0c6308065516b5f527511dc36e13c1b513ebd6c53ac20c1d23c007b92935a39e1c07495f17fe603a749c52e9b204029dfdbd2ff4228aa
-MISC metadata.xml 350 BLAKE2B d4b0b920ed1542d23b2f0a645d610554db98572253d202e3784518f0e1a94f7a2a8f6e0d567ebf5b287071ad0ebfcc63805096979352b191bdf1de9dee986bed SHA512 274d4faa8009a3cc0f409e275ade851a71dc87d2a8f18a8361bb61444b0b40677d9469e3cc1d2276d13763949a9f5d5e02cce0a9d719d2a837fbe7e943bbe874
diff --git a/dev-haskell/regex-tdfa-rc/metadata.xml b/dev-haskell/regex-tdfa-rc/metadata.xml
deleted file mode 100644
index ef9adfc1fe9c..000000000000
--- a/dev-haskell/regex-tdfa-rc/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-	</maintainer>
-	<longdescription>
-		A new all Haskell "tagged" DFA regex engine, inspired by libtre (fork by Roman Cheplyaka)
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/regex-tdfa-rc/regex-tdfa-rc-1.1.8.3.ebuild b/dev-haskell/regex-tdfa-rc/regex-tdfa-rc-1.1.8.3.ebuild
deleted file mode 100644
index 9edc5e35f13c..000000000000
--- a/dev-haskell/regex-tdfa-rc/regex-tdfa-rc-1.1.8.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex (fork by Roman Cheplyaka)"
-HOMEPAGE="http://hackage.haskell.org/package/${PN}"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-haskell/regex-base-0.93.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.3
-"
diff --git a/dev-haskell/regex-tdfa/Manifest b/dev-haskell/regex-tdfa/Manifest
deleted file mode 100644
index bc5dfb59c782..000000000000
--- a/dev-haskell/regex-tdfa/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST regex-tdfa-1.2.0.tar.gz 66039 BLAKE2B dd9a0d00e9608968d9e3a95428bb934661c17847645d73f5c1c0a6a96f83df8d99520971b245f217ea0dc2634ab70c7b7fe027aeacd86190d9694a997f14d01b SHA512 d4419c5d5062dbe63ec5931bd9f11020b3aa3227abdb66cac0732417e34cac9a3a9d564bba8114a77570e3b1bacce404062ab04536dafe10b764886af8e491c9
-DIST regex-tdfa-1.2.1.tar.gz 66108 BLAKE2B 105b048e48b98197b776249d99b60ccdcf6c81c2fddf362b19751abebffee6bb8b41d5549724218adee5b56f1ba80bb78b9d646c20e91781afd2cdc4148ff2a5 SHA512 04d3c7235c126695ceaaef0bbd5e6ee6ebffe7c4fb96b9f5a3df28bebe02a680cda870f228bd2e0e30ed98f88eeed4b4d4cdf6dc5ccd0b8e45c8427b6d7fa85d
-DIST regex-tdfa-1.2.2.tar.gz 65969 BLAKE2B c533dd7fd39e973ccf73d1bced6c35e65ce3a57a543e3e6c15c191748c2073c7d4a230f995168a2c52f4eafe152961950edcb28fa72c064a70bd058a49a28896 SHA512 86241b9bfa27351302e4ef18fd2cdc8a58341d6a8fa12c92e3ebb11cca93e58e5a69b97b545c61ce704bd6e2ac0b7a7c1a3555f138ba5ee9cf9728175f43d26a
-EBUILD regex-tdfa-1.2.0.ebuild 844 BLAKE2B cbacb22f8c3a4047ad257464fba45026fc52d504172997d5641cc52f09f3b59ce7b2b135126636ae43a15eb88c844e1d70dc4e9714851c35a70f7aeb2ad0f2fd SHA512 b72542b7363412b534e7a890090cf4601e154cec5b1cf4889f5db1a5d7bac2215f7d99d186f776a2a3776dc4216f5dcea7857e7942c9074ea4498f9158fdbde6
-EBUILD regex-tdfa-1.2.1.ebuild 846 BLAKE2B 50b9bdb480e20ea89ae817c1ce590eb04082717fa75bc38192036a9415288c258d55e6134a4844530ca57c3b47a037f2a3bd7facb908759cacaef7ac795a2573 SHA512 29b70c7a3cbba14294776278af652ac85934f4f0f4a88fe84fa5718a903cea2a9b6eaddd24e1b4cf7b24663f88df93e4b68def366f79237e17808075c6cff91c
-EBUILD regex-tdfa-1.2.2.ebuild 766 BLAKE2B 4f28641cb8e155abfce8a59540b8f4dc076465c7eb56464fa464fef9b54a8664d059214708e872a862709036329b5093ce3c3fd5d41adcda18ce92c48945aeb7 SHA512 049d931847f800117202e2d217f34f804bac9beea1dbcc79243b220d138e40ab7908bd39734ec9d9c613cba598a4c26fc641cc7744dfbce9f12ed1e7cb75f565
-MISC metadata.xml 444 BLAKE2B 0d14326afe1d69dec62f60c7b41e77ed8dff408f212f638f4a2f5eed25adc1865df2a6994c71e25b6a7394d6fbf4c40e75296bd08869e509f614362bdea3ae5f SHA512 6b72b58d486e2613a573d36ec714244b8bb9b23cceefe0714a4ca3778522a9f6435c4055b442d7ec465b4b89d6c5edb61890250b98d4d077d11638a84b711937
diff --git a/dev-haskell/regex-tdfa/metadata.xml b/dev-haskell/regex-tdfa/metadata.xml
deleted file mode 100644
index ba8348877db0..000000000000
--- a/dev-haskell/regex-tdfa/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A new all Haskell "tagged" DFA regex engine, inspired by libtre
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ChrisKuklewicz/regex-tdfa</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/regex-tdfa/regex-tdfa-1.2.0.ebuild b/dev-haskell/regex-tdfa/regex-tdfa-1.2.0.ebuild
deleted file mode 100644
index d9b9e7d2f523..000000000000
--- a/dev-haskell/regex-tdfa/regex-tdfa-1.2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-#hackport: flags: +base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="http://hackage.haskell.org/package/regex-tdfa"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-haskell/regex-base-0.93.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.3
-"
-
-src_prepare() {
-	# too much load on compiler (~2GB RAM against ~500)
-	cabal_chdeps \
-		'-O2 ' ' '
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=base4
-}
diff --git a/dev-haskell/regex-tdfa/regex-tdfa-1.2.1.ebuild b/dev-haskell/regex-tdfa/regex-tdfa-1.2.1.ebuild
deleted file mode 100644
index 272ac0acf03f..000000000000
--- a/dev-haskell/regex-tdfa/regex-tdfa-1.2.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="http://hackage.haskell.org/package/regex-tdfa"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-haskell/regex-base-0.93.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.3
-"
-
-src_prepare() {
-	# too much load on compiler (~2GB RAM against ~500)
-	cabal_chdeps \
-		'-O2 ' ' '
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=base4
-}
diff --git a/dev-haskell/regex-tdfa/regex-tdfa-1.2.2.ebuild b/dev-haskell/regex-tdfa/regex-tdfa-1.2.2.ebuild
deleted file mode 100644
index 65a4150ca7bf..000000000000
--- a/dev-haskell/regex-tdfa/regex-tdfa-1.2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -base4,-devel
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="https://github.com/ChrisKuklewicz/regex-tdfa"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-haskell/regex-base-0.93.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-base4 \
-		--flag=-devel
-}
diff --git a/dev-haskell/resource-pool-0.2.3.2 b/dev-haskell/resource-pool-0.2.3.2
new file mode 100644
index 000000000000..6118ad742c44
--- /dev/null
+++ b/dev-haskell/resource-pool-0.2.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/hashable:=[profile?] >=dev-haskell/monad-control-0.2.0.1:=[profile?] >=dev-haskell/stm-2.3:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A high-performance striped resource pooling implementation
+EAPI=5
+HOMEPAGE=https://github.com/bos/pool
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/hashable:=[profile?] >=dev-haskell/monad-control-0.2.0.1:=[profile?] >=dev-haskell/stm-2.3:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.3.2
+SRC_URI=mirror://hackage/packages/archive/resource-pool/0.2.3.2/resource-pool-0.2.3.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b82fd0e177ec6e0ddae7c59ebb6e94c7
diff --git a/dev-haskell/resource-pool/Manifest b/dev-haskell/resource-pool/Manifest
deleted file mode 100644
index e8986d2ac547..000000000000
--- a/dev-haskell/resource-pool/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST resource-pool-0.2.3.2.tar.gz 6527 BLAKE2B e57d2406a483f0252cc564de91f74c51b62b9c1e7b52ae147e5c60a647130c2803af469d5b33389a5ff618d259f110738a973580e7633d2ff2dc9e7d57cd82a7 SHA512 42b0bb6dea35c08884f65604acc0dd93707b8d4de780c584877e92fbfe534d4f754282e9c9f7257c203f1152d85ac8170f84ee9a95573343d02a774006c4118b
-EBUILD resource-pool-0.2.3.2.ebuild 901 BLAKE2B 40839b765adf0803e80e24c1a09c3bd68b998101dbd5e4bd60ac0bce8579d189ee9b12b2c78aa6a1ebd6cabf921b1b11c90917feff34690508d3d21def64b295 SHA512 5e81326ae7a0a7e53cc1f5502527d7d66cceea7063807c8b2c817b3bfd349e64f323d224fc98898272779fcda2d4f896e593d399b51ed14ccd4a12ea7c29edc7
-MISC metadata.xml 497 BLAKE2B 2000412624dbbaca92c36277ebf6235c704b3c5d10c82cb03f759d3fce03476a831090e70cc402be43d275bbd98c9914c658e68957338427818de7d79b9aba8d SHA512 8beb74da34b7c0ee0f919fd08f06d5ff77bf7889a608b569c2fa36ad6f45e0ad83ad4ab19ac17f12e667211d54a2e4107ac06e054734504996cb20d505182707
diff --git a/dev-haskell/resource-pool/metadata.xml b/dev-haskell/resource-pool/metadata.xml
deleted file mode 100644
index ef1c76317bd9..000000000000
--- a/dev-haskell/resource-pool/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A high-performance striped pooling abstraction for managing
-		flexibly-sized collections of resources such as database
-		connections.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bos/pool</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/resource-pool/resource-pool-0.2.3.2.ebuild b/dev-haskell/resource-pool/resource-pool-0.2.3.2.ebuild
deleted file mode 100644
index dda618bbdd2a..000000000000
--- a/dev-haskell/resource-pool/resource-pool-0.2.3.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A high-performance striped resource pooling implementation"
-HOMEPAGE="https://github.com/bos/pool"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hashable:=[profile?]
-	>=dev-haskell/monad-control-0.2.0.1:=[profile?]
-	>=dev-haskell/stm-2.3:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/resourcet-0.4.10 b/dev-haskell/resourcet-0.4.10
new file mode 100644
index 000000000000..073371ec0a78
--- /dev/null
+++ b/dev-haskell/resourcet-0.4.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.0.1:= >=dev-haskell/cabal-1.10.0.0 test? ( >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Deterministic allocation and freeing of scarce resources
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.0.1:=
+SLOT=0/0.4.10
+SRC_URI=mirror://hackage/packages/archive/resourcet/0.4.10/resourcet-0.4.10.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=11247cf981be97d8feb772767fa23ab7
diff --git a/dev-haskell/resourcet-0.4.9 b/dev-haskell/resourcet-0.4.9
new file mode 100644
index 000000000000..3842bdc83544
--- /dev/null
+++ b/dev-haskell/resourcet-0.4.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.0.1:= >=dev-haskell/cabal-1.10.0.0 test? ( >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Deterministic allocation and freeing of scarce resources
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.0.1:=
+SLOT=0/0.4.9
+SRC_URI=mirror://hackage/packages/archive/resourcet/0.4.9/resourcet-0.4.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=873e283307f2abdcb3e3c82326d282d1
diff --git a/dev-haskell/resourcet-1.1.2.2 b/dev-haskell/resourcet-1.1.2.2
new file mode 100644
index 000000000000..ce8560d2069b
--- /dev/null
+++ b/dev-haskell/resourcet-1.1.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/exceptions-0.5:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.0.1:= >=dev-haskell/cabal-1.10.0.0 test? ( >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Deterministic allocation and freeing of scarce resources
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/exceptions-0.5:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.0.1:=
+SLOT=0/1.1.2.2
+SRC_URI=mirror://hackage/packages/archive/resourcet/1.1.2.2/resourcet-1.1.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2157041a326125d5c45ab634b0eb6a97
diff --git a/dev-haskell/resourcet-1.1.7 b/dev-haskell/resourcet-1.1.7
new file mode 100644
index 000000000000..21be76ff1215
--- /dev/null
+++ b/dev-haskell/resourcet-1.1.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/exceptions-0.5:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Deterministic allocation and freeing of scarce resources
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/exceptions-0.5:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.7
+SRC_URI=mirror://hackage/packages/archive/resourcet/1.1.7/resourcet-1.1.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1a99c65173d174d020bd493766b553be
diff --git a/dev-haskell/resourcet-1.1.7.4 b/dev-haskell/resourcet-1.1.7.4
new file mode 100644
index 000000000000..9d3d2dbb175c
--- /dev/null
+++ b/dev-haskell/resourcet-1.1.7.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/exceptions-0.5:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Deterministic allocation and freeing of scarce resources
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/exceptions-0.5:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.7.4
+SRC_URI=mirror://hackage/packages/archive/resourcet/1.1.7.4/resourcet-1.1.7.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=89ac3c3fd10e4c246353201a0fe5b5c4
diff --git a/dev-haskell/resourcet-1.1.9 b/dev-haskell/resourcet-1.1.9
new file mode 100644
index 000000000000..6bbf8fd499ea
--- /dev/null
+++ b/dev-haskell/resourcet-1.1.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/exceptions-0.5:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Deterministic allocation and freeing of scarce resources
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/exceptions-0.5:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.1.9
+SRC_URI=mirror://hackage/packages/archive/resourcet/1.1.9/resourcet-1.1.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a19120b4a1848e65194b47837f6f24d6
diff --git a/dev-haskell/resourcet/Manifest b/dev-haskell/resourcet/Manifest
deleted file mode 100644
index ca4dc3c45e6a..000000000000
--- a/dev-haskell/resourcet/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-DIST resourcet-0.4.10.tar.gz 10455 BLAKE2B cb433337a4a9b9025a93a8229c02d2b3501b10c32ab0f997614bf7c239a52728ae3e08f58c2c528e079d9373bb8e2095006ba38966196451da28fa750075d7ac SHA512 34c97197b3651c45be1ab554d24651665f73cab560ccfaf4dd67413ff1945fe22c2aebc04e51e104475eadf436c3e9eea159737cc4f324658c510146a4045882
-DIST resourcet-0.4.9.tar.gz 9624 BLAKE2B af894f30ac4c3a953469d5bb4ab60f9f36ca1147426c62ab13360fe267290d2dd16c9d97575991dd7896cd74bb11b28e6eb830cf391ec46c790acd6ac71ff6d0 SHA512 7ec0f7c582d735d05bc793f5286d29d0578cf95784dc3e8d4e1f062687818bbac47637372192de7777045f121fc84e1eb716dfc817375b6c97526ff32a649c13
-DIST resourcet-1.1.2.2.tar.gz 10665 BLAKE2B dd7c24c11b6900a3a5e76c0590116bb6a9f802e736af43e2d6c09269827b0e6285d3d326870c790f66554269812e48aae177e53eec5a4a26f73b751e0d2a5d69 SHA512 10f80a7c9070c557ce30a30d132d483e5664cf72ebc0446ee2ab4280d80125a1445d87c931ca3124d8087f4972e6fde5dead73efcd90530e98cbb7744032cc90
-DIST resourcet-1.1.7.4.tar.gz 11674 BLAKE2B 97c9d36d1b7142a6ee36335279f9345f8ce25cd9847df490c143de03f1e34f15df87f57cbe0f77477737bc20f99a1b2ff75bd60dd6fa6809d11db7f749e28ddf SHA512 b61c117a12762b15be2de2676c4fdf9bf89b72ebc4875677a70f5b66358fb49ddd4753d6b1a541ae01dab41368b4e30cbd796caebdc4b8cce6ebf75c9cef08b5
-DIST resourcet-1.1.7.tar.gz 11627 BLAKE2B c0a01bcd14e5e4a988ec41ec6014eb8021217c8bb016f9198dfc5878071ffaebb44be9e56717090505dc710132fc984d9d0db61f198a0d065160c303540c0954 SHA512 27a348354fddfa348882217cb7a66987d843c87658c53f7d173276731e11cfc3438312028d4c35f7821db087a30227979a6d1018bc7e4ca516145c4f2a91a231
-DIST resourcet-1.1.9.tar.gz 15215 BLAKE2B 7ed72548d067e8c0382cb7e0fe423d14b3baf8df742d24375e0886f87e9df8ed480d3346f0f2b86e9660b0eea57cd5da07a7deda938e6a428d911773712a7b42 SHA512 e26e627c19198c1f25e368dda67ca15d52ad41eea70a81acf8ce244b30880b476d3d33b097199d12611bf80a3521196587d669684b18c47999e7abb5c00a7ab9
-EBUILD resourcet-0.4.10.ebuild 1033 BLAKE2B c1d6a88103e0543e0132a9d913f8bf64efbe294238b0028ce4ad32caf2996076d798ab14bc6f55970f7ef2ba34fadd835d375dc55b4fcd5b3a9c94719397a3f7 SHA512 7ecd32f87227992ef3c1626358cd7944f02444f928047294a169c440905663d5bef04de721329316e3dc1f5508ace515da726da8d3aa90bbc30eac1af9e06671
-EBUILD resourcet-0.4.9.ebuild 1031 BLAKE2B cc350eaed33e9f1cf9e104a3674bd6080732ca9f8cc38415545d735964d3b545d9f54a1847e8956e35e9761db441bd8c5e181ba69965a0420bab53768c85f2f0 SHA512 a100bc8e63546455adfa4c164704a018a1a9bf5ef84a2f9dabed4a62da3530cda4460e3422e754f4b254f2aa9d9bce3f4bc29caefe5aca66537f7912cec440f5
-EBUILD resourcet-1.1.2.2.ebuild 1073 BLAKE2B 5c1bb11b08e4bb9f36df1ee6f1681a4edc24fa0f876adaf69c9d48a746397e420cbe0e060850887aec1bd5248fd1081d173394d006d132b5dd7327f2ae5b5bbb SHA512 3a1e1543063740b8fb01420c14e220f1544c4fd4da6aadfd523087bf108b64818e674b2738609d2088b9305af52d26b858be98e2d4998ab9d2c42a81364b19ac
-EBUILD resourcet-1.1.7.4.ebuild 1124 BLAKE2B a862823cf5e6a5de4a024b412d2ee50a4212d8e98bd5f6beacaa5ddfc9eda30ef12cd08f1716b0d7577b43ed9f7753eb8216e4ae58298e961fc0e5ca325acc45 SHA512 0b11bbd74d5c2356219a6771b23a13cfe587754d94f9bd24d12b91ba6e4eb5bde341beddf972d75c62b8d793c29e31e765077a569c93bee60c8934d0171c0d16
-EBUILD resourcet-1.1.7.ebuild 1170 BLAKE2B 6ba68ba8f342e2b81b55d8d4296419d4589468a1e502da3b594fdc644fbf42b7d28f3838e4eabd9fefad474742e0c4ed8fd6f3e326e63644589bb675b50bbcfe SHA512 c8a990dabd627e3f8dc170ca2722da52bbae42750f3d6c5b599bd6bc901b6b9c3f18d213349e340a91eb2edd587f39ad6f22b2f2830f2973e158ee1f6369d2f2
-EBUILD resourcet-1.1.9.ebuild 1087 BLAKE2B 6d6b99bf9242c366c1879be50c646ee85646917d7f2a6c6c1e1bb54125479eb8e1e50f2f06bd0eead0ce479bc85d7edd774d84ddcddf352c4a9af45564426238 SHA512 ae4c1ef46e08bfa6ae2d2c5226b4fe304da651e66a34b833f2074546facc1e1986126a3578335af76186a43232fdba78a0d95f9eeb82365a39cdbe86caba425c
-MISC metadata.xml 544 BLAKE2B 394f5029f5accd2d702704824311737801c868f568dff2f63ec5566466c75e3c7dceaca1351a4308d6fbbf7d410904727b6f7f93efa1d1a6a6a93ecc1dbcea8c SHA512 ff84b8460fab34313f1f38fbab60bf5a228465c79eee21c52a83bd5621334ae50b2fb4a69051c452e6ed206dfb365744d3083938b7816c46c4cd4f40c0d42093
diff --git a/dev-haskell/resourcet/metadata.xml b/dev-haskell/resourcet/metadata.xml
deleted file mode 100644
index 295089b914d3..000000000000
--- a/dev-haskell/resourcet/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package was originally included with the conduit package, and has since been split off. For more information, please see &lt;http://www.yesodweb.com/book/conduits&gt;.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/conduit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/resourcet/resourcet-0.4.10.ebuild b/dev-haskell/resourcet/resourcet-0.4.10.ebuild
deleted file mode 100644
index fbc31f1165a5..000000000000
--- a/dev-haskell/resourcet/resourcet-0.4.10.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Deterministic allocation and freeing of scarce resources"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	>=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-	test? ( >=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/resourcet/resourcet-0.4.9.ebuild b/dev-haskell/resourcet/resourcet-0.4.9.ebuild
deleted file mode 100644
index 555897ae6570..000000000000
--- a/dev-haskell/resourcet/resourcet-0.4.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Deterministic allocation and freeing of scarce resources"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	>=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-	test? ( >=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/resourcet/resourcet-1.1.2.2.ebuild b/dev-haskell/resourcet/resourcet-1.1.2.2.ebuild
deleted file mode 100644
index 63c0e297543f..000000000000
--- a/dev-haskell/resourcet/resourcet-1.1.2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Deterministic allocation and freeing of scarce resources"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.5:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	>=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-	test? ( >=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/resourcet/resourcet-1.1.7.4.ebuild b/dev-haskell/resourcet/resourcet-1.1.7.4.ebuild
deleted file mode 100644
index 3f58a2319d77..000000000000
--- a/dev-haskell/resourcet/resourcet-1.1.7.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Deterministic allocation and freeing of scarce resources"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.5:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	>=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/resourcet/resourcet-1.1.7.ebuild b/dev-haskell/resourcet/resourcet-1.1.7.ebuild
deleted file mode 100644
index 6e479b52b9bd..000000000000
--- a/dev-haskell/resourcet/resourcet-1.1.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Deterministic allocation and freeing of scarce resources"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.5:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	>=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/resourcet/resourcet-1.1.9.ebuild b/dev-haskell/resourcet/resourcet-1.1.9.ebuild
deleted file mode 100644
index bccf52351dc9..000000000000
--- a/dev-haskell/resourcet/resourcet-1.1.9.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Deterministic allocation and freeing of scarce resources"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.5:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	>=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/retry-0.7.4.2 b/dev-haskell/retry-0.7.4.2
new file mode 100644
index 000000000000..2f04b4099963
--- /dev/null
+++ b/dev-haskell/retry-0.7.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/data-default-class:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.9 >=dev-haskell/hunit-1.2.5.2 <dev-haskell/hunit-1.6 dev-haskell/mtl >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.10 dev-haskell/stm ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Retry combinators for monadic actions that may fail
+EAPI=6
+HOMEPAGE=https://github.com/Soostone/retry
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/data-default-class:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.7.4.2
+SRC_URI=mirror://hackage/packages/archive/retry/0.7.4.2/retry-0.7.4.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0562b35ba0e40b8f33faadf25f0720e7
diff --git a/dev-haskell/retry/Manifest b/dev-haskell/retry/Manifest
deleted file mode 100644
index 37322777b3e0..000000000000
--- a/dev-haskell/retry/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST retry-0.7.4.2.tar.gz 9721 BLAKE2B 419f36f128ff3c1977daf6aff15346a499a199c444f1867d08b4da6351465f28298f85e77801fa197c26844558111853abede237939bfdf22fe7f1d977620c3e SHA512 5caeb55225759eae466dc0b0a78ff2538380fda75fbd52758639c12c20e3194d2b272fb9286fbffaf70366418654f2e46088954921a9840720b590598314ba2b
-EBUILD retry-0.7.4.2.ebuild 954 BLAKE2B a6025117e292270414b9c52ddc3f50346102cda54d694d4a8ff6cceed61ef979544dae09054b03201fd29dd973d8b7fd27b6618ade3736bb3a3c4ee32e32ffe1 SHA512 ee6f5d5f826a362dfaae75a154fb5528f6a092326fd327780f15b30f2d36513ff39aa778f5117b0f2b2a79a50c6b5f3aa6c778b34afd1169a41619aef0047bfe
-MISC metadata.xml 828 BLAKE2B 39e47fb53e0a6197850173d421049327a61f09ed8d24c44a5a09901b84af7a4529985d98d8eb340e34eaf1c766892cffd1b123de7dbcfe84b75ce9431b14cfc4 SHA512 59c32a88a5c3a50ac820c0c768f33f66f928b2674fb89a12b6f2be318a94b0043ef31d6b3db45296bd52989222a18947a5ae582b75232726daf63e75aa42d277
diff --git a/dev-haskell/retry/metadata.xml b/dev-haskell/retry/metadata.xml
deleted file mode 100644
index 8df6740dd53a..000000000000
--- a/dev-haskell/retry/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package exposes combinators that can wrap arbitrary
-		monadic actions. They run the action and potentially retry
-		running it with some configurable delay for a configurable
-		number of times.
-		The purpose is to make it easier to work with IO and
-		especially network IO actions that often experience temporary
-		failure and warrant retrying of the original action. For
-		example, a database query may time out for a while, in which
-		case we should hang back for a bit and retry the query instead
-		of simply raising an exception.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/retry/retry-0.7.4.2.ebuild b/dev-haskell/retry/retry-0.7.4.2.ebuild
deleted file mode 100644
index b497f43dc689..000000000000
--- a/dev-haskell/retry/retry-0.7.4.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Retry combinators for monadic actions that may fail"
-HOMEPAGE="https://github.com/Soostone/retry"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/exceptions-0.5:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
-	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.9
-		>=dev-haskell/hunit-1.2.5.2 <dev-haskell/hunit-1.6
-		dev-haskell/mtl
-		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.10
-		dev-haskell/stm )
-"
diff --git a/dev-haskell/rfc5051-0.1.0.3 b/dev-haskell/rfc5051-0.1.0.3
new file mode 100644
index 000000000000..b3905d403ef5
--- /dev/null
+++ b/dev-haskell/rfc5051-0.1.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.0.1:= >=dev-haskell/cabal-1.10.0.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple unicode collation as per RFC5051
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/rfc5051
+IUSE=mkunicodedata doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.0.1:=
+SLOT=0/0.1.0.3
+SRC_URI=mirror://hackage/packages/archive/rfc5051/0.1.0.3/rfc5051-0.1.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0cab520b1c91f84cf5b267dc55b134ee
diff --git a/dev-haskell/rfc5051/Manifest b/dev-haskell/rfc5051/Manifest
deleted file mode 100644
index ec7309250927..000000000000
--- a/dev-haskell/rfc5051/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rfc5051-0.1.0.3.tar.gz 217935 BLAKE2B 0957fd189a5d9560a790f9c8bc9ef7d6c839dcd2111471195c8b89ef1efbb448084b03498889e724095b5b0760138493a74d80026a478d0ba3a49cffa95be9a3 SHA512 aef601b6e42c3f4238e77452ef302f155ba7bc815d35cf680e2f260ce337644652ee4ac77ea03696a91563faaabd7c124b95a4c16661dd104ddc85be7d9dffa0
-EBUILD rfc5051-0.1.0.3.ebuild 669 BLAKE2B b82cc7344f92b3e5b9dd7596188dfb454ce79a4f38669e90c980dac9bcefd49d70eee5759f2f3ee9bf435bdf0b97075f3ff14b0bcf8ad0dc75a13b3313be3067 SHA512 ce71f3954cffd027a5ea1616e34282f40d40da0dd3c96b58b4230147f4c796d6ece295c33cd847ebfb224892b843bec759967ff4b4c054b627067e4b32473c78
-MISC metadata.xml 1087 BLAKE2B 57013de7ce27e188dd9392253d1db57f06ca2272a37a5ef2baa994c68c934dddabfb565f934681fa8e89be1e23d4b2de04ff242a90dee2bfaa73f4624ec50aa1 SHA512 31c69582d90831400266f9315c7ec3a6b00fad9ef76324d7ccf00af507fef5c4e13bd0047b997f7c84320ae9e083395167ee5c525adddc165fb18f5222ee58f1
diff --git a/dev-haskell/rfc5051/metadata.xml b/dev-haskell/rfc5051/metadata.xml
deleted file mode 100644
index 1f536000f3b9..000000000000
--- a/dev-haskell/rfc5051/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="mkunicodedata">build codes generator itself</flag>
-	</use>
-	<longdescription>
-		This library implements @i;unicode-casemap@,
-		the simple, non locale-sensitive unicode collation
-		algorithm described in RFC 5051 (&lt;http://www.rfc-editor.org/rfc/rfc5051.txt&gt;).
-		Proper unicode collation can be done using text-icu, but that is a big
-		dependency that depends on a large C library, and rfc5051 might be better
-		for some purposes.
-		
-		Here is a list of strings sorted by the Prelude's @sort@ function:
-		
-		@Abe Oeb abe ab&amp;#233; oeb &amp;#193;be &amp;#196;be &amp;#212;eb &amp;#225;be &amp;#228;be &amp;#244;eb@
-		
-		Here is the same list sorted by @sortBy compareUnicode@:
-		
-		@Abe abe ab&amp;#233; &amp;#193;be &amp;#225;be &amp;#196;be &amp;#228;be Oeb oeb &amp;#212;eb &amp;#244;eb@
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/rfc5051/rfc5051-0.1.0.3.ebuild b/dev-haskell/rfc5051/rfc5051-0.1.0.3.ebuild
deleted file mode 100644
index 6473d8f22183..000000000000
--- a/dev-haskell/rfc5051/rfc5051-0.1.0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple unicode collation as per RFC5051"
-HOMEPAGE="http://hackage.haskell.org/package/rfc5051"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="mkunicodedata"
-
-RDEPEND=">=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag mkunicodedata mkunicodedata)
-}
diff --git a/dev-haskell/riff-0.3.0.1 b/dev-haskell/riff-0.3.0.1
new file mode 100644
index 000000000000..66ee29455bac
--- /dev/null
+++ b/dev-haskell/riff-0.3.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/either-4.3:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=RIFF parser for Haskell
+EAPI=6
+HOMEPAGE=https://bitbucket.org/robertmassaioli/riff/overview
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/either-4.3:=[profile?] >=dev-lang/ghc-7.10.1:=
+SLOT=0/0.3.0.1
+SRC_URI=mirror://hackage/packages/archive/riff/0.3.0.1/riff-0.3.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=409ad579350bbc9f3556515bf76f7e15
diff --git a/dev-haskell/riff/Manifest b/dev-haskell/riff/Manifest
deleted file mode 100644
index 1379ba13fe71..000000000000
--- a/dev-haskell/riff/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST riff-0.3.0.1.tar.gz 9420 BLAKE2B 28715306b6c6ff6e630da306606f2946f05a5b0470576eae46761d7c368c502084cb4dcae0ddd6af2525491f83f7eb54101645a9d05fce53e117ab0d16123f69 SHA512 9b488fa0853dec662109809627c451ec22766595e710a14d25598e1232bc1e286a649a9fd4933bf42737b68554f1a0401c0fee12e833d6fd79b9eb989a4d23b2
-EBUILD riff-0.3.0.1.ebuild 811 BLAKE2B ba39c243d86977bd60a5013c94741fa164e6f80ba815d34bce9f6e0b745d2b43cb5ff1a730037e694bf2ba958a0a63583d59a84ae09bb3f2bb441fecdb783ba4 SHA512 e0aeec7ad5a20fdf7c736c47440153d927bb5a3d75a2758d0694e8aa60f1ad9904156942e390050a7f9045f6bab8a3bd7fe4f837f4bebab70cdf98746a22a476
-MISC metadata.xml 513 BLAKE2B dbece2e5a9c9ce115a159c6567e82851495dabf863a75ac812b8af948364eaeaa167cd475287a1d48ab112501bf46852c664692ee1323f599a24d99873de4088 SHA512 438371fd59af4219218051f77cccbe09cbd4ebaf66b247e0500568c70b5374820ab3d1498326edd9e724341c88461b0e3c395d783efc8d3aeb5d80c909391009
diff --git a/dev-haskell/riff/metadata.xml b/dev-haskell/riff/metadata.xml
deleted file mode 100644
index 9e39c9d11cc5..000000000000
--- a/dev-haskell/riff/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library provides a RIFF parser for Haskell for easy manipulation
-		of common file formats like WAVE and RIFF container AVI files.
-	</longdescription>
-	<upstream>
-		<remote-id type="bitbucket">robertmassaioli/riff</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/riff/riff-0.3.0.1.ebuild b/dev-haskell/riff/riff-0.3.0.1.ebuild
deleted file mode 100644
index 1af8e526a4cd..000000000000
--- a/dev-haskell/riff/riff-0.3.0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="RIFF parser for Haskell"
-HOMEPAGE="https://bitbucket.org/robertmassaioli/riff/overview"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/either-4.3:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'binary >=0.7 && <0.8' 'binary >=0.7' \
-		'either == 4.3.*' 'either >= 4.3' \
-		'filepath >=1.3 && <1.4' 'filepath >=1.3' \
-		'transformers == 0.4.*' 'transformers >= 0.4'
-}
diff --git a/dev-haskell/safe-0.3.9 b/dev-haskell/safe-0.3.9
new file mode 100644
index 000000000000..f294eaf11084
--- /dev/null
+++ b/dev-haskell/safe-0.3.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Library of safe (exception free) functions
+EAPI=5
+HOMEPAGE=https://github.com/ndmitchell/safe#readme
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~ppc64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.9
+SRC_URI=mirror://hackage/packages/archive/safe/0.3.9/safe-0.3.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ed1cdb0cde13aa3abe044c8834a24260
diff --git a/dev-haskell/safe-exceptions-0.1.4.0 b/dev-haskell/safe-exceptions-0.1.4.0
new file mode 100644
index 000000000000..02cd92fa4243
--- /dev/null
+++ b/dev-haskell/safe-exceptions-0.1.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec dev-haskell/void ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Safe, consistent, and easy exception handling
+EAPI=6
+HOMEPAGE=https://github.com/fpco/safe-exceptions#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.1.4.0
+SRC_URI=mirror://hackage/packages/archive/safe-exceptions/0.1.4.0/safe-exceptions-0.1.4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=42c601ed404ddc6aaa00ae3b3fe13a35
diff --git a/dev-haskell/safe-exceptions/Manifest b/dev-haskell/safe-exceptions/Manifest
deleted file mode 100644
index 569e84785479..000000000000
--- a/dev-haskell/safe-exceptions/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST safe-exceptions-0.1.4.0.tar.gz 12951 BLAKE2B afa5265d9674e1a88fa61cdf4c2356ffadeec3e922a52f418f88bdc1aaa22cf4378711b11a7679c99f933a515f53ca4338513fd4f2bf41f12159279d148a3131 SHA512 377559c3b35f48bd3baef4cb7bb19927bed36f34dfa531864a3565af9f7cb5ef9fc4cc9c92dcc9bb80037cb92f27dd0ba5805cc5941b8707bbc3d4185f0f40e1
-EBUILD safe-exceptions-0.1.4.0.ebuild 704 BLAKE2B 5462e13ed892cb81bf16a3d3908ec7f81d3b9c48afe56bc5332b0f180dc9b011c150c084e6bb808eb320ce5a13d99809a147ae083f9ea19980d897c2b38ddffd SHA512 99247e0251d54618cf46fcb24c6570cd16f89a3253ae3c5fffc396f3bdb66bba5b0e9f226c4de62f9ea9b78dc0b3974ba5f83945e483320e8369e7b98ed85762
-MISC metadata.xml 396 BLAKE2B c107144858612f775a87a0a786c3c640e777ab2df88a7651c4c642989c5149cc984a56d07b317892f97e86a560ea473a25483b9f53090462f1477d60c3286720 SHA512 0a5487203b949ac6e770e05ae8c6387c051ad7a91e39a20d91ca261d1bd7bc3b35d9788109457ea3689729001db73a369898e65a453c202de140dee8162f76cc
diff --git a/dev-haskell/safe-exceptions/metadata.xml b/dev-haskell/safe-exceptions/metadata.xml
deleted file mode 100644
index cda61119fab2..000000000000
--- a/dev-haskell/safe-exceptions/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Please see README.md
-	</longdescription>
-	<upstream>
-		<remote-id type="github">fpco/safe-exceptions</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/safe-exceptions/safe-exceptions-0.1.4.0.ebuild b/dev-haskell/safe-exceptions/safe-exceptions-0.1.4.0.ebuild
deleted file mode 100644
index 271fd86ad6f6..000000000000
--- a/dev-haskell/safe-exceptions/safe-exceptions-0.1.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Safe, consistent, and easy exception handling"
-HOMEPAGE="https://github.com/fpco/safe-exceptions#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec
-		dev-haskell/void )
-"
diff --git a/dev-haskell/safe/Manifest b/dev-haskell/safe/Manifest
deleted file mode 100644
index e7484fb3d2b9..000000000000
--- a/dev-haskell/safe/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST safe-0.3.9.tar.gz 6931 BLAKE2B 3aee0d7e8cedd0b196bb705b4a23f7679e40979f6b3b474a29fa27e4a684820707082979c5167d74fde1f763bd856659ca0c68e323c92fcfe08c1faa953bdac9 SHA512 7759ae8acf0348a3070cc47e78b224ac5a826ecf46302cbe413b52c53d8d6bb6ebd939b0fe3dbb47034e910876bd7c849609f008e44f09e5ccb99a9997d2f418
-EBUILD safe-0.3.9.ebuild 560 BLAKE2B 682add3e19c2465113d8c4d234d0564840282d7de2eac88ce28c1e75d11f1514651acc1c514f8a5276f9eb9ef6dba236da3dbd8f3753928784a35ef36ac28088 SHA512 a46799391357cdf65a725afc1967a0add473b90b199bb1203a727d1383b20f34ee3d15aad0000be58ba1ae02231b2fed107bb096b523459bd67b1bb97fcaa4d2
-MISC metadata.xml 671 BLAKE2B b2ce84efb78cfd7dc4ab81fce425ba25ac3cccf3d8cd6fab27f4b787ffbcba43d8c37842702dbfb195473597491fbc87ffbd7d6fec21fef1658233fd8d983583 SHA512 7cae1ab2eff3fe2468b6d7e10601bc1b61c90937509865e2f3487d3b66ac87f9956129ee3eeb260114a3a27e4e523e82dacbadc77e6edf2b1dc9174ba1a3ef79
diff --git a/dev-haskell/safe/metadata.xml b/dev-haskell/safe/metadata.xml
deleted file mode 100644
index 6f9afad8978c..000000000000
--- a/dev-haskell/safe/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Partial functions from the base library, such as @head@ and @!!@, modified
-		to return more descriptive error messages, programmer defined error messages,
-		@Maybe@ wrapped results and default values.
-		These functions can be used to reduce the number of unsafe pattern matches in
-		your code.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ndmitchell/safe#readme</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/safe/safe-0.3.9.ebuild b/dev-haskell/safe/safe-0.3.9.ebuild
deleted file mode 100644
index bc6f0b02e9bc..000000000000
--- a/dev-haskell/safe/safe-0.3.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Library of safe (exception free) functions"
-HOMEPAGE="https://github.com/ndmitchell/safe#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/safesemaphore-0.10.1 b/dev-haskell/safesemaphore-0.10.1
new file mode 100644
index 000000000000..6789d47591d7
--- /dev/null
+++ b/dev-haskell/safesemaphore-0.10.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/stm:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Much safer replacement for QSemN, QSem, and SampleVar
+EAPI=5
+HOMEPAGE=https://github.com/ChrisKuklewicz/SafeSemaphore
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=dev-haskell/stm:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.10.1
+SRC_URI=mirror://hackage/packages/archive/SafeSemaphore/0.10.1/SafeSemaphore-0.10.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0ff08aee95a07c258bf6e5e53da2c21a
diff --git a/dev-haskell/safesemaphore/Manifest b/dev-haskell/safesemaphore/Manifest
deleted file mode 100644
index 7c72bb5ad990..000000000000
--- a/dev-haskell/safesemaphore/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SafeSemaphore-0.10.1.tar.gz 24007 BLAKE2B c11997a1aba15f8357c1518135c7d78bdb27a6def14ef0da2f94b8530e8ba62a4f4031fca3df040be21474edf8b33e7ccc675d08a5fd855b876fc26f56530ff2 SHA512 877731622e1942f45fcc43e2ed8ba7ddfa2c1f4a7ea4f36cdf425a98acc9c2f54c742d98a7d1bb457ff122f20a5af399ac776bff7403b892353f812e42007250
-EBUILD safesemaphore-0.10.1.ebuild 725 BLAKE2B edbf72f99475e134aec45121786dfc8cc758541447a39b82a0eaebd0cd470657d9de9fa327a06f19335adfa2bac51be3eda5681b34d0a69c816876bf4201cd7c SHA512 aff2abc1e4a39a1f65c6df96476b2da4bc122421ecb8992ed6c4c0fb312c907445d26860718256657ccfbc53c7443a21e77a8da53b173c9de062c5b0221928b0
-MISC metadata.xml 618 BLAKE2B 4d06569c2983b3f2a3420cca9f02083db9c4784fea665682f04feed365215e44a40f6e4995f26f4ea95587a0a8a2c679638f19e66f432001988a5634fa38a71c SHA512 2b5ae768a93018b8a0b06ab910940681aae25f8305b8016115b7aeae16501c3ab1b14f55f26f2c46ca6cc42106ab9e4ac96adc882dfea64e009ca9e3121af900
diff --git a/dev-haskell/safesemaphore/metadata.xml b/dev-haskell/safesemaphore/metadata.xml
deleted file mode 100644
index 59189077d61e..000000000000
--- a/dev-haskell/safesemaphore/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This provides a much safer semaphore than the QSem, QSemN, SampleVar in base.
-		Those base modules are not exception safe and can be broken by killThread.
-		See &lt;https://github.com/ChrisKuklewicz/SafeSemaphore&gt; for more details.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ChrisKuklewicz/SafeSemaphore</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild b/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
deleted file mode 100644
index b613b64e9c43..000000000000
--- a/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="SafeSemaphore"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Much safer replacement for QSemN, QSem, and SampleVar"
-HOMEPAGE="https://github.com/ChrisKuklewicz/SafeSemaphore"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/stm:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit )
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/sandi-0.3.6 b/dev-haskell/sandi-0.3.6
new file mode 100644
index 000000000000..667cc860f518
--- /dev/null
+++ b/dev-haskell/sandi-0.3.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.8.2:= with-conduit? ( >=dev-haskell/conduit-1.2:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hunit dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck dev-haskell/tasty-th ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Data encoding library
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/sandi
+IUSE=+with-conduit doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.8.2:= with-conduit? ( >=dev-haskell/conduit-1.2:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] )
+SLOT=0/0.3.6
+SRC_URI=mirror://hackage/packages/archive/sandi/0.3.6/sandi-0.3.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b7233f40e9ae13180c49f46ff4b94b9e
diff --git a/dev-haskell/sandi-0.4.0 b/dev-haskell/sandi-0.4.0
new file mode 100644
index 000000000000..328646b5939a
--- /dev/null
+++ b/dev-haskell/sandi-0.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= with-conduit? ( >=dev-haskell/conduit-1.2:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hunit dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck dev-haskell/tasty-th ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Data encoding library
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/sandi
+IUSE=+with-conduit doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= with-conduit? ( >=dev-haskell/conduit-1.2:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] )
+SLOT=0/0.4.0
+SRC_URI=mirror://hackage/packages/archive/sandi/0.4.0/sandi-0.4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5758fce45b4f7ed33d8c20152eec6a92
diff --git a/dev-haskell/sandi/Manifest b/dev-haskell/sandi/Manifest
deleted file mode 100644
index fcc601aa8177..000000000000
--- a/dev-haskell/sandi/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST sandi-0.3.6.tar.gz 18463 BLAKE2B e480b127b08edf6d83504b06732f4565ee4e8c8438110a7fea6092f28a552ddda19b1fde93f021400272e9ebd1b5184cc09c902fdebb1fffc9bc2b1b426a736d SHA512 8a730f63e72fb648e2ae478a3785ab364b437a319735acda80558639cc0a43027639ff01dd2b630277348ebc31a4a5fe30ede8f4208229c1c8810f78d350bbf2
-DIST sandi-0.4.0.tar.gz 19319 BLAKE2B 87727c706832e4020f4e7794fa9c562415711766b5d37c4090f4f8ac3b71dfa840ae788b077b49c967ea885b2b915e16a7bd7845e62f46cc3c86fddcd1ca1005 SHA512 8d67d4630940b2bc75eba74e1aea169d604f27701015a19ecba6dfece9a2dc8a215a786991bc9ab1fc6de8c91c3b608144239b83c4cb01be0620b3ddb12ee8b6
-EBUILD sandi-0.3.6.ebuild 1034 BLAKE2B bfc00b61871ec3cc3901bec87db201ea386f40fcc251b6496abdd060d347275bf62223a187ce79124d9f7b0510572f6ced722c887fc1cfda77f8edea02ea3be6 SHA512 1fccafd015bcddd5bc64b114e1b0b5020b6da16368c086e94d4aafe26ed926ab3d516693a37ad5212523a8a0aef4faa80b82678fa8c3d40778e7e5fd611a0958
-EBUILD sandi-0.4.0.ebuild 1045 BLAKE2B 4e140814db7c90213bcb672f4ee343aa2f5ea83309c30c7bedbc5730802e090b79202a4edcfe7dd5c14dd98ce5cde0f2b556759722e7871a0516456212f0996d SHA512 50d4aa5fcd78d6d5e2caf77659d83b88c4360d9ec544d11f7423be07bf39e129c92c0846c2d2d1abdb41cb50024640d52ca52cf8462bc26d60cde84b969a3821
-MISC metadata.xml 398 BLAKE2B a71e1c70366bebe2a04bc69c27ef2130c588992c31931ec60923e94ad7f7831138f090a1c8f234d180f31a1baa3bf5d5826f0146fc91762e791b9d3be534295a SHA512 4f801519f877ab3ae401c93f45d2ff8cc902e737cb5fcfadce21db337eb1d9ae3426df32acb8ce2ee5cfbb9f28df673444f16479970c7a13bcf4d936625caced
diff --git a/dev-haskell/sandi/metadata.xml b/dev-haskell/sandi/metadata.xml
deleted file mode 100644
index 7f88c7da76c1..000000000000
--- a/dev-haskell/sandi/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Reasonably fast data encoding library.
-	</longdescription>
-	<use>
-		<flag name="with-conduit">Build with conduit</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/sandi/sandi-0.3.6.ebuild b/dev-haskell/sandi/sandi-0.3.6.ebuild
deleted file mode 100644
index 87312b7d4f6a..000000000000
--- a/dev-haskell/sandi/sandi-0.3.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Data encoding library"
-HOMEPAGE="http://hackage.haskell.org/package/sandi"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+with-conduit"
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-	with-conduit? ( >=dev-haskell/conduit-1.2:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-			>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck
-		dev-haskell/tasty-th )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >= 4.7 && <4.9' 'base >= 4.7'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag with-conduit with-conduit)
-}
diff --git a/dev-haskell/sandi/sandi-0.4.0.ebuild b/dev-haskell/sandi/sandi-0.4.0.ebuild
deleted file mode 100644
index 050a3e3385d2..000000000000
--- a/dev-haskell/sandi/sandi-0.4.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Data encoding library"
-HOMEPAGE="http://hackage.haskell.org/package/sandi"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+with-conduit"
-
-RDEPEND=">=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	with-conduit? ( >=dev-haskell/conduit-1.2:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-			>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck
-		dev-haskell/tasty-th )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag with-conduit with-conduit)
-}
diff --git a/dev-haskell/say-0.1.0.0 b/dev-haskell/say-0.1.0.0
new file mode 100644
index 000000000000..df6cfbac4412
--- /dev/null
+++ b/dev-haskell/say-0.1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-1.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec dev-haskell/temporary ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Initial project template from stack
+EAPI=6
+HOMEPAGE=https://github.com/fpco/say#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/text-1.2:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.1.0.0
+SRC_URI=mirror://hackage/packages/archive/say/0.1.0.0/say-0.1.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=406102d513b02bc5303e2fc3830c1c4e
diff --git a/dev-haskell/say/Manifest b/dev-haskell/say/Manifest
deleted file mode 100644
index 2fa9f4573e18..000000000000
--- a/dev-haskell/say/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST say-0.1.0.0.tar.gz 5728 BLAKE2B 0d0827a9b397a3b68b21bb1cd81b8303b81d17eb134704f2d54157194595ebfd43ca488b603514f8fcd9d4b69b0e8a8f74721637f2743fa1e3358c52479e3712 SHA512 8bbf2953e9b09e7f783688ccc7323ed0f91d1043db531844d875b5d12bdfbc0fa31148a9a193ea717b05704c25d56c66d8ad53376ba8b120d42f1173e5fde83c
-EBUILD say-0.1.0.0.ebuild 641 BLAKE2B 27fbb3d6f55c672596da095376feecaeaa77c71332c11f0397f5440c9dc7ada767f27f98072b98e816a3ae23b025e37505e0314d59d5b9784a5a65f70b37afd8 SHA512 550f5d387ff2d2e434946e8e5c05ae92419c67f9a8108ca1daf81b9a1c26dbd150d6d56561bcaf425d318e8b3e1e59546afa399446af3575d5ada9bb2def3aa8
-MISC metadata.xml 384 BLAKE2B f2c4ff8b70e45663ec9e79a779842bce30501e8ee6bb1f91e40662c4e820b13568cf2f8967b27d8f242c1f192abf4e3e9d548e584fc8e6ef37305044fcb0f76d SHA512 96b5ba1f2c07411375a275af5f549f2785daa5d885cf57ca9d6065554132dfc2c5c6295eaad89b32411b34c9101c4ad18d4e164709550fb3bda9b2721826ac8b
diff --git a/dev-haskell/say/metadata.xml b/dev-haskell/say/metadata.xml
deleted file mode 100644
index b6159361b19d..000000000000
--- a/dev-haskell/say/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Please see README.md
-	</longdescription>
-	<upstream>
-		<remote-id type="github">fpco/say</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/say/say-0.1.0.0.ebuild b/dev-haskell/say/say-0.1.0.0.ebuild
deleted file mode 100644
index 34f3296d653f..000000000000
--- a/dev-haskell/say/say-0.1.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Initial project template from stack"
-HOMEPAGE="https://github.com/fpco/say#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-1.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec
-		dev-haskell/temporary )
-"
diff --git a/dev-haskell/scientific-0.3.3.8 b/dev-haskell/scientific-0.3.3.8
new file mode 100644
index 000000000000..18c738a43ef3
--- /dev/null
+++ b/dev-haskell/scientific-0.3.3.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.9 >=dev-haskell/smallcheck-1.0 <dev-haskell/smallcheck-1.2 >=dev-haskell/tasty-0.5 <dev-haskell/tasty-0.11 >=dev-haskell/tasty-ant-xml-1.0 <dev-haskell/tasty-ant-xml-1.1 >=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.10 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 >=dev-haskell/tasty-smallcheck-0.2 <dev-haskell/tasty-smallcheck-0.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Numbers represented using scientific notation
+EAPI=5
+HOMEPAGE=https://github.com/basvandijk/scientific
+IUSE=+bytestring-builder doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/0.3.3.8
+SRC_URI=mirror://hackage/packages/archive/scientific/0.3.3.8/scientific-0.3.3.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b4f37e073a4e2b7d3ee3da1f536e3362
diff --git a/dev-haskell/scientific-0.3.4.4 b/dev-haskell/scientific-0.3.4.4
new file mode 100644
index 000000000000..b5fac10180b3
--- /dev/null
+++ b/dev-haskell/scientific-0.3.4.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.9 >=dev-haskell/smallcheck-1.0 <dev-haskell/smallcheck-1.2 >=dev-haskell/tasty-0.5 <dev-haskell/tasty-0.12 >=dev-haskell/tasty-ant-xml-1.0 <dev-haskell/tasty-ant-xml-1.1 >=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.10 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 >=dev-haskell/tasty-smallcheck-0.2 <dev-haskell/tasty-smallcheck-0.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Numbers represented using scientific notation
+EAPI=5
+HOMEPAGE=https://github.com/basvandijk/scientific
+IUSE=+bytestring-builder doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/0.3.4.4
+SRC_URI=mirror://hackage/packages/archive/scientific/0.3.4.4/scientific-0.3.4.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3b1bc93eb239e95494cc5b28646115d2
diff --git a/dev-haskell/scientific-0.3.4.6 b/dev-haskell/scientific-0.3.4.6
new file mode 100644
index 000000000000..15265b2cd70e
--- /dev/null
+++ b/dev-haskell/scientific-0.3.4.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.9 >=dev-haskell/smallcheck-1.0 <dev-haskell/smallcheck-1.2 >=dev-haskell/tasty-0.5 <dev-haskell/tasty-0.12 >=dev-haskell/tasty-ant-xml-1.0 <dev-haskell/tasty-ant-xml-1.1 >=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.10 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 >=dev-haskell/tasty-smallcheck-0.2 <dev-haskell/tasty-smallcheck-0.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Numbers represented using scientific notation
+EAPI=5
+HOMEPAGE=https://github.com/basvandijk/scientific
+IUSE=+bytestring-builder doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/0.3.4.6
+SRC_URI=mirror://hackage/packages/archive/scientific/0.3.4.6/scientific-0.3.4.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ad91b11a5b2887d97265e726e353dae4
diff --git a/dev-haskell/scientific-0.3.4.9 b/dev-haskell/scientific-0.3.4.9
new file mode 100644
index 000000000000..bb69c96ada8a
--- /dev/null
+++ b/dev-haskell/scientific-0.3.4.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.10 >=dev-haskell/smallcheck-1.0 <dev-haskell/smallcheck-1.2 >=dev-haskell/tasty-0.5 <dev-haskell/tasty-0.12 >=dev-haskell/tasty-ant-xml-1.0 <dev-haskell/tasty-ant-xml-1.1 >=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.10 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 >=dev-haskell/tasty-smallcheck-0.2 <dev-haskell/tasty-smallcheck-0.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Numbers represented using scientific notation
+EAPI=6
+HOMEPAGE=https://github.com/basvandijk/scientific
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.4.9
+SRC_URI=mirror://hackage/packages/archive/scientific/0.3.4.9/scientific-0.3.4.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7e6b2a7cdd4bfedc7e89090f343d5405
diff --git a/dev-haskell/scientific/Manifest b/dev-haskell/scientific/Manifest
deleted file mode 100644
index 2b88f3058981..000000000000
--- a/dev-haskell/scientific/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST scientific-0.3.3.8.tar.gz 18543 BLAKE2B ae3a16163d830fe20f7e2705b9e99aa9156743287aa45e635a282f5369b9132f2b8de11596353a5c374b0e11e5a2219ab40de842f1a273f956032fd1908ce514 SHA512 ef77aa3490cbbc92ab71c1db7015ead24100a6230444b895c49bc4840a80dad04f4f8ff0c1bff27490f5c35b53a1f0c294177912492d1259e204bd4d874ea477
-DIST scientific-0.3.4.4.tar.gz 21646 BLAKE2B 9ca2e989cea77dc70a1ce26de4571b0ccdd1ec68c7ab84f00bbb32d7a121963feae9cdd4acb7d51e417a698222143fd4a34d838af21e6f86551fb5f9e097e05f SHA512 18c36036ffe15ef4203d391864c91d505a4a55c7da1b71556cbd6ebb7f83e71e0695789f8beaa4741ae4e21ae54bc1f795a26cd4e3208d08625d639519945217
-DIST scientific-0.3.4.6.tar.gz 21932 BLAKE2B 5d78b981d5627b172af677a35a9bde73bd96053f06cf5e7945957400d3b2b6455bdd6d5039dbf21df16a8bf5f68889a54d9ef71eaf977e0908e21e7792575744 SHA512 c4d3f3c166c45395aa420ff598671128faae130cf85f22b651e338dbbdbe9215ef3b75c58f6b495978a4dd36a49fa45de9a68c7b870151296dc09095e3c79e09
-DIST scientific-0.3.4.9.tar.gz 21932 BLAKE2B 5f0f900b5b51d8b4720bf73d4f2ec4911df7156c9bb5013995eec5f9ee0817be61ad8caf4cc41d07f4b022467de1c6e6943eb630e93cb1b1d9760b6b2b0b58ee SHA512 10b317f6d6aa39883891d4fafaad3a8bdcc8390705f981144f3fe040191ffc7364e0505fde07ab7a3fa9d0b03f97adf42be48fcea2d13ef521fb1031590c0db3
-EBUILD scientific-0.3.3.8.ebuild 1290 BLAKE2B 1a59a844723557101a6550916fa4a559b3e371d9e75db7fb33cc7e5510a4b82aa90aeb495751372498bf8b8306503586876caa51050f7fa59fab5b34423cdab9 SHA512 4b9e617275ddfe0f85e8ab40951c3880155680ac21fc4f14f99490a6d30386ec60400a33dbd9c123d1be285604e0212aef6c957c6bae7d8e31f6ea1f471fef82
-EBUILD scientific-0.3.4.4.ebuild 1443 BLAKE2B 45e5ea5ab95b7a3973dca248da1982e723ac0ebe04caacaf4332dd8bec3d26968a0d1bee506334d597391aee44ff3a65bc18b38ff4eea8463aa11f23ba424736 SHA512 ccc23fb4fde3cc8ee9020c8b7d726837a1ed7ea36bd96f8f10e82f0fc11dc84e88df7ba17e870864c7bf529ecb74d37d7e47e766dec80e40414a2813a04cc733
-EBUILD scientific-0.3.4.6.ebuild 1443 BLAKE2B de6e2cd0d43e4e9b1394cbf34f42e736beac2a8d254232ee3e52ddfdabf6549a49f15a3c71db8ae0c6e01b02632c67aa32ab3d49c2dc09f3926ef37192cbea2a SHA512 d2019d14b4a6cee040a838be4619e72a528bd94acdace20abf4dceda3938fc8251d416d710f979d202ef247f424f67fae9bf777d0e19a9e0922c927b51862d8b
-EBUILD scientific-0.3.4.9.ebuild 1415 BLAKE2B 2484d7d34b3cbf3b8eaeef16fce6acba4188fa98e8c766a2e9954ed1c490c24e81380b3eba7ffd8b43d35d5579ef49cebae0ba8c1a183ad47c56779f8f101cea SHA512 b90db3510d69635f2a36f18bad1c415aa5897b9c4a46019c5d70cc2d149604faa463d05a1ad6d024bed6ec9b1febe64702c22a560740ba3676b514fdd6fb681f
-MISC metadata.xml 1019 BLAKE2B 199c5a43e898b24760454aa88076485f8615506c4feda7df63dec16a907f1f9a645039ce7c4a5c4bd85f642cc1aca577edfc3b714c8632eae99d0f827fbaf8e5 SHA512 954d114b29202a451e82be2dea78c68db8b23c52d46a2dbc59b7cbef7d500d91edc0e23dce702f36569caa7ed3c85ee52bc3cc314d18e9249218635390252963
diff --git a/dev-haskell/scientific/metadata.xml b/dev-haskell/scientific/metadata.xml
deleted file mode 100644
index af4a88b17cb6..000000000000
--- a/dev-haskell/scientific/metadata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A @Scientific@ number is an arbitrary-precision floating-point number
-		represented using scientific notation.
-
-		A scientific number with 'coefficient' @c@ and
-		'base10Exponent' @e@ corresponds to the
-		'Fractional' number: @'fromInteger' c * 10 '^^' e@
-
-		Its primary use-case is to serve as the target of
-		parsing floating point numbers. Since the textual
-		representation of floating point numbers use
-		scientific notation they can be efficiently
-		parsed to a @Scientific@ number.
-	</longdescription>
-	<use>
-		<flag name="bytestring-builder">
-			Provide the Data.ByteString.Builder.Scientific
-			module (requires bytestring &gt;= 0.10).
-		</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">basvandijk/scientific</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/scientific/scientific-0.3.3.8.ebuild b/dev-haskell/scientific/scientific-0.3.3.8.ebuild
deleted file mode 100644
index 93fb99ff04fd..000000000000
--- a/dev-haskell/scientific/scientific-0.3.3.8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Numbers represented using scientific notation"
-HOMEPAGE="https://github.com/basvandijk/scientific"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+bytestring-builder"
-
-RDEPEND=">=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/smallcheck-1.0 <dev-haskell/smallcheck-1.2
-		>=dev-haskell/tasty-0.5 <dev-haskell/tasty-0.11
-		>=dev-haskell/tasty-ant-xml-1.0 <dev-haskell/tasty-ant-xml-1.1
-		>=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9
-		>=dev-haskell/tasty-smallcheck-0.2 <dev-haskell/tasty-smallcheck-0.9 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bytestring-builder bytestring-builder)
-}
diff --git a/dev-haskell/scientific/scientific-0.3.4.4.ebuild b/dev-haskell/scientific/scientific-0.3.4.4.ebuild
deleted file mode 100644
index c06cbb3fe8f2..000000000000
--- a/dev-haskell/scientific/scientific-0.3.4.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Numbers represented using scientific notation"
-HOMEPAGE="https://github.com/basvandijk/scientific"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bytestring-builder"
-
-RDEPEND=">=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.8:=[profile?]
-	>=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/smallcheck-1.0 <dev-haskell/smallcheck-1.2
-		>=dev-haskell/tasty-0.5 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-ant-xml-1.0 <dev-haskell/tasty-ant-xml-1.1
-		>=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9
-		>=dev-haskell/tasty-smallcheck-0.2 <dev-haskell/tasty-smallcheck-0.9 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bytestring-builder bytestring-builder)
-}
diff --git a/dev-haskell/scientific/scientific-0.3.4.6.ebuild b/dev-haskell/scientific/scientific-0.3.4.6.ebuild
deleted file mode 100644
index 0fa3c5fdf2fa..000000000000
--- a/dev-haskell/scientific/scientific-0.3.4.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Numbers represented using scientific notation"
-HOMEPAGE="https://github.com/basvandijk/scientific"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bytestring-builder"
-
-RDEPEND=">=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	>=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/smallcheck-1.0 <dev-haskell/smallcheck-1.2
-		>=dev-haskell/tasty-0.5 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-ant-xml-1.0 <dev-haskell/tasty-ant-xml-1.1
-		>=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9
-		>=dev-haskell/tasty-smallcheck-0.2 <dev-haskell/tasty-smallcheck-0.9 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bytestring-builder bytestring-builder)
-}
diff --git a/dev-haskell/scientific/scientific-0.3.4.9.ebuild b/dev-haskell/scientific/scientific-0.3.4.9.ebuild
deleted file mode 100644
index a42bbdde38a3..000000000000
--- a/dev-haskell/scientific/scientific-0.3.4.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Numbers represented using scientific notation"
-HOMEPAGE="https://github.com/basvandijk/scientific"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	>=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.10
-		>=dev-haskell/smallcheck-1.0 <dev-haskell/smallcheck-1.2
-		>=dev-haskell/tasty-0.5 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-ant-xml-1.0 <dev-haskell/tasty-ant-xml-1.1
-		>=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9
-		>=dev-haskell/tasty-smallcheck-0.2 <dev-haskell/tasty-smallcheck-0.9 )
-"
diff --git a/dev-haskell/securemem-0.1.3 b/dev-haskell/securemem-0.1.3
new file mode 100644
index 000000000000..d15dd4db935c
--- /dev/null
+++ b/dev-haskell/securemem-0.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=abstraction to an auto scrubbing and const time eq, memory chunk
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-securemem
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.1.3
+SRC_URI=mirror://hackage/packages/archive/securemem/0.1.3/securemem-0.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c6417926d683cdac2b94f00f38787ae2
diff --git a/dev-haskell/securemem-0.1.9 b/dev-haskell/securemem-0.1.9
new file mode 100644
index 000000000000..82112b921e86
--- /dev/null
+++ b/dev-haskell/securemem-0.1.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/memory-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=abstraction to an auto scrubbing and const time eq, memory chunk
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-securemem
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/memory-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.9
+SRC_URI=mirror://hackage/packages/archive/securemem/0.1.9/securemem-0.1.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7f043110eb9577f235310fd8f9977e3e
diff --git a/dev-haskell/securemem/Manifest b/dev-haskell/securemem/Manifest
deleted file mode 100644
index 5a0882b24c72..000000000000
--- a/dev-haskell/securemem/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST securemem-0.1.3.tar.gz 4585 BLAKE2B e0be426122a732cc252d083400a5c2e0b6edb7bba162866d9d6d3a3a305c86e93ffa7a8880c5c45fc63c7efc6029a0c3ca01074b3fc325e59e449e5b85314b01 SHA512 a60b10e7d763d63d62de34685615592db6f6bb56a8bf57d7aa672956cfe5d98f0169436dcdad7694d1112eb80c59d98801266d78a061f93b320a0f4b27f8d2f6
-DIST securemem-0.1.9.tar.gz 4180 BLAKE2B faf24711bd6651ee162c189ad0ed005f013e3d66ccd940831ec6e17769487384aff206772d906ae7287d6eb4b0749857a0a79bf20f87f4dca6e3ddeb9b6aede8 SHA512 64623b5a695e0e946b5762fe47baea247e497c2f2add0887dc54300948d87088e8604eec58715f8b31642121100c63ead1c8db96ee7d6c60e1ce27b3da6d56e9
-EBUILD securemem-0.1.3.ebuild 618 BLAKE2B 40448092b7768d10d79203b5cd94f8a494439a60046af659226387092a121b905b1210a647f3bba10d12eebe71008f96423ce640c93d5859cd9f3221bb4fc196 SHA512 0e3c854d7d402d7bd51208663b86ba23e927d94e7e7aaf116d1cef9188e56377117ed612ff0d96ce2db693fb52a785da7a47c3da2fef560d5d3718aa6b34dd89
-EBUILD securemem-0.1.9.ebuild 657 BLAKE2B df7be337144e5a173db36c8d67708ae92f62756932367efdbcda32f1a8e772f84ab7479d9818b86079a81a037ea6abd44b6490712d36594ac7953de3039a9bca SHA512 efa8aac9ff95e41d1e01c559d02f1cf55a7dfc25e41d4466cf30a4ceb048489af156bdacadc73816a91abdc2f46f7f2893e1bfdeb40002472b1b69ecee60c3cf
-MISC metadata.xml 508 BLAKE2B abe2cb1ec464add4a8f06a615c8204e61cdc9149d8643e4a48cc2c7a9cfc40bb00849b1ae5ffe910b5d57a4cadd1ace45ea9e8cd3f28d977c62646f62596c550 SHA512 89ba6b755a9800c71f1c5e41915fe1efe1eaf521a6199bb4de558fa6a6a5a3c0bea6a29a6f969017b45c8f54db503bb8fcaf35317304a02083e96d29da12696a
diff --git a/dev-haskell/securemem/metadata.xml b/dev-haskell/securemem/metadata.xml
deleted file mode 100644
index 62858a206ab3..000000000000
--- a/dev-haskell/securemem/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		SecureMem is similar to ByteString, except that it provides a memory chunk that
-		will be auto-scrubbed after it run out of scope.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-securemem</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/securemem/securemem-0.1.3.ebuild b/dev-haskell/securemem/securemem-0.1.3.ebuild
deleted file mode 100644
index 4bbd028199a3..000000000000
--- a/dev-haskell/securemem/securemem-0.1.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="abstraction to an auto scrubbing and const time eq, memory chunk"
-HOMEPAGE="https://github.com/vincenthz/hs-securemem"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/securemem/securemem-0.1.9.ebuild b/dev-haskell/securemem/securemem-0.1.9.ebuild
deleted file mode 100644
index 13c69e23318c..000000000000
--- a/dev-haskell/securemem/securemem-0.1.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="abstraction to an auto scrubbing and const time eq, memory chunk"
-HOMEPAGE="https://github.com/vincenthz/hs-securemem"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?]
-	>=dev-haskell/memory-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/semigroupoid-extras-3.0.1 b/dev-haskell/semigroupoid-extras-3.0.1
new file mode 100644
index 000000000000..793ce9bc9bb5
--- /dev/null
+++ b/dev-haskell/semigroupoid-extras-3.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-3:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] >=dev-haskell/groupoids-3:=[profile?] >=dev-haskell/semigroupoids-3:=[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=Semigroupoids requiring Haskell extensions
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/semigroupoid-extras
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/comonad-3:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] >=dev-haskell/groupoids-3:=[profile?] >=dev-haskell/semigroupoids-3:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/3.0.1
+SRC_URI=mirror://hackage/packages/archive/semigroupoid-extras/3.0.1/semigroupoid-extras-3.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6c5094ef22ca78a969eead8b2e9bd804
diff --git a/dev-haskell/semigroupoid-extras-4.0 b/dev-haskell/semigroupoid-extras-4.0
new file mode 100644
index 000000000000..3f505621dfff
--- /dev/null
+++ b/dev-haskell/semigroupoid-extras-4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/semigroupoids-4.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3
+DESCRIPTION=This package has been absorbed into semigroupoids 4.0
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/semigroupoid-extras
+IUSE=profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/semigroupoids-4.0:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/4.0
+SRC_URI=mirror://hackage/packages/archive/semigroupoid-extras/4.0/semigroupoid-extras-4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f7bbd699bb31a1a4b646722bab8dcd68
diff --git a/dev-haskell/semigroupoid-extras-5 b/dev-haskell/semigroupoid-extras-5
new file mode 100644
index 000000000000..8ff984adddbf
--- /dev/null
+++ b/dev-haskell/semigroupoid-extras-5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-lang/ghc-7.6.1:= profunctors? ( >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] ) >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Semigroupoids that depend on PolyKinds
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/semigroupoid-extras
+IUSE=+profunctors doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-lang/ghc-7.6.1:= profunctors? ( >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] )
+SLOT=0/5
+SRC_URI=mirror://hackage/packages/archive/semigroupoid-extras/5/semigroupoid-extras-5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=303ecc21cbe196a889cd6895520ab741
diff --git a/dev-haskell/semigroupoid-extras/Manifest b/dev-haskell/semigroupoid-extras/Manifest
deleted file mode 100644
index c695a8c4df2d..000000000000
--- a/dev-haskell/semigroupoid-extras/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST semigroupoid-extras-3.0.1.tar.gz 5284 BLAKE2B 25337fde4ac14025634ff1f4dd0137ed2c2acddfa9a5fe43a88c72a0d8af3a452ea576fa54c1147049c827e1c0636ae387eb3f48af221a61628d9abeb4942458 SHA512 4794258e662b170db10499888aeaca5f4c31057227279befd173aaa412d45efdd7c6fa60398fb47addc382920f1c27da0fb30e4319d2395b20db756cf4315fd5
-DIST semigroupoid-extras-4.0.tar.gz 2052 BLAKE2B 591561f87a45c11c8f93f7a3c576246ca646d807a651c827186de3f938916230753f9f77cb800f12d30979689daa6bc2dc63e44e5d7033b64625040c5688ba00 SHA512 b439733eaadf41181e2bd4ef38ec4fc1bdeb8bf2ec9b13bf03217b14f31ad9bd08c2ed45dff3aa6e6ba046c0f675cdd5f047d4ddf010557947f5a384a4f979c9
-DIST semigroupoid-extras-5.tar.gz 6026 BLAKE2B e2dbde9a8495d80b61447d7091c682df1945f2ef9489abee3dac3c80a5f5c5b68b236bc52a038fc9c92c15805f8bd9d3afc640481253e158f48f51996d1065e3 SHA512 1eb8f12ee31b183038fd00705045b825c21b50dcafa58d8416315be99055d3c750dec59ce437b6f983c54237a889b150678dfa089559d361325a95b047cbd95d
-EBUILD semigroupoid-extras-3.0.1.ebuild 728 BLAKE2B 1fb091f300ec61fe15988c463adfe229e599c7de9f14159a0cea5b567236773d279c04d600aaf7441370d67ead7bb6e8726d0330163dd809a60de8db6243bcd3 SHA512 0648f8993b45afaf4447f5a098d0ce141137e2f3777c9d197badf8ad80fdd26a347215a96e92163c0256044f9d91f8fb9f721f6f103412bebeae933fa395ff57
-EBUILD semigroupoid-extras-4.0.ebuild 596 BLAKE2B 19b6670414e5f53992db015caffd35e639c2d73839ef35691cf9a87266a61e6e035a7c2458c66951b5787c439f45b8158bf09195ba3e40636b5d1a77660a2ace SHA512 f10ad04fae810b167193428ae8f1dce3aa01e3dddb18a1387c625d0aa86da99308baf8e5a8286130684f6dd404fbc2db5501f8bf7ec41f1a782aefd08f196191
-EBUILD semigroupoid-extras-5.ebuild 843 BLAKE2B 7ecda75de3d07b4087aafc25915bc9b84b5f4c264e18c605e69e733b86d0e6fc5a1fefe43fee321015059e51f8f7de035605ae29c74d658c5da310a5dca53c5d SHA512 8c5367bb731556acf3af1b0fefb4a4b82797081dd70ccbe1ff4f328f4ce1c012dd502d5185d78b745c137538b0241f520e4932b1226dcda2b7b4ddabc8ccd848
-MISC metadata.xml 717 BLAKE2B b1aac25c0ad733ef790e831e7ef9deb95f0f7cb37925fe9377e2d08fa2179d97515657896cf25aec70e3c827f54813e5393478e7afed395b6957a51eeb6a4934 SHA512 16e94b7627f9b9fd31d5617998fb5ba2a2e60c2795acf94cf8bd42969e562e0072fa6b26930a0035f761b1dbb1a92106b4483fc0f3dbaaf881f06588a4d1e44e
diff --git a/dev-haskell/semigroupoid-extras/metadata.xml b/dev-haskell/semigroupoid-extras/metadata.xml
deleted file mode 100644
index 0ba1bc3ea5c9..000000000000
--- a/dev-haskell/semigroupoid-extras/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Semigroupoids and semigroupoid operations requiring Haskell extensions
-	</longdescription>
-	<use>
-		<flag name="profunctors">
-			You can disable the use of the
-			`profunctors` package using `-f-profunctors`. Disabing this is
-			an unsupported configuration, but it may be useful for
-			accelerating builds in sandboxes for expert users.
-		</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ekmett/semigroupoid-extras</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/semigroupoid-extras/semigroupoid-extras-3.0.1.ebuild b/dev-haskell/semigroupoid-extras/semigroupoid-extras-3.0.1.ebuild
deleted file mode 100644
index 10817e629d32..000000000000
--- a/dev-haskell/semigroupoid-extras/semigroupoid-extras-3.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroupoids requiring Haskell extensions"
-HOMEPAGE="https://github.com/ekmett/semigroupoid-extras"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3:=[profile?]
-		>=dev-haskell/distributive-0.2.2:=[profile?]
-		>=dev-haskell/groupoids-3:=[profile?]
-		>=dev-haskell/semigroupoids-3:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/semigroupoid-extras/semigroupoid-extras-4.0.ebuild b/dev-haskell/semigroupoid-extras/semigroupoid-extras-4.0.ebuild
deleted file mode 100644
index 7d189cfc3cc3..000000000000
--- a/dev-haskell/semigroupoid-extras/semigroupoid-extras-4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="This package has been absorbed into semigroupoids 4.0"
-HOMEPAGE="https://github.com/ekmett/semigroupoid-extras"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/semigroupoids-4.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/semigroupoid-extras/semigroupoid-extras-5.ebuild b/dev-haskell/semigroupoid-extras/semigroupoid-extras-5.ebuild
deleted file mode 100644
index 42e7a4c47152..000000000000
--- a/dev-haskell/semigroupoid-extras/semigroupoid-extras-5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroupoids that depend on PolyKinds"
-HOMEPAGE="https://github.com/ekmett/semigroupoid-extras"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+profunctors"
-
-RDEPEND=">=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-	profunctors? ( >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag profunctors profunctors)
-}
diff --git a/dev-haskell/semigroupoids-3.1 b/dev-haskell/semigroupoids-3.1
new file mode 100644
index 000000000000..db13cc4d8af4
--- /dev/null
+++ b/dev-haskell/semigroupoids-3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=<dev-haskell/comonad-4:=[profile?] >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-1:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell 98 semigroupoids: Category sans id
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/semigroupoids
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=<dev-haskell/comonad-4:=[profile?] >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-1:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/3.1
+SRC_URI=mirror://hackage/packages/archive/semigroupoids/3.1/semigroupoids-3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e3e837a8a154e355bf3f23b9095fa9e0
diff --git a/dev-haskell/semigroupoids-4.0.2.1 b/dev-haskell/semigroupoids-4.0.2.1
new file mode 100644
index 000000000000..b6ab50eccfe7
--- /dev/null
+++ b/dev-haskell/semigroupoids-4.0.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-1:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Semigroupoids: Category sans id
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/semigroupoids
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-1:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/4.0.2.1
+SRC_URI=mirror://hackage/packages/archive/semigroupoids/4.0.2.1/semigroupoids-4.0.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3797e0910736d42fde122eb25be56a26
diff --git a/dev-haskell/semigroupoids-4.2 b/dev-haskell/semigroupoids-4.2
new file mode 100644
index 000000000000..5a8112fcd5c3
--- /dev/null
+++ b/dev-haskell/semigroupoids-4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= comonad? ( >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] ) contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Semigroupoids: Category sans id
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/semigroupoids
+IUSE=+comonad +containers +contravariant +distributive doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= comonad? ( >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] ) contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
+SLOT=0/4.2
+SRC_URI=mirror://hackage/packages/archive/semigroupoids/4.2/semigroupoids-4.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b3c5b5b1ec981be8132fe690f98657a9
diff --git a/dev-haskell/semigroupoids-4.3 b/dev-haskell/semigroupoids-4.3
new file mode 100644
index 000000000000..cf04e832f126
--- /dev/null
+++ b/dev-haskell/semigroupoids-4.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= comonad? ( >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] ) contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Semigroupoids: Category sans id
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/semigroupoids
+IUSE=+comonad +containers +contravariant +distributive doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= comonad? ( >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] ) contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
+RESTRICT=test
+SLOT=0/4.3
+SRC_URI=mirror://hackage/packages/archive/semigroupoids/4.3/semigroupoids-4.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fc358d7895e6c33a8944849353b82739
diff --git a/dev-haskell/semigroupoids-5.0.0.4 b/dev-haskell/semigroupoids-5.0.0.4
new file mode 100644
index 000000000000..e4b795358f33
--- /dev/null
+++ b/dev-haskell/semigroupoids-5.0.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= comonad? ( >=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-5:=[profile?] ) contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/doctest-0.9.1 <dev-haskell/doctest-0.11 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Semigroupoids: Category sans id
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/semigroupoids
+IUSE=+comonad +containers +contravariant +distributive +tagged doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= comonad? ( >=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-5:=[profile?] ) contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] )
+SLOT=0/5.0.0.4
+SRC_URI=mirror://hackage/packages/archive/semigroupoids/5.0.0.4/semigroupoids-5.0.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=48c0db45af4887ba989ee13072d6bea6
diff --git a/dev-haskell/semigroupoids-5.1 b/dev-haskell/semigroupoids-5.1
new file mode 100644
index 000000000000..e4fd0b76acc7
--- /dev/null
+++ b/dev-haskell/semigroupoids-5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= comonad? ( >=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-6:=[profile?] ) contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/doctest-0.9.1 <dev-haskell/doctest-0.12 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Semigroupoids: Category sans id
+EAPI=6
+HOMEPAGE=https://github.com/ekmett/semigroupoids
+IUSE=+comonad +containers +contravariant +distributive +tagged doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= comonad? ( >=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-6:=[profile?] ) contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] )
+SLOT=0/5.1
+SRC_URI=mirror://hackage/packages/archive/semigroupoids/5.1/semigroupoids-5.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=881dd430196cfcae62e9f7d6dc7e5f84
diff --git a/dev-haskell/semigroupoids/Manifest b/dev-haskell/semigroupoids/Manifest
deleted file mode 100644
index cbb917cfe260..000000000000
--- a/dev-haskell/semigroupoids/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-DIST semigroupoids-3.1.tar.gz 12317 BLAKE2B 9a2c419316c617d37aaf787c4b3f097bbe2d4c8f1f69829501173167e4a5cd9b34a675186401ca99a026f7662ddd27b446db493f919092843e005bff94e7b3ec SHA512 915425feb2f0d2c4c30a19b5823dd3377598b321835058202e623fe5f817f37d646ac1812192e570cd494ada5fb9df5784fa23bc38d39f95d8ed19b16f633755
-DIST semigroupoids-4.0.2.1.tar.gz 15805 BLAKE2B 9c8c36f5d01fee4da3cbcb44217c6b5090b704ac94598974e2861473f72e13dc09573124a84cdb5c802f505494f9d63946892cceaa5dbb0f0defa11f26398578 SHA512 9fe6c9b31013763d0581539f768ea608aa6990625a81307e4a665e1e9cdf47a225efa319489ac4a51c0237fab772bdd318fcc9f3d0d97221563bb8a885433815
-DIST semigroupoids-4.2.tar.gz 16395 BLAKE2B 92378cabf6fdd49ed31344ee181b5cfa7e8d787096ba482fb84b0f21361d101ed78d5af0dad794f32dbce5f555c6c29e28401c3023654b2798d52f6e7ece3019 SHA512 6de5f5d62215789c4ef2c5c20390991e5aa9c6106685daadfcc36f09b91483790d95458344f208e8582430fcaf1fba2f2531743e9a6f7353cec2024adafe10a9
-DIST semigroupoids-4.3.tar.gz 17190 BLAKE2B 6bdab910b519086dad7f98f78c6d0833d34151d0fdaec7acc359144f44269ad6af9cc5ca555f369a95f4beef7fa8b3d78502883b398cce7ff7141572ebda99dc SHA512 2c914071401e26f4c3aa312aab4dd6f5f3d232e0d3368b3c0dbef867bbc2fe1e75d574831994cb6d2b8dbf797b54b9b6573ed3a54392b300bb119779a0c5a961
-DIST semigroupoids-5.0.0.4.tar.gz 20795 BLAKE2B 349c25e8a660501ab5f87b609f12d2141e38f500d16c0ddf6c77c1e851531dbcf0990b83297fb987caae4d5e1efb6a80006d27532d7a24ab70b332ecb8ff4254 SHA512 f1d394a4a6b3f45f9d6cbd338245aa1b70162a91285900986376003799ab67e473a46339e986832ee40de525ef82f54a4766e1b29997425d94a42553e67e43fb
-DIST semigroupoids-5.1.tar.gz 21664 BLAKE2B 98e06a99dbaf2ab8425b3346cb2be2894c8b1839b56fde342471671759e5f4faa01b3cb681afcf3e900867b28050258e06c14d6cb0b6ee7476abb1b296bc4a19 SHA512 ffb02d3192f6a79dffad9cbd4f787484eeed6e49d9cfee412d1abdd4b552d151ca6d66711666f8448cc2c724383b5ff47e141088bdc69a2fb0d2122486fd4dc1
-EBUILD semigroupoids-3.1.ebuild 859 BLAKE2B 6eefff097c133af9351c40b0cde9bf5cea41984a9660123e2c25251cb226ae72cab061fabf1880a239b8fa2e793faf0ca774d158aee7a0f0652032136b6364c1 SHA512 be175bc5135544421e5f41010c717eb727bc24325388df0c95c3381c6198fde4b7b67cf2bf5b6ff98b637c26a71baf2a57060aafede3c654153c62e1770b3686
-EBUILD semigroupoids-4.0.2.1.ebuild 960 BLAKE2B 6134bae5aaa6198243fb8b43a12bb2383b6b5c7f53cd6c8440a2e1c7e9166b8afbea0c91309d6aeebccfb64f5bed338bb9457c8bdd6d1f2b9b2687f4bb26fda8 SHA512 16f3722b95b6c8def8377bacb06d3ccc25e81de81fd36b94b18f3adfc0ab15804de520409c09ee57b5b190e12a894eb77eb5c65245308823d89e494d92a6df61
-EBUILD semigroupoids-4.2.ebuild 1273 BLAKE2B 4bbd125d90daa83431146805c4b11a986287c0bc726879ef79ab75323e85b3a42af36b168a182952c6aee63a519f0f544edc926fa874ac1dd0fc86989ceda996 SHA512 ccbeb10ee43d1cdb4e4c375ff3869a1f2185164c0894757b32a4b30c83475a7f7fa929f9c3398d79f81e9f1f239617aeebee752ba728bff4036539e585a78540
-EBUILD semigroupoids-4.3.ebuild 1393 BLAKE2B 6e7e0d9d2b7585fb17686bd1ca67d459e9a3ac853d79c2f830229438801cb5dc5b5a7da2bc3769bd4de2615e028885e011fde18efee49592d0a4fd6cfc10cb86 SHA512 2e926b312a63d741607ce979cc4c5b89b069a32805c2319ecd74c1fee1bbe6a0528b672b6721c2021991aac703c3f5bbfb9a0cc1439abd5f2bf708c23d73abfc
-EBUILD semigroupoids-5.0.0.4.ebuild 1787 BLAKE2B b9186750d78b5469c821f732398be1650cf69cc81c7c6cfce2e773c18c3e9888c24aa9dc9cd5a8a5ca7846111a890a2ee68ef39b76ba73966e0c25c8983bcccc SHA512 68b22dc053cd0ef706e1a9bfec9e28c24d4540016ef765c6c24c3cae62b216585de12ae24b84942a9b9502745a95356dfd10f248696f178a9a2b3e8893f1d7a1
-EBUILD semigroupoids-5.1.ebuild 1785 BLAKE2B 4633f5fb8a1d3e493a9f64b549dae715eed6d31880d50ac0039983dcd6e5f789407de30ee5ced23fe200f17a397b94ae2630bcdd59a1a4166f2445993f94667b SHA512 4beee01085ee41db8ee6f0f8218294b9c4f7204fde309db2adc578602957624fca4c0dfce87e9b03b61de42c3a9e897f08fec249a5f911a3174fbfdd6afb5ced
-MISC metadata.xml 3901 BLAKE2B 610d61a659d9603532e67bcc12d0a3b04e00716fcc1bd72a6627d70a2df5a22dd026baafe2ba5ceb206de14e5e8eb2c13e0958db3c97e03aaf7a0129cdab5cd6 SHA512 abd91a8feaf1f4fcaa1c19aa9ad33c075fd9a002b7abb9e1b37399faa2fa430d67d17380bc03e7430fab5da56130bcbbb5700ffd05d4456c6cd7a546f4a7a930
diff --git a/dev-haskell/semigroupoids/metadata.xml b/dev-haskell/semigroupoids/metadata.xml
deleted file mode 100644
index d6c06edca015..000000000000
--- a/dev-haskell/semigroupoids/metadata.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Provides a wide array of semigroupoids and operations for working with semigroupds.
-
-		A Semigroupoid is a Category without the requirement of identity arrows for every object in the category.
-
-		When working with comonads you often have the @\&lt;*\&gt;@ portion of an @Applicative@, but
-		not the @pure@. This was captured in Uustalu and Vene's \"Essence of Dataflow Programming\"
-		in the form of the @ComonadZip@ class in the days before @Applicative@. Apply provides a weaker invariant, but for the comonads used for data flow programming (found in the streams package), this invariant is preserved. Applicative function composition forms a semigroupoid.
-
-		Similarly many structures are nearly a comonad, but not quite, for instance lists provide a reasonable 'extend' operation in the form of 'tails', but do not always contain a value.
-
-
-		Ideally the following relationships would hold:
-
-		&gt; Traversable &lt;---- Foldable &lt;--- Functor ------&gt; Alt ---------&gt; Plus           Semigroupoid
-		&gt;      |               |            |                              |                  |
-		&gt;      v               v            v                              v                  v
-		&gt; Traversable1 &lt;--- Foldable1     Apply --------&gt; Applicative -&gt; Alternative      Category
-		&gt;                                   |               |              |                  |
-		&gt;                                   v               v              v                  v
-		&gt;                                 Bind ---------&gt; Monad -------&gt; MonadPlus          Arrow
-		&gt;
-
-		Apply, Bind, and Extract give rise the Static, Kleisli and Cokleisli semigroupoids respectively.
-
-		This lets us remove many of the restrictions from various monad transformers
-		as in many cases the binding operation or @\&lt;*\&gt;@ operation does not require them.
-
-		Finally, to work with these weaker structures it is beneficial to have containers
-		that can provide stronger guarantees about their contents, so versions of 'Traversable'
-		and 'Foldable' that can be folded with just a 'Semigroup' are added.
-	</longdescription>
-	<use>
-		<flag name="comonad">
-			You can disable the use of the `comonad` package using
-			`-f-comonad`. Disabling this is an unsupported configuration, but it may be
-			useful for accelerating builds in sandboxes for expert users. If disabled we
-			will not supply instances of `Comonad`
-		</flag>
-		<flag name="containers">
-			You can disable the use of the `containers` package
-			using `-f-containers`. Disabing this is an unsupported configuration, but it
-			may be useful for accelerating builds in sandboxes for expert users.
-		</flag>
-		<flag name="contravariant">
-			You can disable the use of the `contravariant`
-			package using `-f-contravariant`. Disabling this is an unsupported
-			configuration, but it may be useful for accelerating builds in sandboxes for
-			expert users. If disabled we will not supply instances of `Contravariant`
-		</flag>
-		<flag name="distributive">
-			You can disable the use of the `distributive`
-			package using `-f-distributive`. Disabling this is an unsupported
-			configuration, but it may be useful for accelerating builds in sandboxes for
-			expert users. If disabled we will not supply instances of `Distributive`
-		</flag>
-		<flag name="tagged">
-			You can disable the use of the `tagged` package
-			using `-f-tagged`. Disabing this is an unsupported
-			configuration, but it may be useful for accelerating builds in
-			sandboxes for expert users.
-		</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ekmett/semigroupoids</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/semigroupoids/semigroupoids-3.1.ebuild b/dev-haskell/semigroupoids/semigroupoids-3.1.ebuild
deleted file mode 100644
index 61ef4fbe1323..000000000000
--- a/dev-haskell/semigroupoids/semigroupoids-3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 semigroupoids: Category sans id"
-HOMEPAGE="https://github.com/ekmett/semigroupoids"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/comonad-4:=[profile?]
-		>=dev-haskell/contravariant-0.2.0.1:=[profile?]
-		<dev-haskell/contravariant-1:=[profile?]
-		>=dev-haskell/semigroups-0.8.3.1:=[profile?]
-		<dev-haskell/semigroups-1:=[profile?]
-		>=dev-haskell/transformers-0.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/semigroupoids/semigroupoids-4.0.2.1.ebuild b/dev-haskell/semigroupoids/semigroupoids-4.0.2.1.ebuild
deleted file mode 100644
index 4817b0a8f18a..000000000000
--- a/dev-haskell/semigroupoids/semigroupoids-4.0.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroupoids: Category sans id"
-HOMEPAGE="https://github.com/ekmett/semigroupoids"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-1:=[profile?]
-	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/semigroupoids/semigroupoids-4.2.ebuild b/dev-haskell/semigroupoids/semigroupoids-4.2.ebuild
deleted file mode 100644
index 2aaba5785397..000000000000
--- a/dev-haskell/semigroupoids/semigroupoids-4.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroupoids: Category sans id"
-HOMEPAGE="https://github.com/ekmett/semigroupoids"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+comonad +containers +contravariant +distributive"
-
-RDEPEND=">=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	comonad? ( >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] )
-	contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] )
-	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag comonad comonad) \
-		$(cabal_flag containers containers) \
-		$(cabal_flag contravariant contravariant) \
-		$(cabal_flag distributive distributive)
-}
diff --git a/dev-haskell/semigroupoids/semigroupoids-4.3.ebuild b/dev-haskell/semigroupoids/semigroupoids-4.3.ebuild
deleted file mode 100644
index a2f278f2f837..000000000000
--- a/dev-haskell/semigroupoids/semigroupoids-4.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroupoids: Category sans id"
-HOMEPAGE="https://github.com/ekmett/semigroupoids"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+comonad +containers +contravariant +distributive"
-RESTRICT="test"
-
-RDEPEND=">=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	comonad? ( >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] )
-	contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] )
-	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag comonad comonad) \
-		$(cabal_flag containers containers) \
-		$(cabal_flag contravariant contravariant) \
-		$(cabal_flag distributive distributive)
-}
diff --git a/dev-haskell/semigroupoids/semigroupoids-5.0.0.4.ebuild b/dev-haskell/semigroupoids/semigroupoids-5.0.0.4.ebuild
deleted file mode 100644
index 6596e7c6e693..000000000000
--- a/dev-haskell/semigroupoids/semigroupoids-5.0.0.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +doctests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroupoids: Category sans id"
-HOMEPAGE="https://github.com/ekmett/semigroupoids"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+comonad +containers +contravariant +distributive +tagged"
-
-RDEPEND=">=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	comonad? ( >=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-5:=[profile?] )
-	contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] )
-	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
-	tagged? ( >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.9.1 <dev-haskell/doctest-0.11 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag comonad comonad) \
-		$(cabal_flag containers containers) \
-		$(cabal_flag contravariant contravariant) \
-		$(cabal_flag distributive distributive) \
-		--flag=doctests \
-		$(cabal_flag tagged tagged)
-}
diff --git a/dev-haskell/semigroupoids/semigroupoids-5.1.ebuild b/dev-haskell/semigroupoids/semigroupoids-5.1.ebuild
deleted file mode 100644
index d221202aa3dc..000000000000
--- a/dev-haskell/semigroupoids/semigroupoids-5.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: +doctests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroupoids: Category sans id"
-HOMEPAGE="https://github.com/ekmett/semigroupoids"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+comonad +containers +contravariant +distributive +tagged"
-
-RDEPEND=">=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	comonad? ( >=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-6:=[profile?] )
-	contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] )
-	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
-	tagged? ( >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.9.1 <dev-haskell/doctest-0.12 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag comonad comonad) \
-		$(cabal_flag containers containers) \
-		$(cabal_flag contravariant contravariant) \
-		$(cabal_flag distributive distributive) \
-		--flag=doctests \
-		$(cabal_flag tagged tagged)
-}
diff --git a/dev-haskell/semigroups-0.11-r1 b/dev-haskell/semigroups-0.11-r1
new file mode 100644
index 000000000000..98119f003e0d
--- /dev/null
+++ b/dev-haskell/semigroups-0.11-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Anything that associates
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/semigroups/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/0.11
+SRC_URI=mirror://hackage/packages/archive/semigroups/0.11/semigroups-0.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=53a67da96cbf93fa589ce15ece0fe5ce
diff --git a/dev-haskell/semigroups-0.12.1 b/dev-haskell/semigroups-0.12.1
new file mode 100644
index 000000000000..55992bb34d54
--- /dev/null
+++ b/dev-haskell/semigroups-0.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Anything that associates
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/semigroups/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/0.12.1
+SRC_URI=mirror://hackage/packages/archive/semigroups/0.12.1/semigroups-0.12.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bd40daf0369d2f8ef39e94f12757a356
diff --git a/dev-haskell/semigroups-0.12.2 b/dev-haskell/semigroups-0.12.2
new file mode 100644
index 000000000000..b57367695dc4
--- /dev/null
+++ b/dev-haskell/semigroups-0.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Anything that associates
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/semigroups/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/0.12.2
+SRC_URI=mirror://hackage/packages/archive/semigroups/0.12.2/semigroups-0.12.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=37fec4d6672ab8e5d18203818e4d8066
diff --git a/dev-haskell/semigroups-0.15.1 b/dev-haskell/semigroups-0.15.1
new file mode 100644
index 000000000000..0e16fb7f6719
--- /dev/null
+++ b/dev-haskell/semigroups-0.15.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1:=[profile?] >=dev-lang/ghc-7.4.1:= hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] unordered-containers? ( >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) ) text? ( >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?] ) >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Anything that associates
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/semigroups/
+IUSE=+bytestring +containers +hashable +text +unordered-containers doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1:=[profile?] >=dev-lang/ghc-7.4.1:= hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] unordered-containers? ( >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) ) text? ( >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?] )
+SLOT=0/0.15.1
+SRC_URI=mirror://hackage/packages/archive/semigroups/0.15.1/semigroups-0.15.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=36de828af3d8dde1895def5572639dbc
diff --git a/dev-haskell/semigroups-0.16.2.2 b/dev-haskell/semigroups-0.16.2.2
new file mode 100644
index 000000000000..e39a49772acf
--- /dev/null
+++ b/dev-haskell/semigroups-0.16.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?] >=dev-lang/ghc-7.4.1:= hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] unordered-containers? ( >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) ) text? ( >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?] ) >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Anything that associates
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/semigroups/
+IUSE=+bytestring +containers +deepseq +hashable +text +unordered-containers doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?] >=dev-lang/ghc-7.4.1:= hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] unordered-containers? ( >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) ) text? ( >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?] )
+SLOT=0/0.16.2.2
+SRC_URI=mirror://hackage/packages/archive/semigroups/0.16.2.2/semigroups-0.16.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=899918ef7158c0810eb95f4c6e75b14e
diff --git a/dev-haskell/semigroups-0.18.2 b/dev-haskell/semigroups-0.18.2
new file mode 100644
index 000000000000..9214343f86aa
--- /dev/null
+++ b/dev-haskell/semigroups-0.18.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-1:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= binary? ( dev-haskell/binary:=[profile?] ) transformers? ( >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] ) >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Anything that associates
+EAPI=6
+HOMEPAGE=https://github.com/ekmett/semigroups/
+IUSE=+binary +transformers doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-1:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= binary? ( dev-haskell/binary:=[profile?] ) transformers? ( >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] )
+SLOT=0/0.18.2
+SRC_URI=mirror://hackage/packages/archive/semigroups/0.18.2/semigroups-0.18.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1a10ab5023f3a0f690e8c4d2caec2fba
diff --git a/dev-haskell/semigroups-0.9.2 b/dev-haskell/semigroups-0.9.2
new file mode 100644
index 000000000000..edf8127d31d0
--- /dev/null
+++ b/dev-haskell/semigroups-0.9.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/nats-0.1:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell 98 semigroups
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/semigroups/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/nats-0.1:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/0.9.2
+SRC_URI=mirror://hackage/packages/archive/semigroups/0.9.2/semigroups-0.9.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=eab3ba663f750041da6d0ba9ce94b7f9
diff --git a/dev-haskell/semigroups/Manifest b/dev-haskell/semigroups/Manifest
deleted file mode 100644
index bdb86ac5a79a..000000000000
--- a/dev-haskell/semigroups/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-AUX semigroups-0.15.1-trust.patch 1087 BLAKE2B b08f38132e7382e01beef17e801a2dc7a1e3a3eb1e86d089975b89d3f56c159a3e8741a19a17e3ecb710656d49599c94f19cf86d7974c0e51fd2635d8af3d113 SHA512 a31f9764133eae3081e6093c5e2f111f8815ce620b1d41ae3bf968271f694cc7e080542fe85290e6cf5505fd49dd3d5ed219823fda9e47dd94c6c66134c442df
-DIST semigroups-0.11.tar.gz 10152 BLAKE2B 9309b66982ca09e1985e7950f29d18f94f276018d57ed4dfb6e293baf13d7f320120ec835b3db3b19ed20dd7c7376b10adbec16cae608adca782a7fdd696901a SHA512 56eea20181fda3480c562230ff07e73dc5a1e163fb1da87717971cf95c672afc8c3e52fc9b6fbc98c29772f44245d2cd78d0bdf368bbefa84cefdbfe73c4f8e4
-DIST semigroups-0.12.1.tar.gz 10541 BLAKE2B b91cd8dcd00e2cbd82120c68a62cc72db94f70aaba58390c181f2e1629a52efda97c7d97fdc70d6732eff6bf8a5ed4bdcf2ce2f2a393d425c0c2f158c98a77b3 SHA512 309729b99d7912e8a07ef4d57c433e46233e77828c84a3c9ecabe6d17ed5ab28d7b23111c5d55f7324bbedfe512b1cd4a7e698b8177f631629159f6e72f9d4ca
-DIST semigroups-0.12.2.tar.gz 10546 BLAKE2B 65940addc7f040cc9e46a86c73ca821f3eb7b4dcb2f9e320ba8699bfcc1721e5980dc9a0ad4adf3549fa1c1989b08ccabb88cab9d669594a2c412333d060bcd1 SHA512 20bc7c2273752b6377d2aea662eeb62dbfc020f07767e4c822c8d5072c8803e4b525ca96a2fe02a0a4d28d9268f91d4f87735506ba4c4bccf5491b1f4da7a753
-DIST semigroups-0.15.1.tar.gz 11715 BLAKE2B 1c755b29b80663bc11c55c9f2b1863c7d62ffee88466a623181d7552ea4eeae5cc3f3481855197f738c59e21c50ddd527da268bde378d592a72d5ae947231c88 SHA512 416bbf402f2e928fae81ba955d48d0fa636f6451c1a7ff02bcca2ff44b4e34eb91d8f2bfa39316e646d8bf2c7829858d795bb93640e70be049b232d1ec74d886
-DIST semigroups-0.16.2.2.tar.gz 15159 BLAKE2B eda7050147fb9aaca8051922601a42e19e84282cf88958a60ab66eea2a544e32b6034272f3cf3f07109aa15df73e81b352c818f4b20d1be6b71e459f8c0b8c98 SHA512 c40d666ae14f0f1052db3887b9327282ef2c535becda8bf2aa4dd8688d1744a738a6e7227e69c1b99255433e0673d67efaea287e26236cca2b13c3db951c30b3
-DIST semigroups-0.18.2.tar.gz 17026 BLAKE2B 68112f907b9251656751987f476dee67fd4e2a31b4f2cc81071558f6298933bf8904442eda053eb520cf505d255ec256e54060182a2474d543c8044506ac5b59 SHA512 db43500859eb041eee800727f1606a96bb9367fa7032bb15ee02b7d34a9d5e46bd8d4ce991988058b05b75816351f837e180e1f8df7dda78548cf3fde7a57e45
-DIST semigroups-0.9.2.tar.gz 9653 BLAKE2B b73901c69a6321ffc478f79a7fb7280074010e512955f7aed5dc4f91742b4838b0a821ebc7aca23d259b0fc38589ddfb18c27a2f163843f729d4c93f65487066 SHA512 43385abeed142425fe858632f0bab265e8dda078ab24b270c0b22f798270af502ccff28863200c330fc4e2bdf88fd625b60be25480a9879328e517b2db09c2e0
-EBUILD semigroups-0.11-r1.ebuild 927 BLAKE2B 4119ca8440f1a573d846b1343b3a7129345a47aa587344efbb8e6175bf6bbde4b04679fd8926ccc5f5233fcbb9813e1e3d279f96bb56d35709038194f094d6ce SHA512 b8fa2b035cedabbf5f34b86fed83cf28c38ca43ec30665f2a3a53f21486dec40373b8223e333c3758f2905488bccd2ca11aae48533b228edb94603ece0a0cb50
-EBUILD semigroups-0.12.1.ebuild 852 BLAKE2B a3608936f68d00f31a1b7064a5badcfc5132ba3a6e62bde0bdf3941def8acaf187505e302f1eab8a99bafd1f6ff7e2e5ae0a91cb5a337b524669faa75c0bdc6c SHA512 2a0d91e91f90ded4276ab5c1f59644db0d28f6378dd1a4f4274caf6c10e28cdb379f4775fe1294e103ab183d6b736ec1f57dd3e5d1de9888ba845cab89ff78f0
-EBUILD semigroups-0.12.2.ebuild 850 BLAKE2B 398b6353cb4476b4fa86a2d99464594597cb733aa842718668b920a2566afcd5625bbd2d59965675debb1f60e144cc154f24e0e70fb7776efdcc6ee632379a36 SHA512 ea3164af5f0d5bd290e994f80fb90ad995cc2f39a475601d1ccf9d9dc27b5627f1fe9824b83cf6a0676dbd39baa9c1a24c34631968183fb61533a15ce87d0c30
-EBUILD semigroups-0.15.1.ebuild 1276 BLAKE2B 06d2985ea97062146aff8e32d3ab4abb581e666625af7f4112cefa06872cca02cc16a37539d41f8491a57e22f57350776ce22742a8912121965994c040ada43a SHA512 d5bff85bfe9a77ab598c35153bfdc7c8086215d6380253fc9f6935c752b6e24e1c848733de1be4ce61257c2aec0b6a077a08282bf148272e5ff32e7fceb59175
-EBUILD semigroups-0.16.2.2.ebuild 1259 BLAKE2B f793e2e83bd1b53244f8bc9400a96f8393ca5c5609e7e080ef113f85868dce7920bc56cfc3b9c1b0d1764f6b94b2dcf24f3510564c2841b9a5359710867bf74d SHA512 c1c7b13ee126b8360ece559fc7f7e2c68274879d0fd703903d30835f81bb874fabe6cc2299f19a1801d2934fc361f8dca2061291997ecaec0b2505766423af3a
-EBUILD semigroups-0.18.2.ebuild 1561 BLAKE2B 1f7f7eecf3fadc385eb8c9c2ec5929d3c3549c4067d514a5572f58779c51d441e0bbedba0ba7620a256c23574c076272f24e8289fa2dc369a95fee7c19cd0a11 SHA512 99eea81e3920a525ffe41921c634bc7d5f210e00f1026bed462f7fad68fcd7bc751187416300100acb77f24cecaed1090b6c479974847c7f87d618e0ad9c3289
-EBUILD semigroups-0.9.2.ebuild 568 BLAKE2B f07a33e696acb226f965b5e5c10eb11119212ab0e6a37298a7fa4301b65f11fb88395c4008ce382f5f177519ebacc66b41dcacc17bd1080aa04cc61d7893c80a SHA512 fd6c7b502e6ec70c0a6f01201b9c3794a338105a36d9f59f2f6f6993a7b7453ff7636f18c846018b4ed804d6243419eb24a8d62ca381782cb71cf161e05e9f47
-MISC metadata.xml 2414 BLAKE2B 5205548612df4c16ac0a5d789cbc28c65e2d1f0a17eabb3dd43b2f164cfd6d71e472b6adf154fcc90a668b0ef1880f846cbfa738c2096b3d27f2fff081e529f4 SHA512 b92533ce71503fc7367f82cc9e9cfc9e2588bb342ea90aaf109906f344302e501b8f877a013dd576151ea272d9766e6bbc125e9f5aaa35411c62d84eabb0de0b
diff --git a/dev-haskell/semigroups/files/semigroups-0.15.1-trust.patch b/dev-haskell/semigroups/files/semigroups-0.15.1-trust.patch
deleted file mode 100644
index ff66afa91a6e..000000000000
--- a/dev-haskell/semigroups/files/semigroups-0.15.1-trust.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 118b29f5404014d0a627767a4c7e8de4f00f9fce
-Author: João Cristóvão <jmacristovao@gmail.com>
-Date:   Wed Jul 23 12:27:29 2014 +0100
-
-    If GHC >= 7.8 module is always Thrustworthy, never safe, due to GHC.Exts
-
-diff --git a/src/Data/List/NonEmpty.hs b/src/Data/List/NonEmpty.hs
-index 8a28020..f3c2db5 100644
---- a/src/Data/List/NonEmpty.hs
-+++ b/src/Data/List/NonEmpty.hs
-@@ -1,7 +1,7 @@
- {-# LANGUAGE CPP #-}
- 
- #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 702
--#ifdef MIN_VERSION_hashable
-+#if defined(MIN_VERSION_hashable) || __GLASGOW_HASKELL__ >= 708
- {-# LANGUAGE Trustworthy #-}
- #else
- {-# LANGUAGE Safe #-}
-diff --git a/src/Data/Semigroup.hs b/src/Data/Semigroup.hs
-index 7d41775..88fcbb0 100644
---- a/src/Data/Semigroup.hs
-+++ b/src/Data/Semigroup.hs
-@@ -8,7 +8,7 @@
- #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 702
- #define LANGUAGE_DefaultSignatures
- {-# LANGUAGE DefaultSignatures #-}
--#ifdef MIN_VERSION_hashable
-+#if defined(MIN_VERSION_hashable) || __GLASGOW_HASKELL__ >= 708
- {-# LANGUAGE Trustworthy #-}
- #else
- {-# LANGUAGE Safe #-}
diff --git a/dev-haskell/semigroups/metadata.xml b/dev-haskell/semigroups/metadata.xml
deleted file mode 100644
index ac1ccc6f6f92..000000000000
--- a/dev-haskell/semigroups/metadata.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haskell 98 semigroups
-		
-		In mathematics, a semigroup is an algebraic structure
-		consisting of a set together with an associative binary
-		operation. A semigroup generalizes a monoid in that there
-		might not exist an identity element. It also (originally)
-		generalized a group (a monoid with all inverses) to a type
-		where every element did not have to have an inverse, thus the
-		name semigroup.
-	</longdescription>
-	<use>
-		<flag name="hashable">You can disable the use of the
-		`hashable` package using USE=-hashable. Disabling this is an
-		unsupported configuration, but it may be useful for
-		accelerating builds in sandboxes for expert users. If set we
-		will not supply an instance of `Hashable`.</flag>
-		<flag name="bytestring">You can disable the use of the `bytestring`
-		package using USE=-bytestring. Disabling this is an
-		unsupported configuration, but it may be useful for
-		accelerating builds in sandboxes for expert users.</flag>
-		<flag name="containers">You can disable the use of the `containers`
-		package using USE=-containers. Disabing this is an unsupported
-		configuration, but it may be useful for accelerating builds in
-		sandboxes for expert users.</flag>
-		<flag name="deepseq">You can disable the use of the `deepseq`
-		package using `-f-deepseq`. Disabing this is an unsupported
-		configuration, but it may be useful for accelerating builds in
-		sandboxes for expert users.</flag>
-		<flag name="text">You can disable the use of the `text` package
-		using USE=-text. Disabling this is an unsupported
-		configuration, but it may be useful for accelerating builds in
-		sandboxes for expert users.</flag>
-		<flag name="unordered-containers">You can disable the use of the
-		`unordered-containers` package using
-		USE=-unordered-containers. Disabling this is an unsupported
-		configuration, but it may be useful for accelerating builds in
-		sandboxes for expert users.</flag>
-		<flag name="binary">provide instances for binary package</flag>
-		<flag name="transformers">provide instances for transformers package.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ekmett/semigroups</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/semigroups/semigroups-0.11-r1.ebuild b/dev-haskell/semigroups/semigroups-0.11-r1.ebuild
deleted file mode 100644
index b572ef1740c8..000000000000
--- a/dev-haskell/semigroups/semigroups-0.11-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Anything that associates"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'text                 >= 0.10 && < 0.12' 'text                 >= 0.10'
-}
diff --git a/dev-haskell/semigroups/semigroups-0.12.1.ebuild b/dev-haskell/semigroups/semigroups-0.12.1.ebuild
deleted file mode 100644
index 694e6e986a0e..000000000000
--- a/dev-haskell/semigroups/semigroups-0.12.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Anything that associates"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/semigroups/semigroups-0.12.2.ebuild b/dev-haskell/semigroups/semigroups-0.12.2.ebuild
deleted file mode 100644
index 252cd48c515b..000000000000
--- a/dev-haskell/semigroups/semigroups-0.12.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Anything that associates"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/semigroups/semigroups-0.15.1.ebuild b/dev-haskell/semigroups/semigroups-0.15.1.ebuild
deleted file mode 100644
index 54604a3d1e81..000000000000
--- a/dev-haskell/semigroups/semigroups-0.15.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Anything that associates"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bytestring +containers +hashable +text +unordered-containers"
-
-RDEPEND=">=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-			unordered-containers? ( >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) )
-	text? ( >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-trust.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bytestring bytestring) \
-		$(cabal_flag containers containers) \
-		$(cabal_flag hashable hashable) \
-		$(cabal_flag text text) \
-		$(cabal_flag unordered-containers unordered-containers)
-}
diff --git a/dev-haskell/semigroups/semigroups-0.16.2.2.ebuild b/dev-haskell/semigroups/semigroups-0.16.2.2.ebuild
deleted file mode 100644
index b393a5384dca..000000000000
--- a/dev-haskell/semigroups/semigroups-0.16.2.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Anything that associates"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+bytestring +containers +deepseq +hashable +text +unordered-containers"
-
-RDEPEND=">=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-			unordered-containers? ( >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) )
-	text? ( >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bytestring bytestring) \
-		$(cabal_flag containers containers) \
-		$(cabal_flag deepseq deepseq) \
-		$(cabal_flag hashable hashable) \
-		$(cabal_flag text text) \
-		$(cabal_flag unordered-containers unordered-containers)
-}
diff --git a/dev-haskell/semigroups/semigroups-0.18.2.ebuild b/dev-haskell/semigroups/semigroups-0.18.2.ebuild
deleted file mode 100644
index 67cf33ee379d..000000000000
--- a/dev-haskell/semigroups/semigroups-0.18.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: +bytestring,+containers,+deepseq,+hashable,+tagged,+text,+unordered-containers
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Anything that associates"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+binary +transformers"
-
-RDEPEND=">=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-1:=[profile?]
-	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	binary? ( dev-haskell/binary:=[profile?] )
-	transformers? ( >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag binary binary) \
-		--flag=bytestring \
-		--flag=containers \
-		--flag=deepseq \
-		--flag=hashable \
-		--flag=tagged \
-		--flag=text \
-		$(cabal_flag transformers transformers) \
-		--flag=unordered-containers
-}
diff --git a/dev-haskell/semigroups/semigroups-0.9.2.ebuild b/dev-haskell/semigroups/semigroups-0.9.2.ebuild
deleted file mode 100644
index efb1f7333899..000000000000
--- a/dev-haskell/semigroups/semigroups-0.9.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 semigroups"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/nats-0.1:=[profile?]
-		>=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10"
diff --git a/dev-haskell/sendfile-0.7.9 b/dev-haskell/sendfile-0.7.9
new file mode 100644
index 000000000000..825fb16228fa
--- /dev/null
+++ b/dev-haskell/sendfile-0.7.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND==dev-haskell/network-2*:=[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 portable sendfile library
+EAPI=5
+HOMEPAGE=https://hub.darcs.net/stepcut/sendfile
+IUSE=portable doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND==dev-haskell/network-2*:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.7.9
+SRC_URI=mirror://hackage/packages/archive/sendfile/0.7.9/sendfile-0.7.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3b710a8aa77fac48bc99022b787f7875
diff --git a/dev-haskell/sendfile/Manifest b/dev-haskell/sendfile/Manifest
deleted file mode 100644
index f2a5af0af4fc..000000000000
--- a/dev-haskell/sendfile/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sendfile-0.7.9.tar.gz 10656 BLAKE2B dd6092d6343037d413d162266545607844bb05a6a2abd810f1369bb06f9f15e8b6ee3690af85d5b5d9195f47f2b144a60a99b84c3bd1fd9aaa244d00cfbe41a7 SHA512 a7ba2e82c30b12e5b7f317e2f5cc31c32cb7f682403c3807afc15254d86c3ebb526a645234d191d5b43adc414704caa4cdf61e8083e0a3d53e1af676619f731e
-EBUILD sendfile-0.7.9.ebuild 669 BLAKE2B 4032b3ccf3bf627d0b34cbb6f9fad915e77a0b5edcc02eb26f8ff3a865f2a93a7a764dcffb98bd2abe0a0f89b202b95583fdf203ac382613718e4325b22c1e80 SHA512 4826c3bff30dd00b26c36a6204e18d9bf561bf3fd7f7d3bdcbcffd6a605096c64591185af1a58e3cf02f059c8f95c9a170cc59d5304b7d166b5965c443391d84
-MISC metadata.xml 733 BLAKE2B ade73c9cfdc6e9058b3d831ab81a74d6b28959165fb76a05ff406a1062bc49cd429f801d4239c6b3b213aa60fa734207cb0620ebb4bb44ed5bd806b06c61ecb6 SHA512 7a33c152ebfa91372934b19699819b41bf58ba7738fd8757d63861cd9e08da6a42de506f3d8f225167c6c9ab9aba294fca59a9080ef7657954748ba09fea16bb
diff --git a/dev-haskell/sendfile/metadata.xml b/dev-haskell/sendfile/metadata.xml
deleted file mode 100644
index a9df43fb18bf..000000000000
--- a/dev-haskell/sendfile/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A library which exposes zero-copy sendfile functionality in a portable way. If a platform does not support sendfile, a fallback implementation in haskell is provided.
-		
-		Currently supported platforms: Windows 2000+ (Native), Linux 2.6+ (Native), FreeBSD (Native), OS-X 10.5+ (Native), Everything else (Portable Haskell code).
-	</longdescription>
-	<use>
-		<flag name="portable">Explicitly enable portable sendfile support (implemented in Haskell)</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/sendfile/sendfile-0.7.9.ebuild b/dev-haskell/sendfile/sendfile-0.7.9.ebuild
deleted file mode 100644
index 983e0140d6bf..000000000000
--- a/dev-haskell/sendfile/sendfile-0.7.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A portable sendfile library"
-HOMEPAGE="https://hub.darcs.net/stepcut/sendfile"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="portable"
-
-RDEPEND="=dev-haskell/network-2*:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag portable portable)
-}
diff --git a/dev-haskell/setenv-0.1.1.1 b/dev-haskell/setenv-0.1.1.1
new file mode 100644
index 000000000000..7c40d4d08841
--- /dev/null
+++ b/dev-haskell/setenv-0.1.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A cross-platform library for setting environment variables
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/setenv
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+RESTRICT=test
+SLOT=0/0.1.1.1
+SRC_URI=mirror://hackage/packages/archive/setenv/0.1.1.1/setenv-0.1.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=96ebf89173edc7da7106827ab2980bff
diff --git a/dev-haskell/setenv-0.1.1.3 b/dev-haskell/setenv-0.1.1.3
new file mode 100644
index 000000000000..fc030b9f1257
--- /dev/null
+++ b/dev-haskell/setenv-0.1.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A cross-platform library for setting environment variables
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/setenv
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.1.3
+SRC_URI=mirror://hackage/packages/archive/setenv/0.1.1.3/setenv-0.1.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=10a9f871f912bfb0a590a7af76b1a21e
diff --git a/dev-haskell/setenv/Manifest b/dev-haskell/setenv/Manifest
deleted file mode 100644
index 779af238bcac..000000000000
--- a/dev-haskell/setenv/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST setenv-0.1.1.1.tar.gz 3019 BLAKE2B d09a0e17b9ee318d6c0b9dd9a5945983c8706cdef30b33b994f69559bcea42da8fe2f63429057cecbde76caae3831537e8289e90454a814be31de3d94ec78c57 SHA512 30819eafa006cd88239d892699d5a7c8f9889d080c3fe4f134b80eece8c192836239ee8b082cf694f353f6c35f07e9520d4860125b20daa151d94a506538269b
-DIST setenv-0.1.1.3.tar.gz 2710 BLAKE2B 16076d2a8694e15597b87358a81a4f0ed6b66eec89562c4be597ed7890924297b797fe22e391d62526bd5d1da75768a981b30565443a82433e82bb6965e1c1c1 SHA512 9cce617dcec2c870abed2ffadfc21bc2512b709791a15012f07246ce27fd749e125a16f72e6ef574ae390ecbc512c052c2630ca4c97606a20d11e25da5d2c14a
-EBUILD setenv-0.1.1.1.ebuild 612 BLAKE2B acbe32078181fff47b157dc14518ca724f991a26f227be98b94772b9d5d1b4aaeb3aa5da5a432373dc2d41491a14519969c017367cb89b2c45d60a05e2118551 SHA512 bc90d71d9b3bdbf8a0abf4005dc86fb70e351da910db088afd7c68bdc8d55a8724d4205da40798c283bb0c6b3d4735cfaacfa771ac1ce6cc908c9543185ef670
-EBUILD setenv-0.1.1.3.ebuild 571 BLAKE2B 2efefef9385f49be8933400cb2e0d974b346acf13552e02c4bd45df663f49a45e48ac3a1dd654a67b3be2d2850f9c1ac980425ba47d46def3942f0aae20e5ba7 SHA512 00a05bb89c8c39ca7a89877c8734f9feeccb036c09800b2fefdd77cacb2ce7bf48f73ffcb551cd78d2bf65ce42f8c2c5fbfc5432d52f5456e21c6544043891bc
-MISC metadata.xml 349 BLAKE2B 0f02173f15a1d1ca96dfa208c61d983ddde3b0c5bca0d9c38cfafd1dd07f89b5b727704548ebb0279bc7fee902b39ee2fc65cf9b2b6a9ac1b8dda98ff75e7978 SHA512 62d69aa40344181e13bd0de54ad1b4bb2255beeeb0cb30ae03b0207c796988930676e20f090f296feb23c3f19a0f8ccd05b12541e1a4eeb6dec68d38729ccd81
diff --git a/dev-haskell/setenv/metadata.xml b/dev-haskell/setenv/metadata.xml
deleted file mode 100644
index 01cdbb5563e6..000000000000
--- a/dev-haskell/setenv/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A cross-platform library for setting environment variables
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/setenv/setenv-0.1.1.1.ebuild b/dev-haskell/setenv/setenv-0.1.1.1.ebuild
deleted file mode 100644
index 85e679efb549..000000000000
--- a/dev-haskell/setenv/setenv-0.1.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A cross-platform library for setting environment variables"
-HOMEPAGE="http://hackage.haskell.org/package/setenv"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RESTRICT=test # missing files
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/setenv/setenv-0.1.1.3.ebuild b/dev-haskell/setenv/setenv-0.1.1.3.ebuild
deleted file mode 100644
index fe86ab054c63..000000000000
--- a/dev-haskell/setenv/setenv-0.1.1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A cross-platform library for setting environment variables"
-HOMEPAGE="http://hackage.haskell.org/package/setenv"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/setlocale-1.0.0.3 b/dev-haskell/setlocale-1.0.0.3
new file mode 100644
index 000000000000..7d09cdb1fdd1
--- /dev/null
+++ b/dev-haskell/setlocale-1.0.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell bindings to setlocale
+EAPI=5
+HOMEPAGE=https://bitbucket.org/IchUndNichtDu/haskell-setlocale
+IUSE=doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.6.1:=
+SLOT=0/1.0.0.3
+SRC_URI=mirror://hackage/packages/archive/setlocale/1.0.0.3/setlocale-1.0.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c9ffb285861ee4f40f6036ae1e64ffdf
diff --git a/dev-haskell/setlocale-1.0.0.4 b/dev-haskell/setlocale-1.0.0.4
new file mode 100644
index 000000000000..6cf0aa1a83ef
--- /dev/null
+++ b/dev-haskell/setlocale-1.0.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell bindings to setlocale
+EAPI=6
+HOMEPAGE=https://bitbucket.org/IchUndNichtDu/haskell-setlocale
+IUSE=doc hscolour profile
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.6.1:=
+SLOT=0/1.0.0.4
+SRC_URI=mirror://hackage/packages/archive/setlocale/1.0.0.4/setlocale-1.0.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dce6e8213afa28ed0a0990358ca779d2
diff --git a/dev-haskell/setlocale/Manifest b/dev-haskell/setlocale/Manifest
deleted file mode 100644
index 0ad323add63b..000000000000
--- a/dev-haskell/setlocale/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST setlocale-1.0.0.3.tar.gz 2136 BLAKE2B 16efaca6a8c0a67ab69af92da514330eddcb18aec4c18c0a693d202624f18282f21e7a0df1f0c765cb8a94252038f33980407f28ae0042159f67b9505991ef47 SHA512 a0bbb989572050e3e256e7b7e3782abfee74faf74eb81a99706c5ae88894694b6101a9725ad367b57f56ea5077dad41ca7a7988e292e4403d94f0a3cb5c40b49
-DIST setlocale-1.0.0.4.tar.gz 2138 BLAKE2B e6db87814e859db8ab774d4b1c268f5235ddec5535c5dc0834d835a4d3231bc22850e9bbc686329ace258a0db5722e9a4d47d4a1ba1c4afea0f8b6e15422b907 SHA512 e01451f31a332dd2e85c64c192c12388c35aed5e497408dbc5e587328f5900b8becea51b8df475f083d32bd69b094eca89c96b3f490ad139e58c075ce34e7b62
-EBUILD setlocale-1.0.0.3.ebuild 658 BLAKE2B c9dbb104ee814a4c808037a909e4cebaaec15f85c633b131123358a4d625ec235927737bf311bc8eb7bec56dd84e91b9263a3c2004a9d6ec3a2b43e2de922ca5 SHA512 52f11db7edff228c730c7ebaf03217773d0f09a18cfc6f611f448ec2ab32e14746d8ad10ca5ff07dc932d8745013b049498e91879c7e127ac1a4feed045b2c6c
-EBUILD setlocale-1.0.0.4.ebuild 587 BLAKE2B 62225c62a23a42251c16683aceceeac440c928f2c9320dd5da3d9719d12b618be187681c1d09b218ac2856ab66a7c675c87650cb7a7ca057d4cf3c7d0bd6d5b6 SHA512 af33a262a4091253b409928eb9cbd3e0244638e90010cf8d8ebcdd298493c11e6a62ab96de7b24efdd71595d65d6ca81a9032840cd1f9eacc7e880e5ace1b481
-MISC metadata.xml 427 BLAKE2B 8666b2b73cc0974f00abdb20c8217e824313647077164914ec0ae31fbad1b544a2281e213f9f8aca237e6c0bc52e7fd649291fde4777842aab7afd8c0f5a6c9a SHA512 dfcee3f28895ff1d2587e3e6f6db9322f65530b3c4c65845c0533f468c7fa33514a435e6db11cd23c8066675428309ffd223df9029876a8de12a0ae84f1b0b34
diff --git a/dev-haskell/setlocale/metadata.xml b/dev-haskell/setlocale/metadata.xml
deleted file mode 100644
index b01248ad035c..000000000000
--- a/dev-haskell/setlocale/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A Haskell interface to @setlocale()@.
-	</longdescription>
-	<upstream>
-		<remote-id type="bitbucket">IchUndNichtDu/haskell-setlocale</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/setlocale/setlocale-1.0.0.3.ebuild b/dev-haskell/setlocale/setlocale-1.0.0.3.ebuild
deleted file mode 100644
index 501d7143ef38..000000000000
--- a/dev-haskell/setlocale/setlocale-1.0.0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to setlocale"
-HOMEPAGE="https://bitbucket.org/IchUndNichtDu/haskell-setlocale"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >=4.6 && <4.9' 'base >=4.6'
-}
diff --git a/dev-haskell/setlocale/setlocale-1.0.0.4.ebuild b/dev-haskell/setlocale/setlocale-1.0.0.4.ebuild
deleted file mode 100644
index beb545a43ab0..000000000000
--- a/dev-haskell/setlocale/setlocale-1.0.0.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to setlocale"
-HOMEPAGE="https://bitbucket.org/IchUndNichtDu/haskell-setlocale"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/sha-1.6.4.2 b/dev-haskell/sha-1.6.4.2
new file mode 100644
index 000000000000..0f9347c73d07
--- /dev/null
+++ b/dev-haskell/sha-1.6.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/binary-0.7:=[profile?] <dev-haskell/binary-10000:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-3 >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-10000 >=dev-haskell/test-framework-quickcheck2-0.3.0.2 <dev-haskell/test-framework-quickcheck2-10000 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Implementations of the SHA suite of message digest functions
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/SHA
+IUSE=exe doc hscolour profile test
+KEYWORDS=amd64 x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/binary-0.7:=[profile?] <dev-haskell/binary-10000:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/1.6.4.2
+SRC_URI=mirror://hackage/packages/archive/SHA/1.6.4.2/SHA-1.6.4.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4983511c90e9921c6ce995620cbc151b
diff --git a/dev-haskell/sha/Manifest b/dev-haskell/sha/Manifest
deleted file mode 100644
index de467a0412fb..000000000000
--- a/dev-haskell/sha/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SHA-1.6.4.2.tar.gz 2715266 BLAKE2B bca07ae5bcb85431cfe5af047d1fc033a00c04ca5870dd81a283b80b00ff00dc04d43a3de2decc0123cfc3d1d7be53486120b1419a680683f6695d115a9bcd4a SHA512 aa1178f08ad3364c504ee790dac9b0774b7461fa7ea0a8f2c3ad82943d109602debcf4a8a83090815fef487ceac40019f8b5594ab0043f36e019d69bc5f76853
-EBUILD sha-1.6.4.2.ebuild 1253 BLAKE2B 8e76916c23cb97fc464ade0d6582abd59f57459f1fb8d50f7f8f447b2c35427b1a3a2af6cdf34128e0d1f6605dd82f7fbbaa63122577e02f8445c3fb5bb4b77f SHA512 767ac7eedb44d3ce597a9e374379ccb7bcfb45aecbf56c4b4ea1e5c5e0fbfd73a4da2b09b179c729f019e14cf155dfe3a2b2873b963bc7c1aac37abd26c0901c
-MISC metadata.xml 799 BLAKE2B cbc613c9cdc9a4689a6e19c7bdf60ed0344c3d1a7d8421fcca6e7e1783ef730553ca8be48cacac0f116afeacf9d386d1bc41c8a22cab1b9ecf7ee70fd8ba87eb SHA512 e00b204843e7e36afd812d8ca4b65568e57e51e8f1f1eb1e86ea4ba4ae3d9a2c0f5184056f8d8a10987c8ef90cd2cb4b0867591a49030410dc844c7d36acad39
diff --git a/dev-haskell/sha/metadata.xml b/dev-haskell/sha/metadata.xml
deleted file mode 100644
index 485303c5f624..000000000000
--- a/dev-haskell/sha/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="exe">Build a sha1 and a sha384 executable similar to 'md5sum'.</flag>
-	</use>
-	<longdescription>
-		This library implements the SHA suite of message digest functions,
-		according to NIST FIPS 180-2 (with the SHA-224 addendum), as well
-		as the SHA-based HMAC routines. The functions have been tested
-		against most of the NIST and RFC test vectors for the various
-		functions. While some attention has been paid to performance,
-		these do not presently reach the speed of well-tuned libraries,
-		like OpenSSL.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/sha/sha-1.6.4.2.ebuild b/dev-haskell/sha/sha-1.6.4.2.ebuild
deleted file mode 100644
index f301ffdfd807..000000000000
--- a/dev-haskell/sha/sha-1.6.4.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: +decoderinterface
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="SHA"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Implementations of the SHA suite of message digest functions"
-HOMEPAGE="http://hackage.haskell.org/package/SHA"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="exe"
-
-RESTRICT=test # fails to build on ghc-7.6, https://ghc.haskell.org/trac/ghc/ticket/8657
-
-RDEPEND=">=dev-haskell/binary-0.7:=[profile?] <dev-haskell/binary-10000:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-3
-		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-10000
-		>=dev-haskell/test-framework-quickcheck2-0.3.0.2 <dev-haskell/test-framework-quickcheck2-10000 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cabal_chdeps \
-		' -O2' ' '
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=decoderinterface \
-		$(cabal_flag exe exe)
-}
diff --git a/dev-haskell/shakespeare-1.0.5.1 b/dev-haskell/shakespeare-1.0.5.1
new file mode 100644
index 000000000000..b4f11f2e613b
--- /dev/null
+++ b/dev-haskell/shakespeare-1.0.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A toolkit for making compile-time interpolated templates
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/1.0.5.1
+SRC_URI=mirror://hackage/packages/archive/shakespeare/1.0.5.1/shakespeare-1.0.5.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=127461ba606e8b4c036f817dcd07133a
diff --git a/dev-haskell/shakespeare-1.2.1.1 b/dev-haskell/shakespeare-1.2.1.1
new file mode 100644
index 000000000000..e30244de0204
--- /dev/null
+++ b/dev-haskell/shakespeare-1.2.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 test? ( >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A toolkit for making compile-time interpolated templates
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
+IUSE=test_export doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/1.2.1.1
+SRC_URI=mirror://hackage/packages/archive/shakespeare/1.2.1.1/shakespeare-1.2.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1fca797097fbe843b0623a7114028e69
diff --git a/dev-haskell/shakespeare-2.0.12.1 b/dev-haskell/shakespeare-2.0.12.1
new file mode 100644
index 000000000000..9b936dad182c
--- /dev/null
+++ b/dev-haskell/shakespeare-2.0.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/blaze-html:=[profile?] dev-haskell/blaze-markup:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/scientific-0.3.0.0:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A toolkit for making compile-time interpolated templates
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
+IUSE=test_coffee test_export test_roy doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/blaze-html:=[profile?] dev-haskell/blaze-markup:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/scientific-0.3.0.0:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/2.0.12.1
+SRC_URI=mirror://hackage/packages/archive/shakespeare/2.0.12.1/shakespeare-2.0.12.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9f41476d53db38194972230fbc202b25
diff --git a/dev-haskell/shakespeare-2.0.7 b/dev-haskell/shakespeare-2.0.7
new file mode 100644
index 000000000000..2ecc2236892c
--- /dev/null
+++ b/dev-haskell/shakespeare-2.0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/blaze-html:=[profile?] dev-haskell/blaze-markup:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] dev-haskell/scientific:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A toolkit for making compile-time interpolated templates
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
+IUSE=test_coffee test_export test_roy doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/blaze-html:=[profile?] dev-haskell/blaze-markup:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] dev-haskell/scientific:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/2.0.7
+SRC_URI=mirror://hackage/packages/archive/shakespeare/2.0.7/shakespeare-2.0.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6a8dbfd12a937ff9d35e41091fe23a3b
diff --git a/dev-haskell/shakespeare-css-1.0.6.6 b/dev-haskell/shakespeare-css-1.0.6.6
new file mode 100644
index 000000000000..2de34609ef5a
--- /dev/null
+++ b/dev-haskell/shakespeare-css-1.0.6.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/text-0.11.1.1:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Stick your haskell variables into css at compile time
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/text-0.11.1.1:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.0.6.6
+SRC_URI=mirror://hackage/packages/archive/shakespeare-css/1.0.6.6/shakespeare-css-1.0.6.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fb8264bb4aaacd132fcc14ae47e54017
diff --git a/dev-haskell/shakespeare-css-1.1.0 b/dev-haskell/shakespeare-css-1.1.0
new file mode 100644
index 000000000000..5c51fcecc8e1
--- /dev/null
+++ b/dev-haskell/shakespeare-css-1.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8
+DESCRIPTION=Stick your haskell variables into css at compile time. (deprecated)
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
+IUSE=profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.1.0
+SRC_URI=mirror://hackage/packages/archive/shakespeare-css/1.1.0/shakespeare-css-1.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dc1366589ce0715368409436f1792b81
diff --git a/dev-haskell/shakespeare-css/Manifest b/dev-haskell/shakespeare-css/Manifest
deleted file mode 100644
index 8a6898662f01..000000000000
--- a/dev-haskell/shakespeare-css/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST shakespeare-css-1.0.6.6.tar.gz 17155 BLAKE2B 5394880732fea675b909ce1305efb9513586e7bf411204ef764f5b6b48170a0fecc874d31eb4d43bc8ab9e605bf732ddadf9da37c96e8a2bc6b4747c3ac3f033 SHA512 5f1c6191f425e81eb91376f97ec5e31e18d84dd3f40ec57d8f944047598d8e5187434b71dbf2c789258a34ce720fc1dbe8ac465eaa4067a13ddb59a3f8e0a08d
-DIST shakespeare-css-1.1.0.tar.gz 1572 BLAKE2B d9c15b65d24ac507c57d013bc440230fa3307e80b5a4a113e8fc7daebb81380c07c86fb18d019c2deed457e18ef6827e36d0d00bd1d2eec08056038b5d1fc2cb SHA512 e855c2be0af9d5d8ed8f9c0ec6e78305a75df983342ebf05300e16c858c28f6316e46cf435f3653c13316dcfbe07ab1fa80e428153a219696eb3de4afd8aacff
-EBUILD shakespeare-css-1.0.6.6.ebuild 878 BLAKE2B 98e3ddd33c9240d6b0e034edc8356f49c1c23782e4fe9c7ab0d897d10bf621898d088a59609f082dff04dab62dcf3b3dd4fa9df3e0e7e372d99abe1c3cba8089 SHA512 6901444171ef7e10c0c2c551b76889b54bace8cdf19c8c86cdc1ae3d200d899356a29689dcad745e5121486d3fbfa5dd034c5525ffe88bc2ce5ef61e1b15d409
-EBUILD shakespeare-css-1.1.0.ebuild 612 BLAKE2B ab08adbdd73dcc011fd1d86c5c4eaa2c77c8b344315cb5996f2bd588ec06b0852847b5cd26d701d8c9f3689745657d2c2012923830bcd351e92c40b2be2267ae SHA512 81a6cacfbd2390c9594f1beaec76da73a5974b98bc4d3da320e1f5eff1f7b14e582cde6256c174dece4aec01986ec4db510a7541c36cc5928ab5cbb8a35e3116
-MISC metadata.xml 992 BLAKE2B 81bddba95667bf04fee0ffb5cb3b736f7ecf15ec96128b8472325b5bef956ad1aa8978c7b8382aa692cc2d59181ed2a511c594a79ca81651dc34bc509122bd11 SHA512 a389fc962e743a8fe3c2e5ca7186f4ac27828c71340699ec78ee8d4acf26f8c1fcf5c962c0e887cf0b699f075a4a508b8f408f37099bcfc7015d4d8719e64ed5
diff --git a/dev-haskell/shakespeare-css/metadata.xml b/dev-haskell/shakespeare-css/metadata.xml
deleted file mode 100644
index 5ed8cf4dd7ca..000000000000
--- a/dev-haskell/shakespeare-css/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		
-		Shakespeare is a template family for type-safe, efficient templates with simple variable interpolation . Shakespeare templates can be used inline with a quasi-quoter or in an external file. Shakespeare interpolates variables according to the type being inserted.
-		In this case, the variable type needs a ToCss instance.
-		
-		This package contains 2 css template languages. The Cassius language uses whitespace to avoid the need for closing brackets and semi-colons. Lucius does not care about whitespace and is a strict superset of css. There are also some significant conveniences added for css.
-		
-		Please see http://docs.yesodweb.com/book/templates for a more thorough description and examples
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/shakespeare-css/shakespeare-css-1.0.6.6.ebuild b/dev-haskell/shakespeare-css/shakespeare-css-1.0.6.6.ebuild
deleted file mode 100644
index bf30650d13ad..000000000000
--- a/dev-haskell/shakespeare-css/shakespeare-css-1.0.6.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Stick your haskell variables into css at compile time"
-HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?]
-	>=dev-haskell/text-0.11.1.1:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/shakespeare-css/shakespeare-css-1.1.0.ebuild b/dev-haskell/shakespeare-css/shakespeare-css-1.1.0.ebuild
deleted file mode 100644
index 3e59db260a09..000000000000
--- a/dev-haskell/shakespeare-css/shakespeare-css-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Stick your haskell variables into css at compile time. (deprecated)"
-HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/shakespeare-i18n-1.0.0.5 b/dev-haskell/shakespeare-i18n-1.0.0.5
new file mode 100644
index 000000000000..1105c4125585
--- /dev/null
+++ b/dev-haskell/shakespeare-i18n-1.0.0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/parsec:=[profile?] >=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A type-based approach to internationalization
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/parsec:=[profile?] >=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.0.0.5
+SRC_URI=mirror://hackage/packages/archive/shakespeare-i18n/1.0.0.5/shakespeare-i18n-1.0.0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c274f9ca603afd49d4b16023c6cc3a0c
diff --git a/dev-haskell/shakespeare-i18n-1.1.0 b/dev-haskell/shakespeare-i18n-1.1.0
new file mode 100644
index 000000000000..d92fc8ed6e25
--- /dev/null
+++ b/dev-haskell/shakespeare-i18n-1.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8
+DESCRIPTION=A type-based approach to internationalization. (deprecated)
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
+IUSE=profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.1.0
+SRC_URI=mirror://hackage/packages/archive/shakespeare-i18n/1.1.0/shakespeare-i18n-1.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d15ccda07eff1a9714140d95b3c520ce
diff --git a/dev-haskell/shakespeare-i18n/Manifest b/dev-haskell/shakespeare-i18n/Manifest
deleted file mode 100644
index 9d754c614057..000000000000
--- a/dev-haskell/shakespeare-i18n/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST shakespeare-i18n-1.0.0.5.tar.gz 6678 BLAKE2B 415cf35d892fabd95c48642f0f7f4b828d73bee2455f8f2f1df305d72de40ce145f5856d3a0f6fe4198b64388e7e4890ae48b3e2d36dcc05cc16b4a7e36d6bba SHA512 21bdc445d60476fdb5ee1bc42bd302de78e21d07112352bf62feb130dfe4201ad407fe60b1454fdcedb61928db10e47c556d8750e8e6a6489e9b02b4e675a690
-DIST shakespeare-i18n-1.1.0.tar.gz 1440 BLAKE2B badf791117105ee280c73d334a4793a8b7e62accc80ae8615b3925458e1af00342452e4d576d50e49c2251ee52fea30dece9747b73e23e51e0df3ed425c5d6bf SHA512 3e6959a32e5c0cf85ca6875f87b7fcbc430df91750904045f29a7b95a2b26398cf1526daa6b33a7c941b2192c8e9238bdfe1673aa8b7dd2b7cb583a2d9fb0063
-EBUILD shakespeare-i18n-1.0.0.5.ebuild 769 BLAKE2B ae098e57cfb894b6364f8a7259ac7ff11365bcb67fb42725d13699d1c2194df9f8ea0fc45658ff6eb3e04ac237b6c27e6bf70fc4ee28959ba10eaf0261747d5f SHA512 bc97b1d4ab2f38312187887aa7b0ddb912d8e49fc8dd102cf24622cf5f087f64d1be2a44e99dd7e14eb2ac5cb67b1763bcfe26f3c468e12fcc11e96ed759b762
-EBUILD shakespeare-i18n-1.1.0.ebuild 604 BLAKE2B 3860690b399ba0cf1fba4224a14f9e4392fa690514dbf90942d152e2a2fe064b28d648f6443636be824684da765db466546d31b9cd82015a918f568369d8521a SHA512 eeaa6efb517f3f636d6cbc4a91811e5f357b6904d30a9c44ffa75972dae710f2b49c7d6829fe88f2db123bb36d0df8da2c5755a4ab174f22a3a805c7fbc01b39
-MISC metadata.xml 707 BLAKE2B 91cad3d13c4540a94e6c6a5104b010b35247fc6416cc548dce2478e93689c33322929f3691ed3dd4be32bd261c19bbbb5dd7139b5f0c82fd6a55d43e43e0909f SHA512 1e310d634ac93ad7b7b0b7a9c7d135668771e4a0c80ec7479c0e383d1bdae417366eb6f02cffb9d5f7557c1e0110f8f0c8c1cf27255d1941098678074095aeb5
diff --git a/dev-haskell/shakespeare-i18n/metadata.xml b/dev-haskell/shakespeare-i18n/metadata.xml
deleted file mode 100644
index fa6233cb8c1b..000000000000
--- a/dev-haskell/shakespeare-i18n/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package uses the same approach of type-safe URLs to create translated content. It has a simple syntax for translators, while allowing the ful power of Haskell for applying complex grammar rules.
-		
-		This package was spun off from yesod-core, and therefore the Yesod documentation is a good place to start in understanding this package. Please see &lt;http://www.yesodweb.com/book/i18n&gt; for more information.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/shakespeare-i18n/shakespeare-i18n-1.0.0.5.ebuild b/dev-haskell/shakespeare-i18n/shakespeare-i18n-1.0.0.5.ebuild
deleted file mode 100644
index 4233236186a0..000000000000
--- a/dev-haskell/shakespeare-i18n/shakespeare-i18n-1.0.0.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A type-based approach to internationalization"
-HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/parsec:=[profile?]
-	>=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.4 )
-"
diff --git a/dev-haskell/shakespeare-i18n/shakespeare-i18n-1.1.0.ebuild b/dev-haskell/shakespeare-i18n/shakespeare-i18n-1.1.0.ebuild
deleted file mode 100644
index ea982c75aee0..000000000000
--- a/dev-haskell/shakespeare-i18n/shakespeare-i18n-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="A type-based approach to internationalization. (deprecated)"
-HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/shakespeare-js-1.1.4.1 b/dev-haskell/shakespeare-js-1.1.4.1
new file mode 100644
index 000000000000..d538517a06eb
--- /dev/null
+++ b/dev-haskell/shakespeare-js-1.1.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.5:=[profile?] >=dev-haskell/shakespeare-1.0.5:=[profile?] <dev-haskell/shakespeare-1.1:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Stick your haskell variables into javascript/coffeescript at compile time
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] >=dev-haskell/shakespeare-1.0.5:=[profile?] <dev-haskell/shakespeare-1.1:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.1.4.1
+SRC_URI=mirror://hackage/packages/archive/shakespeare-js/1.1.4.1/shakespeare-js-1.1.4.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=03e6e2e796fb5a614121aa6ac896d778
diff --git a/dev-haskell/shakespeare-js-1.2.0.4 b/dev-haskell/shakespeare-js-1.2.0.4
new file mode 100644
index 000000000000..4700d9dc1f65
--- /dev/null
+++ b/dev-haskell/shakespeare-js-1.2.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.5:=[profile?] >=dev-haskell/shakespeare-1.2:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Stick your haskell variables into javascript/coffeescript at compile time
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
+IUSE=test_coffee test_export test_roy doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] >=dev-haskell/shakespeare-1.2:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.2.0.4
+SRC_URI=mirror://hackage/packages/archive/shakespeare-js/1.2.0.4/shakespeare-js-1.2.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=82420a886ce2e088b5d354f766c3445c
diff --git a/dev-haskell/shakespeare-js-1.3.0 b/dev-haskell/shakespeare-js-1.3.0
new file mode 100644
index 000000000000..32c1a718ab56
--- /dev/null
+++ b/dev-haskell/shakespeare-js-1.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8
+DESCRIPTION=Stick your haskell variables into javascript/coffeescript at compile time
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
+IUSE=profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.3.0
+SRC_URI=mirror://hackage/packages/archive/shakespeare-js/1.3.0/shakespeare-js-1.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7a643d86960f638aecb8e885b3156117
diff --git a/dev-haskell/shakespeare-js/Manifest b/dev-haskell/shakespeare-js/Manifest
deleted file mode 100644
index 3acc24d5e18f..000000000000
--- a/dev-haskell/shakespeare-js/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST shakespeare-js-1.1.4.1.tar.gz 7942 BLAKE2B d7bcf9e4abf870b20fbf5e51245eecc20bf00374c33eea1f0ccbeb42b7781ba2213100550edb18bc5efd950708a08ed60fac538d10d34c8e0028e2914b1eda84 SHA512 da326b6c2a5f8147d3e0a74d7dae99fa4a9c10eb631e33f4a4641eb02874d30a4ea7826e917dccc7699fd700ee3537303f8dbb7631ce1a457e443d4365bfa48c
-DIST shakespeare-js-1.2.0.4.tar.gz 7964 BLAKE2B 3f4d3eb17092092a2ef0d4126d03d47e3b5471ae956c9cbcdd567c7547d56db468737a4bdbcd21984f4af72607135f58b8ffeee846684f184a7731ccd05c98ce SHA512 e45c1f434d4c97566d908ae7e1baefe37d4351c3b0716e3f0ab4b6e47b10fa994b2c0a806998500e6795dd54fb3d1ba417fa3838d609208e2dc69e963e7a045b
-DIST shakespeare-js-1.3.0.tar.gz 1625 BLAKE2B 4250b58fc0ef3f3052dad4eb46c4aa2309fe62a2a9cce06201b84364801807f303c13745f559decb1e8145d19c36abc626394f00fd506904576805d277a57a8d SHA512 73840c66a7dc287642a81c7f49a89974e68f924a3a57ba6ea85e51457363956e58030c01b64dd8dd5e81eecd25fe99cb4dcd0e0fdb2ccc52e4a257f63a0aeb6a
-EBUILD shakespeare-js-1.1.4.1.ebuild 832 BLAKE2B 67a47027e1948b4914abcf039ca1d62c75e3367b6d12a96e68999391b8b9095df50e7df542b7994c890d7e1ff9074fefc9d92263093cedf51d9264aadc21e8c2 SHA512 a4f08b4916b1a2e9c941da52df613e95748006cecbaa4990c92c21a3c5bbe7eb6d14cf2bdc81de0f84171893d2aef1cfffc6c4d0a72912823ef79f912647bba3
-EBUILD shakespeare-js-1.2.0.4.ebuild 1024 BLAKE2B fb758d139d51df2886ae3e2e2c38545a8d384ce07aa2a6837ee40944d217cd4532251025f8a7b87c3ddf21f6b5d10ddd06e86238480e04d58e0980c7be1bb204 SHA512 762b7460456a32ab2d685d403f1b43182871fd545151b94931e4d3194ff7eae079ba8440598bf75cb8a0e155772d9119fd00dc0d1b7af5234a52e73135921ec5
-EBUILD shakespeare-js-1.3.0.ebuild 618 BLAKE2B b63db6dae5a4ebbff38142c45493bf4c800eb038735417eaed7f86e92d63955a46865587bea47061ef2ae5407db6c5ee1a904a131d21dc6aa50cdbe6c69c503d SHA512 b4b8ac322be963c928668e1bc1de9c2b4e87ba8390255457b1e86777bd16f4853373bcaefa8ceb0ebc0d13a8ec3455e8fabf7e6a89afe6ea15837ba007c52e9d
-MISC metadata.xml 1199 BLAKE2B 0c6b08e0fdd3d923e6df46771c7b1948d16db5bb2a6a829bc4d59be27735e2a00d9a340324598363c102f5b962a873de80e93d8ae60da548f792ac5fb3bf535f SHA512 7f38965cd17571a66ce294fcb49f24065820f0443e595389b85951707f6b742a11372ea9ad920f287e7efcf93b4b632acc652447fac911d482d54cfe83df95d4
diff --git a/dev-haskell/shakespeare-js/metadata.xml b/dev-haskell/shakespeare-js/metadata.xml
deleted file mode 100644
index 7e754854eb91..000000000000
--- a/dev-haskell/shakespeare-js/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Shakespeare is a template family for type-safe, efficient templates with simple variable interpolation . Shakespeare templates can be used inline with a quasi-quoter or in an external file. Shakespeare interpolates variables according to the type being inserted.
-		In this case, the variable type needs a ToJavascript instance.
-
-		There is also shakespeare-coffeescript for coffeescript templates. Coffescript is a language that compiles down to javascript. It expects a coffeescript compiler in your path, and variable should be a ToCoffee instance.
-
-		Please see http://docs.yesodweb.com/book/templates for a more thorough description and examples
-
-		shakespeare-js was originally called julius, and shakespeare originated from the hamlet template package.
-	</longdescription>
-	<use>
-		<flag name="test_coffee">Test coffee.</flag>
-		<flag name="test_export">Test export.</flag>
-		<flag name="test_roy">Test roy.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/shakespeare-js/shakespeare-js-1.1.4.1.ebuild b/dev-haskell/shakespeare-js/shakespeare-js-1.1.4.1.ebuild
deleted file mode 100644
index ec0b73fcc016..000000000000
--- a/dev-haskell/shakespeare-js/shakespeare-js-1.1.4.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Stick your haskell variables into javascript/coffeescript at compile time"
-HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-		>=dev-haskell/shakespeare-1.0.5:=[profile?]
-		<dev-haskell/shakespeare-1.1:=[profile?]
-		>=dev-haskell/text-0.7:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/hunit
-		)"
diff --git a/dev-haskell/shakespeare-js/shakespeare-js-1.2.0.4.ebuild b/dev-haskell/shakespeare-js/shakespeare-js-1.2.0.4.ebuild
deleted file mode 100644
index 123e7ad5ec8f..000000000000
--- a/dev-haskell/shakespeare-js/shakespeare-js-1.2.0.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Stick your haskell variables into javascript/coffeescript at compile time"
-HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test_coffee test_export test_roy"
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	>=dev-haskell/shakespeare-1.2:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test_coffee test_coffee) \
-		$(cabal_flag test_export test_export) \
-		$(cabal_flag test_roy test_roy)
-}
diff --git a/dev-haskell/shakespeare-js/shakespeare-js-1.3.0.ebuild b/dev-haskell/shakespeare-js/shakespeare-js-1.3.0.ebuild
deleted file mode 100644
index 76d594e78334..000000000000
--- a/dev-haskell/shakespeare-js/shakespeare-js-1.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Stick your haskell variables into javascript/coffeescript at compile time"
-HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/shakespeare-text-1.0.2 b/dev-haskell/shakespeare-text-1.0.2
new file mode 100644
index 000000000000..c7914ffe4dce
--- /dev/null
+++ b/dev-haskell/shakespeare-text-1.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Interpolation with quasi-quotation: put variables strings
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.0.2
+SRC_URI=mirror://hackage/packages/archive/shakespeare-text/1.0.2/shakespeare-text-1.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9b0590b36bc7534ccb557cd4e78a5ec7
diff --git a/dev-haskell/shakespeare-text-1.1.0 b/dev-haskell/shakespeare-text-1.1.0
new file mode 100644
index 000000000000..5760a87210e1
--- /dev/null
+++ b/dev-haskell/shakespeare-text-1.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8
+DESCRIPTION=Interpolation with quasi-quotation: put variables strings (deprecated)
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
+IUSE=profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.1.0
+SRC_URI=mirror://hackage/packages/archive/shakespeare-text/1.1.0/shakespeare-text-1.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3971dfcc9c9afb55f0783732ef8d35c0
diff --git a/dev-haskell/shakespeare-text/Manifest b/dev-haskell/shakespeare-text/Manifest
deleted file mode 100644
index b523755410cf..000000000000
--- a/dev-haskell/shakespeare-text/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST shakespeare-text-1.0.2.tar.gz 4623 BLAKE2B 3e0b501cfffb883e0876d95424ab199bed46dcca24dae48622d79c2ab614b9ca93b03721e77860962c4118f8903060c43cf54a18e5657d632ac3bb3a37036898 SHA512 45ad9251e9aeda71c29b1350e0c3e6dd8ce7d3695d6be89fbcb82dc47aff6d9aaceaa00b514a885691c546c709782f0f2318bb835fea711863c04f6f9c5798ea
-DIST shakespeare-text-1.1.0.tar.gz 1810 BLAKE2B a352a5efde2437233460a7aa3544f2c2f0d6bb6e68a8b3763fa49ece62e922a89cd8ee11baddff846467756014aa2e44df2fd1cee99ca97523226402bc5d1eef SHA512 45dce0a8ef5e0b45466110fdae3ce73fa6fa053d1c68afc0f7aab20726474b34e7ca3ddde6882e40cd2cd8d37ba2e0f7f4064260879c4dbb81ccd2dd5daadb5b
-EBUILD shakespeare-text-1.0.2.ebuild 769 BLAKE2B b17edb1bf6df834627f51ee52bc405a357268bfc4fb0e2fbdc3ea645e4c8652ab3587f0d5c2e25c55a155e8c1e25a705d4fda997551223733bacdcdb47e1a9e0 SHA512 febd9a34cf9af7892f3f3a59941c23a9b6abb04c88b8a5f52276380a75ba16cad6965e4d02b721babd68b2bb4ecada35466ab6ce919e505948297a49eb40db26
-EBUILD shakespeare-text-1.1.0.ebuild 615 BLAKE2B 9f62a93c03027aa04bf6078f5263f6766ee61af4fe336520c51c9cc7b7b39c41a4159834fffbab5803373c6831586b07b0172007604bc23bf078029c233c5b76 SHA512 9b4cfac47f5c34148bb8a79667c44ce3464240aeaee1eb3e6afde1eaabd5dce6b7cce63bc57232d44d5cf488b36f70ac634ccf20ec2107ca2a71721ae32db8e7
-MISC metadata.xml 1564 BLAKE2B 86ee591e45ff13cf0aa6474ce4d4c9569bb63515f233d4635fec3151f2f5b8a88f8c04c90b97878cf1f521de70af6036ace1e690989575f2258896dd21def0e2 SHA512 39742b1ffaf3052e1e79465a3b0fa0e9792b898256d3bf9c5beca2908678305eaa28a942c671ff6cd653bcf4621b05cc96b16869c58f1b9ec87399707aae20dd
diff --git a/dev-haskell/shakespeare-text/metadata.xml b/dev-haskell/shakespeare-text/metadata.xml
deleted file mode 100644
index 3ce699212101..000000000000
--- a/dev-haskell/shakespeare-text/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		interpolation with quasi-quotation: stick haskell variables into haskell strings
-		
-		Note there is no dependency on haskell-src-extras. If you don't mind that dependency, you may want to look at using these packages: Interpolation, interpolatedstring-perl6, interpolatedstring-qq.
-		
-		This package has 1 other general feature that those others may not (but would be easy to duplicate): instead of using quasi-quoting you can also use an external file. It also has url/embeding interpolation, with \@ and \^, which are used in Yesod.
-		
-		This package also uses blaze-builder for efficiently constructing strings (I am not sure what the other packages use). This might be of interest to you for large templates or performance sensitive code, or otherwise having a nice interface to blaze-builder
-		
-		Shakespeare is a template family for type-safe, efficient templates with simple variable interpolation . Shakespeare templates can be used inline with a quasi-quoter or in an external file. Shakespeare interpolates variables according to the type being inserted.
-		In this case, the variable type needs a ToText instance.
-		
-		Please see http://docs.yesodweb.com/book/templates for a more thorough description and examples of the shakespeare family of template languages.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/shakespeare-text/shakespeare-text-1.0.2.ebuild b/dev-haskell/shakespeare-text/shakespeare-text-1.0.2.ebuild
deleted file mode 100644
index 48a9e84b9b2b..000000000000
--- a/dev-haskell/shakespeare-text/shakespeare-text-1.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Interpolation with quasi-quotation: put variables strings"
-HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/shakespeare-text/shakespeare-text-1.1.0.ebuild b/dev-haskell/shakespeare-text/shakespeare-text-1.1.0.ebuild
deleted file mode 100644
index 09de57854562..000000000000
--- a/dev-haskell/shakespeare-text/shakespeare-text-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Interpolation with quasi-quotation: put variables strings (deprecated)"
-HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/shakespeare/Manifest b/dev-haskell/shakespeare/Manifest
deleted file mode 100644
index 23236fddb627..000000000000
--- a/dev-haskell/shakespeare/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST shakespeare-1.0.5.1.tar.gz 10773 BLAKE2B 5a234732a88b390914936e635884ed9befe10fc4b42d72d034aaf0d96099a9f8d9f136a7669307eea60cec7d773f3e7cd02a5ff2a37c73336bd4a3927625d71f SHA512 1b012cdfc90c930365633868e9714793bbbdf2fd276c578459495fe57531f4d3fb401db930880ab96eecdc95c60383a52ec8aa0cfa08b17bc099acee241192e7
-DIST shakespeare-1.2.1.1.tar.gz 11053 BLAKE2B 7c2b43f260740ddd364831f8bb991f052be8df014869bf29a1839d43f6cdcaf184fdc691ee4cecbd349dc68b848910a90399b5a48d48ed639180e609df36ba0c SHA512 559e77735c96edb551d85127e68af1aebfba383a6c67999ed86d4a93dc5dd7cedc8b7ca841219c0b7912cfc8509150733a7ba34fcb71d8e7a080fe34527b49e5
-DIST shakespeare-2.0.12.1.tar.gz 65156 BLAKE2B 0351f9453331a6aea8a346759902256ee1424a92ae5b0e655ed71567b0351449eff1c45ce675abd16556d9f09a4d31c8fdf11b8b28784171f50292b30da4a677 SHA512 01591844b51ab93a8021646ad15350d9682aa3e12c5017c32b89ca3b8de1cc46a01eb0096a35585297558d25c7a641a43f2766ad04766b2e033e8d02bdbc330e
-DIST shakespeare-2.0.7.tar.gz 62913 BLAKE2B a1e4f7c05123ad28cec27d07e491af4a86847ca0cf9fc85cca821b3c80a246508370e7c985fd27339601a5a4b500ab2ef437852c4746481cfb00b5aa45e24946 SHA512 5d682c2a4c36b7c8b5c8b87a3d0e509eb84e9e0a0e00a691cb9687c6f335c9ad895b81115a4e6fe8f4087ac6febe3e3e26d39ec305267228b1c9f295f9cf6d16
-EBUILD shakespeare-1.0.5.1.ebuild 834 BLAKE2B 1c7be45e91e6f9e89427cd0906c3e69d626923d58b238e1b73a6c3fdfe2cb18700ad6f2e97e91e37c325cb35d406955f3523f73ddf8af7b4c3e1eb4bc7b17723 SHA512 57373099f70dd5afdca5e63c086c2793ab581b78141b09bf81d769adb474eb19cd3868ee0003022f53a761fe8958e1d65518a95b10a8f49c99f97610bd0f2a75
-EBUILD shakespeare-1.2.1.1.ebuild 933 BLAKE2B 709c59845ae60f90707accd7c06bc685744e17655ee4c53d53a6f796d7693cd4bb7b49847d2ee61cdb3d6c4529accdf0cca983381259d95512bed4b8004fb946 SHA512 35349db54b0c0a87105f45e2023ba1697d3ad1ae97f2927e185f51fa8b5d343683acd74f029e50868b3d98436b07f3babe64228a03cd1245abb8cca727857c09
-EBUILD shakespeare-2.0.12.1.ebuild 1244 BLAKE2B ee5cac7cd929f74a29f4220fdc44906ef5b971f07d13f6e034f6c7fd526de7dc7eeafdbaf980d7b95a0ed63e27cc6fa073685877eaa40362f863367203e5b37a SHA512 5da60483575d504162b10c4944cd69515c8982d76a04e94999ea340c171a0140703f0836569161bbb558e14d644ac19e5281d600e07671a999e17b1fc4997f91
-EBUILD shakespeare-2.0.7.ebuild 1270 BLAKE2B 2db5292dcb90fff7b613d5b4a19930b2005a66a9e7224ff11456d563a63f24ccbc5d89732b5cf90b34e5885cb14acb9aa4639bd90837827265c09a96ad22a42d SHA512 751725c6759497ecca736f7e52e835f2674f8c5047b3d7799d1a084c023fce07e5bacd86f28006788d34d7458989a54b026080ec991fa0d55e22c91da22514b2
-MISC metadata.xml 1034 BLAKE2B 8ee8cec477e244ddba648870a68b02271f7c11d95bab7b59454898d70e0b53d0edce0f179de29556ca2fd0c60cc93eac66f3d8fbb02b7a2d924c54d3b676a6a5 SHA512 d8fb7e3b9d128dad8551df4153d1e01e771a07c9639fd3b082d0794e3f9c4d63eeed5041bdc930576b94440294c126cf5d35bec1bbec59ba95688c426bc5ac80
diff --git a/dev-haskell/shakespeare/metadata.xml b/dev-haskell/shakespeare/metadata.xml
deleted file mode 100644
index 4628e04a14a6..000000000000
--- a/dev-haskell/shakespeare/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Shakespeare is a template family for type-safe, efficient templates with simple variable interpolation . Shakespeare templates can be used inline with a quasi-quoter or in an external file. Shakespeare interpolates variables according to the type being inserted.
-
-		Note there is no dependency on haskell-src-extras.
-
-		packages that use this: shakespeare-js, shakespeare-css, shakespeare-interpolated, hamlet, and xml-hamlet
-		Please see the documentation at &lt;http://docs.yesodweb.com/book/hamlet/&gt; for more details.
-	</longdescription>
-	<use>
-		<flag name="test_export">Test export.</flag>
-		<flag name="test_coffee">Render tests through coffeescript render function.</flag>
-		<flag name="test_roy">Render tests through roy render function.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/shakespeare/shakespeare-1.0.5.1.ebuild b/dev-haskell/shakespeare/shakespeare-1.0.5.1.ebuild
deleted file mode 100644
index 69ef587ec697..000000000000
--- a/dev-haskell/shakespeare/shakespeare-1.0.5.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A toolkit for making compile-time interpolated templates"
-HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-2:=[profile?]
-		<dev-haskell/parsec-4:=[profile?]
-		>=dev-haskell/system-fileio-0.3:=[profile?]
-		>=dev-haskell/system-filepath-0.4:=[profile?]
-		>=dev-haskell/text-0.7:=[profile?]
-		>=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-		)"
diff --git a/dev-haskell/shakespeare/shakespeare-1.2.1.1.ebuild b/dev-haskell/shakespeare/shakespeare-1.2.1.1.ebuild
deleted file mode 100644
index 4d81aa004c1a..000000000000
--- a/dev-haskell/shakespeare/shakespeare-1.2.1.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A toolkit for making compile-time interpolated templates"
-HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test_export"
-
-RDEPEND=">=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-haskell/system-fileio-0.3:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( >=dev-haskell/hspec-1.3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test_export test_export)
-}
diff --git a/dev-haskell/shakespeare/shakespeare-2.0.12.1.ebuild b/dev-haskell/shakespeare/shakespeare-2.0.12.1.ebuild
deleted file mode 100644
index 139c98fd3d3b..000000000000
--- a/dev-haskell/shakespeare/shakespeare-2.0.12.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A toolkit for making compile-time interpolated templates"
-HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test_coffee test_export test_roy"
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/blaze-html:=[profile?]
-	dev-haskell/blaze-markup:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-haskell/scientific-0.3.0.0:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
-		dev-haskell/hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test_coffee test_coffee) \
-		$(cabal_flag test_export test_export) \
-		$(cabal_flag test_roy test_roy)
-}
diff --git a/dev-haskell/shakespeare/shakespeare-2.0.7.ebuild b/dev-haskell/shakespeare/shakespeare-2.0.7.ebuild
deleted file mode 100644
index d4eb111b7497..000000000000
--- a/dev-haskell/shakespeare/shakespeare-2.0.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A toolkit for making compile-time interpolated templates"
-HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test_coffee test_export test_roy"
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/blaze-html:=[profile?]
-	dev-haskell/blaze-markup:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
-		dev-haskell/hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test_coffee test_coffee) \
-		$(cabal_flag test_export test_export) \
-		$(cabal_flag test_roy test_roy)
-}
diff --git a/dev-haskell/shell-escape-0.2.0 b/dev-haskell/shell-escape-0.2.0
new file mode 100644
index 000000000000..476418ba3fe3
--- /dev/null
+++ b/dev-haskell/shell-escape-0.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/vector-0.6.0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Shell escaping library
+EAPI=6
+HOMEPAGE=https://github.com/solidsnack/shell-escape
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/vector-0.6.0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.0
+SRC_URI=mirror://hackage/packages/archive/shell-escape/0.2.0/shell-escape-0.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d270d5dfc1a33cd9ddeaf31c0093b955
diff --git a/dev-haskell/shell-escape/Manifest b/dev-haskell/shell-escape/Manifest
deleted file mode 100644
index 167d72a63449..000000000000
--- a/dev-haskell/shell-escape/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST shell-escape-0.2.0.tar.gz 6066 BLAKE2B 673e524c8914672fe9a5b955503ba66994a19edfbe1d46069c4a18053318fb731ac9e8949b2fee59ca517429f8b7f8631342d0cbea09a73b85d38f32003ecb9c SHA512 b2e8ae93b13619cd6801b0fb85e4783c2472a57f5162fb397d2cf00468290b0ca6189ba6a54b54efa68b2977d25ec02cdcf8d9c49f0d21cd6d6f1a030dd05db4
-EBUILD shell-escape-0.2.0.ebuild 576 BLAKE2B ec8d63e66415c3f2288779a43ea7c50c8a850fa4a4be88bcc96793fddc289c29b3547836bf7c2da50fa3d31fc2f9547d8be4049dff7377e7df6ec50909734e21 SHA512 6064c2de8593936401a34fbf88b31a7c1c2c6f89a1e78f6923f67746b7ee68733cbf5ceea55f29ce81338d963ed785f5fa5ef547e369ef6a9d4672066018d8d4
-MISC metadata.xml 471 BLAKE2B 3324c1e4541f8f98879975c0bf02eb72f9a57e02d82441d01122930ddccbe8ce66f8f9d2280c2a61c74ef746ad2ba74c90f491cd9002d771c02a1cef1b68c15a SHA512 f1074913d346aaa8e665ad3087d6f0fdd05e6f26d17f223031d4d4952b36390e8f3b1b3eb0a23fe0cea42d637435db8378b54770a211bf002344421e522fe90d
diff --git a/dev-haskell/shell-escape/metadata.xml b/dev-haskell/shell-escape/metadata.xml
deleted file mode 100644
index 48d4af45c12d..000000000000
--- a/dev-haskell/shell-escape/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Shell escaping library, offering both Bourne shell and Bash style escaping
-		of ByteStrings.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">solidsnack/shell-escape</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/shell-escape/shell-escape-0.2.0.ebuild b/dev-haskell/shell-escape/shell-escape-0.2.0.ebuild
deleted file mode 100644
index 3592336fdf1e..000000000000
--- a/dev-haskell/shell-escape/shell-escape-0.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Shell escaping library"
-HOMEPAGE="https://github.com/solidsnack/shell-escape"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/vector-0.6.0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/shellish-0.1.4 b/dev-haskell/shellish-0.1.4
new file mode 100644
index 000000000000..7d26966a18c6
--- /dev/null
+++ b/dev-haskell/shellish-0.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/mtl[profile?] dev-haskell/strict[profile?] dev-haskell/unix-compat[profile?] >=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=shell-/perl- like (systems) programming in Haskell
+EAPI=4
+HOMEPAGE=http://repos.mornfall.net/shellish
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl[profile?] dev-haskell/strict[profile?] dev-haskell/unix-compat[profile?] >=dev-lang/ghc-6.10.1
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/shellish/0.1.4/shellish-0.1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1bfe5d0cf603ba5a402da3636532e791
diff --git a/dev-haskell/shellish/Manifest b/dev-haskell/shellish/Manifest
deleted file mode 100644
index d080a8055a25..000000000000
--- a/dev-haskell/shellish/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX shellish-0.1.4-ghc-7.10.patch 333 BLAKE2B 2375e508af85b207a50b499faf8f4b31de54ffdad118663c1b631a8727de110cbe47754b7fb60b4911f86ed635ea1069dd077103fdbe555aad514b4d0b4d8098 SHA512 ea9b8b75200dbae42cc7498905333e96c4a5f203671e6b8fe74954ca1bb249bb0657b171da1bc40a2f70c5b1b69ef2f9155ab7e08c7018f4209047585a775656
-AUX shellish-0.1.4-ghc-8.patch 287 BLAKE2B d03709941ecef3374790422aa78bd5601bd9d92c1116774106c9263426ce37cf4a63c3fd7d93ce057fe93f2e68b69c0fddc011d79fb2542efe7ac69dbb5b88be SHA512 84fe9c8ad7420c4567d5277b014ee62e0e1c9a594c7ba72c3e3192e40999ee5fdc9c883ff5b99a0091f6e8e0d0599dbdc44b34cc1d752bd16590d3bffe3fce73
-DIST shellish-0.1.4.tar.gz 7268 BLAKE2B d315b956f64d6ebf9cd3728468b63775448fd6446fdbed8570ddc81885027884b2112c1377a457693463d42dc9f43c8088119f4fa09b8612dd830a504ffcb07b SHA512 4507ab92ca2db6a0e79d799ba303b3cb64fa887ec4581f0e1d191340fa7116db2c4bae069d6692c51d3d754ea0672b2d5c12b582d769b81b5b0e25c8c97c8a62
-EBUILD shellish-0.1.4.ebuild 769 BLAKE2B 29fb1484713c8cf7a2c6218bb1e0751c548ed0b2722d54403834b5ee6f5ec93361d8a74d250f9bfc0089b3a04b3f7c432c890b8ab54905de71ddad5d372ea9e9 SHA512 5acb69c6258063b6d16f43c5952286e36240ea6e95068dfc601b14f74eedabdae0fdd2ba3851af4394c95f31573dd2c3814bf21c4eaa4dc0925bfea8b2e3f8c8
-MISC metadata.xml 675 BLAKE2B 52149b22d14e149ef8feeeb92fceea6fe1f9833ceb338cd630c9a4c2cf6c6c8e3332366e2a8b657b62b55f9ac64b42e6c7344959fdcfc9a47e1c49f9634ae279 SHA512 0eb2ad21fc402a2c9164b703aa26bcb733df7636dd22a3b358aed68a2d41df90da450d85516e0cce5f682c0768f35d7b5310cf4312fb9b0f3839979a67705807
diff --git a/dev-haskell/shellish/files/shellish-0.1.4-ghc-7.10.patch b/dev-haskell/shellish/files/shellish-0.1.4-ghc-7.10.patch
deleted file mode 100644
index c756635f6000..000000000000
--- a/dev-haskell/shellish/files/shellish-0.1.4-ghc-7.10.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/Shellish.hs b/Shellish.hs
-index 1e3c192..0ac20c2 100644
---- a/Shellish.hs
-+++ b/Shellish.hs
-@@ -1,3 +1,3 @@
- {-# LANGUAGE ScopedTypeVariables, DeriveDataTypeable, OverloadedStrings,
--             MultiParamTypeClasses, FlexibleInstances #-}
-+             MultiParamTypeClasses, FlexibleInstances, FlexibleContexts #-}
- 
diff --git a/dev-haskell/shellish/files/shellish-0.1.4-ghc-8.patch b/dev-haskell/shellish/files/shellish-0.1.4-ghc-8.patch
deleted file mode 100644
index 49525543acbd..000000000000
--- a/dev-haskell/shellish/files/shellish-0.1.4-ghc-8.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/Shellish.hs b/Shellish.hs
-index 0ac20c2..7de0e11 100644
---- a/Shellish.hs
-+++ b/Shellish.hs
-@@ -180,3 +180,3 @@ test_s = path >=> liftIO . \f -> do
-   stat <- getSymbolicLinkStatus f
--  return $ isSymbolicLink stat
-+  return $ System.PosixCompat.Files.isSymbolicLink stat
- 
diff --git a/dev-haskell/shellish/metadata.xml b/dev-haskell/shellish/metadata.xml
deleted file mode 100644
index 220975e213d9..000000000000
--- a/dev-haskell/shellish/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The shellisg package provides a single module for convenient
-		\"systems\" programming in Haskell, similar in spirit to POSIX
-		shells or PERL.
-		
-		* Elegance and safety is sacrificed for conciseness and
-		swiss-army-knife-ness.
-		
-		* The interface exported by Shellish is thread-safe.
-		
-		Overall, the module should help you to get a job done quickly,
-		without getting too dirty.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/shellish/shellish-0.1.4.ebuild b/dev-haskell/shellish/shellish-0.1.4.ebuild
deleted file mode 100644
index c38907e5941e..000000000000
--- a/dev-haskell/shellish/shellish-0.1.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.17.9999
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="shell-/perl- like (systems) programming in Haskell"
-HOMEPAGE="http://repos.mornfall.net/shellish"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl[profile?]
-		dev-haskell/strict[profile?]
-		dev-haskell/unix-compat[profile?]
-		>=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-	epatch "${FILESDIR}"/${P}-ghc-8.patch
-}
diff --git a/dev-haskell/shelly-1.5.6-r1 b/dev-haskell/shelly-1.5.6-r1
new file mode 100644
index 000000000000..8af6979fa4af
--- /dev/null
+++ b/dev-haskell/shelly-1.5.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=dev-haskell/async:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.7:=[profile?] dev-haskell/lifted-async:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/system-fileio-0.4:=[profile?] >=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=shell-like (systems) programming in Haskell
+EAPI=5
+HOMEPAGE=https://github.com/yesodweb/Shelly.hs
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/async:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.7:=[profile?] dev-haskell/lifted-async:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/system-fileio-0.4:=[profile?] >=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.5.6
+SRC_URI=mirror://hackage/packages/archive/shelly/1.5.6/shelly-1.5.6.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e6a5fbf8885a8e51c00d4697c8b2341e
diff --git a/dev-haskell/shelly-1.6.5 b/dev-haskell/shelly-1.6.5
new file mode 100644
index 000000000000..2a11123f131d
--- /dev/null
+++ b/dev-haskell/shelly-1.6.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] dev-haskell/lifted-async:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/system-fileio-0.4:=[profile?] >=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.5 >=dev-haskell/hunit-1.2 >=dev-haskell/text-0.11 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=shell-like (systems) programming in Haskell
+EAPI=5
+HOMEPAGE=https://github.com/yesodweb/Shelly.hs
+IUSE=lifted doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/async:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] dev-haskell/lifted-async:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/system-fileio-0.4:=[profile?] >=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.6.5
+SRC_URI=mirror://hackage/packages/archive/shelly/1.6.5/shelly-1.6.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9ce5fc0fdf14981600ae380ce3d123bc
diff --git a/dev-haskell/shelly-1.6.6 b/dev-haskell/shelly-1.6.6
new file mode 100644
index 000000000000..57b75d9fa56f
--- /dev/null
+++ b/dev-haskell/shelly-1.6.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/async:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] dev-haskell/lifted-async:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/system-fileio-0.4:=[profile?] >=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.5 >=dev-haskell/hunit-1.2 >=dev-haskell/text-0.11 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=shell-like (systems) programming in Haskell
+EAPI=6
+HOMEPAGE=https://github.com/yesodweb/Shelly.hs
+IUSE=lifted doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/async:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] dev-haskell/lifted-async:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/system-fileio-0.4:=[profile?] >=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.6.6
+SRC_URI=mirror://hackage/packages/archive/shelly/1.6.6/shelly-1.6.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=414fa3d06b14e4eda35273e51fc452e8
diff --git a/dev-haskell/shelly-1.6.8.1 b/dev-haskell/shelly-1.6.8.1
new file mode 100644
index 000000000000..bcfd89716578
--- /dev/null
+++ b/dev-haskell/shelly-1.6.8.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/async:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] dev-haskell/lifted-async:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/system-fileio-0.4:=[profile?] >=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers-base:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.5 >=dev-haskell/hunit-1.2 >=dev-haskell/text-0.11 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=shell-like (systems) programming in Haskell
+EAPI=6
+HOMEPAGE=https://github.com/yesodweb/Shelly.hs
+IUSE=examples lifted doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/async:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] dev-haskell/lifted-async:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/system-fileio-0.4:=[profile?] >=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers-base:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.6.8.1
+SRC_URI=mirror://hackage/packages/archive/shelly/1.6.8.1/shelly-1.6.8.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=33f09565463d976dbc1c2c3e98acd57d
diff --git a/dev-haskell/shelly/Manifest b/dev-haskell/shelly/Manifest
deleted file mode 100644
index 922c5429968f..000000000000
--- a/dev-haskell/shelly/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX shelly-1.5.6-monad-control-1.1.patch 2847 BLAKE2B c979ca3d31f146dd18e49526e131130a61c6c3b35cf0b87148d9ea7097d2690f4b7d5255a06c45f87b1077d98516443e41bf6c8a2d9b89f93cf1d9860422a4ed SHA512 f2a386defa742076f4a0062597113f86706eccfcacfe62483536bbffe410d5c752b8c59c365c89a39f99dbb83c88cf2c3a4f76e4d5132858f254be5cad420e00
-AUX shelly-1.6.5-ghc-8.patch 700 BLAKE2B a1bad8d6dccb17b40f87178f377bcf8abbb485cf5ca8c599182a1b96635eb4df83a7ea1f4266ddd0e57f11b921a3b4a346a511611a81ae531cef3df498b67ef0 SHA512 fcbdb8b61cb471c2d3731c84e334875b3c5b8e4752e679097df99c80e31c15785878d2f73ba3e6247991ee3941896922e07f42aff2fbd33fa5f3eb7c8a8ad7cd
-AUX shelly-1.6.8.1-ghc-8.0.2_rc1.patch 251 BLAKE2B 6d4a799f132b9ed9d0b1558c0b4616c8458f40e8d7ceddd09cf288646ab265d9ff854db7af2c76e63c15ae6f21799045ed83b1178807c4841a046fda4f1c7d81 SHA512 46b6992227ee15ab9d02b52e897a7507c2e0cd97b4b2d4b1899d269c132ff0ac4179fe3693f4e538adb174b2ff523eb85c419f54bbe7a95d2154bbdae8720d81
-DIST shelly-1.5.6.tar.gz 28264 BLAKE2B ec1a51e8799a7d0e37f31f737cfcf50bb780636094365991693b19f89ba5c72dbf7c40ed922352d76294ca8a07fcb73ba2359613ff2a244831b6fe82d6457b94 SHA512 522aa76454211b9f31dc92f052703e3f9f4a103c134da063ff5c4c04e209a1f881dc10c0f8589c557ad179a8dc319951b897b8ff401dd8f9a371f69f1def6022
-DIST shelly-1.6.5.tar.gz 97274 BLAKE2B 0cb2ef6482f509e9547dc6571b8d7e2eaf61fb0ceca2be5ed5ab423118ff69032205711b697a539e45c27551149ec79fc95e176f5b6afe7d8ccdf3c8b1f46208 SHA512 6a5b418987392d755e7faf60206a3e9283e98f56a4d9d9f956c0385074ff8909fb6bddceb050b00dbd0f8eda55eeb4897d9afd2f8dd2d510367567336a7a6770
-DIST shelly-1.6.6.tar.gz 97529 BLAKE2B a171ceba324ca8775604d7ddedb0bb26697d1161231f5b0fed5611fb9f035e2db61011891f4be9bf8fcc7df1b4d3d50b89f7fed15b48f5bc1a5bfb1c6b891802 SHA512 1b78cb84d126f6bb67db3a3d5e669759e71811e2770831af41a4867d094f89b32c3cf39363cc39c808e71019d6e7eca18d25e854bbf4160bd3388c6769a8665c
-DIST shelly-1.6.8.1.tar.gz 97802 BLAKE2B 08f0f5d7e86b803804f6fae7c66fccf2cd5ae044dd8cb164f49254e311644bee4d103cf04ca9c7b20fb4d29e742ed9480d6c714205bdebb07656b5f925491b4e SHA512 76ab37289a9b6c51ecb6d5326161b326a4015ed27f6c61cd889d4dbf8f6417e6629d0059fdf65ec40f4093cb921ea3b4871105ccd77c94f863c2a087e3c2fab6
-EBUILD shelly-1.5.6-r1.ebuild 1265 BLAKE2B 066de23f0b060d8110830f9d975a1b2d6e365d48aa66fc97bbe17585fabfeed88a8558a5de4fa6197b35af2a70706b51e1fc8a42fe354ab3e34fd030f3fd52e2 SHA512 7b94d6e9eb605531edc66928829e15bddc41cdbb69bcd04d6dd5cff087b4e074a870e04e7d018cec0866e4ac8a2a44eba693491456069906b3ee68fcfb0d66e7
-EBUILD shelly-1.6.5.ebuild 1389 BLAKE2B 76275f779b24c9465d7b4493357255b6f98950385fe9aff6e437b76c063c5559d4f99654f5b0640477f4f7332fcb7273adaddb1c3de6f90fcbfb2df90872c7e8 SHA512 00aa6ddffb3f8dd41d3f6c947bdd086c9f235ee5cc824d0cf91f046b63fb388c6e91fdc4ef316d34855b99a5de95e4ea3869b0eb604582d76b007610dee1aefd
-EBUILD shelly-1.6.6.ebuild 1557 BLAKE2B 59bc6c65ca298d7aee2da1b50c36500cdbffd7c91f69749b098586d5af85f86a595434b01f3a02a01e9de3cd57771ff85162e151a45733ed68058e42872b4136 SHA512 0bfe9ba453d6bb7f598ed94a4fdf70c9f9fb8d7e9d21017736043e8b296bd40b321b393d0791e9398c223aaf4cfab18ae9ac7a1784ffa16a82535f3a676d583d
-EBUILD shelly-1.6.8.1.ebuild 1629 BLAKE2B fc296b400798222e22314968eff767fb1db4abc2fe96603c399a87f9e5a7e77eec41e27536d5b1889e3b88c32f7a0ba6fe238cbf07ea5706776e63bb15d508d8 SHA512 29c5804da2a86c983aa79e9fbf7d8728685e30c03494370656aec8a764331d654f868ecda94ebdd0de2ba1ee46356981583afe45e25dce976973e37e959f166a
-MISC metadata.xml 1068 BLAKE2B 92ccc8747907426957a475c110516beb04d036015f4a79a8d8732045c4cdca61e1b247087675bf85b7957d1b73b69e80b95378742229969cfbc38827d6ac2f29 SHA512 e27e2b45c197ba0f7696ff142d6b6b69df12ed35074d0f9924cf87b043fe9301ad17f1fd2874a904347781825f691ce1feefddfabcccc20a186072992dbb15b4
diff --git a/dev-haskell/shelly/files/shelly-1.5.6-monad-control-1.1.patch b/dev-haskell/shelly/files/shelly-1.5.6-monad-control-1.1.patch
deleted file mode 100644
index a2ef39376c08..000000000000
--- a/dev-haskell/shelly/files/shelly-1.5.6-monad-control-1.1.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-commit 33b32439e7ef1ba60cc8d72ae0f0c53b6d01ae90
-Merge: d3aec33 b70a308
-Author: Greg Weber <greg@gregweber.info>
-Date:   Mon Dec 22 10:32:40 2014 -0800
-
-    Merge pull request #84 from yesodweb/monad-control-1.0
-    
-    monad-control 1.0
-
-commit d3aec338e23a03027c404aaf5a7b5790b3300ec5
-Author: Luite Stegeman <stegeman@gmail.com>
-Date:   Mon Dec 22 16:21:01 2014 +0100
-
-    bump time upper bound
-
-diff --git a/shelly.cabal b/shelly.cabal
-index ed0d086..3d3c46d 100644
---- a/shelly.cabal
-+++ b/shelly.cabal
-@@ -39,7 +39,7 @@ Library
- 
-   Build-depends:
-     containers                >= 0.4.2.0,
--    time                      >= 1.3 && < 1.5,
-+    time                      >= 1.3 && < 1.6,
-     directory                 >= 1.1.0.0 && < 1.3.0.0,
-     mtl                       >= 2,
-     process                   >= 1.0,
-
-commit c1da49fb0d59a56c9e4140a5cbf0700c9fc1ca5f
-Author: Luite Stegeman <stegeman@gmail.com>
-Date:   Mon Dec 22 16:20:18 2014 +0100
-
-    Add Alternative instance for Sh, since it's now a superclass of
-    MonadPlus.
-
-diff --git a/src/Shelly/Pipe.hs b/src/Shelly/Pipe.hs
-index a8d0182..f0a64ec 100644
---- a/src/Shelly/Pipe.hs
-+++ b/src/Shelly/Pipe.hs
-@@ -138,6 +138,10 @@ instance Applicative Sh where
-     pure = return
-     (<*>) = ap
- 
-+instance Alternative Sh where
-+    empty = mzero
-+    (<|>) = mplus
-+
- instance MonadPlus Sh where
-     mzero = Sh $ return []
-     mplus a b = Sh $ liftA2 (++) (unSh a) (unSh b)
-
-commit b70a308ad14af0b57bbdd9cf8441bdc30ff65c36
-Author: Michael Snoyman <michael@snoyman.com>
-Date:   Mon Dec 22 13:49:54 2014 +0200
-
-    monad-control 1.0
-
-diff --git a/shelly.cabal b/shelly.cabal
-index ed0d086..99a85d3 100644
---- a/shelly.cabal
-+++ b/shelly.cabal
-@@ -46,7 +46,7 @@ Library
-     unix-compat               < 0.5,
-     system-filepath           >= 0.4.7 && < 0.5,
-     system-fileio             < 0.4,
--    monad-control             >= 0.3.2 && < 0.4,
-+    monad-control             >= 0.3.2 && < 1.1,
-     lifted-base,
-     lifted-async,
-     exceptions                == 0.6.*,
-diff --git a/src/Shelly/Base.hs b/src/Shelly/Base.hs
-index e05ad43..3d6fe00 100644
---- a/src/Shelly/Base.hs
-+++ b/src/Shelly/Base.hs
-@@ -71,11 +71,19 @@ instance MonadBase IO Sh where
-     liftBase = Sh . ReaderT . const
- 
- instance MonadBaseControl IO Sh where
-+#if MIN_VERSION_monad_control(1,0,0)
-+    type StM Sh a = StM (ReaderT (IORef State) IO) a
-+    liftBaseWith f =
-+        Sh $ liftBaseWith $ \runInBase -> f $ \k ->
-+            runInBase $ unSh k
-+    restoreM = Sh . restoreM
-+#else
-     newtype StM Sh a = StMSh (StM (ReaderT (IORef State) IO) a)
-     liftBaseWith f =
-         Sh $ liftBaseWith $ \runInBase -> f $ \k ->
-             liftM StMSh $ runInBase $ unSh k
-     restoreM (StMSh m) = Sh . restoreM $ m
-+#endif
- 
- instance Catch.MonadThrow Sh where
-   throwM = liftIO . Catch.throwM
diff --git a/dev-haskell/shelly/files/shelly-1.6.5-ghc-8.patch b/dev-haskell/shelly/files/shelly-1.6.5-ghc-8.patch
deleted file mode 100644
index 75d56220e38c..000000000000
--- a/dev-haskell/shelly/files/shelly-1.6.5-ghc-8.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/Shelly/Lifted.hs b/src/Shelly/Lifted.hs
-index 825201d..cdca61b 100644
---- a/src/Shelly/Lifted.hs
-+++ b/src/Shelly/Lifted.hs
-@@ -2,4 +2,4 @@
-              FlexibleInstances, FlexibleContexts, IncoherentInstances,
--             TypeFamilies, ExistentialQuantification, RankNTypes,
--             ImpredicativeTypes #-}
-+             TypeFamilies, ExistentialQuantification, RankNTypes
-+  #-}
- {-# OPTIONS_GHC -fno-warn-orphans #-}
-@@ -299,3 +299,3 @@ instance (MonadShControl m, Monoid w)
- controlSh :: MonadShControl m => ((forall x. m x -> Sh (ShM m x)) -> Sh (ShM m a)) -> m a
--controlSh = liftShWith >=> restoreSh
-+controlSh r = liftShWith r >>= restoreSh
- {-# INLINE controlSh #-}
diff --git a/dev-haskell/shelly/files/shelly-1.6.8.1-ghc-8.0.2_rc1.patch b/dev-haskell/shelly/files/shelly-1.6.8.1-ghc-8.0.2_rc1.patch
deleted file mode 100644
index 078f979fd013..000000000000
--- a/dev-haskell/shelly/files/shelly-1.6.8.1-ghc-8.0.2_rc1.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/src/Shelly/Pipe.hs b/src/Shelly/Pipe.hs
-index 7fe7d98..cc5668d 100644
---- a/src/Shelly/Pipe.hs
-+++ b/src/Shelly/Pipe.hs
-@@ -121,3 +121,3 @@ import Data.Text as T hiding (concat, all, find, cons)
- 
--default (T.Text)
-+-- default (T.Text)
- 
diff --git a/dev-haskell/shelly/metadata.xml b/dev-haskell/shelly/metadata.xml
deleted file mode 100644
index 061239b47e2b..000000000000
--- a/dev-haskell/shelly/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Shelly provides convenient systems programming in Haskell,
-		similar in spirit to POSIX shells. Shelly:
-		
-		* is aimed at convenience and getting things done rather than
-		being a demonstration of elegance.
-		
-		* has detailed and useful error messages
-		
-		* maintains its own environment, making it thread-safe.
-		
-		* is modern, using Text and system-filepath/system-fileio
-		
-		Shelly is originally forked from the Shellish package.
-		
-		See the shelly-extra package for additional functionality.
-		
-		An overview is available in the README: &lt;https://github.com/yesodweb/Shelly.hs/blob/master/README.md&gt;
-	</longdescription>
-	<upstream>
-		<remote-id type="github">yesodweb/Shelly.hs</remote-id>
-	</upstream>
-	<use>
-		<flag name="lifted">run the tests against Shelly.Lifted</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/shelly/shelly-1.5.6-r1.ebuild b/dev-haskell/shelly/shelly-1.5.6-r1.ebuild
deleted file mode 100644
index ddcff5b9bc5f..000000000000
--- a/dev-haskell/shelly/shelly-1.5.6-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="shell-like (systems) programming in Haskell"
-HOMEPAGE="https://github.com/yesodweb/Shelly.hs"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.7:=[profile?]
-	dev-haskell/lifted-async:=[profile?]
-	dev-haskell/lifted-base:=[profile?]
-	>=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	<dev-haskell/system-fileio-0.4:=[profile?]
-	>=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	<dev-haskell/unix-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-PATCHES=("${FILESDIR}/${PN}-1.5.6-monad-control-1.1.patch")
diff --git a/dev-haskell/shelly/shelly-1.6.5.ebuild b/dev-haskell/shelly/shelly-1.6.5.ebuild
deleted file mode 100644
index d3d9fd78e085..000000000000
--- a/dev-haskell/shelly/shelly-1.6.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="shell-like (systems) programming in Haskell"
-HOMEPAGE="https://github.com/yesodweb/Shelly.hs"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="lifted"
-
-RDEPEND="dev-haskell/async:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
-	dev-haskell/lifted-async:=[profile?]
-	dev-haskell/lifted-base:=[profile?]
-	>=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	<dev-haskell/system-fileio-0.4:=[profile?]
-	>=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	<dev-haskell/unix-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.5
-		>=dev-haskell/hunit-1.2
-		>=dev-haskell/text-0.11 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag lifted lifted)
-}
diff --git a/dev-haskell/shelly/shelly-1.6.6.ebuild b/dev-haskell/shelly/shelly-1.6.6.ebuild
deleted file mode 100644
index 209da0df31f9..000000000000
--- a/dev-haskell/shelly/shelly-1.6.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="shell-like (systems) programming in Haskell"
-HOMEPAGE="https://github.com/yesodweb/Shelly.hs"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="lifted"
-
-RDEPEND="dev-haskell/async:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
-	dev-haskell/lifted-async:=[profile?]
-	dev-haskell/lifted-base:=[profile?]
-	>=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	<dev-haskell/system-fileio-0.4:=[profile?]
-	>=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	<dev-haskell/unix-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.5
-		>=dev-haskell/hunit-1.2
-		>=dev-haskell/text-0.11 )
-"
-
-PATCHES=("${FILESDIR}"/${PN}-1.6.5-ghc-8.patch)
-
-src_prepare() {
-	cabal_chdeps \
-		'time                      >= 1.3 && < 1.6' 'time                      >= 1.3'
-	default
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag lifted lifted)
-}
diff --git a/dev-haskell/shelly/shelly-1.6.8.1.ebuild b/dev-haskell/shelly/shelly-1.6.8.1.ebuild
deleted file mode 100644
index ab7e9c46dcc8..000000000000
--- a/dev-haskell/shelly/shelly-1.6.8.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: build-examples:examples
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="shell-like (systems) programming in Haskell"
-HOMEPAGE="https://github.com/yesodweb/Shelly.hs"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="examples lifted"
-
-RDEPEND="dev-haskell/async:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
-	dev-haskell/lifted-async:=[profile?]
-	dev-haskell/lifted-base:=[profile?]
-	>=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	<dev-haskell/system-fileio-0.4:=[profile?]
-	>=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	<dev-haskell/unix-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.5
-		>=dev-haskell/hunit-1.2
-		>=dev-haskell/text-0.11 )
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-8.0.2_rc1.patch)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'directory                 >= 1.1.0.0 && < 1.3.0.0' 'directory                 >= 1.1.0.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples build-examples) \
-		$(cabal_flag lifted lifted)
-}
diff --git a/dev-haskell/shuffle-0.1.3.3 b/dev-haskell/shuffle-0.1.3.3
new file mode 100644
index 000000000000..4fdf9c70c4fb
--- /dev/null
+++ b/dev-haskell/shuffle-0.1.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cabal-1.14:=[profile?] >=dev-haskell/uhc-util-0.1.5.5:=[profile?] >=dev-haskell/uuagc-0.9.40.3:=[profile?] >=dev-haskell/uuagc-cabal-1.0.3.0:=[profile?] >=dev-haskell/uulib-0.9:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Shuffle tool for UHC
+EAPI=5
+HOMEPAGE=https://github.com/UU-ComputerScience/shuffle
+IUSE=+network-uri doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cabal-1.14:=[profile?] >=dev-haskell/uhc-util-0.1.5.5:=[profile?] >=dev-haskell/uuagc-0.9.40.3:=[profile?] >=dev-haskell/uuagc-cabal-1.0.3.0:=[profile?] >=dev-haskell/uulib-0.9:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/0.1.3.3
+SRC_URI=mirror://hackage/packages/archive/shuffle/0.1.3.3/shuffle-0.1.3.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=17437a664f53bda19e4cc069130eea79
diff --git a/dev-haskell/shuffle/Manifest b/dev-haskell/shuffle/Manifest
deleted file mode 100644
index e0ab5301091c..000000000000
--- a/dev-haskell/shuffle/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST shuffle-0.1.3.3.tar.gz 31685 BLAKE2B 007f91bedca1cd7b7a7d40b3425f528b3e76e5636447b509bfa30ba09894267c51a759ca512a39c8c3c296765b816df28ad6952085e5135f24b6169dfab8d519 SHA512 44fcb34a3a9c251970c132c5a504aa4fe30befbc2829ff8b4f788e797c8a35373c5ed4325fb3e5d5846caf0f566b84c398f53be0c7d33d4392343e4f8655a096
-EBUILD shuffle-0.1.3.3.ebuild 1048 BLAKE2B 30c8220f41640382333c04081db9a82860c1ae920be442668b88c911a868808e816be3f7a37dfd6ba70a141a5bab7e9bfa6992e2b14421e39b5dd5e0a099cd16 SHA512 88b9654dcbdda9de75754d3db0686a1ab748444aeba9ebc0ec22b8e3cd8b41995200036add57ac56820f0a005c3a7fa7131a53076ea7bf6c9ea0c897b38c289f
-MISC metadata.xml 528 BLAKE2B 833369c241ba94d4cc50079d3b18a1b1e69af328c82462a509ff23d91de8ab56493c84ea6412c2ded2899cc439da0856611953bbfcc186e54265e253a8df6569 SHA512 0743b1484681c038884c38418b9407923b3f1f4cd5d301ce9a912879b6fb60672158341c9f889b758340a20ee542c3bf79770bcc2d158115340c53dc25e30bb0
diff --git a/dev-haskell/shuffle/metadata.xml b/dev-haskell/shuffle/metadata.xml
deleted file mode 100644
index 6988c173b587..000000000000
--- a/dev-haskell/shuffle/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Shuffle tool used by UHC (Utrecht Haskell Compiler)
-	</longdescription>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">UU-ComputerScience/shuffle</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/shuffle/shuffle-0.1.3.3.ebuild b/dev-haskell/shuffle/shuffle-0.1.3.3.ebuild
deleted file mode 100644
index 4948d58249ec..000000000000
--- a/dev-haskell/shuffle/shuffle-0.1.3.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Shuffle tool for UHC"
-HOMEPAGE="https://github.com/UU-ComputerScience/shuffle"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/cabal-1.14:=[profile?]
-	>=dev-haskell/uhc-util-0.1.5.5:=[profile?]
-	>=dev-haskell/uuagc-0.9.40.3:=[profile?]
-	>=dev-haskell/uuagc-cabal-1.0.3.0:=[profile?]
-	>=dev-haskell/uulib-0.9:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/silently-1.2.4.1 b/dev-haskell/silently-1.2.4.1
new file mode 100644
index 000000000000..dc35897a5754
--- /dev/null
+++ b/dev-haskell/silently-1.2.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/nanospec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Prevent or capture writing to stdout and other handles
+EAPI=5
+HOMEPAGE=https://github.com/trystan/silently
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/1.2.4.1
+SRC_URI=mirror://hackage/packages/archive/silently/1.2.4.1/silently-1.2.4.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b68c0bc2131612c79e25d9e293605b10
diff --git a/dev-haskell/silently-1.2.5 b/dev-haskell/silently-1.2.5
new file mode 100644
index 000000000000..688d881f19ac
--- /dev/null
+++ b/dev-haskell/silently-1.2.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/nanospec dev-haskell/temporary ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Prevent or capture writing to stdout and other handles
+EAPI=5
+HOMEPAGE=https://github.com/hspec/silently
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.5
+SRC_URI=mirror://hackage/packages/archive/silently/1.2.5/silently-1.2.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a5a24c732fcb501578c0cba31c1c73a1
diff --git a/dev-haskell/silently/Manifest b/dev-haskell/silently/Manifest
deleted file mode 100644
index 84f374aa4ddb..000000000000
--- a/dev-haskell/silently/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST silently-1.2.4.1.tar.gz 3199 BLAKE2B f3d05403e8fc9cab5b83808526cb957c0bc030d88b6c4249c61223f7dc3b5a5ccf10a8268aed492e48895e9ff4321282e8626439bcc19052cbd8904fc57dbc4a SHA512 ab8fea9c15a2061e3c3fd6970422a2cdea67aac3614991a8135f19a2f075de52f923fd0e78b5a45a91f2523f6263eb626efea2e89ed94277e03a132410862e19
-DIST silently-1.2.5.tar.gz 3364 BLAKE2B b5f248bc50c4a85268cf6709a8984307b40524763304cf8aacab64d0ba3949c2fccc104157a848a15841ee6cad6c56fb54d7b7003c13a300aaedc77a12fce9d7 SHA512 f28075e064561fffaa85dc88e7feef543411abc453e76d1ef90d3a7e617d9d9e8fc3ce053da391f0c8d78c7e27fb1e5dcda6a022f43f95491339366362f02acc
-EBUILD silently-1.2.4.1.ebuild 603 BLAKE2B 493c889ade972f447235defb875bcb3001eab261d4465c2316358dbf0140564ef5deb7480e695c450d000535860274ca052c5b5c4ea2c15e2fe69f03837c0355 SHA512 7e2a52812374363ce0f6c0609548922df8346d9277bf63c067e00961717286b0bcde910d69d56ef490f641fd300421e89edc6eea4f73ad98683f48dbe3aff949
-EBUILD silently-1.2.5.ebuild 626 BLAKE2B 4721157395da852551ad30c849c60f4553954249e9a9cdb1fb85fea95296889e6218f7f49cafb4274044fcb1376a222a205dc7386a0c4c3e0804618a68dd74aa SHA512 2f4d7d85e87f285f9aab3c4f91d6c746b90603384588f7d012f81d655517fdd09ffa6f2b979d159fa3a95fa328b4435b7c3f224c3377a46097f1c41b2b00d959
-MISC metadata.xml 427 BLAKE2B 07dc2d7f1c8f37c13135e3fb1fd4ecdd78e118fdd7ac6b568bad2657b3f9f56e096885490faedd25213d7faae9965d1ad119a304c00609f8bcf2c16a4566f75e SHA512 506248006e0c2bbe28e8a9dd9882b60c3cbedfaf254336770768ade198610de86377607e306d87f4056ad3ffedda4211cd0ce1ce45bad737d97953175927f0be
diff --git a/dev-haskell/silently/metadata.xml b/dev-haskell/silently/metadata.xml
deleted file mode 100644
index ca55290ec73f..000000000000
--- a/dev-haskell/silently/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Prevent or capture writing to stdout and other handles.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">trystan/silently</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/silently/silently-1.2.4.1.ebuild b/dev-haskell/silently/silently-1.2.4.1.ebuild
deleted file mode 100644
index 8d76f9570578..000000000000
--- a/dev-haskell/silently/silently-1.2.4.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Prevent or capture writing to stdout and other handles"
-HOMEPAGE="https://github.com/trystan/silently"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/nanospec )"
diff --git a/dev-haskell/silently/silently-1.2.5.ebuild b/dev-haskell/silently/silently-1.2.5.ebuild
deleted file mode 100644
index 7af12a66fd16..000000000000
--- a/dev-haskell/silently/silently-1.2.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Prevent or capture writing to stdout and other handles"
-HOMEPAGE="https://github.com/hspec/silently"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/nanospec
-		dev-haskell/temporary )
-"
diff --git a/dev-haskell/simple-reflect-0.3.2 b/dev-haskell/simple-reflect-0.3.2
new file mode 100644
index 000000000000..82159c1a28fe
--- /dev/null
+++ b/dev-haskell/simple-reflect-0.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple reflection of expressions containing variables
+EAPI=5
+HOMEPAGE=https://twanvl.nl/blog/haskell/simple-reflection-of-expressions
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.2
+SRC_URI=mirror://hackage/packages/archive/simple-reflect/0.3.2/simple-reflect-0.3.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=80f4646f73e7480e72641db41c6f1082
diff --git a/dev-haskell/simple-reflect/Manifest b/dev-haskell/simple-reflect/Manifest
deleted file mode 100644
index edc021c5e492..000000000000
--- a/dev-haskell/simple-reflect/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST simple-reflect-0.3.2.tar.gz 4492 BLAKE2B 933f9d5902a18ad3e69aa8c9731c67eb4e35aec36f860d92876d8a7709f3ced259781979bf469ca5d547e21995b84e0a94aa599f4df6e3f5fa3cbc8337e0702f SHA512 0e8e9666b10fcebbb4fe421ca8a1102d2028d8a4b2b9c196400b15ceedaa0420160e1536fadf55fdc316e1a07fb11aa92e2933b2fe491d27a1f3c54b62f268a1
-EBUILD simple-reflect-0.3.2.ebuild 584 BLAKE2B 0e5361d47f8658b08e78fe7003957a630d96cc1ae2d4b6ef93ec94b85494a23e7924fe3c28fe3ad3d60c8e25bc03a35de49e4eaa680387408e48375b1ae2022f SHA512 96e00b2ce6e534be7725a55bc940bce150a78ff717459825480fc30860a8d98a693df9b22fa2e55479110f3d30c6dfe6cbbf8a7a58b611e61693e1a67c145522
-MISC metadata.xml 592 BLAKE2B b975899549ba9e105eecbd12481245c88e5d7d8e771e4cd33b9cbfbaefa66c1b357292b7d0e5f7d2d6d8475a9ff04ae975298747b174ec219b8e901975d9319b SHA512 7a105e85491afae1d8b82be079cadf3600daafc016ed89f60365b696d340b165fa3e65e6d457d907a0fcc4a31952666eead61cdb71d9bc7080fd50f5e4fb9690
diff --git a/dev-haskell/simple-reflect/metadata.xml b/dev-haskell/simple-reflect/metadata.xml
deleted file mode 100644
index f910f43f15d1..000000000000
--- a/dev-haskell/simple-reflect/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package allows simple reflection of expressions containing variables.
-		Reflection here means that a Haskell expression is turned into a string.
-		The primary aim of this package is teaching and understanding;
-		there are no options for manipulating the reflected expressions beyond showing them.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/simple-reflect/simple-reflect-0.3.2.ebuild b/dev-haskell/simple-reflect/simple-reflect-0.3.2.ebuild
deleted file mode 100644
index 248be3b436f7..000000000000
--- a/dev-haskell/simple-reflect/simple-reflect-0.3.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple reflection of expressions containing variables"
-HOMEPAGE="https://twanvl.nl/blog/haskell/simple-reflection-of-expressions"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/simple-sendfile-0.2.13 b/dev-haskell/simple-sendfile-0.2.13
new file mode 100644
index 000000000000..407d29f852a7
--- /dev/null
+++ b/dev-haskell/simple-sendfile-0.2.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/conduit >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/network-conduit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Cross platform library for the sendfile system call
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/simple-sendfile
+IUSE=+allow-bsd doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-6.10.4:=
+RESTRICT=test
+SLOT=0/0.2.13
+SRC_URI=mirror://hackage/packages/archive/simple-sendfile/0.2.13/simple-sendfile-0.2.13.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7be8c83b9f842fb8064a47a219e8582d
diff --git a/dev-haskell/simple-sendfile-0.2.21 b/dev-haskell/simple-sendfile-0.2.21
new file mode 100644
index 000000000000..47aebade586a
--- /dev/null
+++ b/dev-haskell/simple-sendfile-0.2.21
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/conduit dev-haskell/conduit-extra >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/resourcet ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Cross platform library for the sendfile system call
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/simple-sendfile
+IUSE=+allow-bsd doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.2.21
+SRC_URI=mirror://hackage/packages/archive/simple-sendfile/0.2.21/simple-sendfile-0.2.21.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=96bca6aa41bfde0ef87870622881144d
diff --git a/dev-haskell/simple-sendfile-0.2.25 b/dev-haskell/simple-sendfile-0.2.25
new file mode 100644
index 000000000000..e369b17977d9
--- /dev/null
+++ b/dev-haskell/simple-sendfile-0.2.25
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/conduit dev-haskell/conduit-extra >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/resourcet ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Cross platform library for the sendfile system call
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/simple-sendfile
+IUSE=+allow-bsd doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.25
+SRC_URI=mirror://hackage/packages/archive/simple-sendfile/0.2.25/simple-sendfile-0.2.25.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9bff7f65c0a16f55b07fc62d536b0a89
diff --git a/dev-haskell/simple-sendfile/Manifest b/dev-haskell/simple-sendfile/Manifest
deleted file mode 100644
index 7ab41e2f4b59..000000000000
--- a/dev-haskell/simple-sendfile/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST simple-sendfile-0.2.13.tar.gz 7272 BLAKE2B 37b02f5062913df47c3099e65469a0d59fb01b9e7ae45bfc620f339ec0c4362f06ffabffc4529076ced2327375766c5e0ffa48f1226e576d9a4cbdaee5c1e004 SHA512 945ded7475b7c96869a806f70fba3704c98c1959e1665f20624dba1041f0d98ab50a0624ac3e27eb802f4ad9b20455cffd7a5aa35ddac2758a8164dddf63c2ff
-DIST simple-sendfile-0.2.21.tar.gz 7469 BLAKE2B 70040c0bcdbb63c8132ba55398b3ac5f1615f25e49b8f9492312ef63292d2e3150cc2bdd10d73e3d9e9ef0732b6fde40bffe8d98bce2916ef9b47e28748d6c02 SHA512 bf6c8d42eed99e31ea71dc2447a3ea30f80ca6573edb7b19d4881c1b9c8b39a9f9c23cf84427f30f2d13cea50930c674a32acea6dd1c7ef98071d259af0e44f7
-DIST simple-sendfile-0.2.25.tar.gz 343509 BLAKE2B ee0351e332d72f22ffb5236335fcff2bcbcfbf83a6c8793271027c00144afce3c9881d5ecc2f2dda7f6ede91dbc3962064c9c861520aca471f2c091ec102261e SHA512 4e31bd6843e74988b5f132e77557e4db0da833cd7f0e8ee6dfa460a495afa1de18325deddb0ca71b959b704f090292ca4eb4c2bf06cd96fd27fc78a4d3f79eeb
-EBUILD simple-sendfile-0.2.13.ebuild 898 BLAKE2B d216e682f28277eedb43fd8ec9d22b24dcf3fed9a8e5aea796dfcb722ab04dfad5f26f7d87382ba6e7891ca0e87fabba0d0cd413833060254a06cfad4dee70fd SHA512 edd828a45577dcbf9eff4a47d061922241e792d310dcc446dc77a03cdb1ad0b7b598ecfac77252e8377a0667a37db039739ff5b703821b3546503a507d3ebab7
-EBUILD simple-sendfile-0.2.21.ebuild 877 BLAKE2B f3ce8836a8f02f30db098a078cd93aed1d601868036bdd16fff3d60cf2ccea209c2373fcb16ce8ad12f7b8722cb7af551678a82aa49b87615ba9a97b0ec2d57a SHA512 63686676f260cfebb142add9e44e59d88015b21840075958e9bfc861084ddc3a317e07d57ae5bc760bfefbfe7f8013facd56cfd0b6859d9996a7dc6628a8c4bc
-EBUILD simple-sendfile-0.2.25.ebuild 843 BLAKE2B b7bf6920f2ca159ed4069a9d0d892daeb9d4ce45501cb95ed9b903bd34e31e8c1d396c7d075c20d98b9ad88bc15975c568cadfef6219c9f81a52d06c2c2f0717 SHA512 ef637e51ba93beb8ebbca7ef5955a0b6e86db03b28b75957d934f68871d995cda75548babbacb6c9a985e08f6432dd7c037e6febfa9f000cd5462ab4dceedaa7
-MISC metadata.xml 537 BLAKE2B 056b9c3c9f3bafe74db9214c50f53dbff672cfbb07746be269ff1c5b4e9ea636516bdfb761d0852b7646fa5290d4dbdd8576b59261af68dd837d90cec0725d43 SHA512 e8c3e530af2d0c74996d66706b56f7a314daebacdfcf7a6fde49eef48505ecb10c10cddf4d1c8a13648f852c55acd1bc674ae00c78f62c5d3d031458d9b26a2a
diff --git a/dev-haskell/simple-sendfile/metadata.xml b/dev-haskell/simple-sendfile/metadata.xml
deleted file mode 100644
index c7a91a305795..000000000000
--- a/dev-haskell/simple-sendfile/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Cross platform library for the sendfile system call.
-		This library tries to call minimum system calls which
-		are the bottleneck of web servers.
-	</longdescription>
-	<use>
-		<flag name="allow-bsd">Allow use of BSD sendfile (disable on
-		GNU/kFreeBSD)</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/simple-sendfile/simple-sendfile-0.2.13.ebuild b/dev-haskell/simple-sendfile/simple-sendfile-0.2.13.ebuild
deleted file mode 100644
index 2e83fa9c1c6d..000000000000
--- a/dev-haskell/simple-sendfile/simple-sendfile-0.2.13.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cross platform library for the sendfile system call"
-HOMEPAGE="http://hackage.haskell.org/package/simple-sendfile"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+allow-bsd"
-
-RESTRICT=test # openBinaryFile: does not exist (No such file or directory)
-
-RDEPEND="dev-haskell/network:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/conduit
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/network-conduit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag allow-bsd allow-bsd)
-}
diff --git a/dev-haskell/simple-sendfile/simple-sendfile-0.2.21.ebuild b/dev-haskell/simple-sendfile/simple-sendfile-0.2.21.ebuild
deleted file mode 100644
index 55b5157f5f2b..000000000000
--- a/dev-haskell/simple-sendfile/simple-sendfile-0.2.21.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cross platform library for the sendfile system call"
-HOMEPAGE="http://hackage.haskell.org/package/simple-sendfile"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+allow-bsd"
-
-RESTRICT="test" #missing files
-
-RDEPEND="dev-haskell/network:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/conduit
-		dev-haskell/conduit-extra
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/resourcet )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag allow-bsd allow-bsd)
-}
diff --git a/dev-haskell/simple-sendfile/simple-sendfile-0.2.25.ebuild b/dev-haskell/simple-sendfile/simple-sendfile-0.2.25.ebuild
deleted file mode 100644
index df7b3d9e1570..000000000000
--- a/dev-haskell/simple-sendfile/simple-sendfile-0.2.25.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cross platform library for the sendfile system call"
-HOMEPAGE="http://hackage.haskell.org/package/simple-sendfile"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+allow-bsd"
-
-RDEPEND="dev-haskell/network:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/conduit
-		dev-haskell/conduit-extra
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/resourcet )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag allow-bsd allow-bsd)
-}
diff --git a/dev-haskell/skein-1.0.9.4 b/dev-haskell/skein-1.0.9.4
new file mode 100644
index 000000000000..e778daf0dbd4
--- /dev/null
+++ b/dev-haskell/skein-1.0.9.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/crypto-api-0.6:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?] >=dev-haskell/tagged-0.2:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Skein, a family of cryptographic hash functions. Includes Skein-MAC as well
+EAPI=5
+HOMEPAGE=https://github.com/meteficha/skein
+IUSE=big-endian force-endianness reference doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/crypto-api-0.6:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?] >=dev-haskell/tagged-0.2:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.9.4
+SRC_URI=mirror://hackage/packages/archive/skein/1.0.9.4/skein-1.0.9.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0fec0b0161df849f5f6e53743ab9341d
diff --git a/dev-haskell/skein/Manifest b/dev-haskell/skein/Manifest
deleted file mode 100644
index cedb4bb955b6..000000000000
--- a/dev-haskell/skein/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST skein-1.0.9.4.tar.gz 134346 BLAKE2B 0161ea5a6de793c7938595d05b98b04f8929f007945fb86ea6c6fc7cef26a7022be00d0546920abbfb0ececcdab3e770acf4a4f468a33582106cd8290e830f2f SHA512 4f449de2db0c9f6a22e3f7375999029c1ab9139ae2e678e5582d5ad05dc8b3c12c99951ede884228579b9acc0243b00b93dca07dd6d1ea314cc0d3d223165c34
-EBUILD skein-1.0.9.4.ebuild 1076 BLAKE2B cd4bf57067bca638b8e9201144513d62662671c6771b3d013999caf41d36f6f6e598ff3224fd44f3efbf58870af3f0142fab4fafdf3ea173530f68b48b0ec26e SHA512 b15983a168cc3e650154a409e329bc033ade6eadec40176f514209decd783984dd735f7f83549a79f7f7ce712114187acf0900e2ae903d20ba136a1822c5a387
-MISC metadata.xml 1460 BLAKE2B 1dccc7c204fd31f08ed354f0c2e11d0d9a8295b1bb366eab6bc60debf224bd35b50560b89310c148d6f6817934eb120beed9696ab6a6d7a1ce0b6edd1b9049eb SHA512 8979dc64387fe53f66f80484988f55c0e176803a8f3c4f7d09e2e60430609d948292af918190dac0fda114fee9f03b756ba2c6baa5bc8beb2e2d42cbaee00465
diff --git a/dev-haskell/skein/metadata.xml b/dev-haskell/skein/metadata.xml
deleted file mode 100644
index 155e664ff75c..000000000000
--- a/dev-haskell/skein/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Skein (&lt;http://www.skein-hash.info/&gt;) is a family of fast
-		secure cryptographic hash functions designed by Niels
-		Ferguson, Stefan Lucks, Bruce Schneier, Doug Whiting, Mihir
-		Bellare, Tadayoshi Kohno, Jon Callas and Jesse Walker.
-
-		This package uses bindings to the optimized C implementation
-		of Skein.  We provide a high-level interface (see module
-		"Crypto.Skein") to some of the Skein use cases.  We also
-		provide a low-level interface (see module
-		"Crypto.Skein.Internal") should you need to use Skein in a
-		different way.
-
-		Currently we have support for Skein as cryptographic hash
-		function as Skein as a message authentication code
-		(Skein-MAC).  For examples of how to use this package, see
-		"Crypto.Skein" module documentation.
-	</longdescription>
-	<use>
-		<flag name="big-endian">When manually selecting the endianness, use big-endian (default is little-endian)</flag>
-		<flag name="force-endianness">Use a manually selected endian when compiling (see flag 'big-endian')</flag>
-		<flag name="reference">Use the reference implementation instead of the optimized one</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">meteficha/skein</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/skein/skein-1.0.9.4.ebuild b/dev-haskell/skein/skein-1.0.9.4.ebuild
deleted file mode 100644
index 099965f17124..000000000000
--- a/dev-haskell/skein/skein-1.0.9.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Skein, a family of cryptographic hash functions.  Includes Skein-MAC as well"
-HOMEPAGE="https://github.com/meteficha/skein"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="big-endian force-endianness reference"
-
-RDEPEND=">=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
-	>=dev-haskell/crypto-api-0.6:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?]
-	>=dev-haskell/tagged-0.2:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag big-endian big-endian) \
-		$(cabal_flag force-endianness force-endianness) \
-		$(cabal_flag reference reference)
-}
diff --git a/dev-haskell/skylighting-0.1.1.5 b/dev-haskell/skylighting-0.1.1.5
new file mode 100644
index 000000000000..a9db63ab5172
--- /dev/null
+++ b/dev-haskell/skylighting-0.1.1.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/case-insensitive:=[profile?] dev-haskell/hxt:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/regex-pcre-builtin:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.8.2:= executable? ( dev-haskell/pretty-show:=[profile?] ) >=dev-haskell/cabal-1.24.2.0 test? ( dev-haskell/diff dev-haskell/hunit dev-haskell/random dev-haskell/tasty dev-haskell/tasty-golden dev-haskell/tasty-hunit !executable? ( dev-haskell/pretty-show ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=syntax highlighting library
+EAPI=6
+HOMEPAGE=https://github.com/jgm/skylighting
+IUSE=executable doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/case-insensitive:=[profile?] dev-haskell/hxt:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/regex-pcre-builtin:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.8.2:= executable? ( dev-haskell/pretty-show:=[profile?] )
+SLOT=0/0.1.1.5
+SRC_URI=mirror://hackage/packages/archive/skylighting/0.1.1.5/skylighting-0.1.1.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2490e29bc231e31beadcb7fbd4ab3b86
diff --git a/dev-haskell/skylighting-0.3 b/dev-haskell/skylighting-0.3
new file mode 100644
index 000000000000..aca116a4d0d8
--- /dev/null
+++ b/dev-haskell/skylighting-0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/case-insensitive:=[profile?] dev-haskell/hxt:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/regex-pcre:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.8.2:= executable? ( dev-haskell/pretty-show:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/diff dev-haskell/hunit dev-haskell/random dev-haskell/tasty dev-haskell/tasty-golden dev-haskell/tasty-hunit !executable? ( dev-haskell/pretty-show ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=syntax highlighting library
+EAPI=6
+HOMEPAGE=https://github.com/jgm/skylighting
+IUSE=executable doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/case-insensitive:=[profile?] dev-haskell/hxt:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/regex-pcre:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.8.2:= executable? ( dev-haskell/pretty-show:=[profile?] )
+SLOT=0/0.3
+SRC_URI=mirror://hackage/packages/archive/skylighting/0.3/skylighting-0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=09aeb92d1f9cb734953ad94d65ba613b
diff --git a/dev-haskell/skylighting/Manifest b/dev-haskell/skylighting/Manifest
deleted file mode 100644
index 69d6302eb1f2..000000000000
--- a/dev-haskell/skylighting/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST skylighting-0.1.1.5.tar.gz 584235 BLAKE2B 87226657d721b1491565f6003eb0d9087edd7f25a67549bc60b219f4c0ff5a5d799a9aa1c42b087a805af235434ea288f1f659711eeb2299395ce5f976a734b2 SHA512 2d430d2067d7694978620af0c63ce47240074055bf5179b968ac2a430b9968f445307347c8975e550823f509c05ab600f07c3d1cdc7f8909bf19506e0153e3ef
-DIST skylighting-0.3.tar.gz 537701 BLAKE2B 5589aed231b25bd33160a314b5924432fe2c508bc58fbe1567d0742e19ff46784069c3e33f68888751e1c5252ead8050c7895d6fd6a05efd9588b79aee74eecf SHA512 5ecff7f3fcf244d58fa21a83ebad9358661079cd559802a7b7b888bef7969f40587f2ca80aefae5b5424e05c1fe6bc168a6df034eb843b3613f7b3fc0abedc04
-EBUILD skylighting-0.1.1.5.ebuild 1254 BLAKE2B f6951af4b99d68ab4901d25616a50d29707e3b67967a6727bfc10f31fc158b25080b1e436fdbd1f13ac4e974769757b66313fdf15d5d43b3010d52e74c9af2a4 SHA512 1fc517e98b1aec0c7c6f4b4a97e15f6b4cc4578411389d7b56c835fd365823f52bcf659696590607b47f4d0c5e16ee2f43c5c6e2f6175d53d6346886049126a4
-EBUILD skylighting-0.3.ebuild 1280 BLAKE2B 165eb27ae69006d421d4043c833d2f6bcb25ddf8d463356795f496f4720f7233bf9fed97582285dbb4f2593fd0ea839405351eaf097b8a492bcee0732b3d6ca3 SHA512 077c289c545d28c8b4c26f43ca3c8eab92fc1c8e677ded26efe868c4276a408800cd036d7a36bc73001b0637d3d7fd428e923151d23ffeaca4b8a45a14ce0892
-MISC metadata.xml 824 BLAKE2B 40102d8937d28fe2b98f055019288ea9fb08307e23702e46c2f10e815006e4a3f4fa11a34fd787c1053441f30a27c138252ce853e9c22867523b3be8fa711f3c SHA512 377bf69b015def5abcaa6dde5865890fb97188b09b4539f13f704880d61aa352df3f4a8f5a76bcadc51e4938ed6336e4732540a8ee12e705aa6fa39e58f9b792
diff --git a/dev-haskell/skylighting/metadata.xml b/dev-haskell/skylighting/metadata.xml
deleted file mode 100644
index 45342c91c5fd..000000000000
--- a/dev-haskell/skylighting/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="executable">Build the skylighting executable.</flag>
-	</use>
-	<longdescription>
-		Skylighting is a syntax highlighting library with
-		support for over one hundred languages.  It derives
-		its tokenizers from XML syntax definitions used
-		by KDE's KSyntaxHighlighting framework, so any
-		syntax supported by that framework can be added.
-		An optional command-line program is provided.
-		Skylighting is intended to be the successor to
-		highlighting-kate.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">jgm/skylighting</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/skylighting/skylighting-0.1.1.5.ebuild b/dev-haskell/skylighting/skylighting-0.1.1.5.ebuild
deleted file mode 100644
index 47a38e9f18dd..000000000000
--- a/dev-haskell/skylighting/skylighting-0.1.1.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -bootstrap
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="syntax highlighting library"
-HOMEPAGE="https://github.com/jgm/skylighting"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable"
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	dev-haskell/case-insensitive:=[profile?]
-	dev-haskell/hxt:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/regex-pcre-builtin:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	executable? ( dev-haskell/pretty-show:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.2.0
-	test? ( dev-haskell/diff
-		dev-haskell/hunit
-		dev-haskell/random
-		dev-haskell/tasty
-		dev-haskell/tasty-golden
-		dev-haskell/tasty-hunit
-		!executable? ( dev-haskell/pretty-show ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bootstrap \
-		$(cabal_flag executable executable)
-}
diff --git a/dev-haskell/skylighting/skylighting-0.3.ebuild b/dev-haskell/skylighting/skylighting-0.3.ebuild
deleted file mode 100644
index 78336add296a..000000000000
--- a/dev-haskell/skylighting/skylighting-0.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -bootstrap,+system-pcre
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="syntax highlighting library"
-HOMEPAGE="https://github.com/jgm/skylighting"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="executable"
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	dev-haskell/case-insensitive:=[profile?]
-	dev-haskell/hxt:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/regex-pcre:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	executable? ( dev-haskell/pretty-show:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/diff
-		dev-haskell/hunit
-		dev-haskell/random
-		dev-haskell/tasty
-		dev-haskell/tasty-golden
-		dev-haskell/tasty-hunit
-		!executable? ( dev-haskell/pretty-show ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bootstrap \
-		$(cabal_flag executable executable) \
-		--flag=system-pcre
-}
diff --git a/dev-haskell/smallcheck-1.1.1 b/dev-haskell/smallcheck-1.1.1
new file mode 100644
index 000000000000..8621456774f4
--- /dev/null
+++ b/dev-haskell/smallcheck-1.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/logict:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A property-based testing library
+EAPI=5
+HOMEPAGE=https://github.com/feuerbach/smallcheck
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=dev-haskell/logict:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/1.1.1
+SRC_URI=mirror://hackage/packages/archive/smallcheck/1.1.1/smallcheck-1.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=106125e74c59d6af6983befdfc2ecee3
diff --git a/dev-haskell/smallcheck/Manifest b/dev-haskell/smallcheck/Manifest
deleted file mode 100644
index b066638b69ee..000000000000
--- a/dev-haskell/smallcheck/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST smallcheck-1.1.1.tar.gz 15202 BLAKE2B 7963a39b9a08b3c28268b88a8177df7861011baeb4ba8a5dc879c95111c9d243cbe14f36b82715e80b237d04f5acedfaa7c72cc6d0fa2bd4d770158301f3626e SHA512 09aa5dcfca2bece6ac91803d38f2591d415c6e312c76cacb33d2e93e40e949acb788bc89ba6a4beb9dc60815e1f554cda4f68195269eedbfb45228415f1bca64
-EBUILD smallcheck-1.1.1.ebuild 626 BLAKE2B c04eb7cb7ac7b26f8904fef108ca74a159515efee1910c561b22cb2fea0188fb0380c60aaacc915878b98e53bd43b4d0daaa0cf8be4e286847dcb095585e960f SHA512 33cd06e5bca7ea6a261a13ba0ab83d3ef264c49dd0c3b6eb3877a473627df492f4a6200312c8098752c5d1d03299fa98b4859862288b70dc13b3a9047298dc5f
-MISC metadata.xml 631 BLAKE2B 4be425e8e7def047d619eef426efb5057adc1aab18c6ab7a64abbe3e1ba1ad21d3217ab4a83d9d9194b3f51b8a59e2c4b443dea385836ffcfd78d6f1b4270bc8 SHA512 8f1ffef35613622fd153b512437a1634f72e25e80378335c9912eb26e2185e95943d0d530225d628f696de7a53b908a71161bde515447506779dd7b791f26b54
diff --git a/dev-haskell/smallcheck/metadata.xml b/dev-haskell/smallcheck/metadata.xml
deleted file mode 100644
index ed9043f55a28..000000000000
--- a/dev-haskell/smallcheck/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		SmallCheck is similar to QuickCheck (Claessen and Hughes 2000-) but
-		instead of testing for a sample of randomly generated values, SmallCheck
-		tests properties for all the finitely many values up to some depth,
-		progressively increasing the depth used.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">feuerbach/smallcheck</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/smallcheck/smallcheck-1.1.1.ebuild b/dev-haskell/smallcheck/smallcheck-1.1.1.ebuild
deleted file mode 100644
index 50df160b5131..000000000000
--- a/dev-haskell/smallcheck/smallcheck-1.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A property-based testing library"
-HOMEPAGE="https://github.com/feuerbach/smallcheck"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="dev-haskell/logict:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/snap-core-0.9.8.0 b/dev-haskell/snap-core-0.9.8.0
new file mode 100644
index 000000000000..3e2599c9b4a2
--- /dev/null
+++ b/dev-haskell/snap-core-0.9.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/attoparsec-enumerator-0.3:=[profile?] <dev-haskell/attoparsec-enumerator-0.4:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-builder-enumerator-0.2:=[profile?] <dev-haskell/blaze-builder-enumerator-0.3:=[profile?] >=dev-haskell/case-insensitive-0.3:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/enumerator-0.4.15:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?] >=dev-haskell/monadcatchio-transformers-0.2.1:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-2:=[profile?] >=dev-haskell/regex-posix-0.95:=[profile?] <dev-haskell/regex-posix-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/unordered-containers-0.1.4.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/zlib-enum-0.2.1:=[profile?] <dev-haskell/zlib-enum-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] portable? ( >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] ) !portable? ( >=dev-haskell/bytestring-mmap-0.2.2:=[profile?] <dev-haskell/bytestring-mmap-0.3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Snap: A Haskell Web Framework (core interfaces and types)
+EAPI=5
+HOMEPAGE=http://snapframework.com/
+IUSE=debug portable doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/attoparsec-enumerator-0.3:=[profile?] <dev-haskell/attoparsec-enumerator-0.4:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-builder-enumerator-0.2:=[profile?] <dev-haskell/blaze-builder-enumerator-0.3:=[profile?] >=dev-haskell/case-insensitive-0.3:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/enumerator-0.4.15:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?] >=dev-haskell/monadcatchio-transformers-0.2.1:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-2:=[profile?] >=dev-haskell/regex-posix-0.95:=[profile?] <dev-haskell/regex-posix-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/unordered-containers-0.1.4.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/zlib-enum-0.2.1:=[profile?] <dev-haskell/zlib-enum-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] portable? ( >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] ) !portable? ( >=dev-haskell/bytestring-mmap-0.2.2:=[profile?] <dev-haskell/bytestring-mmap-0.3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] )
+SLOT=0/0.9.8.0
+SRC_URI=mirror://hackage/packages/archive/snap-core/0.9.8.0/snap-core-0.9.8.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=75883025238f799d67d31904b5594a9c
diff --git a/dev-haskell/snap-core-1.0.1.0 b/dev-haskell/snap-core-1.0.1.0
new file mode 100644
index 000000000000..9b35dfa4b273
--- /dev/null
+++ b/dev-haskell/snap-core-1.0.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.4:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-2:=[profile?] >=dev-haskell/readable-0.1:=[profile?] <dev-haskell/readable-0.4:=[profile?] >=dev-haskell/regex-posix-0.95:=[profile?] <dev-haskell/regex-posix-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/unix-compat-0.3:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/unordered-containers-0.1.4.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.8.2:= portable? ( >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] ) !portable? ( >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hashable >=dev-haskell/parallel-3 <dev-haskell/parallel-4 >=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3 >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4 >=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Snap: A Haskell Web Framework (core interfaces and types)
+EAPI=6
+HOMEPAGE=http://snapframework.com/
+IUSE=debug portable doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.4:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-2:=[profile?] >=dev-haskell/readable-0.1:=[profile?] <dev-haskell/readable-0.4:=[profile?] >=dev-haskell/regex-posix-0.95:=[profile?] <dev-haskell/regex-posix-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/unix-compat-0.3:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/unordered-containers-0.1.4.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.8.2:= portable? ( >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] ) !portable? ( >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] )
+SLOT=0/1.0.1.0
+SRC_URI=mirror://hackage/packages/archive/snap-core/1.0.1.0/snap-core-1.0.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=600f5721c508472568fcfff59409df75
diff --git a/dev-haskell/snap-core/Manifest b/dev-haskell/snap-core/Manifest
deleted file mode 100644
index 95b71185880f..000000000000
--- a/dev-haskell/snap-core/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST snap-core-0.9.8.0.tar.gz 91610 BLAKE2B 291dd696482f3406b58081fc3dede958cd255ef725ee84d0e4706b096c9c468832b99e5e3d61771e0c652cc0463e831a9c7119595328f18443deedd901625417 SHA512 8bf98590294b3f8752255612b90378f19cec14067f2eaddab496cee5fddb4b8be954aada5a7831b81611d7ffc04d74156eb8fdb5d3c5f45e30259c7f86605585
-DIST snap-core-1.0.1.0.tar.gz 139670 BLAKE2B 13c0839ef95b2260e1272dbf26c9ee1f8970094e3f9ffea728d760f4bf11a260ad73120495a39305e8d8d05cb39c230db08ae1e4094efcaf7879acf4680f61c3 SHA512 ed862530f235adca6f193c96d45b31705534089c58637bf8d0d9d8cd898db8f25494990e210151adc737c34e3cc59f5e0a47cc6b1e638dae9104e991e27dbe8b
-EBUILD snap-core-0.9.8.0.ebuild 2583 BLAKE2B 9247faaf39384f594d041fda396637affeb1128f9ffc01725946aaeae30daa565e62f8dc8be953627ef1e21b42f1639443074c0a14b76406e389d0a59f5c6d53 SHA512 64daa778afd91fefe627b1cad171a1feedc045ad1d0e9c08a061aa57ba89ba1bfe5ee05923870056dd5e2fac62aa7428c78b27f70999c7b12f89a2ebf787ae96
-EBUILD snap-core-1.0.1.0.ebuild 2677 BLAKE2B fe836a952b776b8d301c9c08286139b8def6dbca876615280daf7a4f8b561d509553ab7bb3d7447eb9e41f9e40dba8993863ca730beb229cfc77ccb70c54ec97 SHA512 f9e0ff4f1e06c677bcb04f5454ad335d96fe0e8e293a6493e7741401607826fcda7d1b718ccc3149d4fe6df358b65a413038b328cde140574c03b9a41662ac57
-MISC metadata.xml 1855 BLAKE2B 061e56d781f921b5ad34683a6c5c2192a282567e5efa39c315c50cdf915032d70c66d8f270c76647b47ad5c9bee1b666305dc3d9fa790c941bb9ecd416fdf792 SHA512 f497be0430344459a95055207a06f9b9b2b33c6a0edc2cff99ad89051a5d8f615258aaf94234689d4443a6d30e0c4a6df1dadeba2fe142b1f0c324932691e66f
diff --git a/dev-haskell/snap-core/metadata.xml b/dev-haskell/snap-core/metadata.xml
deleted file mode 100644
index f00884306e68..000000000000
--- a/dev-haskell/snap-core/metadata.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="portable">No non-haskell unportable code.</flag>
-	</use>
-	<longdescription>
-		Snap is a simple and fast web development framework and server written in
-		Haskell. For more information or to download the latest version, you can
-		visit the Snap project website at &lt;http://snapframework.com/&gt;.
-		
-		This library contains the core definitions and types for the Snap framework,
-		including:
-		
-		1. Primitive types and functions for HTTP (requests, responses, cookies,
-		post/query parameters, etc)
-		
-		2. Type aliases and helper functions for Iteratee I/O
-		
-		3. A monad for programming web handlers called \"Snap\", inspired by
-		happstack's (&lt;http://happstack.com/index.html&gt;), which allows:
-		
-		* Stateful access to the HTTP request and response objects
-		
-		* Monadic failure (i.e. MonadPlus/Alternative instances) for declining
-		to handle requests and chaining handlers together
-		
-		* Early termination of the computation if you know early what you want
-		to return and want to prevent further monadic processing
-		
-		/Quick start/: The 'Snap' monad and HTTP definitions are in "Snap.Core",
-		some iteratee utilities are in "Snap.Iteratee".
-		
-		Higher-level facilities for building web applications (like user/session
-		management, component interfaces, data modeling, etc.) are planned but not
-		yet implemented, so this release will mostly be of interest for those who:
-		
-		* need a fast and minimal HTTP API at roughly the same level of abstraction
-		as Java servlets, or
-		
-		* are interested in contributing to the Snap Framework project.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/snap-core/snap-core-0.9.8.0.ebuild b/dev-haskell/snap-core/snap-core-0.9.8.0.ebuild
deleted file mode 100644
index ed5746eb2b61..000000000000
--- a/dev-haskell/snap-core/snap-core-0.9.8.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Snap: A Haskell Web Framework (core interfaces and types)"
-HOMEPAGE="http://snapframework.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="debug portable"
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/attoparsec-enumerator-0.3:=[profile?] <dev-haskell/attoparsec-enumerator-0.4:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-builder-enumerator-0.2:=[profile?] <dev-haskell/blaze-builder-enumerator-0.3:=[profile?]
-	>=dev-haskell/case-insensitive-0.3:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/enumerator-0.4.15:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?]
-	>=dev-haskell/monadcatchio-transformers-0.2.1:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-2:=[profile?]
-	>=dev-haskell/regex-posix-0.95:=[profile?] <dev-haskell/regex-posix-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
-	>=dev-haskell/unordered-containers-0.1.4.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/zlib-enum-0.2.1:=[profile?] <dev-haskell/zlib-enum-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	portable? ( >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] )
-	!portable? ( >=dev-haskell/bytestring-mmap-0.2.2:=[profile?] <dev-haskell/bytestring-mmap-0.3:=[profile?]
-			>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'time                      >= 1.0     && < 1.6' 'time                      >= 1.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug) \
-		$(cabal_flag portable portable)
-}
diff --git a/dev-haskell/snap-core/snap-core-1.0.1.0.ebuild b/dev-haskell/snap-core/snap-core-1.0.1.0.ebuild
deleted file mode 100644
index c34b212ca497..000000000000
--- a/dev-haskell/snap-core/snap-core-1.0.1.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Snap: A Haskell Web Framework (core interfaces and types)"
-HOMEPAGE="http://snapframework.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="debug portable"
-
-RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	>=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?]
-	>=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.4:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-2:=[profile?]
-	>=dev-haskell/readable-0.1:=[profile?] <dev-haskell/readable-0.4:=[profile?]
-	>=dev-haskell/regex-posix-0.95:=[profile?] <dev-haskell/regex-posix-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/unix-compat-0.3:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
-	>=dev-haskell/unordered-containers-0.1.4.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	portable? ( >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] )
-	!portable? ( >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hashable
-		>=dev-haskell/parallel-3 <dev-haskell/parallel-4
-		>=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3
-		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4
-		>=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug) \
-		$(cabal_flag portable portable)
-}
diff --git a/dev-haskell/snap-server-0.9.5.1-r1 b/dev-haskell/snap-server-0.9.5.1-r1
new file mode 100644
index 000000000000..8c2e9e3917cd
--- /dev/null
+++ b/dev-haskell/snap-server-0.9.5.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/attoparsec-enumerator-0.3:=[profile?] <dev-haskell/attoparsec-enumerator-0.4:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-builder-enumerator-0.2.0:=[profile?] <dev-haskell/blaze-builder-enumerator-0.3:=[profile?] >=dev-haskell/case-insensitive-0.3:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/enumerator-0.4.15:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/monadcatchio-transformers-0.2.1:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.7:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/snap-core-0.9.3:=[profile?] <dev-haskell/snap-core-0.10:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= openssl? ( >=dev-haskell/hsopenssl-0.10:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A fast, iteratee-based, epoll-enabled web server for the Snap Framework
+EAPI=5
+HOMEPAGE=http://snapframework.com/
+IUSE=openssl portable doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/attoparsec-enumerator-0.3:=[profile?] <dev-haskell/attoparsec-enumerator-0.4:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-builder-enumerator-0.2.0:=[profile?] <dev-haskell/blaze-builder-enumerator-0.3:=[profile?] >=dev-haskell/case-insensitive-0.3:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/enumerator-0.4.15:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/monadcatchio-transformers-0.2.1:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.7:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/snap-core-0.9.3:=[profile?] <dev-haskell/snap-core-0.10:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= openssl? ( >=dev-haskell/hsopenssl-0.10:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?] )
+SLOT=0/0.9.5.1
+SRC_URI=mirror://hackage/packages/archive/snap-server/0.9.5.1/snap-server-0.9.5.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4d3ade452aff821c23b2fcee270e7f27
diff --git a/dev-haskell/snap-server-1.0.1.1 b/dev-haskell/snap-server-1.0.1.1
new file mode 100644
index 000000000000..4de7a0e384b8
--- /dev/null
+++ b/dev-haskell/snap-server-1.0.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/clock-0.7.1:=[profile?] <dev-haskell/clock-0.8:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.4:=[profile?] >=dev-haskell/io-streams-haproxy-1.0:=[profile?] <dev-haskell/io-streams-haproxy-1.1:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/snap-core-1.0:=[profile?] <dev-haskell/snap-core-1.1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.4.1:= openssl? ( >=dev-haskell/hsopenssl-0.10.4:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?] >=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.3:=[profile?] ) >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/base16-bytestring-0.1 <dev-haskell/base16-bytestring-0.2 >=dev-haskell/http-common-0.7 <dev-haskell/http-common-0.9 >=dev-haskell/http-streams-0.7 <dev-haskell/http-streams-0.9 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/monad-control-1.0 <dev-haskell/monad-control-1.1 >=dev-haskell/parallel-3 <dev-haskell/parallel-4 >=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3 >=dev-haskell/random-1.0 <dev-haskell/random-1.2 >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4 >=dev-haskell/threads-0.5 <dev-haskell/threads-0.6 >=dev-haskell/transformers-0.3 <dev-haskell/transformers-0.6 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A web server for the Snap Framework
+EAPI=6
+HOMEPAGE=http://snapframework.com/
+IUSE=build-pong debug openssl portable doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/clock-0.7.1:=[profile?] <dev-haskell/clock-0.8:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.4:=[profile?] >=dev-haskell/io-streams-haproxy-1.0:=[profile?] <dev-haskell/io-streams-haproxy-1.1:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/snap-core-1.0:=[profile?] <dev-haskell/snap-core-1.1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.4.1:= openssl? ( >=dev-haskell/hsopenssl-0.10.4:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?] >=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.3:=[profile?] )
+SLOT=0/1.0.1.1
+SRC_URI=mirror://hackage/packages/archive/snap-server/1.0.1.1/snap-server-1.0.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b1fbdfe2d66570973c67ef950dcd9f34
diff --git a/dev-haskell/snap-server/Manifest b/dev-haskell/snap-server/Manifest
deleted file mode 100644
index a158b6262f14..000000000000
--- a/dev-haskell/snap-server/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST snap-server-0.9.5.1.tar.gz 59062 BLAKE2B 395796da3eb41a16c0c4e0f0118dbba31d75f78f1a31c4bfab70920c83b4d7e807be8fccd7619713aac48446c912ea988881f2c0aff138552a35e737f44ea70d SHA512 6320401c349fd7c376e798959274a9fb3aff49cf11c8b6d9edd513c6311c3daf23eeaf03087cda3c0afb11686203a422b0e36e8391d418b6b47e791505db50e3
-DIST snap-server-1.0.1.1.tar.gz 73893 BLAKE2B 35b907d285c099059ec5d1f288252a5e4086d20cf0c81f6992e4d0977340474e2123e8c48cc416c9483f4dcc919a0acd37a73f286f8db84aec546e36912ac422 SHA512 bf3496123c07432cefedc6b03de5f335bb9b3a1e917bac45c0ee6b8d7529a3013d19d21433ce02d3f3caa2091abf0a4415b974470317804d70dfb8c9d46b33bd
-EBUILD snap-server-0.9.5.1-r1.ebuild 2121 BLAKE2B 40af9a6b1617bac3cc399edd768e1536c99ef9f9d616aca72ce69e42a34f0ddf7368ac0e4cee62f8aa280f097f5930050ea4c4d6ff6124ee6596561f18af9bd3 SHA512 0e5fe7f136b8ad71320978768445c6914fd84220cc33ba93560e7ffc02c31ca0a897c717674479483e196e9d3a2ae0020360a7ed128c86f127dc557f97cd6fbd
-EBUILD snap-server-1.0.1.1.ebuild 3300 BLAKE2B ec1ed4d092f48e61e7f2ade66530b5a730da8f51c9861af59af9697a258450fa9b745104f2471776f842bf16d4c16d9f789d3e380003a28ab65983472df468d1 SHA512 2da192e11849e8bd066b248e934191f0886c898d31451d11c7de285441efc7afc0b546bfcf0eb5726de65c3938db1ffe5e63aa0208ca3463c4c690fa925dbc5c
-MISC metadata.xml 1427 BLAKE2B d190025f7b08e754a96fc40656ea5669e0a15bee559e5d8d8b88ea25ebc4b195e055b7779c42d5aeb8be3ce878031c0e16912e75755eeaa5c37366c6304dd180 SHA512 b94a8124fae8c073c4dfa2e8d629b547077d6d09eb9e7cf17faa038274125b17fe217b065e5c5ec78087abbdfea1219c3d45bbbc30e3fd2ebbe60c3e53cd3d81
diff --git a/dev-haskell/snap-server/metadata.xml b/dev-haskell/snap-server/metadata.xml
deleted file mode 100644
index ebe4d9a5fb29..000000000000
--- a/dev-haskell/snap-server/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="build-pong">Build a server that just returns "PONG"</flag>
-		<flag name="openssl">enable https support using <pkg>dev-haskell/hsopenssl</pkg></flag>
-		<flag name="portable">no non-haskell unportable code.</flag>
-	</use>
-	<longdescription>
-		Snap is a simple and fast web development framework and server written in
-		Haskell. For more information or to download the latest version, you can
-		visit the Snap project website at &lt;http://snapframework.com/&gt;.
-		
-		The Snap HTTP server is a high performance, epoll-enabled, iteratee-based web
-		server library written in Haskell. Together with the @snap-core@ library upon
-		which it depends, it provides a clean and efficient Haskell programming
-		interface to the HTTP protocol.
-		
-		Higher-level facilities for building web applications (like user/session
-		management, component interfaces, data modeling, etc.) are planned but not
-		yet implemented, so this release will mostly be of interest for those who:
-		
-		* need a fast and minimal HTTP API at roughly the same level of abstraction
-		as Java servlets, or
-		
-		* are interested in contributing to the Snap Framework project.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/snap-server/snap-server-0.9.5.1-r1.ebuild b/dev-haskell/snap-server/snap-server-0.9.5.1-r1.ebuild
deleted file mode 100644
index 26400139a1c7..000000000000
--- a/dev-haskell/snap-server/snap-server-0.9.5.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A fast, iteratee-based, epoll-enabled web server for the Snap Framework"
-HOMEPAGE="http://snapframework.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="openssl portable"
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/attoparsec-enumerator-0.3:=[profile?] <dev-haskell/attoparsec-enumerator-0.4:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-builder-enumerator-0.2.0:=[profile?] <dev-haskell/blaze-builder-enumerator-0.3:=[profile?]
-	>=dev-haskell/case-insensitive-0.3:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/enumerator-0.4.15:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
-	>=dev-haskell/monadcatchio-transformers-0.2.1:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.7:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-haskell/snap-core-0.9.3:=[profile?] <dev-haskell/snap-core-0.10:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	openssl? ( >=dev-haskell/hsopenssl-0.10:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'attoparsec                >= 0.10     && < 0.13' 'attoparsec                >= 0.10     && < 0.14' \
-		'time                      >= 1.0      && < 1.6' 'time                      >= 1.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag openssl openssl) \
-		$(cabal_flag portable portable)
-}
diff --git a/dev-haskell/snap-server/snap-server-1.0.1.1.ebuild b/dev-haskell/snap-server/snap-server-1.0.1.1.ebuild
deleted file mode 100644
index 53647cff47d8..000000000000
--- a/dev-haskell/snap-server/snap-server-1.0.1.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A web server for the Snap Framework"
-HOMEPAGE="http://snapframework.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="build-pong debug openssl portable"
-
-RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	>=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/clock-0.7.1:=[profile?] <dev-haskell/clock-0.8:=[profile?]
-	>=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.4:=[profile?]
-	>=dev-haskell/io-streams-haproxy-1.0:=[profile?] <dev-haskell/io-streams-haproxy-1.1:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.7:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/snap-core-1.0:=[profile?] <dev-haskell/snap-core-1.1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	openssl? ( >=dev-haskell/hsopenssl-0.10.4:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?]
-			>=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/base16-bytestring-0.1 <dev-haskell/base16-bytestring-0.2
-		>=dev-haskell/http-common-0.7 <dev-haskell/http-common-0.9
-		>=dev-haskell/http-streams-0.7 <dev-haskell/http-streams-0.9
-		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/monad-control-1.0 <dev-haskell/monad-control-1.1
-		>=dev-haskell/parallel-3 <dev-haskell/parallel-4
-		>=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3
-		>=dev-haskell/random-1.0 <dev-haskell/random-1.2
-		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4
-		>=dev-haskell/threads-0.5 <dev-haskell/threads-0.6
-		>=dev-haskell/transformers-0.3 <dev-haskell/transformers-0.6 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'directory                           >= 1.0      && < 1.3' 'directory                           >= 1.0' \
-		'directory                           >= 1.1      && < 1.3' 'directory                           >= 1.1'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag build-pong build-pong) \
-		$(cabal_flag debug debug) \
-		$(cabal_flag openssl openssl) \
-		$(cabal_flag portable portable)
-}
diff --git a/dev-haskell/socks-0.5.4 b/dev-haskell/socks-0.5.4
new file mode 100644
index 000000000000..9ab154a84ccf
--- /dev/null
+++ b/dev-haskell/socks-0.5.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cereal-0.3.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Socks proxy (version 5) implementation
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-socks
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cereal-0.3.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.5.4
+SRC_URI=mirror://hackage/packages/archive/socks/0.5.4/socks-0.5.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=06efc4dc43861acf8d01f03916e070f1
diff --git a/dev-haskell/socks-0.5.5 b/dev-haskell/socks-0.5.5
new file mode 100644
index 000000000000..69c80d53944b
--- /dev/null
+++ b/dev-haskell/socks-0.5.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cereal-0.3.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Socks proxy (version 5) implementation
+EAPI=6
+HOMEPAGE=https://github.com/vincenthz/hs-socks
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cereal-0.3.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.5.5
+SRC_URI=mirror://hackage/packages/archive/socks/0.5.5/socks-0.5.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0c304e088a7efd5e11562a6e4ccd790a
diff --git a/dev-haskell/socks/Manifest b/dev-haskell/socks/Manifest
deleted file mode 100644
index 003f5a378c30..000000000000
--- a/dev-haskell/socks/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST socks-0.5.4.tar.gz 8021 BLAKE2B 46496752c8ef776a3a54263a11f8c0ad5912af778ec2121ccda317334b597a9d33973fb81784d31e41ac9904cdeeee024cab2abcc9c5428fc42d923bd36bad26 SHA512 eba119e40e521f963ed779f8247832bd54db7c57267f433b89a57f72395eb212231d51fb5c56bb910185bc273aaee1044999fa781ad31da56e6d0ec03f07e783
-DIST socks-0.5.5.tar.gz 10159 BLAKE2B 36f9c43fe0f406bf88cc24a3a2d73205e7bd102a870dd2f02aa5c0301577e9fd97737571e362e34253bf25e813aa2cc5c7f618c0f4d7753e20eede82a098884a SHA512 cc811d0175d9a20c0aaec2eb593145908d25792f2ad5fb6b129564922bf8b64c3cda6b1424ac7e8ad2abfd1bcde7ece7ab717550266b75a5b360b4b729a768f5
-EBUILD socks-0.5.4.ebuild 629 BLAKE2B b65a636a3c85a15eb157fbbeda399ca01c2b4097356307d0ebe4961df3b9d56f792f48017a2316954f5b5b82aa9803337be5850c3f5af322ccff25f39ff24e52 SHA512 aec88b5c4eb15b33fef56567fa3100f0ce092d6d96840a60c4819c5b6d96097b2098e864852e6a241789939425b1e445ffeb8bf66e9628b2bafda712944f4fd8
-EBUILD socks-0.5.5.ebuild 624 BLAKE2B b9bcc4841918c84320338bd70057216cefa5af28467c3eb86579cf2bddd4e3483a2a05e4750a074e0f852754fca2e421c7b9f0d48b8f1c78126d5c9ccd86597b SHA512 9895305e1ff17648415bc2d1e8a9fa52e15ca409429c85c45fd07da727128a0ae0c17391b42b3a050e87a214645f6697cc061ceaa51e501a56d41d698b67edbc
-MISC metadata.xml 413 BLAKE2B 20b6ce579bd30d5674c0cd81e12800c30d1d6efeca6f3d60fecd0166e6bc2799c9b84e4c097c559ea1d8be7581b9deaf0a834771fc7cd94d795afda4ac3c3aa6 SHA512 8d6c9d814d711df8745bcc5f0068f10c5987e4fd81a957d3b17924ad28f264eb029acb1e84e29a5e1f0ee0694c15db0ad835afd5b06710aa3fcaffab23bee5b6
diff --git a/dev-haskell/socks/metadata.xml b/dev-haskell/socks/metadata.xml
deleted file mode 100644
index 79064c2dbc46..000000000000
--- a/dev-haskell/socks/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Socks proxy (version 5) implementation.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-socks</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/socks/socks-0.5.4.ebuild b/dev-haskell/socks/socks-0.5.4.ebuild
deleted file mode 100644
index c3aa1cf997df..000000000000
--- a/dev-haskell/socks/socks-0.5.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Socks proxy (version 5) implementation"
-HOMEPAGE="https://github.com/vincenthz/hs-socks"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cereal-0.3.1:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/socks/socks-0.5.5.ebuild b/dev-haskell/socks/socks-0.5.5.ebuild
deleted file mode 100644
index c04334ae6161..000000000000
--- a/dev-haskell/socks/socks-0.5.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Socks proxy (version 5) implementation"
-HOMEPAGE="https://github.com/vincenthz/hs-socks"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cereal-0.3.1:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/split-0.1.4.3 b/dev-haskell/split-0.1.4.3
new file mode 100644
index 000000000000..f11392b9819d
--- /dev/null
+++ b/dev-haskell/split-0.1.4.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=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=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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=19846352232a243757bdb61a0c7f94f0
diff --git a/dev-haskell/split-0.2.2 b/dev-haskell/split-0.2.2
new file mode 100644
index 000000000000..9caaecfc13b2
--- /dev/null
+++ b/dev-haskell/split-0.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f001eccbd81395f3a37d877876266ebe
diff --git a/dev-haskell/split-0.2.3 b/dev-haskell/split-0.2.3
new file mode 100644
index 000000000000..37337307537c
--- /dev/null
+++ b/dev-haskell/split-0.2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0c5d3adcfb4a52608316300d0fe3c8be
diff --git a/dev-haskell/split-0.2.3.1 b/dev-haskell/split-0.2.3.1
new file mode 100644
index 000000000000..0bac59c1b786
--- /dev/null
+++ b/dev-haskell/split-0.2.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=52ca93727b68f92a1bdb729b8dbd5702
diff --git a/dev-haskell/split/Manifest b/dev-haskell/split/Manifest
deleted file mode 100644
index 1bc6ddc4ef4c..000000000000
--- a/dev-haskell/split/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST split-0.1.4.3.tar.gz 12882 BLAKE2B 75943c52bd37a49ab497caf7a1ddb14b44e28c329b6f3e8f3aa765565da195b6bc60c0ef08b33612ec057ff0eea96313849d3e17c43e1de0e2fba7c285f33494 SHA512 d5add24f0757fdbcc0671b1eea48be678021e12619bd6971b624cf62b23affa6e1a15d064e9784eeaaf87ad20087bc0fdb34dce2997ce3fe273e8cdada014121
-DIST split-0.2.2.tar.gz 14666 BLAKE2B 77ec6491edaff1e0de17567694e9b34bedf837462bd47e696b8f1e4f3c6610a4ea13e08fd7f11101d7a5941807cf82c260ea6ebff692a7811e696c02079fba68 SHA512 d3e1a0d875632d15b12c0e454188382b705f2b9d93cb99d64f0a2a150ee7b7458628eff95da7da5f51fe9ed4ef3bd8ef3640f925f66e8f6f61253f679326614e
-DIST split-0.2.3.1.tar.gz 15623 BLAKE2B aed85fbcb6e1c7aee14f3d4517fce632f3fa95bf63f13f46d454e3dc64f4c88d970e6253a891b184e79e981bd3a9c7eee08cacb9268b7dfb1624fbb4639113ac SHA512 7b56be09279c1279120631a75bb5305bfdd6c351d582174a326985a7a630933aab747f32dd9d4ef13c81528255fe95337488f6a9117c259fe967189651828fce
-DIST split-0.2.3.tar.gz 15545 BLAKE2B d0494d299a9d6d109bfcca3f5e2f86d80357abd68038595cb94873a1b0eb0fd11ccad5439b67dde611d11c45118168a56376ec074ee2a5080ba4257694f06ea2 SHA512 bd0181b419326219d6ebad1a45683c8ff55d5e485bd669ef76e76690ebdcceddab2b8bc98616b7034de9622d54c6825200aede99e37f376e67f71bf242b1cece
-EBUILD split-0.1.4.3.ebuild 717 BLAKE2B 918578e1b9704c4e2566143930379264c127aa5e2e7088978a3845b2b260f136879e287bd21eaeeec90d926a4e2e645b086701da1f2de9ed0e1e22deb3270f67 SHA512 b47777d1bfdd924e994d76901547b02d6f7962b0af508626cafec2b028025df6667352900a55989f30ef63f63e23be5e4b69bf12d113a56a739c0c40359ad811
-EBUILD split-0.2.2.ebuild 718 BLAKE2B 4ab6814b67be25875a3d9c96f4876799a0d5a94cb2add6a1304897480bfd0450a0337e882d9b79fdecdd14c6136f235cf8c01fe544fd0554889d4bff4fa77e54 SHA512 1f34e8510c3ade017bf11a85e500d59f75a977c6cc62075a98830ea44cdb92bb73fe5cba8c531a857af5747f0f87b1a4f8f662685069c2201e12f991880c93d5
-EBUILD split-0.2.3.1.ebuild 664 BLAKE2B 62eb46f055957f80e577b8c98b6c30d83d19e099456703f66dcb9b7de112bc7c2a2adac1461e97eee9c8ddaad38fc40b1c1be6e73c5dd6f6a5d6d729bb788c81 SHA512 905ad9aa3279dd636ba2b646ce0f0cd114cacd6bb38294b42924f3561fc85d5306666ed9fc421549c723501c2f653314d28cce0b894a10f46cf068c07f52444d
-EBUILD split-0.2.3.ebuild 732 BLAKE2B 9e44770c2916f8f416cdd014da1a2b6d975077e687443397dbbc0c384ea92095d7b4f5c8c944830f7a633ba16588bef9143c58bc8493be09bbda96144b2a39c3 SHA512 556768addd464f495913c132b4d4b9447dc8b613fa6c1b81aba998683955f97eb33d058a255b9e666557b95c89573ecba7a0b2f296ad361c8ff8fda5f3bad41d
-MISC metadata.xml 352 BLAKE2B d2a1a1b1ff1b2cf8270771c1fcaa662f6e89f82d167c36ba17e75969d47f802e89c71e594c2b28760fcb47c8e4a5c9f10d80c7e28d0d46a8797e1d43a23eb5d7 SHA512 6bcfd09102e3e42d6d207ccd14ec2dbd7593d9c87fd5a260bb5d0428dd87811e46ed3e30025e7a07d7d11a703092a1b04236b8f724b430bed0951e70f019a7f4
diff --git a/dev-haskell/split/metadata.xml b/dev-haskell/split/metadata.xml
deleted file mode 100644
index bb03bef0c0ef..000000000000
--- a/dev-haskell/split/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Combinator library and utility functions for splitting lists.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/split/split-0.1.4.3.ebuild b/dev-haskell/split/split-0.1.4.3.ebuild
deleted file mode 100644
index 5d8aa1ed97cd..000000000000
--- a/dev-haskell/split/split-0.1.4.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Combinator library for splitting lists"
-HOMEPAGE="http://code.haskell.org/~byorgey/code/split"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	sed -e 's@base <4.6@base <5.0@' \
-		-i "${S}/${PN}.cabal" || die "Could not loosen depdencies"
-}
diff --git a/dev-haskell/split/split-0.2.2.ebuild b/dev-haskell/split/split-0.2.2.ebuild
deleted file mode 100644
index 27537c984d1d..000000000000
--- a/dev-haskell/split/split-0.2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Combinator library for splitting lists"
-HOMEPAGE="http://hackage.haskell.org/package/split"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10
-		test? ( >=dev-haskell/quickcheck-2.4
-		)"
-
-src_prepare() {
-	cabal_chdeps \
-		'base <4.8' 'base'
-}
diff --git a/dev-haskell/split/split-0.2.3.1.ebuild b/dev-haskell/split/split-0.2.3.1.ebuild
deleted file mode 100644
index 0b96f0c58478..000000000000
--- a/dev-haskell/split/split-0.2.3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Combinator library for splitting lists"
-HOMEPAGE="http://hackage.haskell.org/package/split"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.4 )
-"
diff --git a/dev-haskell/split/split-0.2.3.ebuild b/dev-haskell/split/split-0.2.3.ebuild
deleted file mode 100644
index 56aab6e6a1b1..000000000000
--- a/dev-haskell/split/split-0.2.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Combinator library for splitting lists"
-HOMEPAGE="http://hackage.haskell.org/package/split"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE=""
-
-RESTRICT=test # test fail when quickcheck exhausted search space
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.4 )
-"
diff --git a/dev-haskell/stack-1.3.2 b/dev-haskell/stack-1.3.2
new file mode 100644
index 000000000000..3c224f345caf
--- /dev/null
+++ b/dev-haskell/stack-1.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-1.1:=[profile?] >=dev-haskell/annotated-wl-pprint-0.7.0:=[profile?] <dev-haskell/annotated-wl-pprint-0.8:=[profile?] >=dev-haskell/ansi-terminal-0.6.2.3:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?] >=dev-haskell/async-2.0.2:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/attoparsec-0.12.1.5:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base-compat-0.6:=[profile?] <dev-haskell/base-compat-0.10:=[profile?] >=dev-haskell/base16-bytestring-0.1.1.6:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/base64-bytestring-1.0.0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-tagged-0.1.1:=[profile?] <dev-haskell/binary-tagged-0.2:=[profile?] >=dev-haskell/blaze-builder-0.4.0.2:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/cabal-1.18.1.5:=[profile?] <dev-haskell/cabal-1.25:=[profile?] >=dev-haskell/clock-0.7.2:=[profile?] <dev-haskell/clock-0.8:=[profile?] >=dev-haskell/conduit-1.2.9:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1.7.1:=[profile?] <dev-haskell/conduit-extra-1.2:=[profile?] >=dev-haskell/cryptohash-0.11.6:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/cryptohash-conduit-0.1.1:=[profile?] <dev-haskell/cryptohash-conduit-0.2:=[profile?] >=dev-haskell/either-4.4.1.1:=[profile?] <dev-haskell/either-4.5:=[profile?] >=dev-haskell/errors-2.1.2:=[profile?] <dev-haskell/errors-2.2:=[profile?] >=dev-haskell/exceptions-0.8.0.2:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/extra-1.4.10:=[profile?] <dev-haskell/extra-1.6:=[profile?] >=dev-haskell/fast-logger-2.3.1:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?] >=dev-haskell/file-embed-0.0.10:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] >=dev-haskell/filelock-0.1.0.1:=[profile?] <dev-haskell/filelock-0.2:=[profile?] >=dev-haskell/fsnotify-0.2.1:=[profile?] <dev-haskell/fsnotify-0.3:=[profile?] >=dev-haskell/generic-deriving-1.10.5:=[profile?] <dev-haskell/generic-deriving-1.12:=[profile?] >=dev-haskell/gitrev-1.1:=[profile?] <dev-haskell/gitrev-1.3:=[profile?] >=dev-haskell/hashable-1.2.3.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/hastache-0.6.1:=[profile?] <dev-haskell/hastache-0.7:=[profile?] >=dev-haskell/hit-0.6.3:=[profile?] <dev-haskell/hit-0.7:=[profile?] >=dev-haskell/hpack-0.14.0:=[profile?] <dev-haskell/hpack-0.16:=[profile?] >=dev-haskell/http-client-0.5.3.3:=[profile?] <dev-haskell/http-client-0.6:=[profile?] >=dev-haskell/http-client-tls-0.3.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-conduit-2.2.3:=[profile?] <dev-haskell/http-conduit-2.3:=[profile?] >=dev-haskell/http-types-0.8.6:=[profile?] <dev-haskell/http-types-0.10:=[profile?] >=dev-haskell/lifted-async-0.9.0:=[profile?] <dev-haskell/lifted-async-0.10:=[profile?] >=dev-haskell/lifted-base-0.2.3.8:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/microlens-0.3.0.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?] >=dev-haskell/monad-control-1.0.1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/monad-logger-0.3.13.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] >=dev-haskell/monad-unlift-0.2.0:=[profile?] <dev-haskell/monad-unlift-0.3:=[profile?] >=dev-haskell/mtl-2.1.3.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/open-browser-0.2.1:=[profile?] <dev-haskell/open-browser-0.3:=[profile?] >=dev-haskell/optparse-applicative-0.13:=[profile?] <dev-haskell/optparse-applicative-0.14:=[profile?] >=dev-haskell/optparse-simple-0.0.3:=[profile?] <dev-haskell/optparse-simple-0.1:=[profile?] >=dev-haskell/path-0.5.9:=[profile?] <dev-haskell/path-0.6:=[profile?] >=dev-haskell/path-io-1.1.0:=[profile?] <dev-haskell/path-io-2.0.0:=[profile?] >=dev-haskell/persistent-2.1.2:=[profile?] <dev-haskell/persistent-2.7:=[profile?] >=dev-haskell/persistent-template-2.1.1:=[profile?] <dev-haskell/persistent-template-2.6:=[profile?] >=dev-haskell/pid1-0.1:=[profile?] <dev-haskell/pid1-0.2:=[profile?] >=dev-haskell/project-template-0.2:=[profile?] <dev-haskell/project-template-0.3:=[profile?] >=dev-haskell/regex-applicative-text-0.1.0.1:=[profile?] <dev-haskell/regex-applicative-text-0.2:=[profile?] >=dev-haskell/resourcet-1.1.4.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/retry-0.6:=[profile?] <dev-haskell/retry-0.8:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/safe-exceptions-0.1.4.0:=[profile?] <dev-haskell/safe-exceptions-0.2:=[profile?] >=dev-haskell/semigroups-0.5:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/split-0.2.3.1:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/stm-2.4.4:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/store-0.2.1.0:=[profile?] <dev-haskell/store-0.4:=[profile?] >=dev-haskell/streaming-commons-0.1.10.0:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/tar-0.5.0.3:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/temporary-1.2.0.3:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/text-1.2.0.4:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/text-binary-0.2.1.1:=[profile?] <dev-haskell/text-binary-0.3:=[profile?] >=dev-haskell/text-metrics-0.1:=[profile?] <dev-haskell/text-metrics-0.3:=[profile?] >=dev-haskell/tls-1.3.8:=[profile?] <dev-haskell/tls-1.4:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/unicode-transforms-0.1:=[profile?] <dev-haskell/unicode-transforms-0.3:=[profile?] >=dev-haskell/unix-compat-0.4.1.4:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/unordered-containers-0.2.5.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10.12.3:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/vector-binary-instances-0.2.3.2:=[profile?] <dev-haskell/vector-binary-instances-0.3:=[profile?] >=dev-haskell/yaml-0.8.20:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.7:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?] >=dev-haskell/zlib-0.5.4.2:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.10.1:= >dev-haskell/persistent-sqlite-2.5.0.1:=[profile?] <dev-haskell/persistent-sqlite-2.7:=[profile?] >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/attoparsec-0.13.1.0 <dev-haskell/attoparsec-0.14 >=dev-haskell/conduit-extra-1.1.14 <dev-haskell/conduit-extra-1.2 >=dev-haskell/cryptohash-0.11.9 <dev-haskell/cryptohash-0.12 >=dev-haskell/exceptions-0.8.3 <dev-haskell/exceptions-0.9 >=dev-haskell/hspec-2.2 <dev-haskell/hspec-2.4 >=dev-haskell/monad-logger-0.3.20.1 <dev-haskell/monad-logger-0.4 >=dev-haskell/mono-traversable-0.10.2 <dev-haskell/mono-traversable-0.11 >=dev-haskell/neat-interpolation-0.3 <dev-haskell/neat-interpolation-0.4 >=dev-haskell/quickcheck-2.8.2 <dev-haskell/quickcheck-2.10 >=dev-haskell/resourcet-1.1.8.1 <dev-haskell/resourcet-1.2 >=dev-haskell/smallcheck-1.1.1 <dev-haskell/smallcheck-1.2 >=dev-haskell/temporary-1.2.0.4 <dev-haskell/temporary-1.3 >=dev-haskell/text-1.2.2.1 <dev-haskell/text-1.3 >=dev-haskell/th-reify-many-0.1.6 <dev-haskell/th-reify-many-0.2 >=dev-haskell/vector-0.11.0.0 <dev-haskell/vector-0.12 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=The Haskell Tool Stack
+EAPI=6
+HOMEPAGE=http://haskellstack.org
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-1.1:=[profile?] >=dev-haskell/annotated-wl-pprint-0.7.0:=[profile?] <dev-haskell/annotated-wl-pprint-0.8:=[profile?] >=dev-haskell/ansi-terminal-0.6.2.3:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?] >=dev-haskell/async-2.0.2:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/attoparsec-0.12.1.5:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base-compat-0.6:=[profile?] <dev-haskell/base-compat-0.10:=[profile?] >=dev-haskell/base16-bytestring-0.1.1.6:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/base64-bytestring-1.0.0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-tagged-0.1.1:=[profile?] <dev-haskell/binary-tagged-0.2:=[profile?] >=dev-haskell/blaze-builder-0.4.0.2:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/cabal-1.18.1.5:=[profile?] <dev-haskell/cabal-1.25:=[profile?] >=dev-haskell/clock-0.7.2:=[profile?] <dev-haskell/clock-0.8:=[profile?] >=dev-haskell/conduit-1.2.9:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1.7.1:=[profile?] <dev-haskell/conduit-extra-1.2:=[profile?] >=dev-haskell/cryptohash-0.11.6:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/cryptohash-conduit-0.1.1:=[profile?] <dev-haskell/cryptohash-conduit-0.2:=[profile?] >=dev-haskell/either-4.4.1.1:=[profile?] <dev-haskell/either-4.5:=[profile?] >=dev-haskell/errors-2.1.2:=[profile?] <dev-haskell/errors-2.2:=[profile?] >=dev-haskell/exceptions-0.8.0.2:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] >=dev-haskell/extra-1.4.10:=[profile?] <dev-haskell/extra-1.6:=[profile?] >=dev-haskell/fast-logger-2.3.1:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?] >=dev-haskell/file-embed-0.0.10:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] >=dev-haskell/filelock-0.1.0.1:=[profile?] <dev-haskell/filelock-0.2:=[profile?] >=dev-haskell/fsnotify-0.2.1:=[profile?] <dev-haskell/fsnotify-0.3:=[profile?] >=dev-haskell/generic-deriving-1.10.5:=[profile?] <dev-haskell/generic-deriving-1.12:=[profile?] >=dev-haskell/gitrev-1.1:=[profile?] <dev-haskell/gitrev-1.3:=[profile?] >=dev-haskell/hashable-1.2.3.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/hastache-0.6.1:=[profile?] <dev-haskell/hastache-0.7:=[profile?] >=dev-haskell/hit-0.6.3:=[profile?] <dev-haskell/hit-0.7:=[profile?] >=dev-haskell/hpack-0.14.0:=[profile?] <dev-haskell/hpack-0.16:=[profile?] >=dev-haskell/http-client-0.5.3.3:=[profile?] <dev-haskell/http-client-0.6:=[profile?] >=dev-haskell/http-client-tls-0.3.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-conduit-2.2.3:=[profile?] <dev-haskell/http-conduit-2.3:=[profile?] >=dev-haskell/http-types-0.8.6:=[profile?] <dev-haskell/http-types-0.10:=[profile?] >=dev-haskell/lifted-async-0.9.0:=[profile?] <dev-haskell/lifted-async-0.10:=[profile?] >=dev-haskell/lifted-base-0.2.3.8:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/microlens-0.3.0.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?] >=dev-haskell/monad-control-1.0.1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/monad-logger-0.3.13.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] >=dev-haskell/monad-unlift-0.2.0:=[profile?] <dev-haskell/monad-unlift-0.3:=[profile?] >=dev-haskell/mtl-2.1.3.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/open-browser-0.2.1:=[profile?] <dev-haskell/open-browser-0.3:=[profile?] >=dev-haskell/optparse-applicative-0.13:=[profile?] <dev-haskell/optparse-applicative-0.14:=[profile?] >=dev-haskell/optparse-simple-0.0.3:=[profile?] <dev-haskell/optparse-simple-0.1:=[profile?] >=dev-haskell/path-0.5.9:=[profile?] <dev-haskell/path-0.6:=[profile?] >=dev-haskell/path-io-1.1.0:=[profile?] <dev-haskell/path-io-2.0.0:=[profile?] >=dev-haskell/persistent-2.1.2:=[profile?] <dev-haskell/persistent-2.7:=[profile?] >=dev-haskell/persistent-template-2.1.1:=[profile?] <dev-haskell/persistent-template-2.6:=[profile?] >=dev-haskell/pid1-0.1:=[profile?] <dev-haskell/pid1-0.2:=[profile?] >=dev-haskell/project-template-0.2:=[profile?] <dev-haskell/project-template-0.3:=[profile?] >=dev-haskell/regex-applicative-text-0.1.0.1:=[profile?] <dev-haskell/regex-applicative-text-0.2:=[profile?] >=dev-haskell/resourcet-1.1.4.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/retry-0.6:=[profile?] <dev-haskell/retry-0.8:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/safe-exceptions-0.1.4.0:=[profile?] <dev-haskell/safe-exceptions-0.2:=[profile?] >=dev-haskell/semigroups-0.5:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/split-0.2.3.1:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/stm-2.4.4:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/store-0.2.1.0:=[profile?] <dev-haskell/store-0.4:=[profile?] >=dev-haskell/streaming-commons-0.1.10.0:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/tar-0.5.0.3:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/temporary-1.2.0.3:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/text-1.2.0.4:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/text-binary-0.2.1.1:=[profile?] <dev-haskell/text-binary-0.3:=[profile?] >=dev-haskell/text-metrics-0.1:=[profile?] <dev-haskell/text-metrics-0.3:=[profile?] >=dev-haskell/tls-1.3.8:=[profile?] <dev-haskell/tls-1.4:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/unicode-transforms-0.1:=[profile?] <dev-haskell/unicode-transforms-0.3:=[profile?] >=dev-haskell/unix-compat-0.4.1.4:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/unordered-containers-0.2.5.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10.12.3:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/vector-binary-instances-0.2.3.2:=[profile?] <dev-haskell/vector-binary-instances-0.3:=[profile?] >=dev-haskell/yaml-0.8.20:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.7:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?] >=dev-haskell/zlib-0.5.4.2:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.10.1:= >dev-haskell/persistent-sqlite-2.5.0.1:=[profile?] <dev-haskell/persistent-sqlite-2.7:=[profile?] !dev-haskell/stack-bin[symlink]
+RESTRICT=test
+SLOT=0/1.3.2
+SRC_URI=mirror://hackage/packages/archive/stack/1.3.2/stack-1.3.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=04b232d0891031379396147b8f818789
diff --git a/dev-haskell/stack-bin-1.5.1 b/dev-haskell/stack-bin-1.5.1
new file mode 100644
index 000000000000..0f9503aed832
--- /dev/null
+++ b/dev-haskell/stack-bin-1.5.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=The Haskell Tool Stack (Binary)
+EAPI=6
+HOMEPAGE=https://github.com/commercialhaskell/stack
+IUSE=symlink
+KEYWORDS=~amd64 ~x86 ~arm
+LICENSE=BSD
+RDEPEND=sys-libs/zlib dev-libs/gmp:0 symlink? ( !dev-haskell/stack )
+SLOT=0
+SRC_URI=arm? ( https://github.com/commercialhaskell/stack/releases/download/v1.5.1/stack-1.5.1-linux-arm.tar.gz ) x86? ( https://github.com/commercialhaskell/stack/releases/download/v1.5.1/stack-1.5.1-linux-i386.tar.gz ) amd64? ( https://github.com/commercialhaskell/stack/releases/download/v1.5.1/stack-1.5.1-linux-x86_64.tar.gz )
+_md5_=8984adae787aa0a22d6c79fb3a0ded3b
diff --git a/dev-haskell/stack-bin-1.6.1 b/dev-haskell/stack-bin-1.6.1
new file mode 100644
index 000000000000..4040bb3770cb
--- /dev/null
+++ b/dev-haskell/stack-bin-1.6.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=The Haskell Tool Stack (Binary)
+EAPI=6
+HOMEPAGE=https://github.com/commercialhaskell/stack
+IUSE=symlink
+KEYWORDS=~amd64 ~x86 ~arm
+LICENSE=BSD
+RDEPEND=sys-libs/zlib dev-libs/gmp:0 symlink? ( !dev-haskell/stack )
+SLOT=0
+SRC_URI=arm? ( https://github.com/commercialhaskell/stack/releases/download/v1.6.1/stack-1.6.1-linux-arm.tar.gz ) x86? ( https://github.com/commercialhaskell/stack/releases/download/v1.6.1/stack-1.6.1-linux-i386.tar.gz ) amd64? ( https://github.com/commercialhaskell/stack/releases/download/v1.6.1/stack-1.6.1-linux-x86_64.tar.gz )
+_md5_=8984adae787aa0a22d6c79fb3a0ded3b
diff --git a/dev-haskell/stack-bin/Manifest b/dev-haskell/stack-bin/Manifest
deleted file mode 100644
index 4dff09850e86..000000000000
--- a/dev-haskell/stack-bin/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST stack-1.5.1-linux-arm.tar.gz 16542317 BLAKE2B 73a5bd6d6b09b67fea3edaf1a37e31f26afca2026e5fa6fc00639f0fdfd30af39b947261abf9fd21d30627b803de2ccd181f87c5f0f2b8253537ba869c10be21 SHA512 efb3d8eff4b4f8381364ab397298c6879e4ef3f6cdba799306696f961031f31e301b68f140624f0b6e7a0cb5d2bba02eb953203c1b7ab4a6a42d6368c8b39a29
-DIST stack-1.5.1-linux-i386.tar.gz 11546331 BLAKE2B e49aa708887fcf94e7990b1a8a8dd0e3c4b9fdf7ebbf0ce787c8334d6f81886c3518e5d9c997ad0ecde558e210abcaed7c8471a5348eda16f0dcdf70000232c1 SHA512 f8b640d74ab013426a60d3bc6a8a190acad48439e7e80c33517c5904cf818e9d988e7b84dcd0fba15e24013887849c3d56ab7655a4bb549ee292058a00f14e12
-DIST stack-1.5.1-linux-x86_64.tar.gz 11788896 BLAKE2B 379c31e6afe179e23cca928f9c3163b57e8ef8dfd4f9ac77a7cb4f4f898c2d47d846adab1c35a2637eac04ca0a066ade805e34952e7da8afa2a0edd72238a782 SHA512 837190e769e33d95a7f7d105884b82fb1ace47d84534c017ba44019d8a5335728d13f1e6c5a3591ee542172734ae2ed49d2f9ab3f19b25963a01d001fc24f1b3
-DIST stack-1.6.1-linux-arm.tar.gz 16560843 BLAKE2B 863e519ba19dd59dd08485b377e42e73554de1d548f4e26d4ebf175ca1cc06ed4b75c66bc798a88b5086eaa5e3552994c054edc29de760b5b477c3123f508df4 SHA512 4db9d962af8765ede290b5ebdb6c66a164f513ebfc05db715cd4dca70cad79846e17a48027ecce008939ecbf645d643f9497a4d53fe4d76a82ca94876a800fae
-DIST stack-1.6.1-linux-i386.tar.gz 12623620 BLAKE2B 2db8c645ab6b8ff70a469c70cbf15d252c7d30d302c8dcc1f017129f297231e358a9764f188b03b7b914ba22a15339e72a6e639397879cd8a331ce44a047f112 SHA512 8f2998a6b2f9b4764f14520ecf0c02225513c4bda7d7442e97c5595bf09a6fc09c15a45de0d096a563b4a3705f4b2d1fbf6bf9b771db52991d61134319074642
-DIST stack-1.6.1-linux-x86_64.tar.gz 12989288 BLAKE2B 44625d81410bd80ea0879e639a5b49d369939e3e3e01751061f25a5ce516ef3938e7b44f367be6851c77ae562a6846328bc9708a698b4417e5d215bffa584944 SHA512 dbd07448fa06e2020651be1dcdb39b383dfa6d207fbc9c63ac7744f3055416020fbe6b26203c43668fad01a8036237da84778057486b1edeec32f7eb66b2239e
-EBUILD stack-bin-1.5.1.ebuild 870 BLAKE2B c3a93c6ea1d151494fcb6918a15c6bff779f779aa28f5124e38c6836c011fa562c39e942e51ad5e32feaa8546a193fe637c9b728572b5b4e9f5a385d6f92d152 SHA512 bbbfac5b50928ec39062251aafea28434b5ec8f0398270f4fbea2c922e1e0c5ab624da92cdb0b38f9d270a1ebb5e2e3d56ff7745f12784186280e95f14f07d45
-EBUILD stack-bin-1.6.1.ebuild 870 BLAKE2B c3a93c6ea1d151494fcb6918a15c6bff779f779aa28f5124e38c6836c011fa562c39e942e51ad5e32feaa8546a193fe637c9b728572b5b4e9f5a385d6f92d152 SHA512 bbbfac5b50928ec39062251aafea28434b5ec8f0398270f4fbea2c922e1e0c5ab624da92cdb0b38f9d270a1ebb5e2e3d56ff7745f12784186280e95f14f07d45
-MISC metadata.xml 569 BLAKE2B d9cd3865738b2e6d95ace1d13bc72f662a1aee4c77f0ffbcf844813a20e6287baf38cf0581c53b1ec492e42ef6307d6f7ab0e84e0ac2019765a574e85cd52276 SHA512 2e325913852f2545fb617c68310a4071c8e40e3ed4e0fe275db89ff76e3bcea47ed4cd1e8e6dabb7623659bb8402a162d6e247eeefd4d4ef7a03b1a4f6cb98d8
diff --git a/dev-haskell/stack-bin/metadata.xml b/dev-haskell/stack-bin/metadata.xml
deleted file mode 100644
index d702142876ff..000000000000
--- a/dev-haskell/stack-bin/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Please see the README.md for usage information, and
-		the wiki on Github for more details.  Also, note that
-		the API for the library is not currently stable, and may
-		change significantly, even between minor releases. It is
-		currently only intended for use by the executable.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/stack-bin/stack-bin-1.5.1.ebuild b/dev-haskell/stack-bin/stack-bin-1.5.1.ebuild
deleted file mode 100644
index 5638974f850a..000000000000
--- a/dev-haskell/stack-bin/stack-bin-1.5.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The Haskell Tool Stack (Binary)"
-HOMEPAGE="https://github.com/commercialhaskell/stack"
-
-uri() {
-	echo "https://github.com/commercialhaskell/stack/releases/download/v${PV}/stack-${PV}-linux-$1.tar.gz"
-}
-
-SRC_URI="
-	arm? ( $(uri arm) )
-	x86? ( $(uri i386) )
-	amd64? ( $(uri x86_64) )
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm"
-IUSE="symlink"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	sys-libs/zlib
-	dev-libs/gmp:0
-"
-RDEPEND+=" symlink? ( !dev-haskell/stack )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="/usr/bin/stack-bin"
-QA_PRESTRIPPED="/usr/bin/stack-bin"
-
-src_prepare() {
-	default
-
-	mv stack-${PV}-*/doc doc || die
-	mv stack-${PV}-*/stack stack-bin || die
-}
-
-src_install() {
-	dodoc doc/*
-	dobin stack-bin
-	use symlink && dosym stack-bin /usr/bin/stack
-}
diff --git a/dev-haskell/stack-bin/stack-bin-1.6.1.ebuild b/dev-haskell/stack-bin/stack-bin-1.6.1.ebuild
deleted file mode 100644
index 5638974f850a..000000000000
--- a/dev-haskell/stack-bin/stack-bin-1.6.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The Haskell Tool Stack (Binary)"
-HOMEPAGE="https://github.com/commercialhaskell/stack"
-
-uri() {
-	echo "https://github.com/commercialhaskell/stack/releases/download/v${PV}/stack-${PV}-linux-$1.tar.gz"
-}
-
-SRC_URI="
-	arm? ( $(uri arm) )
-	x86? ( $(uri i386) )
-	amd64? ( $(uri x86_64) )
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm"
-IUSE="symlink"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	sys-libs/zlib
-	dev-libs/gmp:0
-"
-RDEPEND+=" symlink? ( !dev-haskell/stack )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="/usr/bin/stack-bin"
-QA_PRESTRIPPED="/usr/bin/stack-bin"
-
-src_prepare() {
-	default
-
-	mv stack-${PV}-*/doc doc || die
-	mv stack-${PV}-*/stack stack-bin || die
-}
-
-src_install() {
-	dodoc doc/*
-	dobin stack-bin
-	use symlink && dosym stack-bin /usr/bin/stack
-}
diff --git a/dev-haskell/stack/Manifest b/dev-haskell/stack/Manifest
deleted file mode 100644
index bb077a1e6ac7..000000000000
--- a/dev-haskell/stack/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stack-1.3.2.tar.gz 502764 BLAKE2B 13becc53cc3b24036c3718a2d2f9d581239f231f948fa8dc610436d71201461f614695addaf145bad4bff18da0f8f3c923b317be3515fe64054387e9ef976851 SHA512 1805268fa548ea8c120abe2498b0de75d0e6a265c1a53aab1a6da51e8c4b00bc8b5c100abb1e1e822a3a68b2f469c3c82ba9c12ad7753a20a0819f8e0bd27d12
-EBUILD stack-1.3.2.ebuild 8519 BLAKE2B a4c14b8f0130b77831a3f10126854aeb681f3e1a4e95d9852384afc2d1d5a424b8905ad4c015d6302cd9ae86f1604eb8ec721b40e16c3da615a0d3b519b4c1dc SHA512 319339e5e017ac62566fa4a7399c4c8353af47755e851f06c69b5e90d40e82403abd87cb6ee764bc9b71ab2975b068c1294b85f08e3ccbb0ff482b9a278af056
-MISC metadata.xml 569 BLAKE2B d9cd3865738b2e6d95ace1d13bc72f662a1aee4c77f0ffbcf844813a20e6287baf38cf0581c53b1ec492e42ef6307d6f7ab0e84e0ac2019765a574e85cd52276 SHA512 2e325913852f2545fb617c68310a4071c8e40e3ed4e0fe275db89ff76e3bcea47ed4cd1e8e6dabb7623659bb8402a162d6e247eeefd4d4ef7a03b1a4f6cb98d8
diff --git a/dev-haskell/stack/metadata.xml b/dev-haskell/stack/metadata.xml
deleted file mode 100644
index d702142876ff..000000000000
--- a/dev-haskell/stack/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Please see the README.md for usage information, and
-		the wiki on Github for more details.  Also, note that
-		the API for the library is not currently stable, and may
-		change significantly, even between minor releases. It is
-		currently only intended for use by the executable.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/stack/stack-1.3.2.ebuild b/dev-haskell/stack/stack-1.3.2.ebuild
deleted file mode 100644
index 4d87beee8e8d..000000000000
--- a/dev-haskell/stack/stack-1.3.2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -disable-git-info,-hide-dependency-versions,-integration-tests,-static
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="The Haskell Tool Stack"
-HOMEPAGE="http://haskellstack.org"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # installs packages from network
-
-RDEPEND=">=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-1.1:=[profile?]
-	>=dev-haskell/annotated-wl-pprint-0.7.0:=[profile?] <dev-haskell/annotated-wl-pprint-0.8:=[profile?]
-	>=dev-haskell/ansi-terminal-0.6.2.3:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?]
-	>=dev-haskell/async-2.0.2:=[profile?] <dev-haskell/async-2.2:=[profile?]
-	>=dev-haskell/attoparsec-0.12.1.5:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/base-compat-0.6:=[profile?] <dev-haskell/base-compat-0.10:=[profile?]
-	>=dev-haskell/base16-bytestring-0.1.1.6:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
-	>=dev-haskell/base64-bytestring-1.0.0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/binary-tagged-0.1.1:=[profile?] <dev-haskell/binary-tagged-0.2:=[profile?]
-	>=dev-haskell/blaze-builder-0.4.0.2:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?]
-	>=dev-haskell/cabal-1.18.1.5:=[profile?] <dev-haskell/cabal-1.25:=[profile?]
-	>=dev-haskell/clock-0.7.2:=[profile?] <dev-haskell/clock-0.8:=[profile?]
-	>=dev-haskell/conduit-1.2.9:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.1.7.1:=[profile?] <dev-haskell/conduit-extra-1.2:=[profile?]
-	>=dev-haskell/cryptohash-0.11.6:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
-	>=dev-haskell/cryptohash-conduit-0.1.1:=[profile?] <dev-haskell/cryptohash-conduit-0.2:=[profile?]
-	>=dev-haskell/either-4.4.1.1:=[profile?] <dev-haskell/either-4.5:=[profile?]
-	>=dev-haskell/errors-2.1.2:=[profile?] <dev-haskell/errors-2.2:=[profile?]
-	>=dev-haskell/exceptions-0.8.0.2:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
-	>=dev-haskell/extra-1.4.10:=[profile?] <dev-haskell/extra-1.6:=[profile?]
-	>=dev-haskell/fast-logger-2.3.1:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?]
-	>=dev-haskell/file-embed-0.0.10:=[profile?] <dev-haskell/file-embed-0.1:=[profile?]
-	>=dev-haskell/filelock-0.1.0.1:=[profile?] <dev-haskell/filelock-0.2:=[profile?]
-	>=dev-haskell/fsnotify-0.2.1:=[profile?] <dev-haskell/fsnotify-0.3:=[profile?]
-	>=dev-haskell/generic-deriving-1.10.5:=[profile?] <dev-haskell/generic-deriving-1.12:=[profile?]
-	>=dev-haskell/gitrev-1.1:=[profile?] <dev-haskell/gitrev-1.3:=[profile?]
-	>=dev-haskell/hashable-1.2.3.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/hastache-0.6.1:=[profile?] <dev-haskell/hastache-0.7:=[profile?]
-	>=dev-haskell/hit-0.6.3:=[profile?] <dev-haskell/hit-0.7:=[profile?]
-	>=dev-haskell/hpack-0.14.0:=[profile?] <dev-haskell/hpack-0.16:=[profile?]
-	>=dev-haskell/http-client-0.5.3.3:=[profile?] <dev-haskell/http-client-0.6:=[profile?]
-	>=dev-haskell/http-client-tls-0.3.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
-	>=dev-haskell/http-conduit-2.2.3:=[profile?] <dev-haskell/http-conduit-2.3:=[profile?]
-	>=dev-haskell/http-types-0.8.6:=[profile?] <dev-haskell/http-types-0.10:=[profile?]
-	>=dev-haskell/lifted-async-0.9.0:=[profile?] <dev-haskell/lifted-async-0.10:=[profile?]
-	>=dev-haskell/lifted-base-0.2.3.8:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/microlens-0.3.0.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?]
-	>=dev-haskell/monad-control-1.0.1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/monad-logger-0.3.13.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?]
-	>=dev-haskell/monad-unlift-0.2.0:=[profile?] <dev-haskell/monad-unlift-0.3:=[profile?]
-	>=dev-haskell/mtl-2.1.3.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/open-browser-0.2.1:=[profile?] <dev-haskell/open-browser-0.3:=[profile?]
-	>=dev-haskell/optparse-applicative-0.13:=[profile?] <dev-haskell/optparse-applicative-0.14:=[profile?]
-	>=dev-haskell/optparse-simple-0.0.3:=[profile?] <dev-haskell/optparse-simple-0.1:=[profile?]
-	>=dev-haskell/path-0.5.9:=[profile?] <dev-haskell/path-0.6:=[profile?]
-	>=dev-haskell/path-io-1.1.0:=[profile?] <dev-haskell/path-io-2.0.0:=[profile?]
-	>=dev-haskell/persistent-2.1.2:=[profile?] <dev-haskell/persistent-2.7:=[profile?]
-	>=dev-haskell/persistent-template-2.1.1:=[profile?] <dev-haskell/persistent-template-2.6:=[profile?]
-	>=dev-haskell/pid1-0.1:=[profile?] <dev-haskell/pid1-0.2:=[profile?]
-	>=dev-haskell/project-template-0.2:=[profile?] <dev-haskell/project-template-0.3:=[profile?]
-	>=dev-haskell/regex-applicative-text-0.1.0.1:=[profile?] <dev-haskell/regex-applicative-text-0.2:=[profile?]
-	>=dev-haskell/resourcet-1.1.4.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/retry-0.6:=[profile?] <dev-haskell/retry-0.8:=[profile?]
-	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
-	>=dev-haskell/safe-exceptions-0.1.4.0:=[profile?] <dev-haskell/safe-exceptions-0.2:=[profile?]
-	>=dev-haskell/semigroups-0.5:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/split-0.2.3.1:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/stm-2.4.4:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-haskell/store-0.2.1.0:=[profile?] <dev-haskell/store-0.4:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.10.0:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?]
-	>=dev-haskell/tar-0.5.0.3:=[profile?] <dev-haskell/tar-0.6:=[profile?]
-	>=dev-haskell/temporary-1.2.0.3:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
-	>=dev-haskell/text-1.2.0.4:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/text-binary-0.2.1.1:=[profile?] <dev-haskell/text-binary-0.3:=[profile?]
-	>=dev-haskell/text-metrics-0.1:=[profile?] <dev-haskell/text-metrics-0.3:=[profile?]
-	>=dev-haskell/tls-1.3.8:=[profile?] <dev-haskell/tls-1.4:=[profile?]
-	>=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/unicode-transforms-0.1:=[profile?] <dev-haskell/unicode-transforms-0.3:=[profile?]
-	>=dev-haskell/unix-compat-0.4.1.4:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.5.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10.12.3:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/vector-binary-instances-0.2.3.2:=[profile?] <dev-haskell/vector-binary-instances-0.3:=[profile?]
-	>=dev-haskell/yaml-0.8.20:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
-	>=dev-haskell/zip-archive-0.2.3.7:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?]
-	>=dev-haskell/zlib-0.5.4.2:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-	>dev-haskell/persistent-sqlite-2.5.0.1:=[profile?] <dev-haskell/persistent-sqlite-2.7:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/attoparsec-0.13.1.0 <dev-haskell/attoparsec-0.14
-		>=dev-haskell/conduit-extra-1.1.14 <dev-haskell/conduit-extra-1.2
-		>=dev-haskell/cryptohash-0.11.9 <dev-haskell/cryptohash-0.12
-		>=dev-haskell/exceptions-0.8.3 <dev-haskell/exceptions-0.9
-		>=dev-haskell/hspec-2.2 <dev-haskell/hspec-2.4
-		>=dev-haskell/monad-logger-0.3.20.1 <dev-haskell/monad-logger-0.4
-		>=dev-haskell/mono-traversable-0.10.2 <dev-haskell/mono-traversable-0.11
-		>=dev-haskell/neat-interpolation-0.3 <dev-haskell/neat-interpolation-0.4
-		>=dev-haskell/quickcheck-2.8.2 <dev-haskell/quickcheck-2.10
-		>=dev-haskell/resourcet-1.1.8.1 <dev-haskell/resourcet-1.2
-		>=dev-haskell/smallcheck-1.1.1 <dev-haskell/smallcheck-1.2
-		>=dev-haskell/temporary-1.2.0.4 <dev-haskell/temporary-1.3
-		>=dev-haskell/text-1.2.2.1 <dev-haskell/text-1.3
-		>=dev-haskell/th-reify-many-0.1.6 <dev-haskell/th-reify-many-0.2
-		>=dev-haskell/vector-0.11.0.0 <dev-haskell/vector-0.12 )
-"
-RDEPEND+=" !dev-haskell/stack-bin[symlink]"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'directory >=1.2.1.0 && <1.3' 'directory >=1.2.1.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-disable-git-info \
-		--flag=-hide-dependency-versions \
-		--flag=-integration-tests \
-		--flag=-static
-}
diff --git a/dev-haskell/statevar-1.0.0.0-r1 b/dev-haskell/statevar-1.0.0.0-r1
new file mode 100644
index 000000000000..8d1a86f743b1
--- /dev/null
+++ b/dev-haskell/statevar-1.0.0.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=State variables
+EAPI=5
+HOMEPAGE=http://www.haskell.org/HOpenGL/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/1.0.0.0
+SRC_URI=mirror://hackage/packages/archive/StateVar/1.0.0.0/StateVar-1.0.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ed0d2d36ea8976ddb8053012f0d22293
diff --git a/dev-haskell/statevar-1.0.1.0 b/dev-haskell/statevar-1.0.1.0
new file mode 100644
index 000000000000..9e3ef93a6cc2
--- /dev/null
+++ b/dev-haskell/statevar-1.0.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= dev-haskell/cabal doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=State variables
+EAPI=5
+HOMEPAGE=https://github.com/haskell-opengl/StateVar
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.1.0
+SRC_URI=mirror://hackage/packages/archive/StateVar/1.0.1.0/StateVar-1.0.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=023bd96b1382281539979915f8e50ce3
diff --git a/dev-haskell/statevar-1.1.0.3 b/dev-haskell/statevar-1.1.0.3
new file mode 100644
index 000000000000..73fed340d4c1
--- /dev/null
+++ b/dev-haskell/statevar-1.1.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=State variables
+EAPI=5
+HOMEPAGE=https://github.com/haskell-opengl/StateVar
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.0.3
+SRC_URI=mirror://hackage/packages/archive/StateVar/1.1.0.3/StateVar-1.1.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=880a72829ed644ff2263150fdaa87494
diff --git a/dev-haskell/statevar-1.1.0.4 b/dev-haskell/statevar-1.1.0.4
new file mode 100644
index 000000000000..309927e881fc
--- /dev/null
+++ b/dev-haskell/statevar-1.1.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=State variables
+EAPI=6
+HOMEPAGE=https://github.com/haskell-opengl/StateVar
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.0.4
+SRC_URI=mirror://hackage/packages/archive/StateVar/1.1.0.4/StateVar-1.1.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=767bdcfa8b4e9f1486b65466840b52e3
diff --git a/dev-haskell/statevar/Manifest b/dev-haskell/statevar/Manifest
deleted file mode 100644
index 6df36d490628..000000000000
--- a/dev-haskell/statevar/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST StateVar-1.0.0.0.tar.gz 2728 BLAKE2B 03faf18cabf2d913f41254ec7ba2cd51b8e9c17a3cc31ce0ed3a80dabc529a6eb18142e07dfe02f4372536dbfdfa0c97a7ada74fa1b10383affd0ecdadcc03be SHA512 0196fc184e638fae736020fdc7139fa1a08adebcc495424316795e7e775c5d7ab1df89792ea088745854dbeb396bdf5f3c07942126b8227743fb2b7bd599b8c5
-DIST StateVar-1.0.1.0.tar.gz 2800 BLAKE2B 504a3afe5a3c93c98967ee00b9771f83aac143206f33ffd0bea1e14cdf5b68ab4b6f821c30025e4886e8aecb48115601cba1068a0b050bca6bf9d63fb9f9058c SHA512 4a3f35943d9a3670e8fd633b916fb0b800aabe98af2f4285a79ff40523ef49ee28ba83457a796f0e4d6f718a1cf9c57790f4124c42cede9a884360803a86b194
-DIST StateVar-1.1.0.3.tar.gz 4475 BLAKE2B d9ea1506c8173255fb9c4dd5e9c72fe09acc8972158c9f57622a43c9c6b6441ede8b1c6d6bfe1d0d17ebe219f9ddfb30b658a4f4a079ef8e4e211ea4b7695a64 SHA512 4be7a0d005bd1af713102100ece6c074f7c1835b356c40d6128152bd0b56fc4f0b29c3b7d5c2f5b5413d4cf3ca6f5118d0c5932d54aceec1eba1f835ee1dd64e
-DIST StateVar-1.1.0.4.tar.gz 4587 BLAKE2B 37172b221866e4fd276c0ea819e613d413ad7585efce5742fa9a7a1019d34e6aa0c7de0359061a1d18fcad2789a81d6c1bcac0633ea68f47deea0c121e10f25a SHA512 2d9f958dc2d1b749c5e2b661958cd38b58a1048603dc48a585a2f32ca386cef42db99e39c033194376f6f3de154444841de048dc39804d236f6e10c90c5e3f0b
-EBUILD statevar-1.0.0.0-r1.ebuild 590 BLAKE2B fa33240980fa9bf29bfcb3168ba72f9b286dec14d7ce4883763a7fd402e4a0f4cf874caf5a4d5ef14d43a532c4f772b3f1a2ee9e31bceca2d685f7cb28d699ec SHA512 6fa2ff371a592ac9144259852289c051893fdd1426e291e0ac58450c7120089d278c6cd9740a2b7e775c4c4a913eff2a7f0916391cca8b64d3c9c0ab185af80d
-EBUILD statevar-1.0.1.0.ebuild 595 BLAKE2B deda87fba3e90fc450777718971babd8d7d70e0752461ab82157eb784c4c1a30437e84be91eb8a057bcea70fbd0744a652a48e9f3db574c0ef61aee0b6399248 SHA512 e9fccdd3d78980826f3ba1a4e97fc100f1fd3ea61b20971d574fd10b3d9138403d65bf9deae90b88e016f1ed3b89fdbaa5085b20bd2ae2b286933788fe0cf908
-EBUILD statevar-1.1.0.3.ebuild 761 BLAKE2B b54b64560e2fdc78157bf659f4519dfdbc879317ed0d93a232bdaf605445fe427dbf26307f5cee9acbe83e910311774fe2c001052e6a4cf8749c823ca0075de7 SHA512 4736484a717e88ee986cb3508694be9ccb7336f0bcd1f40f311b08192946a0f35af55fdbf42f7067511f30a2fb597568becc12452c5d0ff024c832123e6d9649
-EBUILD statevar-1.1.0.4.ebuild 759 BLAKE2B d048eb5eb312e71e31fb3b7ce10be31565be27e3ed58f6c690d43c33064bdbde4fc04dd927b6ac667a00125dc31c342d55328c79d2a5f9a2a344854e81ab5ed3 SHA512 666373ae33e37dae9fedb02afd4901c06ee16723d8d7e41d7fe3ae86cec83a3c439c84fea15d7ad0dad030c159cb88c6bf61179df8bb7bab6413a3b9753df26b
-MISC metadata.xml 499 BLAKE2B cb138c482d3dd15d0fae893cc39a10b91be2cf24bc3c9bff5694c22e68eb9e572c154208640211f830556f55cce70acc2d82fe81efc12e9473a080810e651d2b SHA512 f9c314c50fa0d9bfd431a6506bca07b00f1359cf6a2f19bfd1bb9cdd06bd04ceaa46f64fb290482b2a8967f98af147af83f4f32624191682401d8b91b30ea111
diff --git a/dev-haskell/statevar/metadata.xml b/dev-haskell/statevar/metadata.xml
deleted file mode 100644
index afb1df96d2a4..000000000000
--- a/dev-haskell/statevar/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package contains state variables, which are references in the IO monad,
-		like IORefs or parts of the OpenGL state.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">haskell-opengl/StateVar</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/statevar/statevar-1.0.0.0-r1.ebuild b/dev-haskell/statevar/statevar-1.0.0.0-r1.ebuild
deleted file mode 100644
index e2d11d60ff9a..000000000000
--- a/dev-haskell/statevar/statevar-1.0.0.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="StateVar"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="State variables"
-HOMEPAGE="http://www.haskell.org/HOpenGL/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-0"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/statevar/statevar-1.0.1.0.ebuild b/dev-haskell/statevar/statevar-1.0.1.0.ebuild
deleted file mode 100644
index 96a52fc14b56..000000000000
--- a/dev-haskell/statevar/statevar-1.0.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="StateVar"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="State variables"
-HOMEPAGE="https://github.com/haskell-opengl/StateVar"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/cabal
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/statevar/statevar-1.1.0.3.ebuild b/dev-haskell/statevar/statevar-1.1.0.3.ebuild
deleted file mode 100644
index 5b6e67292246..000000000000
--- a/dev-haskell/statevar/statevar-1.1.0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="StateVar"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="State variables"
-HOMEPAGE="https://github.com/haskell-opengl/StateVar"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/statevar/statevar-1.1.0.4.ebuild b/dev-haskell/statevar/statevar-1.1.0.4.ebuild
deleted file mode 100644
index 9b6a5292e253..000000000000
--- a/dev-haskell/statevar/statevar-1.1.0.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="StateVar"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="State variables"
-HOMEPAGE="https://github.com/haskell-opengl/StateVar"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/statistics-0.10.5.2 b/dev-haskell/statistics-0.10.5.2
new file mode 100644
index 000000000000..aab27f65c5d4
--- /dev/null
+++ b/dev-haskell/statistics-0.10.5.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/binary-0.6.3.0:=[profile?] dev-haskell/erf:=[profile?] >=dev-haskell/math-functions-0.1.2:=[profile?] >=dev-haskell/monad-par-0.3.4:=[profile?] >=dev-haskell/mwc-random-0.13.0.0:=[profile?] >=dev-haskell/primitive-0.3:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-haskell/vector-binary-instances-0.2.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/ieee754-0.7.3 >=dev-haskell/quickcheck-2 dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A library of statistical types, data, and functions
+EAPI=5
+HOMEPAGE=https://github.com/bos/statistics
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/binary-0.6.3.0:=[profile?] dev-haskell/erf:=[profile?] >=dev-haskell/math-functions-0.1.2:=[profile?] >=dev-haskell/monad-par-0.3.4:=[profile?] >=dev-haskell/mwc-random-0.13.0.0:=[profile?] >=dev-haskell/primitive-0.3:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-haskell/vector-binary-instances-0.2.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.10.5.2
+SRC_URI=mirror://hackage/packages/archive/statistics/0.10.5.2/statistics-0.10.5.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c24e496e729712a1d70715f9469fb805
diff --git a/dev-haskell/statistics-0.11.0.3 b/dev-haskell/statistics-0.11.0.3
new file mode 100644
index 000000000000..567cddf37f6a
--- /dev/null
+++ b/dev-haskell/statistics-0.11.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/binary-0.5.1.0:=[profile?] dev-haskell/erf:=[profile?] >=dev-haskell/math-functions-0.1.5.2:=[profile?] >=dev-haskell/monad-par-0.3.4:=[profile?] >=dev-haskell/mwc-random-0.13.0.0:=[profile?] >=dev-haskell/primitive-0.3:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-haskell/vector-binary-instances-0.2.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/ieee754-0.7.3 >=dev-haskell/quickcheck-2.7 dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A library of statistical types, data, and functions
+EAPI=5
+HOMEPAGE=https://github.com/bos/statistics
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/binary-0.5.1.0:=[profile?] dev-haskell/erf:=[profile?] >=dev-haskell/math-functions-0.1.5.2:=[profile?] >=dev-haskell/monad-par-0.3.4:=[profile?] >=dev-haskell/mwc-random-0.13.0.0:=[profile?] >=dev-haskell/primitive-0.3:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-haskell/vector-binary-instances-0.2.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.11.0.3
+SRC_URI=mirror://hackage/packages/archive/statistics/0.11.0.3/statistics-0.11.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=977d90f1abe54f5c32027b5be2773408
diff --git a/dev-haskell/statistics-0.13.2.3 b/dev-haskell/statistics-0.13.2.3
new file mode 100644
index 000000000000..97a2febdebe4
--- /dev/null
+++ b/dev-haskell/statistics-0.13.2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.6.0.0:=[profile?] >=dev-haskell/binary-0.5.1.0:=[profile?] dev-haskell/erf:=[profile?] >=dev-haskell/math-functions-0.1.5.2:=[profile?] >=dev-haskell/monad-par-0.3.4:=[profile?] >=dev-haskell/mwc-random-0.13.0.0:=[profile?] >=dev-haskell/primitive-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-haskell/vector-binary-instances-0.2.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/ieee754-0.7.3 >=dev-haskell/quickcheck-2.7.5 dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A library of statistical types, data, and functions
+EAPI=5
+HOMEPAGE=https://github.com/bos/statistics
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.6.0.0:=[profile?] >=dev-haskell/binary-0.5.1.0:=[profile?] dev-haskell/erf:=[profile?] >=dev-haskell/math-functions-0.1.5.2:=[profile?] >=dev-haskell/monad-par-0.3.4:=[profile?] >=dev-haskell/mwc-random-0.13.0.0:=[profile?] >=dev-haskell/primitive-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-haskell/vector-binary-instances-0.2.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.13.2.3
+SRC_URI=mirror://hackage/packages/archive/statistics/0.13.2.3/statistics-0.13.2.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2bdf00c20f06b7a9867fcbcea51fae04
diff --git a/dev-haskell/statistics-0.13.3.0 b/dev-haskell/statistics-0.13.3.0
new file mode 100644
index 000000000000..27c88cb97ec0
--- /dev/null
+++ b/dev-haskell/statistics-0.13.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.6.0.0:=[profile?] >=dev-haskell/binary-0.5.1.0:=[profile?] dev-haskell/erf:=[profile?] >=dev-haskell/math-functions-0.1.5.2:=[profile?] >=dev-haskell/monad-par-0.3.4:=[profile?] >=dev-haskell/mwc-random-0.13.0.0:=[profile?] >=dev-haskell/primitive-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-haskell/vector-binary-instances-0.2.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/ieee754-0.7.3 >=dev-haskell/quickcheck-2.7.5 dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A library of statistical types, data, and functions
+EAPI=6
+HOMEPAGE=https://github.com/bos/statistics
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.6.0.0:=[profile?] >=dev-haskell/binary-0.5.1.0:=[profile?] dev-haskell/erf:=[profile?] >=dev-haskell/math-functions-0.1.5.2:=[profile?] >=dev-haskell/monad-par-0.3.4:=[profile?] >=dev-haskell/mwc-random-0.13.0.0:=[profile?] >=dev-haskell/primitive-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-haskell/vector-binary-instances-0.2.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.13.3.0
+SRC_URI=mirror://hackage/packages/archive/statistics/0.13.3.0/statistics-0.13.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bcf3f2d6cd04398062b903ba24eafbcc
diff --git a/dev-haskell/statistics/Manifest b/dev-haskell/statistics/Manifest
deleted file mode 100644
index 1c182c750641..000000000000
--- a/dev-haskell/statistics/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST statistics-0.10.5.2.tar.gz 67302 BLAKE2B 0c59041735e9f04eed0217357092ecf1aaf2935ad09872c81b15c326c96c8ecb168cc09065ad4a833106f94760559dd804939a27080d38f7465fa2858c1cc585 SHA512 92ca0852551d2f67b1a0d96d472952492422d0c35962c1c784baa4d28915b7938e588c6fd8eddab1071e4526b78181258dda79a1962312714d140ccaaf1367e1
-DIST statistics-0.11.0.3.tar.gz 69092 BLAKE2B 62d8a847e4384747ae5539319abfe046aa667bd6efbd3fcdd0403747ec04932b5b952a6260cf8ecf256b35f288464b1c73a3e95c769c6b30f8294fd69bfcbb8c SHA512 7715e5497a794d4706232372c63a83072a60a7ba25517bbecafcce5125d83ad13916755db83af0ece349a35a663447037fc0316cf841570fa3e6a83bb29457fb
-DIST statistics-0.13.2.3.tar.gz 79522 BLAKE2B 44a83b646fb5e97a210237421e5bdc88c18d87934cd026dff1d3171b51d5e7957ecff92ea4fa3256435a3c33c4bb1b196da944853139baca82b08340a2ecad84 SHA512 5fcc6f6889ed5b54d17d5d3f505bc6860d836f6f9784cf768a337db00179b68e16fc9d9a3a2336563c76cb24cb4faf9e705f14150fd6adb5c649760b63726b17
-DIST statistics-0.13.3.0.tar.gz 83534 BLAKE2B d2e05ab16966148a42fb6292b23c3ea222d1b04464069243ab0e6dda44f24d2a0cb17f3fe2f296b85c7a54d0ec731348e0ec2a312280c30ee6591612832c3217 SHA512 66eee4b6ea7f2ce6ac5fdcaf9e3f8185b0a4915e13f77474ab4709353692a95c99b15a00b52129d88a5fb35392f3e6795799335b1fa4a4e69208e94d81357715
-EBUILD statistics-0.10.5.2.ebuild 1200 BLAKE2B b3e8413ee29ec528eeb37cb623befd864e5077f4dfd8bc2aa944fa74421e3bac5bd191d351f7031b2af78670defb220ec9d721e31b6720ad751eccf562742878 SHA512 85ce2d03bc378c3e38f5d5e39a61242c71cfa3b113b94315e7031248154c8756653b9d262f425e16494f16ca6e82354ecf45470f71e75998dc474f9e191b8865
-EBUILD statistics-0.11.0.3.ebuild 1202 BLAKE2B 4dda2266ca8b9431d9aeb22912ec95b06f35d21ec0c49e634e04a18dfdf4d72b3df75f18f76ad1a09484463b062c5abece1046697f63e7018ab39fbe3da2a2f9 SHA512 d37adaf1aa9462963bccb0728ef466e4bbe927b7917556fdd6876678af4e4943764f6d1374b6cd5534cd1ccf251a41a17bee677ff3214c5c174a341a1e431d5c
-EBUILD statistics-0.13.2.3.ebuild 1241 BLAKE2B 48ccc6ffba8bd0287f7bc5c770369f0caa5458c2771167835ae207e70f87b55fb27334cde84bc3f2ce50861186b52285f132e90faa28061f51e023d97c79d45f SHA512 5c82d286d5aa604cc7b2111d15de9921fc794e588e20b990dacf30c140c883dbf9cce2e8e510f76121e625ece02bda75f4843285ea048823511bdebe876ef568
-EBUILD statistics-0.13.3.0.ebuild 1244 BLAKE2B b07889636b780e565762243995cdfdd5178cfa77e18a401221332746743f69e5667ff9c89f6bf4b6bbe644e35a9b651523bf15b72fa6f220032a5f8977d76fd2 SHA512 d76acbc24a5bd2fd2a28b508d8a13e674bc3116d3bcc73de5bb02a0c528b4967b5a49d42208eac184c91dc86d6b67b057d4a1d3fdccc9bb147cdf2bb30f71ba4
-MISC metadata.xml 3721 BLAKE2B bf5d4664b1136c2947bc43be99ffe0ffe107e4b222e43525203a38833c48893ff56783f6a346ef919599c43d7417d4cd5adc5208b704f04652fa795078100105 SHA512 f6d923da49f891d98d7e8f9ee39823bee879c249f70c20c0860c2ac947af7e8ceec9ffcdca5e8b90bbd6af8d886b31c55a98119e0ddf0cfb3015ea83df0f433b
diff --git a/dev-haskell/statistics/metadata.xml b/dev-haskell/statistics/metadata.xml
deleted file mode 100644
index a68564979679..000000000000
--- a/dev-haskell/statistics/metadata.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library provides a number of common functions and types useful
-		in statistics.  We focus on high performance, numerical robustness,
-		and use of good algorithms.  Where possible, we provide
-		references to the statistical literature.
-		
-		The library's facilities can be divided into four broad categories:
-		
-		* Working with widely used discrete and continuous probability
-		distributions.  (There are dozens of exotic distributions in use;
-		we focus on the most common.)
-		
-		* Computing with sample data: quantile estimation, kernel density
-		estimation, histograms, bootstrap methods, significance testing,
-		and autocorrelation analysis.
-		
-		* Random variate generation under several different distributions.
-		
-		* Common statistical tests for significant differences between
-		samples.
-		
-		Changes in 0.10.0.0:
-		
-		* The type classes @Mean@ and @Variance@ are split in two. This is
-		required for distributions which do not have finite variance or
-		mean.
-		
-		* The @S.Sample.KernelDensity@ module has been renamed, and
-		completely rewritten to be much more robust.  The older module
-		oversmoothed multi-modal data.  (The older module is still
-		available under the name @S.Sample.KernelDensity.Simple@).
-		
-		* Histogram computation is added, in @S.Sample.Histogram@.
-		
-		* Forward and inverse discrete Fourier and cosine transforms are
-		added, in @S.Transform@.
-		
-		* Root finding is added, in @S.Math.RootFinding@.
-		
-		* The @complCumulative@ function is added to the @Distribution@
-		class in order to accurately assess probalities P(X&gt;x) which are
-		used in one-tailed tests.
-		
-		* A @stdDev@ function is added to the @Variance@ class for
-		distributions.
-		
-		* The constructor @S.Distribution.normalDistr@ now takes standard
-		deviation instead of variance as its parameter.
-		
-		* A bug in @S.Quantile.weightedAvg@ is fixed. It produced a wrong
-		answer if a sample contained only one element.
-		
-		* Bugs in quantile estimations for chi-square and gamma distribution
-		are fixed.
-		
-		* Integer overlow in @mannWhitneyUCriticalValue@ is fixed. It
-		produced incorrect critical values for moderately large
-		samples. Something around 20 for 32-bit machines and 40 for 64-bit
-		ones.
-		
-		* A bug in @mannWhitneyUSignificant@ is fixed. If either sample was
-		larger than 20, it produced a completely incorrect answer.
-		
-		* One- and two-tailed tests in @S.Tests.NonParametric@ are selected
-		with sum types instead of @Bool@.
-		
-		* Test results returned as enumeration instead of @Bool@.
-		
-		* Performance improvements for Mann-Whitney U and Wilcoxon tests.
-		
-		* Module @S.Tests.NonParamtric@ is split into @S.Tests.MannWhitneyU@
-		and @S.Tests.WilcoxonT@
-		
-		* @sortBy@ is added to @S.Function@.
-		
-		* Mean and variance for gamma distribution are fixed.
-		
-		* Much faster cumulative probablity functions for Poisson and
-		hypergeometric distributions.
-		
-		* Better density functions for gamma and Poisson distributions.
-		
-		* Student-T, Fisher-Snedecor F-distributions and Cauchy-Lorentz
-		distrbution are added.
-		
-		* The function @S.Function.create@ is removed. Use @generateM@ from
-		the @vector@ package instead.
-		
-		* Function to perform approximate comparion of doubles is added to
-		@S.Function.Comparison@
-		
-		* Regularized incomplete beta function and its inverse are added to
-		@S.Function@.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bos/statistics</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/statistics/statistics-0.10.5.2.ebuild b/dev-haskell/statistics/statistics-0.10.5.2.ebuild
deleted file mode 100644
index 87de6e05ef06..000000000000
--- a/dev-haskell/statistics/statistics-0.10.5.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A library of statistical types, data, and functions"
-HOMEPAGE="https://github.com/bos/statistics"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # likes to fail under a load
-
-RDEPEND=">=dev-haskell/binary-0.6.3.0:=[profile?]
-	dev-haskell/erf:=[profile?]
-	>=dev-haskell/math-functions-0.1.2:=[profile?]
-	>=dev-haskell/monad-par-0.3.4:=[profile?]
-	>=dev-haskell/mwc-random-0.13.0.0:=[profile?]
-	>=dev-haskell/primitive-0.3:=[profile?]
-	>=dev-haskell/vector-0.7.1:=[profile?]
-	>=dev-haskell/vector-algorithms-0.4:=[profile?]
-	>=dev-haskell/vector-binary-instances-0.2.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/ieee754-0.7.3
-		>=dev-haskell/quickcheck-2
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/statistics/statistics-0.11.0.3.ebuild b/dev-haskell/statistics/statistics-0.11.0.3.ebuild
deleted file mode 100644
index b3bc517c9d8d..000000000000
--- a/dev-haskell/statistics/statistics-0.11.0.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A library of statistical types, data, and functions"
-HOMEPAGE="https://github.com/bos/statistics"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # likes to fail under a load
-
-RDEPEND=">=dev-haskell/binary-0.5.1.0:=[profile?]
-	dev-haskell/erf:=[profile?]
-	>=dev-haskell/math-functions-0.1.5.2:=[profile?]
-	>=dev-haskell/monad-par-0.3.4:=[profile?]
-	>=dev-haskell/mwc-random-0.13.0.0:=[profile?]
-	>=dev-haskell/primitive-0.3:=[profile?]
-	>=dev-haskell/vector-0.7.1:=[profile?]
-	>=dev-haskell/vector-algorithms-0.4:=[profile?]
-	>=dev-haskell/vector-binary-instances-0.2.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/ieee754-0.7.3
-		>=dev-haskell/quickcheck-2.7
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/statistics/statistics-0.13.2.3.ebuild b/dev-haskell/statistics/statistics-0.13.2.3.ebuild
deleted file mode 100644
index d46b882c8481..000000000000
--- a/dev-haskell/statistics/statistics-0.13.2.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A library of statistical types, data, and functions"
-HOMEPAGE="https://github.com/bos/statistics"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # likes to fail under a load
-
-RDEPEND=">=dev-haskell/aeson-0.6.0.0:=[profile?]
-	>=dev-haskell/binary-0.5.1.0:=[profile?]
-	dev-haskell/erf:=[profile?]
-	>=dev-haskell/math-functions-0.1.5.2:=[profile?]
-	>=dev-haskell/monad-par-0.3.4:=[profile?]
-	>=dev-haskell/mwc-random-0.13.0.0:=[profile?]
-	>=dev-haskell/primitive-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-haskell/vector-algorithms-0.4:=[profile?]
-	>=dev-haskell/vector-binary-instances-0.2.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/ieee754-0.7.3
-		>=dev-haskell/quickcheck-2.7.5
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/statistics/statistics-0.13.3.0.ebuild b/dev-haskell/statistics/statistics-0.13.3.0.ebuild
deleted file mode 100644
index 8a242b141622..000000000000
--- a/dev-haskell/statistics/statistics-0.13.3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A library of statistical types, data, and functions"
-HOMEPAGE="https://github.com/bos/statistics"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # likes to fail under a load
-
-RDEPEND=">=dev-haskell/aeson-0.6.0.0:=[profile?]
-	>=dev-haskell/binary-0.5.1.0:=[profile?]
-	dev-haskell/erf:=[profile?]
-	>=dev-haskell/math-functions-0.1.5.2:=[profile?]
-	>=dev-haskell/monad-par-0.3.4:=[profile?]
-	>=dev-haskell/mwc-random-0.13.0.0:=[profile?]
-	>=dev-haskell/primitive-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-haskell/vector-algorithms-0.4:=[profile?]
-	>=dev-haskell/vector-binary-instances-0.2.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/ieee754-0.7.3
-		>=dev-haskell/quickcheck-2.7.5
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/stm-2.4.2 b/dev-haskell/stm-2.4.2
new file mode 100644
index 000000000000..aa85967cc6f0
--- /dev/null
+++ b/dev-haskell/stm-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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=Software Transactional Memory
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/stm
+IUSE=doc hscolour profile
+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/2.4.2
+SRC_URI=mirror://hackage/packages/archive/stm/2.4.2/stm-2.4.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c59fa07902a2f6731d6275bc8dc7aa89
diff --git a/dev-haskell/stm-2.4.4.1 b/dev-haskell/stm-2.4.4.1
new file mode 100644
index 000000000000..7785629f957f
--- /dev/null
+++ b/dev-haskell/stm-2.4.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Software Transactional Memory
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/stm
+IUSE=doc hscolour profile
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/2.4.4.1
+SRC_URI=mirror://hackage/packages/archive/stm/2.4.4.1/stm-2.4.4.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cbe197e9eb38b625508b2497f69cef4f
diff --git a/dev-haskell/stm-chans-3.0.0.4 b/dev-haskell/stm-chans-3.0.0.4
new file mode 100644
index 000000000000..44c477da07d2
--- /dev/null
+++ b/dev-haskell/stm-chans-3.0.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/stm-2.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Additional types of channels for STM
+EAPI=5
+HOMEPAGE=http://code.haskell.org/~wren/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/stm-2.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/3.0.0.4
+SRC_URI=mirror://hackage/packages/archive/stm-chans/3.0.0.4/stm-chans-3.0.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6b3c64842f1110ac9874b5d1094c4501
diff --git a/dev-haskell/stm-chans/Manifest b/dev-haskell/stm-chans/Manifest
deleted file mode 100644
index 5957594e5464..000000000000
--- a/dev-haskell/stm-chans/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stm-chans-3.0.0.4.tar.gz 9673 BLAKE2B ecde49051b1849a357bfd1886e6075255ebcf1a72716b82740383725e370a66a516e1c16fca8acdfe1a1c9180b3553497c798a0bb1167def1b4cd5396b2d26b2 SHA512 7882fa4d036dc3de3dfbfcb62fd54eef5bf679d2adcbdc0653a1cd4c4f1b715dab6a70465573721b141cb9a281f2d6119114445c0dc79c5e4c474250f4f22d18
-EBUILD stm-chans-3.0.0.4.ebuild 573 BLAKE2B fbc69369cc4874e333e01a0d6aa4008bb92e947deb8e9e643c0828762cc679d95fffc74f4efe3bbd8ecaaedaff70cbda86e55860071609933709194ab4dd7755 SHA512 09d05c8d41311e6a35a6e17a350506838c8ca3bf5c6a80abffdf1ddcdc976bf63724e916bfd022f9ddf645e62e71b2f9c0a1251624a88045dd15bd3a8c4d9409
-MISC metadata.xml 328 BLAKE2B e59df29069b481ff01e59060bc9bf0422530dfd76f6ba77c61c5a5e4d5ef79c918b1d6286418412a5b1727c9413f273e9835b24363ba8301daaa79284c9520f9 SHA512 fa87fc0cc8f2037d1fd137887f6fc2f95575b3b3d9abc05cef9c129b4eb9500293abce786294c2e77719be77b38599b6b23f271825f85956ceb52ed64a5d2f00
diff --git a/dev-haskell/stm-chans/metadata.xml b/dev-haskell/stm-chans/metadata.xml
deleted file mode 100644
index 89a51c39cb0f..000000000000
--- a/dev-haskell/stm-chans/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Additional types of channels for STM.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/stm-chans/stm-chans-3.0.0.4.ebuild b/dev-haskell/stm-chans/stm-chans-3.0.0.4.ebuild
deleted file mode 100644
index e8fd85dd9798..000000000000
--- a/dev-haskell/stm-chans/stm-chans-3.0.0.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Additional types of channels for STM"
-HOMEPAGE="http://code.haskell.org/~wren/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/stm/Manifest b/dev-haskell/stm/Manifest
deleted file mode 100644
index 1b7d72e3c8a0..000000000000
--- a/dev-haskell/stm/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST stm-2.4.2.tar.gz 9635 BLAKE2B 4a1c394d1308619b409dfeaad0af1209a0317dca70943d57b62be34fd48983ce214de23b3c8e1b8341f2d2a1fb0b6e0af5f5ac8acdb462fe6e6734dfc0fb8d8b SHA512 ed1f58f7b08262d4afa683fde16ad79670bb111f0cfc22fdce81614358e903698e6b1bd410428661b1c7d5af50b10dbcf688d8ce5e7ddae86cc55d6d1c5598da
-DIST stm-2.4.4.1.tar.gz 10367 BLAKE2B 63cba3b6097d32f9740eea6a2a62f2ae7c642ed27905e62af4f0d7fb7100c1372357bf5626654a2f6c188743b944e73747206227f8790b367a61803ef583e245 SHA512 12a8edb7489995245fb21d9f0782cad87e992f56343d4492eef788370ebc2dcb934193d8602b85b5f3935c4bdb4c9426717b6149437cd7b0bb5311bda4b237eb
-EBUILD stm-2.4.2.ebuild 597 BLAKE2B dd6a228108fc6c06429f3d3f71eeebf9343f28a63e322b1f947fa417bd486253cb4b6a7e23f861f507a7adb98383b65e86ffbb997d1d564fb51ddce72b9fa8b0 SHA512 4b943b3fb8253196ff423249290941ca2926b40e6e8950f7d479e6e0e25659c5ca74dc727ded2e7f06467406f14ec456c09107f566aab35be51a4680c6338b4b
-EBUILD stm-2.4.4.1.ebuild 607 BLAKE2B 11e4a8fed67135588391f239b999712fa40014cabd46dbad905c9c9ceb7e65dcd4766fc96f4fa61481a5caedcd6de3181af72f8638d8e1db5adc357943136644 SHA512 197daebfd2fd7428187671528d0a04f0e712fb60cacf2c7125286fcb7edec40776ee1721865bfb21b414998b1c9861c50d15eab46343903c30a4d07253026add
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/stm/metadata.xml b/dev-haskell/stm/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/stm/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/stm/stm-2.4.2.ebuild b/dev-haskell/stm/stm-2.4.2.ebuild
deleted file mode 100644
index c2b2615e05a2..000000000000
--- a/dev-haskell/stm/stm-2.4.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Software Transactional Memory"
-HOMEPAGE="http://hackage.haskell.org/package/stm"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/stm/stm-2.4.4.1.ebuild b/dev-haskell/stm/stm-2.4.4.1.ebuild
deleted file mode 100644
index a6bfab97c2c3..000000000000
--- a/dev-haskell/stm/stm-2.4.4.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Software Transactional Memory"
-HOMEPAGE="http://hackage.haskell.org/package/stm"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/stmonadtrans-0.3.3 b/dev-haskell/stmonadtrans-0.3.3
new file mode 100644
index 000000000000..70388427f7b1
--- /dev/null
+++ b/dev-haskell/stmonadtrans-0.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A monad transformer version of the ST monad
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/STMonadTrans
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.3
+SRC_URI=mirror://hackage/packages/archive/STMonadTrans/0.3.3/STMonadTrans-0.3.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0c3dea305493e021f80d62cf29d11e40
diff --git a/dev-haskell/stmonadtrans-0.3.4 b/dev-haskell/stmonadtrans-0.3.4
new file mode 100644
index 000000000000..a3a133339ead
--- /dev/null
+++ b/dev-haskell/stmonadtrans-0.3.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A monad transformer version of the ST monad
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/STMonadTrans
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.3.4
+SRC_URI=mirror://hackage/packages/archive/STMonadTrans/0.3.4/STMonadTrans-0.3.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4b277ecc5d16d60908d202b64ac7bc09
diff --git a/dev-haskell/stmonadtrans/Manifest b/dev-haskell/stmonadtrans/Manifest
deleted file mode 100644
index bc12586618c5..000000000000
--- a/dev-haskell/stmonadtrans/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST STMonadTrans-0.3.3.tar.gz 4820 BLAKE2B 5406412f362f9b5cb63aaae759510c5bd36b376a90b60b93849c4af42630b2a2266b708cc624b99726d49a80de9cd5c86cbf2a0ce05cd38250acc2864593dfbf SHA512 5395dfac66abcf75593b5c62252b452e4935b85e294a1f9b4a40424b29be76109b89b0cc35eaa15bd448a4d51ae0500bfe72924db854e02e949685fd9180d847
-DIST STMonadTrans-0.3.4.tar.gz 5442 BLAKE2B 748d95bc1f14e38220d2b2342a939a1a2df428c1eed11c40558eeac21566e552b1d43653a4bcb2f4c1dcdabe35352ed526cdd9a86c20acd54778154bcc71e1b2 SHA512 3799af190af51276d3cbd03908275d539dd8c290b9a48e2e9e3e41b1ea1c7d966ecddd86b93466e2fe7e63c4776e10912fa349f12aaf698a403d2e3effe59eab
-EBUILD stmonadtrans-0.3.3.ebuild 665 BLAKE2B 4c0c495ce2782100427486c7a105a283e7dd1d5915b7681d6b5fb87f9e87305812bffeb820f4806fb731dd80ec3c8cb59e9c9302b3a19b2fe9b28299a083dc08 SHA512 2e0da6edbc288104020b4db1a467482c497dcd7a5d459535cca7e66a6ec1309228538902618f8573e19f36665e17413f51f3d78ef3955c8a9918e5478ba6c5d6
-EBUILD stmonadtrans-0.3.4.ebuild 736 BLAKE2B ccc6baf6eecb3196d6271cae592bb80f7515401c952cb2960e08c03f431e0f70875d3b92aeb0ced1d0fd9a0989e22063263ed52efc876d4464b20bf301dea6c8 SHA512 0e452d76ca2fe6237961347f672a6a436b54c53b2cdcd7a90a5b59cb3acee3eab89dc2d166e91b662dd513c20a74957fae6351ded65ded75694b69d8e612bd1e
-MISC metadata.xml 736 BLAKE2B 12c1a4b31c610a16412e0a93b1a2ddec0ea04a507b44acc15a5c44fe14c7d378a98b0530fa5e4335af93f7d976c0d2148958ee142cf67bd21046114922135361 SHA512 677a9ab85a55865ca6c6a87c65ff3bad20d8e9b7c08761712a97a131c0690dd1f01417fe1d455536e33318282e6982845431bb0b3e8a35430de299620f997d1f
diff --git a/dev-haskell/stmonadtrans/metadata.xml b/dev-haskell/stmonadtrans/metadata.xml
deleted file mode 100644
index f224e9002210..000000000000
--- a/dev-haskell/stmonadtrans/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A monad transformer version of the ST monad
-		Warning! This monad transformer should not be used with monads that
-		can contain multiple answers, like the list monad. The reason is that
-		the will be duplicated across the different answers and this cause
-		Bad Things to happen (such as loss of referential transparency). Safe
-		monads include the monads State, Reader, Writer, Maybe and
-		combinations of their corresponding monad transformers.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/stmonadtrans/stmonadtrans-0.3.3.ebuild b/dev-haskell/stmonadtrans/stmonadtrans-0.3.3.ebuild
deleted file mode 100644
index 39caa6c0ea67..000000000000
--- a/dev-haskell/stmonadtrans/stmonadtrans-0.3.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="STMonadTrans"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A monad transformer version of the ST monad"
-HOMEPAGE="http://hackage.haskell.org/package/STMonadTrans"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/stmonadtrans/stmonadtrans-0.3.4.ebuild b/dev-haskell/stmonadtrans/stmonadtrans-0.3.4.ebuild
deleted file mode 100644
index 5a4c6a3c3cb1..000000000000
--- a/dev-haskell/stmonadtrans/stmonadtrans-0.3.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="STMonadTrans"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A monad transformer version of the ST monad"
-HOMEPAGE="http://hackage.haskell.org/package/STMonadTrans"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # uses detailed-0.9 test suite, cabal fails it
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/store-0.3.1 b/dev-haskell/store-0.3.1
new file mode 100644
index 000000000000..d2320f012583
--- /dev/null
+++ b/dev-haskell/store-0.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/async-2.0.2:=[profile?] >=dev-haskell/base-orphans-0.4.3:=[profile?] >=dev-haskell/base64-bytestring-0.1.1:=[profile?] >=dev-haskell/conduit-1.2.3.1:=[profile?] >=dev-haskell/contravariant-1.3:=[profile?] >=dev-haskell/cryptohash-0.11.6:=[profile?] >=dev-haskell/free-4.11:=[profile?] >=dev-haskell/hashable-1.2.3.1:=[profile?] >=dev-haskell/hspec-2.1.2:=[profile?] >=dev-haskell/hspec-smallcheck-0.3.0:=[profile?] >=dev-haskell/lifted-base-0.2.3.3:=[profile?] >=dev-haskell/monad-control-0.3.3.0:=[profile?] >=dev-haskell/mono-traversable-0.7.0:=[profile?] >=dev-haskell/network-2.6.0.2:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/resourcet-1.1.3.3:=[profile?] >=dev-haskell/safe-0.3.8:=[profile?] >=dev-haskell/semigroups-0.8:=[profile?] >=dev-haskell/smallcheck-1.1.1:=[profile?] >=dev-haskell/store-core-0.3:=[profile?] <dev-haskell/store-core-0.4:=[profile?] >=dev-haskell/streaming-commons-0.1.10.0:=[profile?] >=dev-haskell/syb-0.4.4:=[profile?] >=dev-haskell/text-1.2.0.4:=[profile?] >=dev-haskell/th-lift-0.7.1:=[profile?] >=dev-haskell/th-lift-instances-0.1.4:=[profile?] >=dev-haskell/th-orphans-0.12.2:=[profile?] >=dev-haskell/th-reify-many-0.1.6:=[profile?] >=dev-haskell/th-utilities-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2.5.1:=[profile?] >=dev-haskell/vector-0.10.12.3:=[profile?] >=dev-haskell/void-0.5.11:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/cereal dev-haskell/cereal-vector dev-haskell/criterion dev-haskell/vector-binary-instances dev-haskell/weigh ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast binary serialization
+EAPI=6
+HOMEPAGE=https://github.com/fpco/store#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/async-2.0.2:=[profile?] >=dev-haskell/base-orphans-0.4.3:=[profile?] >=dev-haskell/base64-bytestring-0.1.1:=[profile?] >=dev-haskell/conduit-1.2.3.1:=[profile?] >=dev-haskell/contravariant-1.3:=[profile?] >=dev-haskell/cryptohash-0.11.6:=[profile?] >=dev-haskell/free-4.11:=[profile?] >=dev-haskell/hashable-1.2.3.1:=[profile?] >=dev-haskell/hspec-2.1.2:=[profile?] >=dev-haskell/hspec-smallcheck-0.3.0:=[profile?] >=dev-haskell/lifted-base-0.2.3.3:=[profile?] >=dev-haskell/monad-control-0.3.3.0:=[profile?] >=dev-haskell/mono-traversable-0.7.0:=[profile?] >=dev-haskell/network-2.6.0.2:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/resourcet-1.1.3.3:=[profile?] >=dev-haskell/safe-0.3.8:=[profile?] >=dev-haskell/semigroups-0.8:=[profile?] >=dev-haskell/smallcheck-1.1.1:=[profile?] >=dev-haskell/store-core-0.3:=[profile?] <dev-haskell/store-core-0.4:=[profile?] >=dev-haskell/streaming-commons-0.1.10.0:=[profile?] >=dev-haskell/syb-0.4.4:=[profile?] >=dev-haskell/text-1.2.0.4:=[profile?] >=dev-haskell/th-lift-0.7.1:=[profile?] >=dev-haskell/th-lift-instances-0.1.4:=[profile?] >=dev-haskell/th-orphans-0.12.2:=[profile?] >=dev-haskell/th-reify-many-0.1.6:=[profile?] >=dev-haskell/th-utilities-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2.5.1:=[profile?] >=dev-haskell/vector-0.10.12.3:=[profile?] >=dev-haskell/void-0.5.11:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.3.1
+SRC_URI=mirror://hackage/packages/archive/store/0.3.1/store-0.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b7c9b2808d0372378435a5493b06a8d7
diff --git a/dev-haskell/store-core-0.3 b/dev-haskell/store-core-0.3
new file mode 100644
index 000000000000..b1ca88383f19
--- /dev/null
+++ b/dev-haskell/store-core-0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/fail:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-1.0:=[profile?] >=dev-haskell/text-1.2.0.4:=[profile?] <dev-haskell/text-2.0:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast and lightweight binary serialization
+EAPI=6
+HOMEPAGE=https://github.com/fpco/store#readme
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/fail:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-1.0:=[profile?] >=dev-haskell/text-1.2.0.4:=[profile?] <dev-haskell/text-2.0:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.3
+SRC_URI=mirror://hackage/packages/archive/store-core/0.3/store-core-0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0c142b70daadc211f3dd217515521824
diff --git a/dev-haskell/store-core/Manifest b/dev-haskell/store-core/Manifest
deleted file mode 100644
index edcd285c9eec..000000000000
--- a/dev-haskell/store-core/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST store-core-0.3.tar.gz 6952 BLAKE2B 269afdd4c3212c6ed1c6d9c4a499694fced4035b3fa298fd9262af1badcf5952fd0ed95aeece0d7ed82eaeccf739d22811fb44003e564e5e8aa53efb61ce32cc SHA512 32800552f02a4b205794e238637d3c4d12d58e78fdb1b8bb51e4c9c09634c58f6fed13c108ffda1fb9059ef00dafc674c105832b2df290cb3c183d7ba76bbd05
-EBUILD store-core-0.3.ebuild 738 BLAKE2B b969aad7aeb62cca6b4ef5a532ba566a22da6e998aad8c8e7ce9b59dfd83ed710cf26b7fa231f26c0e8aa913d4394f2fc09683d1c4be861285a5aeb5458efde7 SHA512 285fa1a4bbf63c5298112b9a97004c1b6c56732529d841d67f5aca443d0f409d0d925867e0acf2e62ab3a3449098ab790fda117b7dde7cf88106f209c4e9d1c2
-MISC metadata.xml 332 BLAKE2B 82b7159f939ad73cff64abbbf4ee1b4efdb7765a84a32852e8170432b363810f5ed393959326559116b87bd63f54b8562003a6e80c3b1f3a33f95a4dfc4fd257 SHA512 8d9dc61cf39ead27e9db632ac1adf11f5d4f2ec8b992c0cb95b5884e8fa3f6f747654bcc5d67f6d30414dec6234ab522e091a9af8a5a283f185af1a85123b6b1
diff --git a/dev-haskell/store-core/metadata.xml b/dev-haskell/store-core/metadata.xml
deleted file mode 100644
index 46a27879f9b1..000000000000
--- a/dev-haskell/store-core/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Fast and lightweight binary serialization
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/store-core/store-core-0.3.ebuild b/dev-haskell/store-core/store-core-0.3.ebuild
deleted file mode 100644
index 58d73d15803f..000000000000
--- a/dev-haskell/store-core/store-core-0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Fast and lightweight binary serialization"
-HOMEPAGE="https://github.com/fpco/store#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/fail:=[profile?]
-	>=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-1.0:=[profile?]
-	>=dev-haskell/text-1.2.0.4:=[profile?] <dev-haskell/text-2.0:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/store/Manifest b/dev-haskell/store/Manifest
deleted file mode 100644
index 871a3cb24fb5..000000000000
--- a/dev-haskell/store/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST store-0.3.1.tar.gz 41555 BLAKE2B 6dc4cc284725db02987755ccd7665f241cc24b50449707d7af59ecbc82617bfc3445d9be57c37036f6bffb90870cf326d1519f131163c7dc7a87589fbc5718a1 SHA512 7e6064cbee01ce7357e5b7235d502ee9b5b323358ebd7e71b5b310830ae52595384bb143dbbbad8e28cdde2c9001f1ae9ea03b47f2dc5cf50ac18cb2c4e9d7cd
-EBUILD store-0.3.1.ebuild 2259 BLAKE2B a3cd48b1a621b82a212b057a5ba90daaa7b2b23f9c59610ee639a4aaa175dcd57b451317303094046221bf11d5ae945bbc9bdc0b509f414e30527ca6cc4e82c7 SHA512 feb6726888f8c73e3aa7dcc8a91bda27402aa4f8875a7ab87e77a08964bad4208f9a8baa1976cf5453b419885e76f738856e1014441f1060abb03925722c9407
-MISC metadata.xml 316 BLAKE2B 835f4bb685e005fae7a08c4232615b9627d6350e961c8757ac8cae97f79532eb302e63e6c1f33eb95ce0160577ee442f5a850e15231f9fcdc8d3efcda426e378 SHA512 e8fe6a6522fdb50f17a301c2668f519cbc88a51b2697d1da84d356098f4b12b27ab34b454f35c107d8b43e1dd1c6d4540ef578315c761124773d55c87747be20
diff --git a/dev-haskell/store/metadata.xml b/dev-haskell/store/metadata.xml
deleted file mode 100644
index 61d4d499fa23..000000000000
--- a/dev-haskell/store/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Fast binary serialization
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/store/store-0.3.1.ebuild b/dev-haskell/store/store-0.3.1.ebuild
deleted file mode 100644
index fd2828763476..000000000000
--- a/dev-haskell/store/store-0.3.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -small-bench,-comparison-bench
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast binary serialization"
-HOMEPAGE="https://github.com/fpco/store#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/async-2.0.2:=[profile?]
-	>=dev-haskell/base-orphans-0.4.3:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1.1:=[profile?]
-	>=dev-haskell/conduit-1.2.3.1:=[profile?]
-	>=dev-haskell/contravariant-1.3:=[profile?]
-	>=dev-haskell/cryptohash-0.11.6:=[profile?]
-	>=dev-haskell/free-4.11:=[profile?]
-	>=dev-haskell/hashable-1.2.3.1:=[profile?]
-	>=dev-haskell/hspec-2.1.2:=[profile?]
-	>=dev-haskell/hspec-smallcheck-0.3.0:=[profile?]
-	>=dev-haskell/lifted-base-0.2.3.3:=[profile?]
-	>=dev-haskell/monad-control-0.3.3.0:=[profile?]
-	>=dev-haskell/mono-traversable-0.7.0:=[profile?]
-	>=dev-haskell/network-2.6.0.2:=[profile?]
-	>=dev-haskell/primitive-0.6:=[profile?]
-	>=dev-haskell/resourcet-1.1.3.3:=[profile?]
-	>=dev-haskell/safe-0.3.8:=[profile?]
-	>=dev-haskell/semigroups-0.8:=[profile?]
-	>=dev-haskell/smallcheck-1.1.1:=[profile?]
-	>=dev-haskell/store-core-0.3:=[profile?] <dev-haskell/store-core-0.4:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.10.0:=[profile?]
-	>=dev-haskell/syb-0.4.4:=[profile?]
-	>=dev-haskell/text-1.2.0.4:=[profile?]
-	>=dev-haskell/th-lift-0.7.1:=[profile?]
-	>=dev-haskell/th-lift-instances-0.1.4:=[profile?]
-	>=dev-haskell/th-orphans-0.12.2:=[profile?]
-	>=dev-haskell/th-reify-many-0.1.6:=[profile?]
-	>=dev-haskell/th-utilities-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.5.1:=[profile?]
-	>=dev-haskell/vector-0.10.12.3:=[profile?]
-	>=dev-haskell/void-0.5.11:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/cereal
-		dev-haskell/cereal-vector
-		dev-haskell/criterion
-		dev-haskell/vector-binary-instances
-		dev-haskell/weigh )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-comparison-bench \
-		--flag=-small-bench
-}
diff --git a/dev-haskell/stream-0.2.6-r1 b/dev-haskell/stream-0.2.6-r1
new file mode 100644
index 000000000000..1cc3b7c4bc19
--- /dev/null
+++ b/dev-haskell/stream-0.2.6-r1
@@ -0,0 +1,13 @@
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b493f7def710ff7e09bc20db207f0788
diff --git a/dev-haskell/stream-0.4.6 b/dev-haskell/stream-0.4.6
new file mode 100644
index 000000000000..02ac123c70a8
--- /dev/null
+++ b/dev-haskell/stream-0.4.6
@@ -0,0 +1,13 @@
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=971f98f44ba5139606e4dd1e96de1629
diff --git a/dev-haskell/stream-0.4.7.2 b/dev-haskell/stream-0.4.7.2
new file mode 100644
index 000000000000..2f33509c83fa
--- /dev/null
+++ b/dev-haskell/stream-0.4.7.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/lazysmallcheck-0.3:=[profile?] >=dev-haskell/quickcheck-2.0:2=[profile?] >=dev-lang/ghc-7.4.1:= 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=5
+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:2=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.7.2
+SRC_URI=mirror://hackage/packages/archive/Stream/0.4.7.2/Stream-0.4.7.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4df252fbe1e328dd903a72dc406be576
diff --git a/dev-haskell/stream/Manifest b/dev-haskell/stream/Manifest
deleted file mode 100644
index 0c37729d8dc2..000000000000
--- a/dev-haskell/stream/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST Stream-0.2.6.tar.gz 4885 BLAKE2B bdc7bc1185ff064b9cdd11a284ab24dbd53f11ef1f22773cd35de6828e28d7532b71ae47a5dd717f0218b6f0fd5c38fa53baa2ccdad3c0b5e74befddae938636 SHA512 fabbfbceeaac4347e3af02391cf90cf8e1875576f925c1e70f3117c51b597f7f7ab241597e6eb781c39708fd8ec396660a5d42d13905f78695e45432679e25b3
-DIST Stream-0.4.6.tar.gz 5875 BLAKE2B d380889fea81b30c93a9a9b0b8330f50602cf372b1ec658ce357d5d13ae0faa0f5eb3048bfb644e60d6a66031e58fac0fe97581e355a733fd34634ac439b893a SHA512 290173c36e2ec89beca4d8aa9dc8547492439772663d7936abb97c997d785f88e1a6b20b18f8fac16705a7438f3dab09736042b88a796545126d8589569cd1a7
-DIST Stream-0.4.7.2.tar.gz 6543 BLAKE2B 5e399aa6fc8fcdd0616d5349f5919f7b620d33651e12dfe8fbc9f9f3ad2d25021b369e7b0fa8a0d7bde1d68efd0fcc8a2b2f25a82fe49f93526eb6b7ac98329a SHA512 ff0b8c51d11cb4d4ed9d07af272bcf63fc4e4e1b4eaa76dce9c80234ba989c5690c41014e5e9bd3acc9faaea048a899f11d350459fc68d93c67f1e62e1fe6504
-EBUILD stream-0.2.6-r1.ebuild 622 BLAKE2B c45f09e00fc6189f65c2c048b7bac4e2a65d8385fd7a157824730a404b711af2fe603ad2457d9ab6a16bde09aecde5764e543ecbdf8309ece847561ba5502150 SHA512 134b50085e8cc2bcc6672185db05bbc860e22bc4e3daca51911f7b2c7497cc9254e342d855ffaa10b66c3d178b2d323d5a6c82e5f6c88a062c90d1f1d078eb4a
-EBUILD stream-0.4.6.ebuild 722 BLAKE2B 23ef4c8331ba4ec596657d3eb9633846e42203d7165586c36574d210490328f649773b97a699b31302ae3c8aaf3766e4af30d1c599d11d8f067419ab75dcf3ab SHA512 856259cded9a7901872aeb52663649d0cd1eefc027556333f38e5d057a5bbaa87b6d2b88a487d5e79fd1869a4555ec08c1da5d0736171e6053df4aaf1b2c89df
-EBUILD stream-0.4.7.2.ebuild 732 BLAKE2B 3bb4e715eaae5e7b9ea1597253650d7263285d5d6224b34ad1ef23cc605e45eab8468d02e74e33173b09bc8f9462c21d6d4a992cca89e264ed5175b820ad48c5 SHA512 c15afb5dc057d10b925cf7586bd1ba9991196efafd0a711de0af8a82056cd81c590dab021d16cfca876c9c8e9536da14e457937c66537d7b000027fe316fa6f8
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/stream/metadata.xml b/dev-haskell/stream/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/stream/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/stream/stream-0.2.6-r1.ebuild b/dev-haskell/stream/stream-0.2.6-r1.ebuild
deleted file mode 100644
index b2c029106f58..000000000000
--- a/dev-haskell/stream/stream-0.2.6-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
-
-MY_PN="Stream"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library for manipulating infinite lists"
-HOMEPAGE="http://www.cs.nott.ac.uk/~wss/repos/Stream/dist/doc/html/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.6.1
-		dev-haskell/quickcheck:1"
-
-DEPEND="${RDEPEND}
-		dev-haskell/cabal"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/stream/stream-0.4.6.ebuild b/dev-haskell/stream/stream-0.4.6.ebuild
deleted file mode 100644
index 227f43a894df..000000000000
--- a/dev-haskell/stream/stream-0.4.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Stream"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library for manipulating infinite lists"
-HOMEPAGE="http://hackage.haskell.org/package/Stream"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ia64 ppc ~ppc64 sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/lazysmallcheck-0.3[profile?]
-		>=dev-haskell/quickcheck-2.0[profile?]
-		>=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		dev-haskell/cabal"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/stream/stream-0.4.7.2.ebuild b/dev-haskell/stream/stream-0.4.7.2.ebuild
deleted file mode 100644
index aab97166ee1f..000000000000
--- a/dev-haskell/stream/stream-0.4.7.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Stream"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library for manipulating infinite lists"
-HOMEPAGE="http://hackage.haskell.org/package/Stream"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/lazysmallcheck-0.3:=[profile?]
-	>=dev-haskell/quickcheck-2.0:2=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/cabal
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/streaming-commons-0.1.12.1 b/dev-haskell/streaming-commons-0.1.12.1
new file mode 100644
index 000000000000..cb4b4cfd7bf8
--- /dev/null
+++ b/dev-haskell/streaming-commons-0.1.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] dev-haskell/bytestring-builder:=[profile?] dev-haskell/network:=[profile?] dev-haskell/random:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/async >=dev-haskell/hspec-1.8 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Common lower-level functions needed by various streaming data libraries
+EAPI=5
+HOMEPAGE=https://github.com/fpco/streaming-commons
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] dev-haskell/bytestring-builder:=[profile?] dev-haskell/network:=[profile?] dev-haskell/random:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.12.1
+SRC_URI=mirror://hackage/packages/archive/streaming-commons/0.1.12.1/streaming-commons-0.1.12.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=09168a2079c62016a340f3baf809321d
diff --git a/dev-haskell/streaming-commons-0.1.15 b/dev-haskell/streaming-commons-0.1.15
new file mode 100644
index 000000000000..d319bc94902b
--- /dev/null
+++ b/dev-haskell/streaming-commons-0.1.15
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] dev-haskell/bytestring-builder:=[profile?] dev-haskell/network:=[profile?] dev-haskell/random:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/async >=dev-haskell/hspec-1.8 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Common lower-level functions needed by various streaming data libraries
+EAPI=5
+HOMEPAGE=https://github.com/fpco/streaming-commons
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] dev-haskell/bytestring-builder:=[profile?] dev-haskell/network:=[profile?] dev-haskell/random:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.15
+SRC_URI=mirror://hackage/packages/archive/streaming-commons/0.1.15/streaming-commons-0.1.15.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=693349ca6b908a5f23f1e39f769230e6
diff --git a/dev-haskell/streaming-commons-0.1.15.4 b/dev-haskell/streaming-commons-0.1.15.4
new file mode 100644
index 000000000000..8640d659669f
--- /dev/null
+++ b/dev-haskell/streaming-commons-0.1.15.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] dev-haskell/bytestring-builder:=[profile?] dev-haskell/network:=[profile?] dev-haskell/random:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.8 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Common lower-level functions needed by various streaming data libraries
+EAPI=6
+HOMEPAGE=https://github.com/fpco/streaming-commons
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] dev-haskell/bytestring-builder:=[profile?] dev-haskell/network:=[profile?] dev-haskell/random:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.15.4
+SRC_URI=mirror://hackage/packages/archive/streaming-commons/0.1.15.4/streaming-commons-0.1.15.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=693324378e4e9d748cd73d520b81514c
diff --git a/dev-haskell/streaming-commons-0.1.16 b/dev-haskell/streaming-commons-0.1.16
new file mode 100644
index 000000000000..12ed55817de2
--- /dev/null
+++ b/dev-haskell/streaming-commons-0.1.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/network-2.4.0.0:=[profile?] dev-haskell/random:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/text:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.8 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Common lower-level functions needed by various streaming data libraries
+EAPI=6
+HOMEPAGE=https://github.com/fpco/streaming-commons
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/network-2.4.0.0:=[profile?] dev-haskell/random:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/text:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.1.16
+SRC_URI=mirror://hackage/packages/archive/streaming-commons/0.1.16/streaming-commons-0.1.16.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=79acf143489a92e9fb362700ff7bb07f
diff --git a/dev-haskell/streaming-commons/Manifest b/dev-haskell/streaming-commons/Manifest
deleted file mode 100644
index 791e2ee0b6f1..000000000000
--- a/dev-haskell/streaming-commons/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST streaming-commons-0.1.12.1.tar.gz 86864 BLAKE2B 636fde763da8f24e395b5fab2b9901b8b81d0a7fa0eab4d1c4cc5d87c225d3592677d465d49184cf84737f2a65d857fe17da082b73f67b2655c8b2949c08f963 SHA512 43f30a7cacdcec178885cb424a7fd0380682482130ba4019d116468bb87bb187244ff480fc169a27de8192e17c9f17fe38396df1b83827f5dd578112765aa64e
-DIST streaming-commons-0.1.15.4.tar.gz 90218 BLAKE2B c4402ce5caa8dfdcad405e2e0d7bf3666b5ff6e14539794bbd75fe675343993afcca04b125d85c7abd38d7e748f8f8621a2caef07d14be76cfe77a41d2f961ba SHA512 d67548810e1ce06709f3e92345a18f60600a8754879aa348df8f8e4caae9075f155343f01dbdeccf992d20915df959a122a0cf84739efbff73e4048b8e4b60d2
-DIST streaming-commons-0.1.15.tar.gz 87625 BLAKE2B 154eb93235be6198c4e4fe9001be1ed9c88464a8365ba8555890ce582450d2f0341979b9d33007433d78bcf5a292a701656446c7abc4ca817fecc4036dbf9e48 SHA512 2391e0b667f2f011b3d1b09f72f9cba41f69fb16977804465fe4cb6217c1fa2d3461d93d76e3afced283f5ea8b06c57a6ae86a108bd167ed1c9f4bc28f03b053
-DIST streaming-commons-0.1.16.tar.gz 88494 BLAKE2B 6b3a8bd03e0d362c17d28a0066696ddcf23d45dfc543599baf3bd2a81d5603396a51ea24a8cc4690272172f8373a1956c8ba2facb565f56c7239fb8fc37724f0 SHA512 8833a6aadc7b7de9f1e51ceb2c1a6f3761a26dfad9f889a147a0c9f31f14ea6eceb8a6efed30e069e97582f7f5f9eb976aeaba2e5c2e7fd7e173edc163a5f712
-EBUILD streaming-commons-0.1.12.1.ebuild 997 BLAKE2B 6f92b1c60844396079b1a8bbf2345e1acfed79c1a0b18ffa9067b51ce4bf7a3fa237b947cce5353fab73d90da368175c72a800d7f92734240a7428a7feb1305f SHA512 8349ede35637078c3d67f09e9dd7b6f5e6f470bcc97e7d782786e492d1caef0fee408917d3f4df64031e6d127694513b59c060640aa9f0730db7aff9f091a7a1
-EBUILD streaming-commons-0.1.15.4.ebuild 1008 BLAKE2B 7dd185e35cfd2c6bceb965f332af376fa48f305ac0e4869ba075c6200a9635b33547cf0ba99b7013a83e314b6af0664910684914b8958b3b3828341a7a433a95 SHA512 c1a51961f65d8011a779a14ae0cdc472d68e0b92ecb2377cd760e3887fe0d77e871bbf2d12066bb047d55390f8b83663173aee1e6188e00c27e0d5595d300c17
-EBUILD streaming-commons-0.1.15.ebuild 999 BLAKE2B ebcc9f0df830b74d98a0dce4c507b82b7662de72a54431b685a8a339aece9274b1e3d0d24193ed6a5f5d12988eee5a629d3b34a0a69b69942ff633abbbbb0f1b SHA512 3bd1396b0be185de646f4b519a7945ebb367232794d77784235532b76eab3cd40407cb9d48c32b31a61daa855848370bf240a4ce90e4dc42d34c690630854967
-EBUILD streaming-commons-0.1.16.ebuild 941 BLAKE2B 327f29697a3112397a7980967d23f2255000b7100fff06f1c39f21bd4cdc414ae617cfb8b2b59ea83202a43853c0e89cd4fde1d74fd81e94c46a8b9176f0d22b SHA512 189f263d9659df47ab6ae42524cadc47a328f9441c3044d2580216b328ede3757bd2cda6d18691ae310017a2dea8e539f94796f8385b5b65ad96b6c74e0bad05
-MISC metadata.xml 495 BLAKE2B e58395c7df1194faa39b215ffa29d87a2a7a470c353d69b31bfa1657794da262dd0fade707bcd12747dda1086cc2c1762110bfe56d4e8aeb4ef4ae300bff089a SHA512 2f78ddd3295c802977c0036fb6b5bcb35b12cad399df1108fdd199f5fe3bd3566fc15efed74e59355470cd1d94a61911ce264777342a48c411bb3c8c09fb2309
diff --git a/dev-haskell/streaming-commons/metadata.xml b/dev-haskell/streaming-commons/metadata.xml
deleted file mode 100644
index 4be5bac40765..000000000000
--- a/dev-haskell/streaming-commons/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Provides low-dependency functionality commonly needed by various streaming data libraries, such as conduit and pipes.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">fpco/streaming-commons</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/streaming-commons/streaming-commons-0.1.12.1.ebuild b/dev-haskell/streaming-commons/streaming-commons-0.1.12.1.ebuild
deleted file mode 100644
index e24e7fdfa942..000000000000
--- a/dev-haskell/streaming-commons/streaming-commons-0.1.12.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Common lower-level functions needed by various streaming data libraries"
-HOMEPAGE="https://github.com/fpco/streaming-commons"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/stm:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/async
-		>=dev-haskell/hspec-1.8
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/streaming-commons/streaming-commons-0.1.15.4.ebuild b/dev-haskell/streaming-commons/streaming-commons-0.1.15.4.ebuild
deleted file mode 100644
index 0773e6995e9d..000000000000
--- a/dev-haskell/streaming-commons/streaming-commons-0.1.15.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Common lower-level functions needed by various streaming data libraries"
-HOMEPAGE="https://github.com/fpco/streaming-commons"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/stm:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.8
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/streaming-commons/streaming-commons-0.1.15.ebuild b/dev-haskell/streaming-commons/streaming-commons-0.1.15.ebuild
deleted file mode 100644
index 231cb6200e14..000000000000
--- a/dev-haskell/streaming-commons/streaming-commons-0.1.15.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Common lower-level functions needed by various streaming data libraries"
-HOMEPAGE="https://github.com/fpco/streaming-commons"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/stm:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/async
-		>=dev-haskell/hspec-1.8
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/streaming-commons/streaming-commons-0.1.16.ebuild b/dev-haskell/streaming-commons/streaming-commons-0.1.16.ebuild
deleted file mode 100644
index b3714c6788f9..000000000000
--- a/dev-haskell/streaming-commons/streaming-commons-0.1.16.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Common lower-level functions needed by various streaming data libraries"
-HOMEPAGE="https://github.com/fpco/streaming-commons"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/network-2.4.0.0:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/stm:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.8
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/strict-0.3.2 b/dev-haskell/strict-0.3.2
new file mode 100644
index 000000000000..5823ce675fcd
--- /dev/null
+++ b/dev-haskell/strict-0.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Strict data types and String IO
+EAPI=4
+HOMEPAGE=http://www.cse.unsw.edu.au/~rl/code/strict.html
+IUSE=doc hscolour profile
+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/strict/0.3.2/strict-0.3.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=396419f10fb6fdc328accff9b10912b8
diff --git a/dev-haskell/strict/Manifest b/dev-haskell/strict/Manifest
deleted file mode 100644
index 0d6d6e368919..000000000000
--- a/dev-haskell/strict/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST strict-0.3.2.tar.gz 3948 BLAKE2B f882834fdd7b6df5c1f7c56e93f895380ff291096feb73b627ba26c7d6f41555ef6a135d7d5fdac19f28c48869f9987bd510530300f968482538c79fe1842286 SHA512 ca27ee2b557669c409c0417b2005ceb612ad95040fd4a798535cdbc83b8b7a51a36bb66bc2e7bff04b5b965313894a51910a274d67a891530ed119c831bcd686
-EBUILD strict-0.3.2.ebuild 567 BLAKE2B 6f648fe49c6879a4940f1230d000b855221cae75814b9f253d7a5dbc60f576526879bb00822c5edd4049f73eab99a2c31eb53b4cf9d9ccd69fd88f089be3bf18 SHA512 ac19fba355b74a7838f38e7d721dfc160fead0f0a88823e33e567ba7339073115a26f9d0cb5747b721b7663f63c2c184c8cf9daa8c817ced27e15a6f410a90fa
-MISC metadata.xml 434 BLAKE2B d70d7c3c439f2cc625885ce9df67be8b9d5ca520ff672868b17a9ea5406519b9763f56ba3b8a04d76b8c0f6666f5971bc5744e4364119814efd4020a0bfd3f37 SHA512 ff58eaedb8c7e7e4f4937bd5a9423827479514333bae86d9a6e7b60f957468975d7764ede2900696da478ad50ba75963018f7782f4811ab01cb78ffcc1677553
diff --git a/dev-haskell/strict/metadata.xml b/dev-haskell/strict/metadata.xml
deleted file mode 100644
index 3e475704a457..000000000000
--- a/dev-haskell/strict/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides strict versions of some standard Haskell data
-		types (pairs, Maybe and Either). It also contains strict IO
-		operations.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/strict/strict-0.3.2.ebuild b/dev-haskell/strict/strict-0.3.2.ebuild
deleted file mode 100644
index 0b3cd3a7b1e1..000000000000
--- a/dev-haskell/strict/strict-0.3.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.17.9999
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Strict data types and String IO"
-HOMEPAGE="http://www.cse.unsw.edu.au/~rl/code/strict.html"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/string-qq-0.0.2 b/dev-haskell/string-qq-0.0.2
new file mode 100644
index 000000000000..c803e36aa02e
--- /dev/null
+++ b/dev-haskell/string-qq-0.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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=QuasiQuoter for non-interpolated strings, texts and bytestrings
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/string-qq
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=public-domain
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.0.2
+SRC_URI=mirror://hackage/packages/archive/string-qq/0.0.2/string-qq-0.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0b4199ac75db586122c9c46e176ac0b5
diff --git a/dev-haskell/string-qq/Manifest b/dev-haskell/string-qq/Manifest
deleted file mode 100644
index 0a195abe4dda..000000000000
--- a/dev-haskell/string-qq/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST string-qq-0.0.2.tar.gz 1775 BLAKE2B cd1271b32323439a2f8119a56c469b724c4bf0b8f44a435696e057c7a6b5ff7b2218c8b035176563c4b19b703d7df7ea63778a21562429eaf9aade15c984a517 SHA512 3394f2e129726e5f317693cf145ab91723e9b0352a04e42eeb770e6b5bfcade2c3c8da772f61425641b7c4e48e98542cf1a7544d48cd7f67e21f930236dae9ba
-EBUILD string-qq-0.0.2.ebuild 587 BLAKE2B d3cb700c59a7706a7de5f1f0a3e20999611e418fe4dd9be1ea2c7eb91bddd79e016c386cd7cf681f5cf2543e5d1d733cd36e76fe8758d2373a865c6b5051f4a7 SHA512 083a791ee63f4b8c95171502112605c0337c09f962a4d004478ab486f1c81183c0cbf4c900dc1026d86606a67c5eeb7b4636f950e5fc61dc7d7fc094fd255f1b
-MISC metadata.xml 355 BLAKE2B de5831e0c5e64eb4c302cb3e825c1a74c9fdd0937a1b5b2402d3d902d1e11a1917579a73975566547964a21588d5f3bd24fedd8f25316540f077f3cdd195f571 SHA512 e86fa9b06d0fc63464c3c52839c4749cbbe0b39d49a90122fe65371ca804adbafa4f0c60a4d7c7ff97b430d06bbdde38a0425c2048a879e2899432a151813ee7
diff --git a/dev-haskell/string-qq/metadata.xml b/dev-haskell/string-qq/metadata.xml
deleted file mode 100644
index 7f083d78583b..000000000000
--- a/dev-haskell/string-qq/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		QuasiQuoter for non-interpolated strings, texts and bytestrings.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/string-qq/string-qq-0.0.2.ebuild b/dev-haskell/string-qq/string-qq-0.0.2.ebuild
deleted file mode 100644
index 510b18eb06e7..000000000000
--- a/dev-haskell/string-qq/string-qq-0.0.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="QuasiQuoter for non-interpolated strings, texts and bytestrings"
-HOMEPAGE="http://hackage.haskell.org/package/string-qq"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/stringable-0.1.3 b/dev-haskell/stringable-0.1.3
new file mode 100644
index 000000000000..bef979062f50
--- /dev/null
+++ b/dev-haskell/stringable-0.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/system-filepath-0.4.7:=[profile?] >=dev-haskell/text-0.11.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Stringable type class, in the spirit of Foldable and Traversable
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/stringable
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/system-filepath-0.4.7:=[profile?] >=dev-haskell/text-0.11.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.3
+SRC_URI=mirror://hackage/packages/archive/stringable/0.1.3/stringable-0.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=072cdf5071d07bc9d163e3f617c31129
diff --git a/dev-haskell/stringable/Manifest b/dev-haskell/stringable/Manifest
deleted file mode 100644
index 022ffeaf85b5..000000000000
--- a/dev-haskell/stringable/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stringable-0.1.3.tar.gz 2665 BLAKE2B c50780ce134872b3adf8adec6e3d5c80030033431330e5e76db87ae5aa15cd5897b5c7b39d8c9f3f88d138b94ff5f771ab3e1fff53730863e5e267b34891556c SHA512 f55ac3b1ef18ed9f219da7d7146d625e347d4bc6690e0daf1624692765f06950a3ef4b31a47cb519da519413b36baef2fa9074b04809ef81f9fd2aa7e5c9bfe1
-EBUILD stringable-0.1.3.ebuild 668 BLAKE2B 2bd324d61b2d4efbd19d9b1680be4551dacd2fc36eb9c1249388217e63ed0159f4d67d5b041b4896662be5e22a4805ea691c83cb761d24435a6e6e730ea30c1a SHA512 0329b3ff9dbca64ff336698a152af2942029e473a43536dfdc1f7ed6e7e55d0ba22fbf90365494f22dcade185a95614b9c40a837814c5ff6c9a590987758880b
-MISC metadata.xml 436 BLAKE2B d3043ef48370f849101db808c6ae6ba5296b6e20ab9777c32aece5f175d61fba25f9a0b97241788c8ca51d8bcaa25feee2023845fa2ab998c161efd36538e16a SHA512 83dc010dc26ee2cad5812646d73c71a03c3b6ca4b1a57206831df72f0569bfc2b857be74d4220f2b673f281daae868d5cc48b8e1a19c43370e37408a7d74632c
diff --git a/dev-haskell/stringable/metadata.xml b/dev-haskell/stringable/metadata.xml
deleted file mode 100644
index 6a22462afb29..000000000000
--- a/dev-haskell/stringable/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		'Data.Stringable' provides a type class with a set of functions for
-		converting to and from the most often used string-linke types in
-		Haskell.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/stringable/stringable-0.1.3.ebuild b/dev-haskell/stringable/stringable-0.1.3.ebuild
deleted file mode 100644
index 7dedd8bd20fa..000000000000
--- a/dev-haskell/stringable/stringable-0.1.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Stringable type class, in the spirit of Foldable and Traversable"
-HOMEPAGE="http://hackage.haskell.org/package/stringable"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/system-filepath-0.4.7:=[profile?]
-	>=dev-haskell/text-0.11.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/stringbuilder-0.4.0 b/dev-haskell/stringbuilder-0.4.0
new file mode 100644
index 000000000000..051df67882e3
--- /dev/null
+++ b/dev-haskell/stringbuilder-0.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A writer monad for multi-line string literals
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/stringbuilder
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.4.0
+SRC_URI=mirror://hackage/packages/archive/stringbuilder/0.4.0/stringbuilder-0.4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=96f1c18aee3a94996605dfba29cb6806
diff --git a/dev-haskell/stringbuilder-0.5.0 b/dev-haskell/stringbuilder-0.5.0
new file mode 100644
index 000000000000..74404d14c5e9
--- /dev/null
+++ b/dev-haskell/stringbuilder-0.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A writer monad for multi-line string literals
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/stringbuilder
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.5.0
+SRC_URI=mirror://hackage/packages/archive/stringbuilder/0.5.0/stringbuilder-0.5.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=868e811ef64fbfb77bcdcf3636aa3db0
diff --git a/dev-haskell/stringbuilder/Manifest b/dev-haskell/stringbuilder/Manifest
deleted file mode 100644
index 19c8d0357a30..000000000000
--- a/dev-haskell/stringbuilder/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST stringbuilder-0.4.0.tar.gz 1981 BLAKE2B b92d9c98fd7fd03ab07a5296b0a05acc8ae8b4ee41fe33cc07607e65a42f8cf964a7a97c0d95e0f4c483842a44ac5a58aa9f71c314171e74aca343dd80e94226 SHA512 fead3cedc1851b4b66d443eff50659328c4b5005c2095151ac848314c8eb55fe7061f725d594a792594e7ffe939eb3ef69770e79947a28549b1a4254144ab251
-DIST stringbuilder-0.5.0.tar.gz 2104 BLAKE2B 61ebdfa87153e9725620dfd01d7ee578c5dbc35ca62b1ac607a54ae5cfcce71d2afd73e273cad9eac079f2f06418895f7982998a9bab993bf8c1672953440ece SHA512 39c461a753c1e494b66021e5e277154e3f7aa642414a6848658b30b6ce5d0ca02e6ea9d946361be0ecefe948138f83cc16a5d04341f088666cc131f7a73a38c6
-EBUILD stringbuilder-0.4.0.ebuild 638 BLAKE2B 6ba7c10b3154fe3dd80496e7edc0ffd66e05eb0ce6ce4174a3aea87da0ae1a5505592cf6d49f78d866f08d7549167bdde93396f899dfbd508ff1065c4172e54b SHA512 cfe6c94c8d491aef780f2397a1f406ebddbfc366a5dbf6b5ccf3d789204035f14839e5d282e1f5a04695f9cf76e3abafbf12ba066b7b2e1c0644c09cf4c17883
-EBUILD stringbuilder-0.5.0.ebuild 634 BLAKE2B 29ba0c3afbe8d0d3d397bd1eea878d30d304e777f34616bc8e5babba40290e7f011c319524ebae94e7724282ef5a683a2d9ec553a844ec5c87d674161a9e75ea SHA512 8b13f6019ebed76ceb03cd4f7ebf982d071e55a8735cca828cf98c6ad2877cbc2b9fa66bd8789c20d856288bcd6ccc85276f64fee473e8ced0a7cd78b1d8a192
-MISC metadata.xml 342 BLAKE2B dddb3b5daca7ed39bb04c8dc431097eb2ad316b7ad6b293204cb26a36d6ea388b61356600401ba779a1fab43467453ea8b62a453892635315cb2d4ebbb9c87ff SHA512 700c7a3403b0c82bfdb2d94aa344957873cbcbf172e6958fad2a8557da9ebff87c1e2efb840e682543ae2a810034ba59daa4c28beedf7628b41c88589c376764
diff --git a/dev-haskell/stringbuilder/metadata.xml b/dev-haskell/stringbuilder/metadata.xml
deleted file mode 100644
index 7851dd538ce9..000000000000
--- a/dev-haskell/stringbuilder/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		&lt;https://github.com/sol/stringbuilder#readme&gt;
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/stringbuilder/stringbuilder-0.4.0.ebuild b/dev-haskell/stringbuilder/stringbuilder-0.4.0.ebuild
deleted file mode 100644
index e4754d925936..000000000000
--- a/dev-haskell/stringbuilder/stringbuilder-0.4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A writer monad for multi-line string literals"
-HOMEPAGE="http://hackage.haskell.org/package/stringbuilder"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/quickcheck
-		)
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/stringbuilder/stringbuilder-0.5.0.ebuild b/dev-haskell/stringbuilder/stringbuilder-0.5.0.ebuild
deleted file mode 100644
index dba2f1a0c862..000000000000
--- a/dev-haskell/stringbuilder/stringbuilder-0.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A writer monad for multi-line string literals"
-HOMEPAGE="http://hackage.haskell.org/package/stringbuilder"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/stringprep-0.1.5 b/dev-haskell/stringprep-0.1.5
new file mode 100644
index 000000000000..2caae406c166
--- /dev/null
+++ b/dev-haskell/stringprep-0.1.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ranges-0.2.2:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/text-icu-0.6:=[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=Implements the StringPrep algorithm
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/stringprep
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/ranges-0.2.2:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/text-icu-0.6:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.1.5
+SRC_URI=mirror://hackage/packages/archive/stringprep/0.1.5/stringprep-0.1.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e48eb4757d6ea0b7785d845e78102786
diff --git a/dev-haskell/stringprep-1.0.0 b/dev-haskell/stringprep-1.0.0
new file mode 100644
index 000000000000..29c765866809
--- /dev/null
+++ b/dev-haskell/stringprep-1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-0.9:=[profile?] >=dev-haskell/text-icu-0.6:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-quickcheck dev-haskell/tasty-th ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Implements the StringPrep algorithm
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/stringprep
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-0.9:=[profile?] >=dev-haskell/text-icu-0.6:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.0.0
+SRC_URI=mirror://hackage/packages/archive/stringprep/1.0.0/stringprep-1.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=112a0f90d9ad1bd02d8d4dc3843b1237
diff --git a/dev-haskell/stringprep/Manifest b/dev-haskell/stringprep/Manifest
deleted file mode 100644
index 020453d49b3f..000000000000
--- a/dev-haskell/stringprep/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST stringprep-0.1.5.tar.gz 82062 BLAKE2B 29453e17b56c1c3bc94d87ac29b78cd7c63da4227c34d0d8a2e11a8e381b976cbde71e1498a2a469fbbb330da1cf6004c57620bcf30f166e8e85989cb6ef8c86 SHA512 7899905037927ae4c7d490f56fdf5a7a051daf39324adcb0f4d9a1ad35b06f05b914f3b706ff61c77f694b654e85db7866a7cfc5c8982ccfbbbe6224874a735e
-DIST stringprep-1.0.0.tar.gz 17166 BLAKE2B 14089c667d95f8e4e91450c9990832855857e1f617f1964688adae28c044e3a5668e686eaabdd64cf7eb5cf4b0522fccd33bd3ccc012afce6fc3a25aa0a0b6e5 SHA512 0b6fc990124ccf12fe9a604b0f27a5b99a3d3a5fab7e938390fa9130ed3713cf4a7a610c1ac3b9e8f6138eb7e06a94c23f6bd9be132d1350607fe5abd010ee33
-EBUILD stringprep-0.1.5.ebuild 671 BLAKE2B 15856370952f48570b4005555c3e9acaac68d77c741e33bedd8845e0265e55ff7a2cd1b29ae2945f6d968f0cf19afb2134075cc21d62d9b68c45af2cd580dcc8 SHA512 5ef5452b5804673da8e42b0335586ef10e435c448865095310b68b536fdde2ff7ae3e1cacf55187395be5fc55c514a498643a9b7b7fd84c98b012158b9a4cfa0
-EBUILD stringprep-1.0.0.ebuild 750 BLAKE2B c2769819382c07007c5bd3ff984c008f180111352d63d4e052ba34f594c635efe5036a77b6cd01341b6c6130053ed72e76be1319084d46b3e82b20e05a3e199f SHA512 a3375f73e9d9c84e2933546650ff471e8e746cd3dc88e3f70b1c78ce4da3328b252d227978a41e9ba1970fe7fcfa2308e07d45016f8fba093a7394dec6adfdfe
-MISC metadata.xml 328 BLAKE2B 119f5715dc417bb339098a7423d1d90ca294574d0cfad34de1d55128a1320058aef520a3e298d8b80575097fdd861ccd66a0952fc626479d92250c4771038b38 SHA512 1c68c3a38c37cbfd9852978b06b03269bdb28928cdb148395663f59540e7b2807a9f3b55f3e9d52255d23b4c2fb91472a36c91d7e3d4008aec78c6aeca6d5f59
diff --git a/dev-haskell/stringprep/metadata.xml b/dev-haskell/stringprep/metadata.xml
deleted file mode 100644
index 1ef55c7236ac..000000000000
--- a/dev-haskell/stringprep/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Implements the "StringPrep" algorithm
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/stringprep/stringprep-0.1.5.ebuild b/dev-haskell/stringprep/stringprep-0.1.5.ebuild
deleted file mode 100644
index 0053ca1edf2f..000000000000
--- a/dev-haskell/stringprep/stringprep-0.1.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Implements the "StringPrep" algorithm"
-HOMEPAGE="http://hackage.haskell.org/package/stringprep"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ranges-0.2.2:=[profile?]
-		>=dev-haskell/text-0.9:=[profile?]
-		>=dev-haskell/text-icu-0.6:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/stringprep/stringprep-1.0.0.ebuild b/dev-haskell/stringprep/stringprep-1.0.0.ebuild
deleted file mode 100644
index cf5dfb0b1a7b..000000000000
--- a/dev-haskell/stringprep/stringprep-1.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Implements the "StringPrep" algorithm"
-HOMEPAGE="http://hackage.haskell.org/package/stringprep"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/text-icu-0.6:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/quickcheck
-		dev-haskell/tasty
-		dev-haskell/tasty-quickcheck
-		dev-haskell/tasty-th )
-"
diff --git a/dev-haskell/stringsearch-0.3.6.5 b/dev-haskell/stringsearch-0.3.6.5
new file mode 100644
index 000000000000..554d3fe5cfc9
--- /dev/null
+++ b/dev-haskell/stringsearch-0.3.6.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast searching, splitting and replacing of ByteStrings
+EAPI=5
+HOMEPAGE=https://bitbucket.org/dafis/stringsearch
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.3.6.5
+SRC_URI=mirror://hackage/packages/archive/stringsearch/0.3.6.5/stringsearch-0.3.6.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2699003c688d0c8f3b5509bac707176c
diff --git a/dev-haskell/stringsearch-0.3.6.6 b/dev-haskell/stringsearch-0.3.6.6
new file mode 100644
index 000000000000..2e7aad3a60b9
--- /dev/null
+++ b/dev-haskell/stringsearch-0.3.6.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast searching, splitting and replacing of ByteStrings
+EAPI=5
+HOMEPAGE=https://bitbucket.org/dafis/stringsearch
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.6.6
+SRC_URI=mirror://hackage/packages/archive/stringsearch/0.3.6.6/stringsearch-0.3.6.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e13a3bc8d99de9da9d83a3a108712c3d
diff --git a/dev-haskell/stringsearch/Manifest b/dev-haskell/stringsearch/Manifest
deleted file mode 100644
index 153ad9352a71..000000000000
--- a/dev-haskell/stringsearch/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST stringsearch-0.3.6.5.tar.gz 38994 BLAKE2B 3e20c83315f2bbff08f4117e4741e30e1f196a6329813be68f48fc0a990733bfeb852294843d210f1d50daeacf2351a76f959fd7a78053bcca0db966f76b7107 SHA512 73f41f09d589f737e79b22d62c034bb9ebb5145ba0179fd4a9885c345ff8bf296e3d2f624a888aa8cd481d3f3c90c7b8a8380e345b8e710bcc83a2c3f821cd27
-DIST stringsearch-0.3.6.6.tar.gz 39679 BLAKE2B 78302abf1f7eba7c3eff4452b0f0187b43954001d7be868ad952e6fb58b80d84b5e08b369a9721e06708d0b7fca49ee39dc2cca3a31ccf151f0ce8a5a86bd905 SHA512 a642934981318b399a7fcfbf0134d5d02d8d072591bcfed7abc57bf6474b86d6c7bc6cf11f44ace6db579a0297877850fd9049be69b61f4f9964cd72455b14e0
-EBUILD stringsearch-0.3.6.5.ebuild 569 BLAKE2B 9e3443d75c23407cc0170e1b1af4e117113f75bb223c6ad033c36817a89a6284d96ace6af2649047fc6f0ec7fa2417582a6c1a875fee8a92abaea8e618c13c94 SHA512 bce8f128a1f10838702744dc8e5fff4d3274c6787754e5ff8769997dc96f9ecd89a3eec2844d13c4c0f60efa0e3fac7454a307abf785079b10bb95426c2a2686
-EBUILD stringsearch-0.3.6.6.ebuild 681 BLAKE2B ea4728347f159ef6560e59e62823583312b2b52d5d0c40e3dd2fec6dec47c59fe467e579836c4e973cf903a2b039680543ed7aca422f2827892d9cf67a7ac31f SHA512 ab2abfc0210d2718641d22101ebbc77179988a92f533952ee561b14cacfc0da1fdeee97e459145edbfd7591a67f47b27b878fd1bd3290f388a3c13566ebb6497
-MISC metadata.xml 813 BLAKE2B 82fdc42a6a0096b932c1c3e29767faaeefaca15e67bd71a70477f47568d4d85fb911f320b84eeb0da44c4807aaf727bb6e030a6a11e0795c74b7ae9724975bb0 SHA512 abfeeef6e5cb1c21b3056d2a7ddb5127f10678f213eb3ab4444bf644b0463b5a7c7c2084c860e8882f19d6a24eb86d67bbc4de6e6eda9d68e82211ef69dd185d
diff --git a/dev-haskell/stringsearch/metadata.xml b/dev-haskell/stringsearch/metadata.xml
deleted file mode 100644
index 4ee3843e445d..000000000000
--- a/dev-haskell/stringsearch/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides several functions to quickly
-		search for substrings in strict or lazy ByteStrings.
-		It also provides functions for breaking or splitting
-		on substrings and replacing all occurrences of a
-		substring (the first in case of overlaps) with another.
-		GHC before 6.10 are no longer supported, other compilers
-		only if they support BangPatterns. If you need it to
-		work with other compilers, send a feature request.
-	</longdescription>
-	<upstream>
-		<remote-id type="bitbucket">dafis/stringsearch</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/stringsearch/stringsearch-0.3.6.5.ebuild b/dev-haskell/stringsearch/stringsearch-0.3.6.5.ebuild
deleted file mode 100644
index fa1b573d0057..000000000000
--- a/dev-haskell/stringsearch/stringsearch-0.3.6.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Fast searching, splitting and replacing of ByteStrings"
-HOMEPAGE="https://bitbucket.org/dafis/stringsearch"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/stringsearch/stringsearch-0.3.6.6.ebuild b/dev-haskell/stringsearch/stringsearch-0.3.6.6.ebuild
deleted file mode 100644
index dc5bdd7f4b92..000000000000
--- a/dev-haskell/stringsearch/stringsearch-0.3.6.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -base3,+base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Fast searching, splitting and replacing of ByteStrings"
-HOMEPAGE="https://bitbucket.org/dafis/stringsearch"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-base3 \
-		--flag=base4
-}
diff --git a/dev-haskell/syb-0.3.7 b/dev-haskell/syb-0.3.7
new file mode 100644
index 000000000000..d1e2320981de
--- /dev/null
+++ b/dev-haskell/syb-0.3.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.1 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=64e438ef5ac150d4d9da60334f4ffdac
diff --git a/dev-haskell/syb-0.4.3 b/dev-haskell/syb-0.4.3
new file mode 100644
index 000000000000..db6086ac08e1
--- /dev/null
+++ b/dev-haskell/syb-0.4.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/mtl ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=38a2faa17f1cf5a0a936bbee15c9b673
diff --git a/dev-haskell/syb-0.4.4 b/dev-haskell/syb-0.4.4
new file mode 100644
index 000000000000..ec2c7623998a
--- /dev/null
+++ b/dev-haskell/syb-0.4.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/mtl ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=024754c7c78e0f45cb3fc2d4c3c8d36d
diff --git a/dev-haskell/syb-0.5.1 b/dev-haskell/syb-0.5.1
new file mode 100644
index 000000000000..0e50e4468a51
--- /dev/null
+++ b/dev-haskell/syb-0.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/mtl ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6a59f75876167e9eae2651d470a80987
diff --git a/dev-haskell/syb-with-class-0.6.1.6 b/dev-haskell/syb-with-class-0.6.1.6
new file mode 100644
index 000000000000..6378422aa3cb
--- /dev/null
+++ b/dev-haskell/syb-with-class-0.6.1.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Scrap Your Boilerplate With Class
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/syb-with-class
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.6.1.6
+SRC_URI=mirror://hackage/packages/archive/syb-with-class/0.6.1.6/syb-with-class-0.6.1.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e913c265203f65014b2610a73506df14
diff --git a/dev-haskell/syb-with-class-0.6.1.7 b/dev-haskell/syb-with-class-0.6.1.7
new file mode 100644
index 000000000000..e5cfdee626df
--- /dev/null
+++ b/dev-haskell/syb-with-class-0.6.1.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Scrap Your Boilerplate With Class
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/syb-with-class
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.6.1.7
+SRC_URI=mirror://hackage/packages/archive/syb-with-class/0.6.1.7/syb-with-class-0.6.1.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ea02dcd75daf2255033a4ad4af75ff9a
diff --git a/dev-haskell/syb-with-class/Manifest b/dev-haskell/syb-with-class/Manifest
deleted file mode 100644
index 38bae3106d0a..000000000000
--- a/dev-haskell/syb-with-class/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST syb-with-class-0.6.1.6.tar.gz 12515 BLAKE2B 77e91af42166d35fddd142244d85c645cfbc1acb889fd2023d7d1cc75970e26742385a6a2a1b4411eb3f550f37b5f5f4ede4d0aeed2ff02ff4a693bf3fdca164 SHA512 4d022ace484780fab85f604d216856e9d122f9a0c98f5d14059866162e2a81f4c8366b0fb2df535089e7cdc76411c2be6b97edee90f27849d3809c7a994a9d02
-DIST syb-with-class-0.6.1.7.tar.gz 12524 BLAKE2B c38ac8d3282a4851be2d65c8f6bcbe7684009ed8a935080047af59bd6f21084b5e61692761d81c0ea0d1f8b7f2e1f38c3957d1cab2d4c258f84724c75f4b1ca4 SHA512 fadb4ff87b7cb1c8332551e62332254d241f50b2a93e5ca71bf1469fd6a7d50399571138810f311b127f0813260687c55543a42384335a44dffeb3f5e29ef1a1
-EBUILD syb-with-class-0.6.1.6.ebuild 554 BLAKE2B 1639095972062490435bc6cdbc8a6a0caa467eee183b2a1ee38580fa974a34692519e54862473cc40631a3f5073b4d4e6f878c438cb8256d6d2c1edf72d6dd8c SHA512 6de3026dad57d3f0e30db277b6e6a3e2ea93330fdb6ceaab749f297e514c60822390eef5426c1f5cbb69814ccf2637e8caad7b938acdd64ff2592e8240e5e911
-EBUILD syb-with-class-0.6.1.7.ebuild 552 BLAKE2B 914895ddf750c527fab778e28ff969ee4ce577aece89878fdb76492681717d27460c7ce40336a9d94f459333ffa4bf0c261f2ac05305ec0336c9308d4f3f4a3f SHA512 c9e7c8407be3ed30743d52dee46bb54c7c65b4a0c895f589eafbef139bcadbffcf6f3219ede2c6b7182dced9fdc819e3af50cce773066916933b4e0ef92a182b
-MISC metadata.xml 400 BLAKE2B 6008bc250770a949e0074a7830d8451a38e7ee075295a4d2a15bb0c3b4cde670f25e5b5a91580002d19e6211b85ce06d04a650385bae6681cab3587dfbdef9d0 SHA512 db2b6e1778e715f28b5244b8d15e654692e619c2ddf674ad93dd54caaa79a3a87917b1a7ec4c0bff5af44c89faa7f0be03797cf33fad6f4fcd4279b397b6758c
diff --git a/dev-haskell/syb-with-class/metadata.xml b/dev-haskell/syb-with-class/metadata.xml
deleted file mode 100644
index 76c589281b27..000000000000
--- a/dev-haskell/syb-with-class/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Classes, and Template Haskell code to generate instances, for the
-		Scrap Your Boilerplate With Class system.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/syb-with-class/syb-with-class-0.6.1.6.ebuild b/dev-haskell/syb-with-class/syb-with-class-0.6.1.6.ebuild
deleted file mode 100644
index 9e97dfae228a..000000000000
--- a/dev-haskell/syb-with-class/syb-with-class-0.6.1.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Scrap Your Boilerplate With Class"
-HOMEPAGE="http://hackage.haskell.org/package/syb-with-class"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/syb-with-class/syb-with-class-0.6.1.7.ebuild b/dev-haskell/syb-with-class/syb-with-class-0.6.1.7.ebuild
deleted file mode 100644
index 04e62aecb0f4..000000000000
--- a/dev-haskell/syb-with-class/syb-with-class-0.6.1.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Scrap Your Boilerplate With Class"
-HOMEPAGE="http://hackage.haskell.org/package/syb-with-class"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/syb/Manifest b/dev-haskell/syb/Manifest
deleted file mode 100644
index 02586c2d4724..000000000000
--- a/dev-haskell/syb/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX syb-0.4.3-ghc-7.10.patch 3685 BLAKE2B 6efb3319b7feb2acf3d9626a56b3fa821dec4916685b4cc4a376bd16d1f5d8459ae54b675adcd8da01ba61ec9ad5f10a5b5ce624efc72b91f87deaf12c16389a SHA512 2518320db73ae06c160fa77516ccc66bc156b480d4fb723ae4927ad18704d60522f55d0d255154829bff8c637054fce54d7e9e15757cd1a78be4b75c0ad8c19a
-DIST syb-0.3.7.tar.gz 39091 BLAKE2B 46ef45c632a89b80f403b632583478d1f9468dbb311380c9f6a02e55b9692938ec2f7c8c4e59609cbd08b0112f3d2a6165a392b1d65193b785f4f697390d87b5 SHA512 ede12bc5db250430932c65f764388d356d687059158aa94b2da7b9618b4cc610e5f945a691b86fd9dce6e9761eb1ef4207abdf9b2aa3a4c3ac01d57fb18818ff
-DIST syb-0.4.3.tar.gz 38860 BLAKE2B a4587047b9fbf9a33b9f9e1c94afd4abe87e4f284d91255c9e02863cd1efed9bf4e59fe8441e433adf0aaf81556cfdba2988746f37b6b672d604749f57669035 SHA512 d351eb020dba7c257904b81504cacc233b33864bcc54aad48267db313755243206a2dc4a89d473062d5ca4eff09dd57f0610e99f944717a8e3bbd724775fd6b3
-DIST syb-0.4.4.tar.gz 39215 BLAKE2B 5ef855075b5516ec1c3504ce54a997877873dcb32d6b3050eb7768ded0e10e6b4ef1f652bcb332d3823afb04ffd05724baa9d0e32cdbc271528467e0666d2b93 SHA512 fc916ec2ad4c76c7aa979f2b5040df5088b0a75b1e33e3b2325e2212b59d22db5773fe0803beb1b8b2e0a0a292f5620bcb23201dce8b790b8f4fa2252bd64a33
-DIST syb-0.5.1.tar.gz 39469 BLAKE2B d69ba87a733bc81eb8e4cb24c5a2b6ac3f90a67f6da576f7fdb3a9191b7301805af8029847a578b3750fd672ae238697f7c5e91d34ca4ac1f7046684dc5f4184 SHA512 087bf9a51abe0a09edc0b920f9b91733016701d6ed24184d8f82da87d3b1912b96af4845a3b0ddb41868efede48f90b52d1940633cf0d366559e176cc7771257
-EBUILD syb-0.3.7.ebuild 549 BLAKE2B f16dc3bd54779fd9971f29c6fe3b602e9aa39a64a4c1c503d831161f23441c55e5f09c3bc57a8e8c98bd5d730e27c8e937f9a61f14e76c2339c91ac94c70173c SHA512 91b66cadd44ae7c6bc95e10d680506ffe3a7e1f42f8414143740d8f5f7cd86f42066e46e4b29d077d72970ba3cf8ae17ae22792c20159d651c76b8d20c176095
-EBUILD syb-0.4.3.ebuild 704 BLAKE2B 4c87eaa8f2bdd09a03c73b9b0211efef3edd06074cb6ec3b6275386f1fecea3915d91356e4306ffbf901be5446f5d8786a66812a9ad20f3ba57f5e91f7ecdbd2 SHA512 78371ecfd69ef7d92d7c107b917c84ee67499cd24365150b77067c7ab922a58c0113646a84b53c9ab20b6c39421aeb251248f5a8e2ce6c1708a017eede348bbd
-EBUILD syb-0.4.4.ebuild 707 BLAKE2B 5df85cdf9150de97fc8fd11ae984921755dad270406871b482ea86174382bcd5a54d8a5079d788aa3b218caf0a9bac6e6dbc350ddd2fd2de4777e17790609daa SHA512 9b43a1a991ef1c2eade2ff0d991680e9b94057c663fb11a4eaf36b39d051ccdd596271a6dedf4c983b5252fabe2cacb3e4320448d3a8520b912fa8bf4473e912
-EBUILD syb-0.5.1.ebuild 709 BLAKE2B ac5c4a1a93c91652bca50c3a7b440bdf4de6a0f682cbcad63f70cee6f2f1908349201d641af4492fcfa06b98445abdfdb2f239e4d6a54943b9c60c3b95ff1b6f SHA512 008138d90ea62f84d255f51c1a75f968c51c54080dc04f1843d916f6ac215168ff90dc7f1e94a74ce8b0a732cd2f956faad56c173d32ebb40acf120859fe5b89
-MISC metadata.xml 617 BLAKE2B 18bef7e9fbae8a7be42c015ba247798e8d905e6aed2597109e48b7332608bbf96af3160fd25396142528a61c0d96d394b6186d934d90b2c2199f0acf14f3ce31 SHA512 0c378d2efe45acd20b0437dde07ba0988234120d132aa6764ec35e585149313739748ae25f5b05deee78722b21f8e861ebbc22f96dc800ee8205c74a32be96ff
diff --git a/dev-haskell/syb/files/syb-0.4.3-ghc-7.10.patch b/dev-haskell/syb/files/syb-0.4.3-ghc-7.10.patch
deleted file mode 100644
index 2773bdc5a631..000000000000
--- a/dev-haskell/syb/files/syb-0.4.3-ghc-7.10.patch
+++ /dev/null
@@ -1,152 +0,0 @@
---- syb-0.4.3-orig/tests/XML.hs	2014-12-31 19:40:41.000000000 +1100
-+++ syb-0.4.3/tests/XML.hs	2015-01-02 12:47:10.082782760 +1100
-@@ -13,6 +13,7 @@
- 

- import Test.HUnit

- 

-+import Control.Applicative (Alternative(..), Applicative(..))

- import Control.Monad

- import Data.Maybe

- import Data.Generics

-@@ -157,6 +158,17 @@
-                         else Just (tail x, head x)

-                )

- 

-+instance Functor ReadX where

-+  fmap  = liftM

-+

-+instance Applicative ReadX where

-+  pure  = return

-+  (<*>) = ap

-+

-+instance Alternative ReadX where

-+  (<|>) = mplus

-+  empty = mzero

-+

- -- ReadX is a monad!

- instance Monad ReadX where

-   return x = ReadX (\y -> Just (y,x))

---- syb-0.4.3-orig/tests/Perm.hs	2014-12-31 19:40:41.000000000 +1100
-+++ syb-0.4.3/tests/Perm.hs	2015-01-02 12:47:02.751422866 +1100
-@@ -11,6 +11,7 @@
- 

- import Test.HUnit

- 

-+import Control.Applicative (Alternative(..), Applicative(..))

- import Control.Monad

- import Data.Generics

- 

-@@ -44,6 +45,17 @@
-                         else Just (tail x, head x)

-                )

- 

-+instance Functor ReadT where

-+  fmap  = liftM

-+

-+instance Applicative ReadT where

-+  pure  = return

-+  (<*>) = ap

-+

-+instance Alternative ReadT where

-+  (<|>) = mplus

-+  empty = mzero

-+

- -- ReadT is a monad!

- instance Monad ReadT where

-   return x = ReadT (\y -> Just (y,x))

---- syb-0.4.3-orig/tests/Bits.hs	2014-12-31 19:40:41.000000000 +1100
-+++ syb-0.4.3/tests/Bits.hs	2015-01-02 12:46:37.842839944 +1100
-@@ -39,6 +39,7 @@
- import Data.Generics

- import Data.Char

- import Data.Maybe

-+import Control.Applicative (Alternative(..), Applicative(..))

- import Control.Monad

- import CompanyDatatypes

- 

-@@ -129,6 +130,16 @@
- data ReadB a = ReadB (Bin -> (Maybe a, Bin))

- unReadB (ReadB f) = f

- 

-+instance Functor ReadB where

-+  fmap  = liftM

-+

-+instance Applicative ReadB where

-+  pure  = return

-+  (<*>) = ap

-+

-+instance Alternative ReadB where

-+  (<|>) = mplus

-+  empty = mzero

- 

- -- It's a monad.

- instance Monad ReadB where

---- syb-0.4.3-orig/tests/Encode.hs	2014-12-31 19:40:41.000000000 +1100
-+++ syb-0.4.3/tests/Encode.hs	2015-01-02 12:51:48.500949407 +1100
-@@ -6,6 +6,8 @@
- 

- module Encode () where

- 

-+import Control.Applicative (Applicative(..))

-+import Control.Monad (ap, liftM)

- import Data.Generics

- 

- data Bit = Zero | One

-@@ -62,6 +64,11 @@
- -- Sec. 3.3 cont'd

- 

- data EncM a   -- The encoder monad

-+instance Functor EncM where

-+  fmap  = liftM

-+instance Applicative EncM where

-+  pure  = return

-+  (<*>) = ap

- instance Monad EncM

-  where

-   return  = undefined

---- syb-0.4.3-orig/tests/GRead2.hs	2014-12-31 19:40:41.000000000 +1100
-+++ syb-0.4.3/tests/GRead2.hs	2015-01-02 12:51:27.524567019 +1100
-@@ -10,6 +10,8 @@
- 

- -}

- 

-+import Control.Applicative (Applicative(..))

-+import Control.Monad (ap, liftM)

- import Data.Generics

- 

- gread :: Data a => String -> Maybe a

-@@ -18,6 +20,13 @@
- -- The decoder monad

- newtype DecM a = D (String -> Maybe (String, a))

- 

-+instance Functor DecM where

-+    fmap  = liftM

-+

-+instance Applicative DecM where

-+    pure  = return

-+    (<*>) = ap

-+

- instance Monad DecM where

-     return a = D (\s -> Just (s,a))

-     (D m) >>= k = D (\s ->

---- syb-0.4.3-orig/tests/Ext1.hs	2014-12-31 19:40:41.000000000 +1100
-+++ syb-0.4.3/tests/Ext1.hs	2015-01-02 10:30:39.396517984 +1100
-@@ -1,4 +1,5 @@
- {-# OPTIONS -fglasgow-exts #-}

-+{-# LANGUAGE CPP #-}

- 

- module Ext1 (tests) where

- 

-@@ -11,8 +12,11 @@
- import Test.HUnit

- 

- import Data.Generics

-+#if MIN_VERSION_base(4,8,0)

-+import GHC.Base hiding(foldr)

-+#else

- import GHC.Base

--

-+#endif

- 

- -- Unsafe coerce

- unsafeCoerce :: a -> b

diff --git a/dev-haskell/syb/metadata.xml b/dev-haskell/syb/metadata.xml
deleted file mode 100644
index 61d88fcab472..000000000000
--- a/dev-haskell/syb/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package contains the generics system described in the
-		"Scrap Your Boilerplate" papers (see http://www.cs.uu.nl/wiki/GenericProgramming/SYB).
-		It defines the 'Data' class of types permitting folding and unfolding
-		of constructor applications, instances of this class for primitive
-		types, and a variety of traversals.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/syb/syb-0.3.7.ebuild b/dev-haskell/syb/syb-0.3.7.ebuild
deleted file mode 100644
index 9a3a065b66ca..000000000000
--- a/dev-haskell/syb/syb-0.3.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# PDEPEND of ghc, so restrict depgraph
-CABAL_FEATURES="lib profile haddock hoogle hscolour nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Scrap Your Boilerplate"
-HOMEPAGE="http://www.cs.uu.nl/wiki/GenericProgramming/SYB"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}"
diff --git a/dev-haskell/syb/syb-0.4.3.ebuild b/dev-haskell/syb/syb-0.4.3.ebuild
deleted file mode 100644
index de97eb71252a..000000000000
--- a/dev-haskell/syb/syb-0.4.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit base haskell-cabal
-
-DESCRIPTION="Scrap Your Boilerplate"
-HOMEPAGE="http://www.cs.uu.nl/wiki/GenericProgramming/SYB"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/mtl )
-"
-
-PATCHES=("${FILESDIR}/${PN}-0.4.3-ghc-7.10.patch")
diff --git a/dev-haskell/syb/syb-0.4.4.ebuild b/dev-haskell/syb/syb-0.4.4.ebuild
deleted file mode 100644
index b72fbd21db5d..000000000000
--- a/dev-haskell/syb/syb-0.4.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Scrap Your Boilerplate"
-HOMEPAGE="http://www.cs.uu.nl/wiki/GenericProgramming/SYB"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux"
-IUSE=""
-
-RESTRICT=test # ghc-7.10 slightly changed namespacing
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/mtl )
-"
diff --git a/dev-haskell/syb/syb-0.5.1.ebuild b/dev-haskell/syb/syb-0.5.1.ebuild
deleted file mode 100644
index c9c285003a06..000000000000
--- a/dev-haskell/syb/syb-0.5.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Scrap Your Boilerplate"
-HOMEPAGE="http://www.cs.uu.nl/wiki/GenericProgramming/SYB"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux"
-IUSE=""
-
-RESTRICT=test # ghc-7.10 slightly changed namespacing
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/mtl )
-"
diff --git a/dev-haskell/system-fileio-0.3.16.3 b/dev-haskell/system-fileio-0.3.16.3
new file mode 100644
index 000000000000..ba2e54636906
--- /dev/null
+++ b/dev-haskell/system-fileio-0.3.16.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/system-filepath-0.3.1:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.7.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5 >=dev-haskell/temporary-1.1 <dev-haskell/temporary-2.0 >=dev-haskell/transformers-0.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Consistent filesystem interaction across GHC versions (deprecated)
+EAPI=5
+HOMEPAGE=https://github.com/fpco/haskell-filesystem
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/system-filepath-0.3.1:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.7.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.16.3
+SRC_URI=mirror://hackage/packages/archive/system-fileio/0.3.16.3/system-fileio-0.3.16.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=564c69896933bdffb24ae5640e24a517
diff --git a/dev-haskell/system-fileio/Manifest b/dev-haskell/system-fileio/Manifest
deleted file mode 100644
index 2aaaea0b08ec..000000000000
--- a/dev-haskell/system-fileio/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST system-fileio-0.3.16.3.tar.gz 15296 BLAKE2B 18a48c74794f9b2fbe33a181ce007984fdfab61202832a1bab395a3b3c1ba25aa5f45649f2b33e7608d422ad92a42719e6997ed9ab3ca4370e055d366476d779 SHA512 74ee4028caa77194120d66316677cc0f184fd4af5c4feaa7d713145b97dab8bcebc2f4b971464f9a68f8e304021d0fe5c52272bb282db0925559ff0ff6937842
-EBUILD system-fileio-0.3.16.3.ebuild 869 BLAKE2B becbce34a36b8ad974d2c6d878e7251d92f791aaa400440df7c0c9379aba2e4b8189403c02b68d7385dcb232860189d03588e8410aad907ede8d66f2e7721273 SHA512 83cc19033f9bf9a0fdc35b159eda86419f39eaa5bc7745c1db49aed0e6844b9bb93eb194d68e3fa6bce4b432437dc6cb7267c59df998d2b341fdc9ca8b47f09c
-MISC metadata.xml 757 BLAKE2B bc8189d57e01933bede97c622425c894858e26f5a51456c17f37f2f313edb5c1ab6ea0418e3f9dbc07a73740ba739590ba5e3939931e522746e6ddb66a34addb SHA512 f54a873966d7476a2bd24095b2f83a2d5f3f80d93758050543f648ba85a578070891028db294881ce3497663e23d70d816246d72e2c10310c6b7f693728c3ace
diff --git a/dev-haskell/system-fileio/metadata.xml b/dev-haskell/system-fileio/metadata.xml
deleted file mode 100644
index b1faa3826194..000000000000
--- a/dev-haskell/system-fileio/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This is a small wrapper around the \"directory\", \"unix\", and \"Win32\"
-		packages, for use with \"system-filepath\". It provides a consistent API
-		to the various versions of these packages distributed with different
-		versions of GHC.
-		
-		In particular, this library supports working with POSIX files that have
-		paths which can't be decoded in the current locale encoding.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">fpco/haskell-filesystem</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/system-fileio/system-fileio-0.3.16.3.ebuild b/dev-haskell/system-fileio/system-fileio-0.3.16.3.ebuild
deleted file mode 100644
index 808a5bd88c44..000000000000
--- a/dev-haskell/system-fileio/system-fileio-0.3.16.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Consistent filesystem interaction across GHC versions (deprecated)"
-HOMEPAGE="https://github.com/fpco/haskell-filesystem"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/system-filepath-0.3.1:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	>=dev-haskell/text-0.7.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
-		>=dev-haskell/temporary-1.1 <dev-haskell/temporary-2.0
-		>=dev-haskell/transformers-0.2 )
-"
diff --git a/dev-haskell/system-filepath-0.4.13.4 b/dev-haskell/system-filepath-0.4.13.4
new file mode 100644
index 000000000000..32ea28895b5f
--- /dev/null
+++ b/dev-haskell/system-filepath-0.4.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-0.11.0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5 >=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=High-level, byte-based file and directory path manipulations (deprecated)
+EAPI=5
+HOMEPAGE=https://github.com/fpco/haskell-filesystem
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/text-0.11.0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.13.4
+SRC_URI=mirror://hackage/packages/archive/system-filepath/0.4.13.4/system-filepath-0.4.13.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c8cf9fd859cb28550b6d9efaff757a5c
diff --git a/dev-haskell/system-filepath-0.4.8-r1 b/dev-haskell/system-filepath-0.4.8-r1
new file mode 100644
index 000000000000..ee683de67376
--- /dev/null
+++ b/dev-haskell/system-filepath-0.4.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/text-0.7.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=High-level, byte-based file and directory path manipulations
+EAPI=5
+HOMEPAGE=https://john-millikin.com/software/haskell-filesystem/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/text-0.7.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.8
+SRC_URI=mirror://hackage/packages/archive/system-filepath/0.4.8/system-filepath-0.4.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b3f7ccfad3307476407f4a32cafb05d9
diff --git a/dev-haskell/system-filepath/Manifest b/dev-haskell/system-filepath/Manifest
deleted file mode 100644
index 0ca872eee243..000000000000
--- a/dev-haskell/system-filepath/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST system-filepath-0.4.13.4.tar.gz 16590 BLAKE2B de9203bb34bb885a9b08fa7fa3f5ac977698fd9edf6af9ebb4db512e04ea352d1770ce1ea75f80da546dac707d4627d940f176177eac497b74d47f7e5dc07696 SHA512 81df3ed7bee9ae8b568533361d1b6574cc26c24218922005f03d70828624b6fd279342753c571921c62f69b6dadce4eb6c88cf4ef5cb76c536c5113c37f5cc38
-DIST system-filepath-0.4.8.tar.gz 14497 BLAKE2B 4e61d45f384043da31b32b64eaa522274da66801c13bd81370cdd777b18861b2812e297766252acae43aac36e7bcf82b53061609d9f457853d8c1730b8591edc SHA512 ee23a468186f1e709ec8b39d3b6855038a9f5a7fa4b37b37407b8dbed7668ddb4efe21e877a51b94b20bc3d9a59dd9a525b7378783ac9a0c7a4183ba615b01be
-EBUILD system-filepath-0.4.13.4.ebuild 793 BLAKE2B fa889cc00510dde31e81bf837b4d8bd81d0af24d02273c9186d3d85061e1c82e1b372bf314a73c8afa82569236bafd91e4dd66ce9464d1fac2a23d7fbc0a9ef8 SHA512 0cac52fa99040d8bd45cd2245dad26c51b5c7e9f0d6fd3f20ae066ffda22e67d0890480ebe00e500f2fc5e64708cf4a4be6999456c837046f3448c6060b69428
-EBUILD system-filepath-0.4.8-r1.ebuild 752 BLAKE2B d7ad96ffe5f78fce880ab7f37cc32a34fb296fae0cdda0bc1eff6033c42f55efe41117cac2e52b7a2671a12a4280db6cc96e9f81ecf275a992bd8aa8c63080ea SHA512 a3388a0e0d4c765a0b2d8d8cbe4fe6d6c8b8a0337e723d4f51120f5a1273ce23747537fabef2361bc117debf1177f626e48223859b2fe224dfe6770a75fc6434
-MISC metadata.xml 439 BLAKE2B 4862fbaedc30b3a4520e630d113066e30c1233392789b97d0697891b8f4985c8679efed8dc515b8839126be02b3a3d17a702e4b6f2faaf01ac012b335286565d SHA512 85d9affd4354d2c9409400e6f9213b0e81c74ea4388b39c8893f588fdb3215016f0f3fc9ecb751bf45ebd8f3582b0327a25fc3cf92276b1a86e9c5479059a073
diff --git a/dev-haskell/system-filepath/metadata.xml b/dev-haskell/system-filepath/metadata.xml
deleted file mode 100644
index ffc4e58c8540..000000000000
--- a/dev-haskell/system-filepath/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		High-level, byte-based file and directory path manipulations
-	</longdescription>
-	<upstream>
-		<remote-id type="github">fpco/haskell-filesystem</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/system-filepath/system-filepath-0.4.13.4.ebuild b/dev-haskell/system-filepath/system-filepath-0.4.13.4.ebuild
deleted file mode 100644
index 3d0d0019fec0..000000000000
--- a/dev-haskell/system-filepath/system-filepath-0.4.13.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="High-level, byte-based file and directory path manipulations (deprecated)"
-HOMEPAGE="https://github.com/fpco/haskell-filesystem"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.11.0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/system-filepath/system-filepath-0.4.8-r1.ebuild b/dev-haskell/system-filepath/system-filepath-0.4.8-r1.ebuild
deleted file mode 100644
index bc94e91e535b..000000000000
--- a/dev-haskell/system-filepath/system-filepath-0.4.8-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="High-level, byte-based file and directory path manipulations"
-HOMEPAGE="https://john-millikin.com/software/haskell-filesystem/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.7.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'deepseq >= 1.1 && < 1.4' 'deepseq >= 1.1' \
-		'text >= 0.7.1 && < 0.12' 'text >= 0.7.1'
-}
diff --git a/dev-haskell/system-posix-redirect-1.1.0.1 b/dev-haskell/system-posix-redirect-1.1.0.1
new file mode 100644
index 000000000000..6b5916ce8030
--- /dev/null
+++ b/dev-haskell/system-posix-redirect-1.1.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A toy module to temporarily redirect a program's stdout
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/system-posix-redirect
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.0.1
+SRC_URI=mirror://hackage/packages/archive/system-posix-redirect/1.1.0.1/system-posix-redirect-1.1.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fae9c0688610b87fe2195c932ad76751
diff --git a/dev-haskell/system-posix-redirect/Manifest b/dev-haskell/system-posix-redirect/Manifest
deleted file mode 100644
index e98c6d579aab..000000000000
--- a/dev-haskell/system-posix-redirect/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST system-posix-redirect-1.1.0.1.tar.gz 3581 BLAKE2B d93a0ec31e8ad900871469e501feccbd0094f5b8be7671f44282e26a7a2a72d7f8b74294af57d13d9658aa1fa6ec0e73e26e6e85d967254dc38ed462599edbdd SHA512 3a41668540ebff5ce706db331bb3c736895bd6a8fc11926884ff3e96622bb047c5b715468f4db81d0ac6acd15144ae9dbb71f087173244e29ba5b2a242f43c95
-EBUILD system-posix-redirect-1.1.0.1.ebuild 581 BLAKE2B 9693f26e6bce5c173f102f4b82bcffc5a63c933afe5d330671780dba29128a0b7a78bb30e50bab84431651cdb22b746db12e59f15f6c7743a2f62a2cb6d61241 SHA512 96f15e7af6823390f259a208c470c80afbebdae3ed15f84225707330adcfaa805246ecf9a311e3458864a02979ea057fcc958658cac9ae35aab1f1183fc65e79
-MISC metadata.xml 837 BLAKE2B b1949e599f2f80f86e9fdd21ca4a816fdcc80d2150465060ac7b0def4ed6d1c153c4c36999ec7fe56768350db0a2a1a90e4f633bc950fa19182494c15d03008b SHA512 ec4e74a4e8925c76c71a2f9817838771c6c2080ce11b3324637c3b7ae54c8354508f3df9da043704d87057a9092da8f7173e065c021646d3b0ae8c4010874b84
diff --git a/dev-haskell/system-posix-redirect/metadata.xml b/dev-haskell/system-posix-redirect/metadata.xml
deleted file mode 100644
index 01dac7da10fe..000000000000
--- a/dev-haskell/system-posix-redirect/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Due to the design of POSIX, it is possible to temporarily overload the
-		file descriptors corresponding to stdout and stderr to point to an
-		arbitrary pipe. It is, however, tricky to get right. This module gets
-		it right, as far as such a terrible hack can be made right. It can be
-		used to make misbehaving third-party C libraries stop spewing to
-		standard output. Warning: the module author has concluded that due to
-		lack of portability, this module should not be used in any serious
-		sytem. But, for those who like living dangerously...
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/system-posix-redirect/system-posix-redirect-1.1.0.1.ebuild b/dev-haskell/system-posix-redirect/system-posix-redirect-1.1.0.1.ebuild
deleted file mode 100644
index a728b1929b18..000000000000
--- a/dev-haskell/system-posix-redirect/system-posix-redirect-1.1.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A toy module to temporarily redirect a program's stdout"
-HOMEPAGE="http://hackage.haskell.org/package/system-posix-redirect"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/tagged-0.6.1 b/dev-haskell/tagged-0.6.1
new file mode 100644
index 000000000000..a81b7acb56f7
--- /dev/null
+++ b/dev-haskell/tagged-0.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell 98 phantom types to avoid unsafely passing dummy arguments
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/tagged
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.6.1
+SRC_URI=mirror://hackage/packages/archive/tagged/0.6.1/tagged-0.6.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cc90dd374b27c8296592cd2eeb7aabd8
diff --git a/dev-haskell/tagged-0.7.3 b/dev-haskell/tagged-0.7.3
new file mode 100644
index 000000000000..4e9093b4da9f
--- /dev/null
+++ b/dev-haskell/tagged-0.7.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell 98 phantom types to avoid unsafely passing dummy arguments
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/tagged
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.3
+SRC_URI=mirror://hackage/packages/archive/tagged/0.7.3/tagged-0.7.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4c6980755464f1b2e5727f51c96529a1
diff --git a/dev-haskell/tagged-0.8.2 b/dev-haskell/tagged-0.8.2
new file mode 100644
index 000000000000..3c0475b8ed2a
--- /dev/null
+++ b/dev-haskell/tagged-0.8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell 98 phantom types to avoid unsafely passing dummy arguments
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/tagged
+IUSE=doc hscolour profile
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.8.2
+SRC_URI=mirror://hackage/packages/archive/tagged/0.8.2/tagged-0.8.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=188c590e47c8892994ec806bc36ae0b4
diff --git a/dev-haskell/tagged-0.8.4 b/dev-haskell/tagged-0.8.4
new file mode 100644
index 000000000000..6a30a037bebd
--- /dev/null
+++ b/dev-haskell/tagged-0.8.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell 98 phantom types to avoid unsafely passing dummy arguments
+EAPI=6
+HOMEPAGE=https://github.com/ekmett/tagged
+IUSE=doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.8.4
+SRC_URI=mirror://hackage/packages/archive/tagged/0.8.4/tagged-0.8.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=355708a67cfb08c4e8b70b6c4ad82281
diff --git a/dev-haskell/tagged/Manifest b/dev-haskell/tagged/Manifest
deleted file mode 100644
index 8d67679d4305..000000000000
--- a/dev-haskell/tagged/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST tagged-0.6.1.tar.gz 5238 BLAKE2B 0b1e294948a91d65fadd532f88acaa6d039133e7a3792d3dba80c31e6829c4b9c093fcbecf70f0927a453c3e4b529ee166d5db9d81572a6d7e7aea8ef310bf84 SHA512 36dc032297214123c2f1785a71b54f6427b91a1be254e16add864475fc8853de9a3112cd205244975d9d8ff2fae71941d9ea5cb23d9c759225bae56cb338532a
-DIST tagged-0.7.3.tar.gz 5634 BLAKE2B 38c5e6864cbfd38e5105368703eab45034206a7ce654ad233347a8f81b53b8bcc1097a1e976e022845c507ce30a1bfeb8ccac2f79744c32f3dbeca82fae76440 SHA512 10122b49b7ac0a87243f7fd577fe799046099f1121c912e752d34400a0991e541a3fb9e565235b5335a65617cc7c56519f20922f47e5f1afb8cf8bc67f620b66
-DIST tagged-0.8.2.tar.gz 8957 BLAKE2B 100d00dc4a1e34eca0110e390b3e6d14365031fc14881e6bddbeb5c8765dffd939092036431a3d03a6d304ede020cf5cb5604b996d06b3c706efdfd0e87dedef SHA512 3511d7564e87b853c6514e0f89b2ec617eac175d58dc7de770987dd8f51a3747c191b7bc9ad3003edb433751940dd4c06b8e4082cf0e8c0409eda70a7c486765
-DIST tagged-0.8.4.tar.gz 10055 BLAKE2B 30cb546f6e65b7606c2630eee1ef1585d5d2ee88cdfb691ece3fd5edf64dec0f2a00311b4d489cd12094333b400853302f1761937fc8863f94ee27019db83a9f SHA512 ea11f6fa0658dbf9f40770316873b5bd5a815437cb51b39fbc223f2e26509042feaaefbee815a0f7473fb6b4bd8f8a941f27daf0bfbac08ff1a912937e7328fc
-EBUILD tagged-0.6.1.ebuild 571 BLAKE2B e21ac2e9f8aba290f69e9f4250c8902fdf6c4162c18d5e5059a72d06d04dea8d9ad2be9d1cec13a8ad6d6479767869993354609a1b3c467671368f0c423e13ea SHA512 3d567b8a68252f928559c3118f00a8345f41b56ea183a9554209ce17ec4c42eb7a584c640bf0455d7b0d25133a5f98dd0939a514e6748c4364e087ca5c3a5ec6
-EBUILD tagged-0.7.3.ebuild 591 BLAKE2B 5820dafb984117134f17dbc19ef101a933d03241bab7393f748bb61fb697db14e445784199e09824f39cdc1769fe64e1b53eb3ee4d7347d9695b9cf9621ab5c9 SHA512 1da38efa6acf70a3476331c2a6470b5ecaf2c2d863f267557b4f658cd995b9c12c3a587d9d15b3e5c8240ecde4e1c99466ff4c66277c060260fa2eb912c1f98e
-EBUILD tagged-0.8.2.ebuild 699 BLAKE2B bc307bd93d22a29cc7af831cdd24c49497f55fc1633502653d4524240c800701214214c435bc8a6bc3cb841174e8fb3607f8e9d72d7f7c5cc34c12305a67624e SHA512 6ccb88b320bb40296f1482e5f1b37a190c09fcdeb65d0e0aacadb07c6667b6c98370f809f4ffcd2f09bfe436dbbc9f6ad03d6e5659a7bd85d7955aec105b34ad
-EBUILD tagged-0.8.4.ebuild 697 BLAKE2B 0149f5c5cb9770eeb1b29c0554d35fedf1233d0cfe8be9302f25d27ce39406d6ac813fcf0923150a6f72f7a0b0b17459fa6f09e9bf245ac3f83b9fa9b73c43f7 SHA512 ba5bada286b39b6fbf75154cdb8286198de88de1ff4879df579c4d3f0e67d4a94c83c651057b2cba42ce3030fdaf54d4310bd296bcb0c50abe19fc7f3f46f35e
-MISC metadata.xml 454 BLAKE2B 3c97a837cfd34e481b2a07d5bc797648c2805ee2667d795a67992fe25be834e54403d7d062c7b33b6879011a44b8d1314e9158b218f5239946203eb07fd20c27 SHA512 016998bf11394f7fc147d93365d9b3bf7fcd688d8baec4ed9c3b072139330dd89a4a99efa04ee564622ad9aad06438688cbb9191be8bbd63d84d55b58652e9ea
diff --git a/dev-haskell/tagged/metadata.xml b/dev-haskell/tagged/metadata.xml
deleted file mode 100644
index 01417b693725..000000000000
--- a/dev-haskell/tagged/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/tagged</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/tagged/tagged-0.6.1.ebuild b/dev-haskell/tagged/tagged-0.6.1.ebuild
deleted file mode 100644
index efc60f2bdce8..000000000000
--- a/dev-haskell/tagged/tagged-0.6.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 phantom types to avoid unsafely passing dummy arguments"
-HOMEPAGE="https://github.com/ekmett/tagged"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10"
diff --git a/dev-haskell/tagged/tagged-0.7.3.ebuild b/dev-haskell/tagged/tagged-0.7.3.ebuild
deleted file mode 100644
index be72fe3adf7d..000000000000
--- a/dev-haskell/tagged/tagged-0.7.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 phantom types to avoid unsafely passing dummy arguments"
-HOMEPAGE="https://github.com/ekmett/tagged"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/tagged/tagged-0.8.2.ebuild b/dev-haskell/tagged/tagged-0.8.2.ebuild
deleted file mode 100644
index d293ba25bf03..000000000000
--- a/dev-haskell/tagged/tagged-0.8.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +deepseq
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 phantom types to avoid unsafely passing dummy arguments"
-HOMEPAGE="https://github.com/ekmett/tagged"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=deepseq
-}
diff --git a/dev-haskell/tagged/tagged-0.8.4.ebuild b/dev-haskell/tagged/tagged-0.8.4.ebuild
deleted file mode 100644
index be3f84b6fbe7..000000000000
--- a/dev-haskell/tagged/tagged-0.8.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: +deepseq
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 phantom types to avoid unsafely passing dummy arguments"
-HOMEPAGE="https://github.com/ekmett/tagged"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=deepseq
-}
diff --git a/dev-haskell/tagshare-0.0 b/dev-haskell/tagshare-0.0
new file mode 100644
index 000000000000..76bd543f62f5
--- /dev/null
+++ b/dev-haskell/tagshare-0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-lang/ghc-7.4.2:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=TagShare - explicit sharing with tags
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/tagshare
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-lang/ghc-7.4.2:=
+SLOT=0/0.0
+SRC_URI=mirror://hackage/packages/archive/tagshare/0.0/tagshare-0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=109a7e952ceaf3deebf68cbc167fbed1
diff --git a/dev-haskell/tagshare/Manifest b/dev-haskell/tagshare/Manifest
deleted file mode 100644
index 9d5793fa291b..000000000000
--- a/dev-haskell/tagshare/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tagshare-0.0.tar.gz 2127 BLAKE2B f03fa580c08c45fe26f40cea2490f29a76e88f57d0af85c77c955b420476c28ea518e7ff873e9f8074993f103c5326de897b73fe575917c3b1d1877f65742586 SHA512 872592757bba6b21846888aeec1b36cc4f7c9cd602a299bb493763bd1c38d52d84419319a6761f5019e565081aceedc343cc1e52fcf5449a78e709da6164051f
-EBUILD tagshare-0.0.ebuild 616 BLAKE2B 90c1c12104028c303743f166f7ac4a90eab99eba5a804249640d77a9de69b7b99a3e98c997e2a52afe1eafb9c3f25cf69af200c8a04cd4e14b531c4bfd6ac389 SHA512 cfa8d5f32a4501ad36f90772321ba6c3939f3276af72abe93e95bf96ac26a5e232919164cd4685928d59e9668dd7eb7fe48de3b8e4bf12b66f8fe15b440422ff
-MISC metadata.xml 553 BLAKE2B e86aadaf6b4df3772eb63c53ddd687aa57272354fbbb97df32659af47ed9218dbecdc056aacf20d39da48bbd662dd8ad2257929455068551659f264007e245d8 SHA512 e5b3d9a4b326520129f0a48553c8880eeea1ca5bfa8a43748222d2ac2ea9563d0d040d8e0785ff16e8f3aa7b65c1e86deaa7bd4c88b29df34cbedd2f04cae25d
diff --git a/dev-haskell/tagshare/metadata.xml b/dev-haskell/tagshare/metadata.xml
deleted file mode 100644
index 5938819251da..000000000000
--- a/dev-haskell/tagshare/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		TagShare supplies a monad for sharing values based on tags
-		and types. Each tag and type is bound to at most one value
-		in a dynamic map.
-		
-		The principal use of this package is to ensure that
-		constant class members or other overloaded values are
-		shared.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/tagshare/tagshare-0.0.ebuild b/dev-haskell/tagshare/tagshare-0.0.ebuild
deleted file mode 100644
index a4275b21f7f6..000000000000
--- a/dev-haskell/tagshare/tagshare-0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="TagShare - explicit sharing with tags"
-HOMEPAGE="http://hackage.haskell.org/package/tagshare"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1:=[profile?]
-		<dev-haskell/mtl-3:=[profile?]
-		>=dev-lang/ghc-7.4.2:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/tagsoup-0.13.10 b/dev-haskell/tagsoup-0.13.10
new file mode 100644
index 000000000000..48546ae44f70
--- /dev/null
+++ b/dev-haskell/tagsoup-0.13.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= download? ( dev-haskell/network:=[profile?] ) testprog? ( >=dev-haskell/quickcheck-2.4:2=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parsing and extracting information from (possibly malformed) HTML/XML documents
+EAPI=6
+HOMEPAGE=https://github.com/ndmitchell/tagsoup#readme
+IUSE=download testprog doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= download? ( dev-haskell/network:=[profile?] ) testprog? ( >=dev-haskell/quickcheck-2.4:2=[profile?] )
+SLOT=0/0.13.10
+SRC_URI=mirror://hackage/packages/archive/tagsoup/0.13.10/tagsoup-0.13.10.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=87fdfb81476d84bf6a5fbb7c1ac7290b
diff --git a/dev-haskell/tagsoup-0.13.3-r1 b/dev-haskell/tagsoup-0.13.3-r1
new file mode 100644
index 000000000000..14d692f61fe7
--- /dev/null
+++ b/dev-haskell/tagsoup-0.13.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= download? ( dev-haskell/network:=[profile?] ) testprog? ( >=dev-haskell/quickcheck-2.4:2=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parsing and extracting information from (possibly malformed) HTML/XML documents
+EAPI=5
+HOMEPAGE=http://community.haskell.org/~ndm/tagsoup/
+IUSE=download testprog doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= download? ( dev-haskell/network:=[profile?] ) testprog? ( >=dev-haskell/quickcheck-2.4:2=[profile?] )
+SLOT=0/0.13.3
+SRC_URI=mirror://hackage/packages/archive/tagsoup/0.13.3/tagsoup-0.13.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=980f52e7c9d92bbea98c7c01f161321e
diff --git a/dev-haskell/tagsoup-0.13.8 b/dev-haskell/tagsoup-0.13.8
new file mode 100644
index 000000000000..88a294647fa8
--- /dev/null
+++ b/dev-haskell/tagsoup-0.13.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= download? ( dev-haskell/network:=[profile?] ) testprog? ( >=dev-haskell/quickcheck-2.4:2=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parsing and extracting information from (possibly malformed) HTML/XML documents
+EAPI=5
+HOMEPAGE=https://github.com/ndmitchell/tagsoup#readme
+IUSE=download testprog doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= download? ( dev-haskell/network:=[profile?] ) testprog? ( >=dev-haskell/quickcheck-2.4:2=[profile?] )
+SLOT=0/0.13.8
+SRC_URI=mirror://hackage/packages/archive/tagsoup/0.13.8/tagsoup-0.13.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d222267a026cca56364c2929338021e1
diff --git a/dev-haskell/tagsoup/Manifest b/dev-haskell/tagsoup/Manifest
deleted file mode 100644
index 3b64adf8b124..000000000000
--- a/dev-haskell/tagsoup/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST tagsoup-0.13.10.tar.gz 44587 BLAKE2B cae2de2bd1edadee09033969afbc3bd7b35eb22474a4d4f54ba58eb38525d222606b3d1bf2984379cdf93c69fbc78ef4333842a1221aae69db610cf87f301e54 SHA512 96a3ebd9864279e67ccf2a0c05a37d2dbf4719eb3ef0fba753bf4bb11f9161fb895ed8f8cf86e04e790f8fbe277450379fe517c59ecc068c4586d3ced316b781
-DIST tagsoup-0.13.3.tar.gz 42279 BLAKE2B c4b394e6c60a6e4f7d6964ca63da4dbfdf26b4f14b4adb99aa7121011c1435c1f4af7235301df34d4c4e2ca5a459577a14866c518ea4e76c32771b0381e95b15 SHA512 ee6e7c2459f395facfdf9c28c0903e5279c781d8a5cd0745c2e3648c8eed7fdc84c372b271febce13b8b433ecded5cd7c97a3f169121908f23bb28c2b2f104b0
-DIST tagsoup-0.13.8.tar.gz 43676 BLAKE2B 4b275ab4921934187c62f85013b7f4d452e5412b2c1891678cfe8174395a1b8535d42f7db1686cd3ffc3949bdf4790db5483e9788b409edf9317c047f6915af8 SHA512 e05325090380950467f5327c4988c31d8c1cb9fd45668e6926c428d5ad33d589c2dc5c6b7e38c5349a980587823709b60a49c242d5ffdf76b1a58264217083c5
-EBUILD tagsoup-0.13.10.ebuild 864 BLAKE2B d73ebc68729d9c961c13638a8e94f28694c1c4c48311f0a229355076d7e25620635822fbbe5c21067bc2eea57cce1d6a63f9d8c0f9401e8e4e499d3aedcb4696 SHA512 0cd942ec855b98d90e772b7c4689e9a8bec4f2441ad1b6be4162a4a2ecb91fde275d6e156472289988e80da05e0159a7b502aa2b313732e32b290b6189e2bfbb
-EBUILD tagsoup-0.13.3-r1.ebuild 955 BLAKE2B a965b52768a74301841c2260d2937849cea632637d2efcdf49ba9989ba874b5a6ccda776334c0a8c53c3f081c3d27b838e863cb2a43c0cd73a2d893122680db2 SHA512 4b61fb7755fff0b48c22e05cf0ce3fe64559c2b2c9dfb6f4198132f89dd841ee7299fc414df5358f5020317b70aa7d1f5f0d8d4fdebdc46ea2feea4e0ead42b3
-EBUILD tagsoup-0.13.8.ebuild 872 BLAKE2B 1bd6f9b232d86bcb09268a4c560ceeb2977e3eadc5666ccd876c7439800f7e03824ec90a0c6503da44a3b84367c0717258511472d394794d3e8e989fbac8154c SHA512 17b0ccb9ce9de19c7698e5bab7ef1033077de112b015819ac0d02ad779c56d770fb91ca5b3d79290b7bde27ddfac25ba0a8dc6ef2030305a57c34f60bcfb0aca
-MISC metadata.xml 874 BLAKE2B a27d654e00c9f42b7387ff71966f7b912ff5ab7a54b268893723759c51dd9ff007181bb94a1370264bf3190485ee1991b37574b54fd84aba5c97e5ccd194b318 SHA512 d82ee0b99c454a122614f61d94c2780bc31c2ed4a2c7ab1df4d8ef59de085e34048cd31027d568ea2c08732e9efb7d9517c9943face742406eefd607a3ff302b
diff --git a/dev-haskell/tagsoup/metadata.xml b/dev-haskell/tagsoup/metadata.xml
deleted file mode 100644
index 773bfa6c800f..000000000000
--- a/dev-haskell/tagsoup/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		TagSoup is a library for parsing HTML/XML. It supports the HTML 5 specification,
-		and can be used to parse either well-formed XML, or unstructured and malformed HTML
-		from the web. The library also provides useful functions to extract information
-		from an HTML document, making it ideal for screen-scraping.
-		
-		Users should start from the "Text.HTML.TagSoup" module.
-	</longdescription>
-	<use>
-		<flag name="download">Build with Download module.</flag>
-		<flag name="testprog">Build the test program.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ndmitchell/tagsoup</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/tagsoup/tagsoup-0.13.10.ebuild b/dev-haskell/tagsoup/tagsoup-0.13.10.ebuild
deleted file mode 100644
index b41cfdf46d27..000000000000
--- a/dev-haskell/tagsoup/tagsoup-0.13.10.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parsing and extracting information from (possibly malformed) HTML/XML documents"
-HOMEPAGE="https://github.com/ndmitchell/tagsoup#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="download testprog"
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	download? ( dev-haskell/network:=[profile?] )
-	testprog? ( >=dev-haskell/quickcheck-2.4:2=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag download download) \
-		$(cabal_flag testprog testprog)
-}
diff --git a/dev-haskell/tagsoup/tagsoup-0.13.3-r1.ebuild b/dev-haskell/tagsoup/tagsoup-0.13.3-r1.ebuild
deleted file mode 100644
index da6369378d87..000000000000
--- a/dev-haskell/tagsoup/tagsoup-0.13.3-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parsing and extracting information from (possibly malformed) HTML/XML documents"
-HOMEPAGE="http://community.haskell.org/~ndm/tagsoup/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="download testprog"
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	download? ( dev-haskell/network:=[profile?] )
-	testprog? ( >=dev-haskell/quickcheck-2.4:2=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'executable tagsoup' 'executable haskell-tagsoup'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag download download) \
-		$(cabal_flag testprog testprog)
-}
diff --git a/dev-haskell/tagsoup/tagsoup-0.13.8.ebuild b/dev-haskell/tagsoup/tagsoup-0.13.8.ebuild
deleted file mode 100644
index fd8ef96044b5..000000000000
--- a/dev-haskell/tagsoup/tagsoup-0.13.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parsing and extracting information from (possibly malformed) HTML/XML documents"
-HOMEPAGE="https://github.com/ndmitchell/tagsoup#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="download testprog"
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	download? ( dev-haskell/network:=[profile?] )
-	testprog? ( >=dev-haskell/quickcheck-2.4:2=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag download download) \
-		$(cabal_flag testprog testprog)
-}
diff --git a/dev-haskell/tagstream-conduit-0.5.5.3 b/dev-haskell/tagstream-conduit-0.5.5.3
new file mode 100644
index 000000000000..47c46e617959
--- /dev/null
+++ b/dev-haskell/tagstream-conduit-0.5.5.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/blaze-builder:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/conduit-1.2:=[profile?] >=dev-haskell/conduit-extra-1.1.0:=[profile?] >=dev-haskell/data-default-0.5.0:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/xml-conduit-1.1.0.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=streamlined html tag parser
+EAPI=5
+HOMEPAGE=https://github.com/yihuang/tagstream-conduit
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/blaze-builder:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/conduit-1.2:=[profile?] >=dev-haskell/conduit-extra-1.1.0:=[profile?] >=dev-haskell/data-default-0.5.0:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/xml-conduit-1.1.0.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.5.5.3
+SRC_URI=mirror://hackage/packages/archive/tagstream-conduit/0.5.5.3/tagstream-conduit-0.5.5.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=190c69cc34922b368be1cd748e715439
diff --git a/dev-haskell/tagstream-conduit/Manifest b/dev-haskell/tagstream-conduit/Manifest
deleted file mode 100644
index 8f8dec22c3db..000000000000
--- a/dev-haskell/tagstream-conduit/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tagstream-conduit-0.5.5.3.tar.gz 9813 BLAKE2B efacae2982642e61470312a1374b522ae5d7c2d4e2b4e115c13b246a42c910604e9d51dc9bfee6163730b4dfd35bc7f87c8e3c522b36cb7a7bcafbcbb34bf392 SHA512 84625975df6c6c315011ebfd63d551b22c00927fa9add390d9e723bc104d4a7881743aaf6bceae0ff42efc6056a314baddb594fd5e344449333ea7ff6cbcf154
-EBUILD tagstream-conduit-0.5.5.3.ebuild 1046 BLAKE2B 243f0cb0ef42ab331ba72b9ccb1136c5c98970f89204e228affe759acfd2e6e3b8c7672f17ad36c77195363cd64948ce55e87ab309cdbadf7d9a1cabad827830 SHA512 3adb3b080cae62d3ae6e418c4d52f580964361c4a6cd2fe0d450e1df76475497df8083fcc8705200b40bfaa0c66a0e74f263cf172404ea0127620d7774821e96
-MISC metadata.xml 685 BLAKE2B 473260bcbc7a73a3599594a54894f430c787b830b14aeb6a6e98262e7b367a3fe24bacacfddb2ac1511c47997e5b2dd1d721a104f703808324bfad2af2896dc6 SHA512 2169c70ea9fdcf260c56a70f5fb77661d2bc9b86a7b51dc6e97ab73ffba575ff5b6ad1ce53708f2c44493286e5f6c1e02e19863b6f0e17b3dd1fb07bf8a29963
diff --git a/dev-haskell/tagstream-conduit/metadata.xml b/dev-haskell/tagstream-conduit/metadata.xml
deleted file mode 100644
index a3fa2f565a21..000000000000
--- a/dev-haskell/tagstream-conduit/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Tag-stream is a library for parsing HTML//XML to a token stream.
-		It can parse unstructured and malformed HTML from the web.
-		It also provides an Enumeratee which can parse streamline html, which means it consumes constant memory.
-		You can start from the `tests/Tests.hs` module to see what it can do.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">yihuang/tagstream-conduit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/tagstream-conduit/tagstream-conduit-0.5.5.3.ebuild b/dev-haskell/tagstream-conduit/tagstream-conduit-0.5.5.3.ebuild
deleted file mode 100644
index b20ef869eb29..000000000000
--- a/dev-haskell/tagstream-conduit/tagstream-conduit-0.5.5.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="streamlined html tag parser"
-HOMEPAGE="https://github.com/yihuang/tagstream-conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/case-insensitive:=[profile?]
-	>=dev-haskell/conduit-1.2:=[profile?]
-	>=dev-haskell/conduit-extra-1.1.0:=[profile?]
-	>=dev-haskell/data-default-0.5.0:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/xml-conduit-1.1.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/tar-0.4.0.1 b/dev-haskell/tar-0.4.0.1
new file mode 100644
index 000000000000..e4f13e242624
--- /dev/null
+++ b/dev-haskell/tar-0.4.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7173337571117c9ad857ccfc88cca0fd
diff --git a/dev-haskell/tar-0.4.2.1 b/dev-haskell/tar-0.4.2.1
new file mode 100644
index 000000000000..9dfa4ebac381
--- /dev/null
+++ b/dev-haskell/tar-0.4.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( dev-haskell/old-time >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 >=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.11 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Reading, writing and manipulating ".tar" archive files
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/tar
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86 ~x86-macos
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.6.1:=
+SLOT=0/0.4.2.1
+SRC_URI=mirror://hackage/packages/archive/tar/0.4.2.1/tar-0.4.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=eaf33ca064ad5b10ae890503b868114d
diff --git a/dev-haskell/tar-0.5.0.3 b/dev-haskell/tar-0.5.0.3
new file mode 100644
index 000000000000..cdf32eaba10d
--- /dev/null
+++ b/dev-haskell/tar-0.5.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/bytestring-builder:=[profile?] dev-haskell/old-time:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/bytestring-handle >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 >=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.12 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Reading, writing and manipulating ".tar" archive files
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/tar
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86 ~x86-macos
+LICENSE=BSD
+RDEPEND=dev-haskell/bytestring-builder:=[profile?] dev-haskell/old-time:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.5.0.3
+SRC_URI=mirror://hackage/packages/archive/tar/0.5.0.3/tar-0.5.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=789472423b112e25a97a32a03b500624
diff --git a/dev-haskell/tar/Manifest b/dev-haskell/tar/Manifest
deleted file mode 100644
index 1da381e77e89..000000000000
--- a/dev-haskell/tar/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST tar-0.4.0.1.tar.gz 17875 BLAKE2B c8de1ee0a04df64327f2464ac25b5d13c188aea0dcd84e7efa9487cce7af8bc30dd644771420773e80183a8be1503716c6fba5c8560bf27e63d17bc1202bd2b7 SHA512 7cb042f77dc70b856b4dfd5d0a06620f669f9260a84800ad27e1803ec24a50932bb3775b35a6cc91cefb30ea4cd2b453dd6566007d586327acea0edccc0dee47
-DIST tar-0.4.2.1.tar.gz 29825 BLAKE2B 0a23f3742eaf7b4958dce1669d7be40a73f58eadf6c9c9a6926c10d2b0728d2e73a1343eb5e188e12634bc0ff9aa989d654536af39619c28c0d8914f603b8afe SHA512 8684f20fd31a1d4c83fd6b74e6662eac8f8b0075856b47105c5dc72f39eee5ef3ddbf1b45d2cc730f924b385df4e74ff82a03ec45489662dac1b8b91170397f0
-DIST tar-0.5.0.3.tar.gz 38764 BLAKE2B 3761544917248f02c08e48b00c10975e622b6ef1b296fd57449edec95ba6bde509429259baae55c9a7139afa27e671e15bafcb4b93079e01d4edf7041367aa5e SHA512 f90899e3a5fe097645e29b143cbf25ccf131f8b794bfea655e5b562369e4d7d492df78e53710d3ca4776233f07ace9335242eafbd3b4ba8d0e1d4664fd24a27d
-EBUILD tar-0.4.0.1.ebuild 608 BLAKE2B 3ba68250f233530210a91c46db1c437c028b6ab2584f1d6be33fe923ee50ec58ea6c2969a16204bd4ba2226029c0b4b333dd2577d5faacad4b169ab1ed03c224 SHA512 b0d1e6c1c0d5267edc8f7ff162ba37e2baf612e83eed1523f85465c36e35e5866db5acd4e5f16db97766fdc20e2938d370d59ca08e84faa2124e67b46ed96e76
-EBUILD tar-0.4.2.1.ebuild 798 BLAKE2B bae16f533a33ec76f729c7a3e28c760006cc216523ea0bfb6fd879f0b2cec5b5bcc14945923edfe6c78018343158a0c399c1ac0ee4a10f723f87831b97f752b2 SHA512 bcc61323fa4ec6150547cda41f8b368b53c348130aad8242f0e9383f69b9cb32a44efe60ce98f70e4e4449adbf8d9b53616ca3fbfa7fb18df32c3bee5a2261a8
-EBUILD tar-0.5.0.3.ebuild 880 BLAKE2B b9f6bfb38c8b8c686cb9fb7267b7ac0df02f398e794e2e44e117d196e5928f7168262cc190190b01d1f78d7f2ae95cf3a3900c884786c5939ee99b45f4702dff SHA512 2a251e2434d0475501b58269a26c7d39350a2680a80aa562e9145b18eac2c25d2c0e1cf7a225578f232f544c4a1993aff7400bdeb734aefde4768888613f3188
-MISC metadata.xml 636 BLAKE2B a60075b9bfcde03162a7f5a8a2a22ddecc9906c2305408aa3596763685ae5a65cdbebfe7251f9fbe70348a6045183ec840678a00efe338d0354d06cf0757cba1 SHA512 2088e0e13c3cd3539be718360a10145e17083bd135749b8ed3374cb51523f53bc0bbf4a441c879f95982ef235f18243bfb49ec822ae70ea4fa8e684e96fdde20
diff --git a/dev-haskell/tar/metadata.xml b/dev-haskell/tar/metadata.xml
deleted file mode 100644
index b45e7c641aae..000000000000
--- a/dev-haskell/tar/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-	</maintainer>
-	<longdescription>
-		This library is for working with .tar@ archive files. It
-		can read and write a range of common variations of archive
-		format including V7, USTAR, POSIX and GNU formats. It provides
-		support for packing and unpacking portable archives. This
-		makes it suitable for distribution but not backup because
-		details like file ownership and exact permissions are not
-		preserved.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/tar/tar-0.4.0.1.ebuild b/dev-haskell/tar/tar-0.4.0.1.ebuild
deleted file mode 100644
index ede1fa7e35b0..000000000000
--- a/dev-haskell/tar/tar-0.4.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Reading, writing and manipulating ".tar" archive files"
-HOMEPAGE="http://hackage.haskell.org/package/tar"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/tar/tar-0.4.2.1.ebuild b/dev-haskell/tar/tar-0.4.2.1.ebuild
deleted file mode 100644
index 79a82635afba..000000000000
--- a/dev-haskell/tar/tar-0.4.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Reading, writing and manipulating \".tar\" archive files"
-HOMEPAGE="http://hackage.haskell.org/package/tar"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/old-time
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.11
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 )
-"
diff --git a/dev-haskell/tar/tar-0.5.0.3.ebuild b/dev-haskell/tar/tar-0.5.0.3.ebuild
deleted file mode 100644
index 8f37522c74fa..000000000000
--- a/dev-haskell/tar/tar-0.5.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Reading, writing and manipulating \".tar\" archive files"
-HOMEPAGE="http://hackage.haskell.org/package/tar"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~x86-macos"
-IUSE=""
-
-RDEPEND="dev-haskell/bytestring-builder:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/bytestring-handle
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 )
-"
diff --git a/dev-haskell/tasty-0.10.1.2 b/dev-haskell/tasty-0.10.1.2
new file mode 100644
index 000000000000..4434f16a2160
--- /dev/null
+++ b/dev-haskell/tasty-0.10.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.6.2:=[profile?] >=dev-haskell/async-2.0:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/optparse-applicative-0.11:=[profile?] >=dev-haskell/regex-tdfa-rc-1.1.8.2:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] >=dev-haskell/unbounded-delays-0.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Modern and extensible testing framework
+EAPI=5
+HOMEPAGE=http://documentup.com/feuerbach/tasty
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/ansi-terminal-0.6.2:=[profile?] >=dev-haskell/async-2.0:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/optparse-applicative-0.11:=[profile?] >=dev-haskell/regex-tdfa-rc-1.1.8.2:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] >=dev-haskell/unbounded-delays-0.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.10.1.2
+SRC_URI=mirror://hackage/packages/archive/tasty/0.10.1.2/tasty-0.10.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=10f1b37feccd80d594b4ada12625ccc3
diff --git a/dev-haskell/tasty-0.11.0.4 b/dev-haskell/tasty-0.11.0.4
new file mode 100644
index 000000000000..b29562bbd1dc
--- /dev/null
+++ b/dev-haskell/tasty-0.11.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.6.2:=[profile?] >=dev-haskell/async-2.0:=[profile?] >=dev-haskell/clock-0.4.4.0:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/optparse-applicative-0.11:=[profile?] >=dev-haskell/regex-tdfa-1.1.8.2:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] >=dev-haskell/unbounded-delays-0.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Modern and extensible testing framework
+EAPI=6
+HOMEPAGE=http://documentup.com/feuerbach/tasty
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/ansi-terminal-0.6.2:=[profile?] >=dev-haskell/async-2.0:=[profile?] >=dev-haskell/clock-0.4.4.0:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/optparse-applicative-0.11:=[profile?] >=dev-haskell/regex-tdfa-1.1.8.2:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] >=dev-haskell/unbounded-delays-0.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.11.0.4
+SRC_URI=mirror://hackage/packages/archive/tasty/0.11.0.4/tasty-0.11.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5a12e21a30ca8767eb6ac58ddea5fe88
diff --git a/dev-haskell/tasty-0.3.1 b/dev-haskell/tasty-0.3.1
new file mode 100644
index 000000000000..fcc1f8491f94
--- /dev/null
+++ b/dev-haskell/tasty-0.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/optparse-applicative-0.6:=[profile?] dev-haskell/regex-posix:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] >=dev-lang/ghc-6.10.4:= colors? ( dev-haskell/ansi-terminal:=[profile?] ) >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Modern and extensible testing framework
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/tasty
+IUSE=+colors doc hscolour profile
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
+LICENSE=MIT
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/optparse-applicative-0.6:=[profile?] dev-haskell/regex-posix:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] >=dev-lang/ghc-6.10.4:= colors? ( dev-haskell/ansi-terminal:=[profile?] )
+SLOT=0/0.3.1
+SRC_URI=mirror://hackage/packages/archive/tasty/0.3.1/tasty-0.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7916d694d3b29faf79471dc6653bef05
diff --git a/dev-haskell/tasty-0.5.2 b/dev-haskell/tasty-0.5.2
new file mode 100644
index 000000000000..299645f5e267
--- /dev/null
+++ b/dev-haskell/tasty-0.5.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/optparse-applicative-0.6:=[profile?] dev-haskell/regex-posix:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= colors? ( dev-haskell/ansi-terminal:=[profile?] ) >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Modern and extensible testing framework
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/tasty
+IUSE=+colors doc hscolour profile
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
+LICENSE=MIT
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/optparse-applicative-0.6:=[profile?] dev-haskell/regex-posix:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= colors? ( dev-haskell/ansi-terminal:=[profile?] )
+SLOT=0/0.5.2
+SRC_URI=mirror://hackage/packages/archive/tasty/0.5.2/tasty-0.5.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=abe9eb58a253b25a637e3bdab9cc67dd
diff --git a/dev-haskell/tasty-0.8.1.2 b/dev-haskell/tasty-0.8.1.2
new file mode 100644
index 000000000000..c9a289683468
--- /dev/null
+++ b/dev-haskell/tasty-0.8.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.6.1:=[profile?] >=dev-haskell/async-2.0:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/optparse-applicative-0.6:=[profile?] >=dev-haskell/regex-tdfa-1.2:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] >=dev-haskell/unbounded-delays-0.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Modern and extensible testing framework
+EAPI=5
+HOMEPAGE=http://documentup.com/feuerbach/tasty
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/ansi-terminal-0.6.1:=[profile?] >=dev-haskell/async-2.0:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/optparse-applicative-0.6:=[profile?] >=dev-haskell/regex-tdfa-1.2:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] >=dev-haskell/unbounded-delays-0.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.8.1.2
+SRC_URI=mirror://hackage/packages/archive/tasty/0.8.1.2/tasty-0.8.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0742b03d4dde16758d3b94cbc6de5be6
diff --git a/dev-haskell/tasty-ant-xml-1.0.1 b/dev-haskell/tasty-ant-xml-1.0.1
new file mode 100644
index 000000000000..5da8b6bf4833
--- /dev/null
+++ b/dev-haskell/tasty-ant-xml-1.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/generic-deriving-1.6.2:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] >=dev-haskell/tasty-0.10:=[profile?] <dev-haskell/tasty-0.11:=[profile?] >=dev-haskell/transformers-0.3.0.0:=[profile?] >=dev-haskell/xml-1.3.13:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Render tasty output to XML for Jenkins
+EAPI=5
+HOMEPAGE=https://github.com/ocharles/tasty-ant-xml
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/generic-deriving-1.6.2:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] >=dev-haskell/tasty-0.10:=[profile?] <dev-haskell/tasty-0.11:=[profile?] >=dev-haskell/transformers-0.3.0.0:=[profile?] >=dev-haskell/xml-1.3.13:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.1
+SRC_URI=mirror://hackage/packages/archive/tasty-ant-xml/1.0.1/tasty-ant-xml-1.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c4aec8b2a0e81cedeb03a2a27ff593da
diff --git a/dev-haskell/tasty-ant-xml-1.0.2 b/dev-haskell/tasty-ant-xml-1.0.2
new file mode 100644
index 000000000000..7af77e2d772b
--- /dev/null
+++ b/dev-haskell/tasty-ant-xml-1.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/generic-deriving-1.6.2:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] >=dev-haskell/tasty-0.10:=[profile?] <dev-haskell/tasty-0.12:=[profile?] >=dev-haskell/transformers-0.3.0.0:=[profile?] >=dev-haskell/xml-1.3.13:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Render tasty output to XML for Jenkins
+EAPI=5
+HOMEPAGE=https://github.com/ocharles/tasty-ant-xml
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/generic-deriving-1.6.2:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] >=dev-haskell/tasty-0.10:=[profile?] <dev-haskell/tasty-0.12:=[profile?] >=dev-haskell/transformers-0.3.0.0:=[profile?] >=dev-haskell/xml-1.3.13:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.2
+SRC_URI=mirror://hackage/packages/archive/tasty-ant-xml/1.0.2/tasty-ant-xml-1.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=88987e7309fa0cec07688f9f93acb625
diff --git a/dev-haskell/tasty-ant-xml/Manifest b/dev-haskell/tasty-ant-xml/Manifest
deleted file mode 100644
index 37e541c61f4a..000000000000
--- a/dev-haskell/tasty-ant-xml/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST tasty-ant-xml-1.0.1.tar.gz 3935 BLAKE2B dcbbd5e38e387f4300097dc1c4ac98d1b8493a1cddce286c71aeaea3e8f13cfeeaf2f4d1c8cc48ebcc629324e9e7fcd0496a895a888bfea524ebcc199476fd81 SHA512 37ee0731984990e2ab1a6b166c289e85a3b9f37fac2b997fdc4f85934f0108bbc5b3e12e2ae119f2456649f0eb54e8620e38bdc1fc6b95bd5b3ffe889ea763a1
-DIST tasty-ant-xml-1.0.2.tar.gz 3940 BLAKE2B 3ebe898064bd07c8d6323cdbc8bfd19540488bdb9a464f7508def40501ad9b06d205bb021070073f30d302b2c2d5bc39173e63af9fa87a7fe7801a599c7a7227 SHA512 034e6201413096f2f714287375325d7bd2e716e3cac4c8af68a294925db655ee9c5802bb5a0bc4c32778fc7e121036f56f76b892fe965376e4ded721860c302b
-EBUILD tasty-ant-xml-1.0.1.ebuild 867 BLAKE2B 6ebc5c2aa3d88d4a6cd070347066cc19d2b4b60f18eeec7d6d54d0ad162bd87c9fe45bf7482ca785d2a0b52ce6aec6d30e1b98f78eaa665b1bee117a0043b9c8 SHA512 2a247e17570ab198e3d069155ce4adba92444a9292023cb63fcf0892710841b8a37eeabb58831c9877df8808cad63dab6464f38dd299d32f8adf69bd1b092a63
-EBUILD tasty-ant-xml-1.0.2.ebuild 872 BLAKE2B 31fb3cc5919e64561062e5847638e645a058bcabb0cad09b9d6bf3be4c63d5eab5327591504f52dfc4839c6e772a0b34a0e5a2cacb531852aa13f832d5d1d158 SHA512 3cea0bf4658e8a16e644363667b5404704ccd188c354d3e13a3269f209b2972ec383084e4bd01ef938a3a796b29926c5ed478815d0578b9808fcad7832a12e86
-MISC metadata.xml 523 BLAKE2B 6dfb7f3ac098abc5d9d96adc1f67fe632fc1a281321ff963f53f59ab57032570d1bbbef2532a93cfdfc657b816987ad5636062201f4d2a9652e47509327b482c SHA512 d89e52044b50e0c98e2f871ea81100d8fc59852cf45cddce71816a5b1b2e1f9b24ea5444ce849617aae4d4d2c5387352f9df8afa67dc99d880509725ab65bec7
diff --git a/dev-haskell/tasty-ant-xml/metadata.xml b/dev-haskell/tasty-ant-xml/metadata.xml
deleted file mode 100644
index bb5cb7a5bcc1..000000000000
--- a/dev-haskell/tasty-ant-xml/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A tasty ingredient to output test results in XML, using the Ant schema. This XML can be consumed by the Jenkins continuous integration framework.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ocharles/tasty-ant-xml</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.0.1.ebuild b/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.0.1.ebuild
deleted file mode 100644
index 01f9a519f56c..000000000000
--- a/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Render tasty output to XML for Jenkins"
-HOMEPAGE="https://github.com/ocharles/tasty-ant-xml"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/generic-deriving-1.6.2:=[profile?]
-	>=dev-haskell/mtl-2.1.2:=[profile?]
-	>=dev-haskell/stm-2.4.2:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?]
-	>=dev-haskell/tasty-0.10:=[profile?] <dev-haskell/tasty-0.11:=[profile?]
-	>=dev-haskell/transformers-0.3.0.0:=[profile?]
-	>=dev-haskell/xml-1.3.13:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.0.2.ebuild b/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.0.2.ebuild
deleted file mode 100644
index 74a714dadfee..000000000000
--- a/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Render tasty output to XML for Jenkins"
-HOMEPAGE="https://github.com/ocharles/tasty-ant-xml"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/generic-deriving-1.6.2:=[profile?]
-	>=dev-haskell/mtl-2.1.2:=[profile?]
-	>=dev-haskell/stm-2.4.2:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?]
-	>=dev-haskell/tasty-0.10:=[profile?] <dev-haskell/tasty-0.12:=[profile?]
-	>=dev-haskell/transformers-0.3.0.0:=[profile?]
-	>=dev-haskell/xml-1.3.13:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/tasty-golden-2.2.2.4 b/dev-haskell/tasty-golden-2.2.2.4
new file mode 100644
index 000000000000..2a5ec96889cd
--- /dev/null
+++ b/dev-haskell/tasty-golden-2.2.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/optparse-applicative:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-0.8:=[profile?] dev-haskell/temporary-rc:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.14 test? ( dev-haskell/tasty-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Golden tests support for tasty
+EAPI=5
+HOMEPAGE=https://github.com/feuerbach/tasty-golden
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-haskell/async:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/optparse-applicative:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-0.8:=[profile?] dev-haskell/temporary-rc:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.2.2.4
+SRC_URI=mirror://hackage/packages/archive/tasty-golden/2.2.2.4/tasty-golden-2.2.2.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cfcfd6538b35ee3cb52c20e13528549e
diff --git a/dev-haskell/tasty-golden-2.3.1 b/dev-haskell/tasty-golden-2.3.1
new file mode 100644
index 000000000000..3e1c20290568
--- /dev/null
+++ b/dev-haskell/tasty-golden-2.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/optparse-applicative:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-0.8:=[profile?] dev-haskell/temporary:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( dev-haskell/tasty-hunit dev-haskell/temporary-rc ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Golden tests support for tasty
+EAPI=5
+HOMEPAGE=https://github.com/feuerbach/tasty-golden
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/async:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/optparse-applicative:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-0.8:=[profile?] dev-haskell/temporary:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/2.3.1
+SRC_URI=mirror://hackage/packages/archive/tasty-golden/2.3.1/tasty-golden-2.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1367b9ffc0fd9c92bcc82b69a4f2ba42
diff --git a/dev-haskell/tasty-golden-2.3.1.1 b/dev-haskell/tasty-golden-2.3.1.1
new file mode 100644
index 000000000000..4b817c8a7e45
--- /dev/null
+++ b/dev-haskell/tasty-golden-2.3.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/optparse-applicative:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-0.8:=[profile?] dev-haskell/temporary:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( dev-haskell/tasty-hunit dev-haskell/temporary-rc ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Golden tests support for tasty
+EAPI=6
+HOMEPAGE=https://github.com/feuerbach/tasty-golden
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-haskell/async:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/optparse-applicative:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-0.8:=[profile?] dev-haskell/temporary:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/2.3.1.1
+SRC_URI=mirror://hackage/packages/archive/tasty-golden/2.3.1.1/tasty-golden-2.3.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6ce355710cba7a1d7a8f765e648a7250
diff --git a/dev-haskell/tasty-golden/Manifest b/dev-haskell/tasty-golden/Manifest
deleted file mode 100644
index 08c64145ffd7..000000000000
--- a/dev-haskell/tasty-golden/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST tasty-golden-2.2.2.4.tar.gz 7102 BLAKE2B 110f89128827e83371eb5178831b3cf8b1054132322d5dde8da55f17d931a27236985f8629c1b3c3ac96b1d8548ef787304b586fb352db6694dc7c0185632567 SHA512 7674f0003595a9569ecf05c7b68608887f815361c9c7b234cba3a0af4eda855a1131fbafcfb15cff19c584dd4f9888e3cc001deea8ac110c648d66a9fe1c7237
-DIST tasty-golden-2.3.1.1.tar.gz 7219 BLAKE2B c6160ece4ce5a35d7acc6f390a15fd83c8a13951d5bf243576aca5c65b05b8de9f57ea6227745da57c4527bcbef093dc53c955c547bb5a1c909b195a9ee9ca77 SHA512 b7871d2ddcf7f45e0f1df52982b6370308dd0c48588318985977cb88f93f4b759b1f2bdff44e31ec86f230f04304bcee14286f62c2d2ae01a6105b8a3250e5fb
-DIST tasty-golden-2.3.1.tar.gz 7193 BLAKE2B 65086434b3ff22478c70a1e0fb32f600f4d9bd057340217d2772cfa7f0277f3972284387f7fbcdc4746b06c2615b71c62d3c6f79cf2ad0c6ef78f949573bc908 SHA512 3c729edf394db6eaa94dc606d146599ef00d1bcdbb49482a52fc248e61b3ab236000ce2779cbf59c1cc458738cff5b51a4ff5bf79384e4479db93a1ea88bb6c2
-EBUILD tasty-golden-2.2.2.4.ebuild 796 BLAKE2B 447791141ac54bb64ae45e29b7ff47552f0c4a779d014c0ba00603a678820313c10eb0d6982dedbe2f4c80705b2ab3f76336133e148891dccf4d38441be0b585 SHA512 96896930206727ad3655ab005262dd5ab3ff179ab6cb7a26a1b1ea165aea0ecd857662d4dfd371b5a23df6a592fd211b686c43beaa2ece26c477c550a5ed7427
-EBUILD tasty-golden-2.3.1.1.ebuild 825 BLAKE2B e7242f3d46b064a8697d11ab7febd10a7c80f68ec10e669bdc8aaa36f4de39cd069cb0d5ff2c24699e1a2d1491957c27e8cb31dc4f35fab8b0123ddf3d5198ed SHA512 0d74964827ce3a60e5724af9737d8a27f6b6c0756e967eb2d4e30bfba18fb39f2065d4089a96f3e72f64cea25a74c033c766b6136ca73d83da5896a6fa7c96e2
-EBUILD tasty-golden-2.3.1.ebuild 829 BLAKE2B 3c422fea29727be3816590916434b46e2777a1e5ab734d0128464a3fc462be0fdfba39cdbab5f1f27308722ba768947bb4685c9a7bd62ece0d273060ca7af5a7 SHA512 2bdccb3e67c7e0e1dea2188b14a22e764578f049ac14cf32459711f405e780973b9d9d13ada9384a52cd15bb9729cacb47b1419ea8f7a9986565c5e2f646efe2
-MISC metadata.xml 640 BLAKE2B aa14105087d6fe94c7a811214c1e1be45f1d7988aeb377a8f26bb871b0f7e703a3f70d2569994bb5e4e94666ecc6b17d9e4494c2ff1ac1253199f2cabbab2291 SHA512 c3fb7cc25b2ba825f8c1c01e247539ae511f6a59ea962cd5ce24a538fdf1e047e2e4d7ebda8d69957d40ebb0d37cd95adda1779e4d31ace7b6e6b30a5e17922f
diff --git a/dev-haskell/tasty-golden/metadata.xml b/dev-haskell/tasty-golden/metadata.xml
deleted file mode 100644
index d60b944caaf3..000000000000
--- a/dev-haskell/tasty-golden/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides support for «golden testing».
-		A golden test is an IO action that writes its result to a file.
-		To pass the test, this output file should be identical to the corresponding
-		'golden' file, which contains the correct result for the test.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">feuerbach/tasty-golden</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/tasty-golden/tasty-golden-2.2.2.4.ebuild b/dev-haskell/tasty-golden/tasty-golden-2.2.2.4.ebuild
deleted file mode 100644
index af2700e251ba..000000000000
--- a/dev-haskell/tasty-golden/tasty-golden-2.2.2.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Golden tests support for tasty"
-HOMEPAGE="https://github.com/feuerbach/tasty-golden"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/optparse-applicative:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	>=dev-haskell/tasty-0.8:=[profile?]
-	dev-haskell/temporary-rc:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.14
-	test? ( dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/tasty-golden/tasty-golden-2.3.1.1.ebuild b/dev-haskell/tasty-golden/tasty-golden-2.3.1.1.ebuild
deleted file mode 100644
index 8717e031e8f4..000000000000
--- a/dev-haskell/tasty-golden/tasty-golden-2.3.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Golden tests support for tasty"
-HOMEPAGE="https://github.com/feuerbach/tasty-golden"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/optparse-applicative:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	>=dev-haskell/tasty-0.8:=[profile?]
-	dev-haskell/temporary:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/tasty-hunit
-		dev-haskell/temporary-rc )
-"
diff --git a/dev-haskell/tasty-golden/tasty-golden-2.3.1.ebuild b/dev-haskell/tasty-golden/tasty-golden-2.3.1.ebuild
deleted file mode 100644
index c0b0298002ad..000000000000
--- a/dev-haskell/tasty-golden/tasty-golden-2.3.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Golden tests support for tasty"
-HOMEPAGE="https://github.com/feuerbach/tasty-golden"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/optparse-applicative:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	>=dev-haskell/tasty-0.8:=[profile?]
-	dev-haskell/temporary:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/tasty-hunit
-		dev-haskell/temporary-rc )
-"
diff --git a/dev-haskell/tasty-hunit-0.2 b/dev-haskell/tasty-hunit-0.2
new file mode 100644
index 000000000000..655aeddd1430
--- /dev/null
+++ b/dev-haskell/tasty-hunit-0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/tasty:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HUnit support for the Tasty test framework
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/tasty-hunit
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/tasty:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.2
+SRC_URI=mirror://hackage/packages/archive/tasty-hunit/0.2/tasty-hunit-0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5c12e4ec225b0ab3e8cb320f29bff2a2
diff --git a/dev-haskell/tasty-hunit-0.4.1 b/dev-haskell/tasty-hunit-0.4.1
new file mode 100644
index 000000000000..1ac21709f6d2
--- /dev/null
+++ b/dev-haskell/tasty-hunit-0.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/tasty:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HUnit support for the Tasty test framework
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/tasty-hunit
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/tasty:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.4.1
+SRC_URI=mirror://hackage/packages/archive/tasty-hunit/0.4.1/tasty-hunit-0.4.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0876b5516adefa6b3978a54e4b120e38
diff --git a/dev-haskell/tasty-hunit-0.8.0.1 b/dev-haskell/tasty-hunit-0.8.0.1
new file mode 100644
index 000000000000..f22b6df07a83
--- /dev/null
+++ b/dev-haskell/tasty-hunit-0.8.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/tasty-0.8:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HUnit support for the Tasty test framework
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/tasty-hunit
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/tasty-0.8:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.8.0.1
+SRC_URI=mirror://hackage/packages/archive/tasty-hunit/0.8.0.1/tasty-hunit-0.8.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b5cad4cbeb82c42b45b17b046f76a10f
diff --git a/dev-haskell/tasty-hunit-0.9.2 b/dev-haskell/tasty-hunit-0.9.2
new file mode 100644
index 000000000000..6f95249a635b
--- /dev/null
+++ b/dev-haskell/tasty-hunit-0.9.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/tasty-0.8:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HUnit support for the Tasty test framework
+EAPI=5
+HOMEPAGE=http://documentup.com/feuerbach/tasty
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/tasty-0.8:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.9.2
+SRC_URI=mirror://hackage/packages/archive/tasty-hunit/0.9.2/tasty-hunit-0.9.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2f3589939c716b0c87926f05544f8cc5
diff --git a/dev-haskell/tasty-hunit/Manifest b/dev-haskell/tasty-hunit/Manifest
deleted file mode 100644
index a8f22c9103d3..000000000000
--- a/dev-haskell/tasty-hunit/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST tasty-hunit-0.2.tar.gz 1832 BLAKE2B 329ff8f7e5078e92412f2ed0325bf11ac8563b9bc33b91893e786724f7a7f3256983b1c2dfec89d3a4f69b3e933796ee69a364f67a868f1f5ea687aa0e27c58c SHA512 0622cc120b40108cbb3d0af3f0593e17cf7ae9d27524b095bf05870c1b85b02a7acd8f0bef1788e32ac2ec64a081e4ade2ad627bd444b442cedc2464f6c60e35
-DIST tasty-hunit-0.4.1.tar.gz 1840 BLAKE2B e115e10605f101f875698f2bfc99fef1becb2f8b16eff0ab9e1c5c9ca81e25bbb12fc75049ef6a15246761f8adba0cbdbf31e4410b292eea4dba052d2581666e SHA512 6a1bcecd3b9889eff1296e2ba77810d4421fd570101a4db5e9d8095afbdc3174e5fcfdaa61f51f391237330c97c824f201e368eebc13e2a6ed9015716f8baaae
-DIST tasty-hunit-0.8.0.1.tar.gz 2100 BLAKE2B 4d35a3f92487394d79969a847511b76024604ce2b5baa33f66ff896dd997d956c4edc1eafde3bea04ed33b5b6857dc2719fd044561ab167841dafdd701119e1f SHA512 133a38d3e6e4d19fe7f0f91080a30a0d3212fc17416669710dea78b5d646aab0d2ab67959c6cd4517e74da795327fbb87fcade335161b67e9967f577a9730898
-DIST tasty-hunit-0.9.2.tar.gz 5765 BLAKE2B 94463efe14eba2c5a35a1658a60d29965ed3f7845bc064174447604fe08bec1738ec81912caf7850a0336edbb0c8fa7fc20ccbdfa814aca0ca9ea5360792ad1c SHA512 f7af615938d8cb9ec40114fc27f196a8bc9991b0aefca9c5de72bdb6872073b6d771f276472f831b8c583eade3d2d1413aee8f194befa450631bdf3ed50ed439
-EBUILD tasty-hunit-0.2.ebuild 674 BLAKE2B c2134a81f9205c15e62cfa6e0e08a762e88a453682d72872d6cc16d78dc3d34c951c5e5fabd209dfa49761ca78fcc446b9fd962833ea4550a985b3ee7185e0ff SHA512 7fcbaf4600865a73138eff8dfba3ca1cb7d459f8c405ff06dd6d393691ca121c821c85e58f2c142dcdb45a8bbcd0b9a3715c0a1b519a89202195fa3016117660
-EBUILD tasty-hunit-0.4.1.ebuild 672 BLAKE2B 827515c22cb9e5480bd0e7101649251cbd238a142f4eb8ff902b471c44d471e13ee64ca1df2395710475ae53fea22f7d6d324b4f54609c3f1b30e4defab76d6e SHA512 fa93f75e23e6ccf33ecebb7776031d3891c0c7f2308457e7c5931d061f6daa38d355a8e743a088d9c7c751d6cce41fa9530c52175691605429645b76dffb79a1
-EBUILD tasty-hunit-0.8.0.1.ebuild 659 BLAKE2B 7147324167f5755c4e7ed75b38262903a3920f7f87849671453f88c23553352a5effffc5e489a4c966cf23737ff77bab771e85b39104cdde06938feb9ac28235 SHA512 a9156e98d642658d000899be1347c2e3a16fc4484ec42c8fb5b7106e1315b564ff00035d5a49246109885fae4dfc753033f98f9c7e24617b633a7283f92ee8a1
-EBUILD tasty-hunit-0.9.2.ebuild 582 BLAKE2B 04a7731c37d0ee231160dcb8f0808ad78074d99d0519fa82a3b31bf8627e190ed02a10ad4691f5b95fd461c5091d6cc283738019ab95a320ce7ac0273157afed SHA512 9cde4bbd4f66ed2709f86f3694e4707db069de4f88ac39467b12e0d35ed2e3973f893f58bd723afc0d1cf45d4f8be1da14c98b083ac2a25492dee2b280c9d52d
-MISC metadata.xml 334 BLAKE2B 135597ab3f37ddbce440c83cba4b47360b67383b74d3f2b40c71cd2e9eed9243f30a814ac0a9ba4b3d69998ec5b34de66697fb8f240c16899f88a43e0487d173 SHA512 ee9dcaec93145fa354c7190160fd67f0c943597190febb7292c1e96f7e5f86fa2a88ed6ce1f25f4da5875d6e13ccff3b844f77a3b1d678b18203849971a09064
diff --git a/dev-haskell/tasty-hunit/metadata.xml b/dev-haskell/tasty-hunit/metadata.xml
deleted file mode 100644
index 797bb94b356d..000000000000
--- a/dev-haskell/tasty-hunit/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		HUnit support for the Tasty test framework.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/tasty-hunit/tasty-hunit-0.2.ebuild b/dev-haskell/tasty-hunit/tasty-hunit-0.2.ebuild
deleted file mode 100644
index a3abaf3662e6..000000000000
--- a/dev-haskell/tasty-hunit/tasty-hunit-0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HUnit support for the Tasty test framework"
-HOMEPAGE="http://hackage.haskell.org/package/tasty-hunit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		dev-haskell/tasty:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10"
diff --git a/dev-haskell/tasty-hunit/tasty-hunit-0.4.1.ebuild b/dev-haskell/tasty-hunit/tasty-hunit-0.4.1.ebuild
deleted file mode 100644
index d6c79d0e5169..000000000000
--- a/dev-haskell/tasty-hunit/tasty-hunit-0.4.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HUnit support for the Tasty test framework"
-HOMEPAGE="http://hackage.haskell.org/package/tasty-hunit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/tasty:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/tasty-hunit/tasty-hunit-0.8.0.1.ebuild b/dev-haskell/tasty-hunit/tasty-hunit-0.8.0.1.ebuild
deleted file mode 100644
index 5c0be91bf53e..000000000000
--- a/dev-haskell/tasty-hunit/tasty-hunit-0.8.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HUnit support for the Tasty test framework"
-HOMEPAGE="http://hackage.haskell.org/package/tasty-hunit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/tasty-0.8:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/tasty-hunit/tasty-hunit-0.9.2.ebuild b/dev-haskell/tasty-hunit/tasty-hunit-0.9.2.ebuild
deleted file mode 100644
index 303f1bd17018..000000000000
--- a/dev-haskell/tasty-hunit/tasty-hunit-0.9.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HUnit support for the Tasty test framework"
-HOMEPAGE="http://documentup.com/feuerbach/tasty"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/tasty-0.8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/tasty-kat-0.0.3 b/dev-haskell/tasty-kat-0.0.3
new file mode 100644
index 000000000000..e138c678012a
--- /dev/null
+++ b/dev-haskell/tasty-kat-0.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/tasty:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/mtl dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Known Answer Tests (KAT) framework for tasty
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/tasty-kat
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-haskell/tasty:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.0.3
+SRC_URI=mirror://hackage/packages/archive/tasty-kat/0.0.3/tasty-kat-0.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2ed8677c22c7bb6b3202f80017c0b6a9
diff --git a/dev-haskell/tasty-kat/Manifest b/dev-haskell/tasty-kat/Manifest
deleted file mode 100644
index 17ef3899745b..000000000000
--- a/dev-haskell/tasty-kat/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tasty-kat-0.0.3.tar.gz 6167 BLAKE2B 9ce1e0bfbaabfcbc7757b4b3512be83275d2662d060fe31e9fb4321d6dbac21237822e667b66bdae7126b188cda28a09726883dad349ab810b6129fa8c0c086d SHA512 3a695aaf2cd8d699dd07a58298ef9da12cdc3b56564d5202ec480b6ce099c394fbd7dbe3bbb0664b295d5a4ef6e65ec0a39f0b9479257e87356f67897922c287
-EBUILD tasty-kat-0.0.3.ebuild 674 BLAKE2B a733964503e743e07d3340380d07d4c6d166e8a547fdb09c7f1f916f593019ad8ec25bc28953f6a617c25a7d790f6c7bd14864064fd8c8103f381fee7f314a82 SHA512 ad8698c6a0f47070da46b5c7b560bf43a558cd05e413c149bebff35909a69d3299e42abb387762f4964fce3ca85aa242dc01dfd7edd2ac4135c991fbf19b20f3
-MISC metadata.xml 447 BLAKE2B 05e053dac572f904fbad14b38a80caea250995d18adb4f9b27bc17468d033d148f149211dad6d7027ff285042ccfb46887e8048ca0abc2874416a99017c72266 SHA512 b0397679a512a98ea73ec6b2e145e63c9ee97f9f218653e39db17a9198eb3261ce09385ee36993361d206ba9415eb1fb140d9bcaef2cb5f73bd974c8e9ddb250
diff --git a/dev-haskell/tasty-kat/metadata.xml b/dev-haskell/tasty-kat/metadata.xml
deleted file mode 100644
index 574039e45f07..000000000000
--- a/dev-haskell/tasty-kat/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Tests running from simple KATs file (different formats/helper supported)
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/tasty-kat</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/tasty-kat/tasty-kat-0.0.3.ebuild b/dev-haskell/tasty-kat/tasty-kat-0.0.3.ebuild
deleted file mode 100644
index 5a7521d5d420..000000000000
--- a/dev-haskell/tasty-kat/tasty-kat-0.0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Known Answer Tests (KAT) framework for tasty"
-HOMEPAGE="https://github.com/vincenthz/tasty-kat"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/tasty:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/mtl
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/tasty-quickcheck-0.3.1 b/dev-haskell/tasty-quickcheck-0.3.1
new file mode 100644
index 000000000000..858555cdbad3
--- /dev/null
+++ b/dev-haskell/tasty-quickcheck-0.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/quickcheck-2.5:=[profile?] <dev-haskell/quickcheck-3:=[profile?] dev-haskell/random:=[profile?] dev-haskell/tagged:=[profile?] dev-haskell/tasty:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=QuickCheck support for the Tasty test framework
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/tasty-quickcheck
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/quickcheck-2.5:=[profile?] <dev-haskell/quickcheck-3:=[profile?] dev-haskell/random:=[profile?] dev-haskell/tagged:=[profile?] dev-haskell/tasty:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.3.1
+SRC_URI=mirror://hackage/packages/archive/tasty-quickcheck/0.3.1/tasty-quickcheck-0.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a5868d953cd5e82cef0a57ca5c2eb4fa
diff --git a/dev-haskell/tasty-quickcheck-0.8.3.2 b/dev-haskell/tasty-quickcheck-0.8.3.2
new file mode 100644
index 000000000000..48d349fad53e
--- /dev/null
+++ b/dev-haskell/tasty-quickcheck-0.8.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-0.10.1:=[profile?] >=dev-lang/ghc-7.4.1:= old-quickcheck? ( >=dev-haskell/quickcheck-2.5:2=[profile?] <dev-haskell/quickcheck-2.7:2=[profile?] dev-haskell/random:=[profile?] ) !old-quickcheck? ( >=dev-haskell/quickcheck-2.7:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] ) >=dev-haskell/cabal-1.10 test? ( dev-haskell/pcre-light dev-haskell/tasty-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=QuickCheck support for the Tasty test framework
+EAPI=5
+HOMEPAGE=http://documentup.com/feuerbach/tasty
+IUSE=old-quickcheck doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-0.10.1:=[profile?] >=dev-lang/ghc-7.4.1:= old-quickcheck? ( >=dev-haskell/quickcheck-2.5:2=[profile?] <dev-haskell/quickcheck-2.7:2=[profile?] dev-haskell/random:=[profile?] ) !old-quickcheck? ( >=dev-haskell/quickcheck-2.7:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] )
+SLOT=0/0.8.3.2
+SRC_URI=mirror://hackage/packages/archive/tasty-quickcheck/0.8.3.2/tasty-quickcheck-0.8.3.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0c3ec363482dd472139c8d9c1d5c335e
diff --git a/dev-haskell/tasty-quickcheck-0.8.4 b/dev-haskell/tasty-quickcheck-0.8.4
new file mode 100644
index 000000000000..a4f1ba02ca69
--- /dev/null
+++ b/dev-haskell/tasty-quickcheck-0.8.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-0.10.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/quickcheck-2.5:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] >=dev-haskell/cabal-1.10 test? ( dev-haskell/pcre-light dev-haskell/tasty-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=QuickCheck support for the Tasty test framework
+EAPI=5
+HOMEPAGE=http://documentup.com/feuerbach/tasty
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-0.10.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/quickcheck-2.5:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
+SLOT=0/0.8.4
+SRC_URI=mirror://hackage/packages/archive/tasty-quickcheck/0.8.4/tasty-quickcheck-0.8.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4995c3bc5de6cf9de97458ced0a1ea92
diff --git a/dev-haskell/tasty-quickcheck/Manifest b/dev-haskell/tasty-quickcheck/Manifest
deleted file mode 100644
index 8c01ed218971..000000000000
--- a/dev-haskell/tasty-quickcheck/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST tasty-quickcheck-0.3.1.tar.gz 2643 BLAKE2B e98ce801f560fc9513387fd4fdd1ac2540d774cc8395059661e6f15ebcd40a15e01902bfd3f389c6f5c42437530bb98fe21c1d7cad76edc367efc19cb4653516 SHA512 b6f4ffcc01e9a25a54616cb85a95901010e04c05e59743621b86d57dcfdb820285881c4a39a95e255fcdab6a33b7ee866e585a26c9628649c344c3b2ae4500af
-DIST tasty-quickcheck-0.8.3.2.tar.gz 4438 BLAKE2B 6d22a2155597cf9d981ac0ac290bb65f03b50e8d7fa92092955b74630f5c3c60a8c8fa9ae4928588e8633d527f2614295d636a57c547e15ea02e8ee6f07de35a SHA512 6930e602d0b3b60f13df509191b1d6affc430a408f3536bcc4e749ca87324962ae75414a2e33cd4f49b84296740528a840c1f7ca9295220dfae28b6f2946df57
-DIST tasty-quickcheck-0.8.4.tar.gz 4560 BLAKE2B 5f1ab71b75bb2a7f2384dac024d65514f45b9741e59c260116d4e7b4ad483456c6d2a224c96eb642ee9f5c2b6d985e1c81052312fb5fa725209106a210045aba SHA512 5e503604412af686d24957e111ac369dedc568ad7075374acfdef93bad35342af6e1bdfa5a33aa8eec16bdf7cc3e0e2539d5a92e7eaf8a6cb325bac2149a0ce7
-EBUILD tasty-quickcheck-0.3.1.ebuild 747 BLAKE2B 885fcef5544895bd9fae7294fc0f6aa354246db234c6dd96603fbf8d6e28759d28d5d40fdd182fb7472891627725c44a4cd3ea463c96d1ef94a74f865194caa7 SHA512 eb4ba182952d1e254047d17575768201a34d202e6857a4eddb1363ab0c39f57bd8ea6efb69531289ebf45d1acf7a541ade904d58d788cca0ec0e63aa511fd5f7
-EBUILD tasty-quickcheck-0.8.3.2.ebuild 1052 BLAKE2B 6260cebf218454e7430c12a9a2de79e4a0ad40a7ddb7d794e1d764ce237be5e362135b22acdb27f9ddf35e8fab4f31982f33e65d9b795c9c20e3eb7dabb04e18 SHA512 7d112601a38a161f7c75fd693ff97cc15eb4272c95a15ab020a1ff8a72ce7bd0faefbfed90d49c237c9feaf61dba63273ac8d755df52cc771c6662dfdf33ffb7
-EBUILD tasty-quickcheck-0.8.4.ebuild 782 BLAKE2B 89a4d94ddac79108a965889267c161fb90d15087bcd79aa7b34a750172801d54a326c4a09285d406b50fdf0d77a0beaa730284d599454cc14e69127e3ca75cab SHA512 17c122b38575eb544b5a81bb40d233e1125d3815f9832e4d0550cab12a441b3228f57a5f023f57d9e96c167d41909f9a161ba7458ab5d380d6b3dee59db22092
-MISC metadata.xml 417 BLAKE2B c6d5c2852c587c4db670dd9686f2c28cb57db67c3cf485c26a85712a25b5ef2dc6988e9b23457c6d90ad7fda2cfeb17f6b645542c3b5c29153c582666c311d02 SHA512 e188adf22b27839173f7b9ae598635f6eb9366425b381354e8853cbc33809e2565b0526b067864e2fe5fdcdce94b5178bfa03f815f3000a8adac2e3202fdaaee
diff --git a/dev-haskell/tasty-quickcheck/metadata.xml b/dev-haskell/tasty-quickcheck/metadata.xml
deleted file mode 100644
index 788d4f1313c5..000000000000
--- a/dev-haskell/tasty-quickcheck/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		QuickCheck support for the Tasty test framework.
-	</longdescription>
-	<use>
-		<flag name="old-quickcheck">Use Quick-Check &lt; 2.7.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.3.1.ebuild b/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.3.1.ebuild
deleted file mode 100644
index 4b0a39baa62e..000000000000
--- a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.3.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck support for the Tasty test framework"
-HOMEPAGE="http://hackage.haskell.org/package/tasty-quickcheck"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/quickcheck-2.5:=[profile?] <dev-haskell/quickcheck-3:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	dev-haskell/tasty:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.8.3.2.ebuild b/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.8.3.2.ebuild
deleted file mode 100644
index cd1e763950f2..000000000000
--- a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.8.3.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck support for the Tasty test framework"
-HOMEPAGE="http://documentup.com/feuerbach/tasty"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="old-quickcheck"
-
-RDEPEND="dev-haskell/tagged:=[profile?]
-	>=dev-haskell/tasty-0.10.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	old-quickcheck? ( >=dev-haskell/quickcheck-2.5:2=[profile?] <dev-haskell/quickcheck-2.7:2=[profile?]
-				dev-haskell/random:=[profile?] )
-	!old-quickcheck? ( >=dev-haskell/quickcheck-2.7:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/pcre-light
-		dev-haskell/tasty-hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag old-quickcheck old-quickcheck)
-}
diff --git a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.8.4.ebuild b/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.8.4.ebuild
deleted file mode 100644
index f9c55953d81d..000000000000
--- a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.8.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck support for the Tasty test framework"
-HOMEPAGE="http://documentup.com/feuerbach/tasty"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/tagged:=[profile?]
-	>=dev-haskell/tasty-0.10.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/quickcheck-2.5:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/pcre-light
-		dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/tasty-rerun-1.1.5 b/dev-haskell/tasty-rerun-1.1.5
new file mode 100644
index 000000000000..bc14b421cb8c
--- /dev/null
+++ b/dev-haskell/tasty-rerun-1.1.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/optparse-applicative-0.6:=[profile?] >=dev-haskell/reducers-3.10.1:=[profile?] >=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/tasty-0.10:=[profile?] <dev-haskell/tasty-0.12:=[profile?] >=dev-haskell/transformers-0.3.0.0:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Run tests by filtering the tests depending on the result of previous runs
+EAPI=5
+HOMEPAGE=https://github.com/ocharles/tasty-rerun
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/optparse-applicative-0.6:=[profile?] >=dev-haskell/reducers-3.10.1:=[profile?] >=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/tasty-0.10:=[profile?] <dev-haskell/tasty-0.12:=[profile?] >=dev-haskell/transformers-0.3.0.0:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/1.1.5
+SRC_URI=mirror://hackage/packages/archive/tasty-rerun/1.1.5/tasty-rerun-1.1.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9f176f699d7b5c5eb8b5be5b1e6dafc6
diff --git a/dev-haskell/tasty-rerun-1.1.6 b/dev-haskell/tasty-rerun-1.1.6
new file mode 100644
index 000000000000..25f1fa3b5fc5
--- /dev/null
+++ b/dev-haskell/tasty-rerun-1.1.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/optparse-applicative-0.6:=[profile?] >=dev-haskell/reducers-3.10.1:=[profile?] >=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/tasty-0.10:=[profile?] <dev-haskell/tasty-0.12:=[profile?] >=dev-haskell/transformers-0.3.0.0:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Run tests by filtering the tests depending on the result of previous runs
+EAPI=6
+HOMEPAGE=https://github.com/ocharles/tasty-rerun
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/optparse-applicative-0.6:=[profile?] >=dev-haskell/reducers-3.10.1:=[profile?] >=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/tasty-0.10:=[profile?] <dev-haskell/tasty-0.12:=[profile?] >=dev-haskell/transformers-0.3.0.0:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/1.1.6
+SRC_URI=mirror://hackage/packages/archive/tasty-rerun/1.1.6/tasty-rerun-1.1.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0c0698dff059bd5fa094e40fa67e9784
diff --git a/dev-haskell/tasty-rerun/Manifest b/dev-haskell/tasty-rerun/Manifest
deleted file mode 100644
index 822ea77f9541..000000000000
--- a/dev-haskell/tasty-rerun/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST tasty-rerun-1.1.5.tar.gz 5376 BLAKE2B fe3723004d07e2836b83e85406580a5a74706c5f3cb6b445f575623c8ae1cd659ce8143e11891c4dbdf9b0b9f487b53d8ce64be61b16ba324a0d565bc6e25979 SHA512 becee5c62b425e57666c3cc9b65a7342b1af46e44212ade1360f0cd255cb909cfd9b049d88ff8238940760534479ce077f0e24526359545fff0ab849a0c0d7b7
-DIST tasty-rerun-1.1.6.tar.gz 5399 BLAKE2B 48e329b4f188d618b4a3a2b8eb94723fe0a3a883c64668ed36b7a099bcc86228eb3a0fe42173e8564f14942ab73a2637831b9da4ebf3a4dd4b312bda870fd860 SHA512 dc4db9a4dba424d9d948a4e44d4402b17ab363554493a68035ec0d94bfb6e9e2965e8c9c4b519a071707c70eabd7ea70a4f265f32983e35bf0ee64cd67948808
-EBUILD tasty-rerun-1.1.5.ebuild 1024 BLAKE2B 4073fea7ff9758da57ce5d6d1ea5e1ac73215ec78c99c575639ce2f659ac336a8b6aa7d29aa08807f3dcc74dfb146c90d9a77714b32911ef29ee28c9c55e3ab0 SHA512 f259946c2d3cfe403f34d52ef05a1323b67113cb517aee68ad0bafeef2403cdd42ffc8ebc4bbbe77e50fcf7406706f630c33092e77953a6210a55463cb4c93c1
-EBUILD tasty-rerun-1.1.6.ebuild 1022 BLAKE2B 98f1cbbda7990ff47322eb5ea84f65071eb2e6ec52eb4805e18ac37806d1fff623920225bc653aed7a9d397dfb3baaba72095f97ae66f8db7374ea8ae2a428a1 SHA512 c8c644925deb41bc6c786fd327cf999a3fbb8061fdc096da1dd29c3d706b4e337ab73f399200ab135306e08cbdeb73e9c9f938a6f31c293fb4f2234c2de1ae3f
-MISC metadata.xml 2520 BLAKE2B 168bec58887892ef09313be19f5e114c17ace8d078340b1fa037166f150658e815c48cde5ac39bb72ce510cc96e1c4936bf4d4d489fcfc0018d99eced54cbfd7 SHA512 4cbced2264f235c58c1ebe60937a8ff0c846384be4d53add2c7d3d81927a55e1bf1be9795d94fe2e72ca510f3cfc2fc1b5e1e947eb4a17d2826acb8c275014b6
diff --git a/dev-haskell/tasty-rerun/metadata.xml b/dev-haskell/tasty-rerun/metadata.xml
deleted file mode 100644
index 452f659c0580..000000000000
--- a/dev-haskell/tasty-rerun/metadata.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This ingredient adds the ability to run tests by first filtering the test tree
-		based on the result of a previous test run. For example, you can use this to
-		run only those tests that failed in the last run, or to run only tests that
-		have been added since tests were last ran.
-		
-		This ingredient is specifically an ingredient *transformer* - given a list of
-		'Tasty.Ingredient's, 'rerunningTests' adds the ability for all of these
-		ingredients to run against a filtered test tree. This transformer can be
-		applied as follows:
-		
-		&gt; import Test.Tasty
-		&gt; import Test.Tasty.Runners
-		&gt;
-		&gt; main :: IO ()
-		&gt; main =
-		&gt;   defaultMainWithIngredients
-		&gt;     [ rerunningTests [ listingTests, consoleTestReporter ] ]
-		&gt;     tests
-		&gt;
-		&gt; tests :: TestTree
-		&gt; tests = undefined
-		
-		This ingredient adds three command line parameters:
-		
-		[@--rerun-update@] If specified the results of this test run will be saved to
-		the log file at @--rerun-log-file@. If the ingredient does not execute tests
-		(for example, @--list-tests@ is used) then the log file will not be
-		updated. This option is not enabled by default.  This option does not require
-		a value.
-		
-		[@--rerun-log-file@] The path to the log file to read previous test
-		information from, and where to write new information to (if @--rerun-update@
-		is specified). This option defaults to @.tasty-rerun-log@.
-		
-		[@--rerun-filter@] Which filters to apply to the 'Tasty.TestTree' based on
-		previous test runs. The value of this option is a comma separated list of the
-		following options:
-		
-		* @failures@: Only run tests that failed on the previous run.
-		
-		* @exceptions@: Only run tests that threw an exception on the previous run.
-		
-		* @new@: Only run tests that are new since the previous test run.
-		
-		* @successful@: Only run tests that were successful in the previous run.
-		
-		Multiple options can be combined and will be taken under disjunction - so
-		@--rerun-filter=failures,exceptions@ will run only tests that failed *or*
-		threw an exception on the last run.
-		
-		Defaults to all filters, which means all tests will be ran.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ocharles/tasty-rerun</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/tasty-rerun/tasty-rerun-1.1.5.ebuild b/dev-haskell/tasty-rerun/tasty-rerun-1.1.5.ebuild
deleted file mode 100644
index 3d67e2318b08..000000000000
--- a/dev-haskell/tasty-rerun/tasty-rerun-1.1.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Run tests by filtering the tests depending on the result of previous runs"
-HOMEPAGE="https://github.com/ocharles/tasty-rerun"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.1.2:=[profile?]
-	>=dev-haskell/optparse-applicative-0.6:=[profile?]
-	>=dev-haskell/reducers-3.10.1:=[profile?]
-	>=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/stm-2.4.2:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/tasty-0.10:=[profile?] <dev-haskell/tasty-0.12:=[profile?]
-	>=dev-haskell/transformers-0.3.0.0:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/tasty-rerun/tasty-rerun-1.1.6.ebuild b/dev-haskell/tasty-rerun/tasty-rerun-1.1.6.ebuild
deleted file mode 100644
index f49889cbe2f4..000000000000
--- a/dev-haskell/tasty-rerun/tasty-rerun-1.1.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Run tests by filtering the tests depending on the result of previous runs"
-HOMEPAGE="https://github.com/ocharles/tasty-rerun"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.1.2:=[profile?]
-	>=dev-haskell/optparse-applicative-0.6:=[profile?]
-	>=dev-haskell/reducers-3.10.1:=[profile?]
-	>=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/stm-2.4.2:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/tasty-0.10:=[profile?] <dev-haskell/tasty-0.12:=[profile?]
-	>=dev-haskell/transformers-0.3.0.0:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/tasty-smallcheck-0.2 b/dev-haskell/tasty-smallcheck-0.2
new file mode 100644
index 000000000000..99eb8977e2f0
--- /dev/null
+++ b/dev-haskell/tasty-smallcheck-0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/smallcheck-1.0:=[profile?] dev-haskell/tagged:=[profile?] dev-haskell/tasty:=[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=SmallCheck support for the Tasty test framework
+EAPI=5
+HOMEPAGE=https://github.com/feuerbach/tasty
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/smallcheck-1.0:=[profile?] dev-haskell/tagged:=[profile?] dev-haskell/tasty:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.2
+SRC_URI=mirror://hackage/packages/archive/tasty-smallcheck/0.2/tasty-smallcheck-0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9368a77d7382fbefa1eab8c63471a429
diff --git a/dev-haskell/tasty-smallcheck-0.8 b/dev-haskell/tasty-smallcheck-0.8
new file mode 100644
index 000000000000..52bc71fe9b34
--- /dev/null
+++ b/dev-haskell/tasty-smallcheck-0.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/smallcheck-1.0:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-0.8:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=SmallCheck support for the Tasty test framework
+EAPI=5
+HOMEPAGE=https://github.com/feuerbach/tasty
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/smallcheck-1.0:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-0.8:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.8
+SRC_URI=mirror://hackage/packages/archive/tasty-smallcheck/0.8/tasty-smallcheck-0.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=caad265dfed886e52d6da3ada4d24ecb
diff --git a/dev-haskell/tasty-smallcheck-0.8.1 b/dev-haskell/tasty-smallcheck-0.8.1
new file mode 100644
index 000000000000..18966b9e3e28
--- /dev/null
+++ b/dev-haskell/tasty-smallcheck-0.8.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/smallcheck-1.0:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-0.8:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=SmallCheck support for the Tasty test framework
+EAPI=5
+HOMEPAGE=http://documentup.com/feuerbach/tasty
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/smallcheck-1.0:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-0.8:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.8.1
+SRC_URI=mirror://hackage/packages/archive/tasty-smallcheck/0.8.1/tasty-smallcheck-0.8.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4007ede3a8cbbee8412556759773a317
diff --git a/dev-haskell/tasty-smallcheck/Manifest b/dev-haskell/tasty-smallcheck/Manifest
deleted file mode 100644
index 35527f31e8f5..000000000000
--- a/dev-haskell/tasty-smallcheck/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST tasty-smallcheck-0.2.tar.gz 2341 BLAKE2B 6b91fd77b4ec66ba571cd3c6b9703c37708590f8679e9ff4e6949b36ba92892cd083776934877f694742fae1e8d66c8c4f3344ee30ce550aacecf9b2e57d362c SHA512 5a97592878c9814057cc6448591c3ba1e7a0027d45bbdbe76db1249fc656d66ae4a4b0992e42d101945630e07f6f622c644f9fa3a3abc7fdba472278dda38be1
-DIST tasty-smallcheck-0.8.1.tar.gz 2690 BLAKE2B e6ccfca50577edc27da4d8f77041e5eeb80c28574a5d0d9cfa20154e557a9893242456a4875e72d616e70f477bf1b7c6a1911c7d3a863b71e8481ff387815a00 SHA512 26ed0d75559c2da2f4296af6e9b02f8d0a19043b0ef154674eb782703fcd3ad7f4863b7b07dbaae27440078b4b00a9272cd9d5da23089993018e933577be5893
-DIST tasty-smallcheck-0.8.tar.gz 2426 BLAKE2B c11b53a2a4f9f26375db2b8300520b464e4b46f0b2119a18c3f0957ee45fcc3cce8ae0eb5360c4d105e937dfe58f7c91f52f88e8a166224ff6a1241379d08927 SHA512 8ef5e49647843fece659e21ec8b76fc63a43e82bd60d406b68e2fece18ba81368bea8e9accec36cfd80836f407343fcf3da1507bee60802033b8f2147a16e75c
-EBUILD tasty-smallcheck-0.2.ebuild 710 BLAKE2B bf3f2d988b021f931581b4227d9bab079bc361507b9a6ff1305b433287f2cd056b48ca15a2cc66aab41659606072e58b28cca4d09908bd91758006c52b297f8f SHA512 920fba2e0bbebaf5a26464f9b6115d333ad3bf0319e1662565121752852d9bad74fdfe49ccdd0024e11a25c5010afa740f88fcc8cced17dccbf8432e276fd117
-EBUILD tasty-smallcheck-0.8.1.ebuild 698 BLAKE2B 8c10340ec015668071a3da96c01f044de95d260e625a7c28bd284895282d5d799956bad8bf451c7cbb9d23a9fe4f1cc350edbac4fc8823a7d930aae2c2f4ecd4 SHA512 48cfbba697ce9c89bfd5fb9b5b7179d30dcbd098a0aaeda280c56e65998cd3fe9e4d0647e23d1e638437b2a19222481c9652bf93ef38a751680d15ce290e92c9
-EBUILD tasty-smallcheck-0.8.ebuild 698 BLAKE2B cd70558bb0eeb590efbae073cdd5316e2e24533be944f84f869c1b980e08623a377f019c003f62518bdc1eb208496a9dad45d9e2b4ddd9e660dff51878e1893f SHA512 fda2fc99fd5870b066e2a3cb856d8853870f43ed76918a4d0e77121b8cc7e5c338e0285ea82299c31a1f8bf1a8d17369f9a1bc573d3518a3e652f67119c73678
-MISC metadata.xml 419 BLAKE2B c797b6c22cfeb3ff17ab726a0dd5eb19dea26dda9855a3347437aa8ba911e2deae50ed9f83e4eca3b45ce3a8cded7c2a4606392abf329ee883f3500dfc142f90 SHA512 96c18b1b1c80c6b1bdfa97b329307279100130475b71189487300027fdfcbcc16aba5ec5e8245aa5fbdbbf31d628d7edfa93ed6464f007445000021871a1681d
diff --git a/dev-haskell/tasty-smallcheck/metadata.xml b/dev-haskell/tasty-smallcheck/metadata.xml
deleted file mode 100644
index 6ed62ea42470..000000000000
--- a/dev-haskell/tasty-smallcheck/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		SmallCheck support for the Tasty test framework.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">feuerbach/tasty</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.2.ebuild b/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.2.ebuild
deleted file mode 100644
index 457baec2553a..000000000000
--- a/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="SmallCheck support for the Tasty test framework"
-HOMEPAGE="https://github.com/feuerbach/tasty"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-		>=dev-haskell/smallcheck-1.0:=[profile?]
-		dev-haskell/tagged:=[profile?]
-		dev-haskell/tasty:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.1.ebuild b/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.1.ebuild
deleted file mode 100644
index 4c58307c249c..000000000000
--- a/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="SmallCheck support for the Tasty test framework"
-HOMEPAGE="http://documentup.com/feuerbach/tasty"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/smallcheck-1.0:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	>=dev-haskell/tasty-0.8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.ebuild b/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.ebuild
deleted file mode 100644
index 3349bd596a01..000000000000
--- a/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="SmallCheck support for the Tasty test framework"
-HOMEPAGE="https://github.com/feuerbach/tasty"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/smallcheck-1.0:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	>=dev-haskell/tasty-0.8:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/tasty-th-0.1.3 b/dev-haskell/tasty-th-0.1.3
new file mode 100644
index 000000000000..8eec8bd1f2eb
--- /dev/null
+++ b/dev-haskell/tasty-th-0.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/language-haskell-extract-0.2:=[profile?] dev-haskell/tasty:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Automatic tasty test case discovery using TH
+EAPI=5
+HOMEPAGE=https://github.com/bennofs/tasty-th
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/language-haskell-extract-0.2:=[profile?] dev-haskell/tasty:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.3
+SRC_URI=mirror://hackage/packages/archive/tasty-th/0.1.3/tasty-th-0.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=db1fc0d6e917187cd9d769bd63f7b511
diff --git a/dev-haskell/tasty-th-0.1.4 b/dev-haskell/tasty-th-0.1.4
new file mode 100644
index 000000000000..e38aeda656d3
--- /dev/null
+++ b/dev-haskell/tasty-th-0.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/tasty:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Automatic tasty test case discovery using TH
+EAPI=5
+HOMEPAGE=https://github.com/bennofs/tasty-th
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/tasty:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.4
+SRC_URI=mirror://hackage/packages/archive/tasty-th/0.1.4/tasty-th-0.1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c3c090fd8af7060f572df3885e215c6b
diff --git a/dev-haskell/tasty-th/Manifest b/dev-haskell/tasty-th/Manifest
deleted file mode 100644
index 59b2447b00c9..000000000000
--- a/dev-haskell/tasty-th/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST tasty-th-0.1.3.tar.gz 2636 BLAKE2B 73624c11b93e2cd5b0eb6069d8c44e41a70264b998e6633dc0ed20c1ba12b767027c862f9cfda711d39bdabdbfbc3091901744b87e5a9634aaaa51db8b074082 SHA512 47b2f9a5d471943b78e66e3082186a6b42901d57a5333a2142d211370be35354cddce12c5926490e945d6dc8b35d9ab2527c6b36ad457b79f30a2e88fa538d9a
-DIST tasty-th-0.1.4.tar.gz 3016 BLAKE2B cab6b8734dd8664e760d901b05074c84469381c3cb1e4a793a505b2a973fb0c1d32471847ef1c39fab199c1a16de3351cd0d839b5ab78bcf96515233e09c6fcf SHA512 0bddde5ea5cc0ea8ba502b88ec52fe0d46d9c6bcd107e4e3b6bb675d930752df103308b61589ce3de3302c7ac40eed9911f803542262246a43a867beee942aa6
-EBUILD tasty-th-0.1.3.ebuild 633 BLAKE2B 75911f15c61e0d59565b6053cbaa0aefdaf61061789a51585adf911aa5deadbdd50942f3acc2ab2a9d36aecc5b982859bf9d90d6bf1e4c5a30d1f3961f30efc9 SHA512 b094a3b71cac584ef783d459c5df527d9a08ce8abb96143b421a15597be982d71828955352809d3460ac169fe311e61c60476be0eeb84e4804409185ef593ee4
-EBUILD tasty-th-0.1.4.ebuild 580 BLAKE2B 7e97758f244ddb8a6353fac1a14216d42b858875aa30b03dd45a61f001d918274cf140478095850d6ee4bbe02473f78ea955cb6a646a1bd81f2798b382f6afde SHA512 3fa31a47fcd14135308980a764cd4ac567eafd7b006c166811c4220c39f5d22573efbc24ab9533f723013147b3a4e9f6a1913478af76a48e7acc3f12db83e786
-MISC metadata.xml 451 BLAKE2B 7c8d91ff22cbcada99c2b1943f45c36d49c2eadbe869af41c1367129fe2c552fa74d5e3c0f3c601ccd3822505b9052ed61708e27dc9d42adeaf58ee4749a6a0d SHA512 603420f3611b140c7b2f4b8e3b49d6b4c5f627aa3daee6982e958903ec9edf1e1324b874d7129eea6639050cbde8fc72e147ba50880beb3766768f9e144310e9
diff --git a/dev-haskell/tasty-th/metadata.xml b/dev-haskell/tasty-th/metadata.xml
deleted file mode 100644
index 98dfd3808c9f..000000000000
--- a/dev-haskell/tasty-th/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A fork of of test-framework-th modified to use tasty instead of test-framework.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bennofs/tasty-th</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/tasty-th/tasty-th-0.1.3.ebuild b/dev-haskell/tasty-th/tasty-th-0.1.3.ebuild
deleted file mode 100644
index c25b73ed0ffd..000000000000
--- a/dev-haskell/tasty-th/tasty-th-0.1.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Automatic tasty test case discovery using TH"
-HOMEPAGE="https://github.com/bennofs/tasty-th"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/language-haskell-extract-0.2:=[profile?]
-	dev-haskell/tasty:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/tasty-th/tasty-th-0.1.4.ebuild b/dev-haskell/tasty-th/tasty-th-0.1.4.ebuild
deleted file mode 100644
index a9bb32ec612f..000000000000
--- a/dev-haskell/tasty-th/tasty-th-0.1.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Automatic tasty test case discovery using TH"
-HOMEPAGE="https://github.com/bennofs/tasty-th"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/tasty:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/tasty/Manifest b/dev-haskell/tasty/Manifest
deleted file mode 100644
index cd80d68a5044..000000000000
--- a/dev-haskell/tasty/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST tasty-0.10.1.2.tar.gz 26285 BLAKE2B 0a1ef58c8cf95bbcc87ccd2d2416861d79ee9a8c74c147b4e4dd18c9c37e2e12121ad4ba1771b6068dedec512b6a2fafad53ef5c278cbee041551f0bdeb5e62f SHA512 11171cb42b0c88cee04fc3c42c6003c6e501a16734f86ca4dcb33b7e28bc282fd4af56e88d398f6508ce9bd3da666a954fd3b50b8c89cf27906ea8694d753d3e
-DIST tasty-0.11.0.4.tar.gz 26612 BLAKE2B e6058ec9a3e4442e822b4db17d79b464a98ceb021625281de47179bf6aa768bbb33f2024ba7b4bee2e6a61996769de2270357e7111ba6e8f7719dd3e7e9bc797 SHA512 8ccf7701829fdb42e367ac1e5805363d7489c770139f6e608d1240cec9e54517230166783a857480b70ca424f40f9ab83313e03e893d6d21503706a4c2e84e95
-DIST tasty-0.3.1.tar.gz 12145 BLAKE2B 338417c955c2b6e5072253d93c4e591c5f91f00292e845c6b50ca797376ec89ef4e42bc063c7774042d4e45274140c6d693f03a4ddbb783d2d4d215a0a8180c4 SHA512 aa727d8fcab7cbde07f721ad8eafc957f3fb6f01827a8ffc329bd1dba86bb40dbeb9e17c86becdd44aba592d57e29d07a5435ffbc8fabaa3c92fa0d0fa544e39
-DIST tasty-0.5.2.tar.gz 15369 BLAKE2B 857b844f04b1c14011e7b441334cc180b66817a523e0ea0373271e8eb0c0be7028394638cca8344b124a32ef190907be025fe8dc49ae9ad646e66473040b5434 SHA512 94116a4a12b842c4c136dfb5fff75e3843aa27c05fbad64e1752bd29b60691dbf12d093c5480e9c93d97ec1adbb98d579e63dd13921323e32e9127fb75bb3d37
-DIST tasty-0.8.1.2.tar.gz 23234 BLAKE2B 2bce9e12edc57d0ba769a3d10617d33233a378f6e9c686c9ce41b7c4e5153e67943ee9d6908000d8bb334aeda2e522877a209c18f7b5cbd6c9c93dfd5cc3cd20 SHA512 110c605cd8dae769a4ddd75f5940df5681eb1f38e005eaba72a4a9109637e3e8dedda7389dbac5a11fa8874da1f0551b7601cb7740efb8c6c6726e7a6ed10287
-EBUILD tasty-0.10.1.2.ebuild 883 BLAKE2B 636011467c4c6daf5523f1545835512940416154735ab2f967d4553b355072bc688f8f45b10920e79040261e6bb9a6fa811f9ae99c03eb3a91539aafbb1654fc SHA512 5e99fcbb401de7f8b417902c943884d95a1ec184a141f9e76ca8c90a88f128a844ea886890187d9d13d1d5012670e701d111c607f4195bdcecfeb5257512e164
-EBUILD tasty-0.11.0.4.ebuild 919 BLAKE2B 1b54b517842440c5b2782a8ab0229b446be4744f9bb204af48d35e509527f9d57a36820f37b6a5b1a591c32a77c948ad999d33e58572362e0ca753e4bff72569 SHA512 bb70278282e16729942eb73dc58362afb15fc4248c64cc23b5e2ca2cfb9a5b94d9feccfcfbca56dab30b112b93fc05557bcce2ce800865c8bbfa465cbe16d9a2
-EBUILD tasty-0.3.1.ebuild 901 BLAKE2B 57ec4f036e502d050fed9d6dfc4dd427d2ce357c1a862b1e7f16e6ce292b1e947eca2000b1293bcb9aed59b8a438cbc2cbde2f11154ca110ab5a0943cf2eac60 SHA512 cba41b9da984d3b065b8e79aafcf0be6a5c32feec0fd2284cae8ecf1dcfaf71f1211a5d8b8443b1674ad6a70fff88a43b238a574e6d5d110807b24fb6ed00d82
-EBUILD tasty-0.5.2.ebuild 900 BLAKE2B 69904546c3332d86810af78fec5c6bb75128877e61c0f832f0a0abd64f9355683cfd1dcd5a06c0f47ce787cbd7bc0f074bf74de72c4219800919af6608d5dc4e SHA512 5fad94ba51d0e80fb35021168842b6f431da53aad9fab5e840de799f0cde618bcfb68b88f2776196550d23b59a9bddf2ada62bec9652aff978fbb30df1fa457a
-EBUILD tasty-0.8.1.2.ebuild 875 BLAKE2B 4a441ec7f5bd18ee30d46f87fc469e2cccda228539feddff7dc5959bdb6e6aa09039081e03a9bc6a4f1b4e908e1691140cf14434e2876fe3facd39a2ce456cc0 SHA512 5a9b0f8383726c3a43b4cbc5e6a6fe242fb57cccc4658da9e3d13fd89756d000b74f65efd76d37aa9771616c2733f1e3bac7837729df1c1939d2624aee9d3d30
-MISC metadata.xml 407 BLAKE2B c644721938d16c62308bb17e446d912004ed49bb50b3f3f55c353698000bd7c69ab10175a5caa3f0374133df6945a6bad3e47507090706d916f61c4872aa4571 SHA512 dc2fbcb934ec6f2cd8483d7a0421ec0c22d5807924089fe79aa978ac3b11ffc23ea443d9e565ad83eabe3dab4a068c08909111c589991c33228a179381cce17f
diff --git a/dev-haskell/tasty/metadata.xml b/dev-haskell/tasty/metadata.xml
deleted file mode 100644
index ab7ff66b4e9f..000000000000
--- a/dev-haskell/tasty/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		See &lt;http://documentup.com/feuerbach/tasty&gt;
-	</longdescription>
-	<use>
-		<flag name="colors">Enable colorful output</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/tasty/tasty-0.10.1.2.ebuild b/dev-haskell/tasty/tasty-0.10.1.2.ebuild
deleted file mode 100644
index 4090ea5b2263..000000000000
--- a/dev-haskell/tasty/tasty-0.10.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Modern and extensible testing framework"
-HOMEPAGE="http://documentup.com/feuerbach/tasty"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
-	>=dev-haskell/async-2.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/optparse-applicative-0.11:=[profile?]
-	>=dev-haskell/regex-tdfa-rc-1.1.8.2:=[profile?]
-	>=dev-haskell/stm-2.3:=[profile?]
-	>=dev-haskell/tagged-0.5:=[profile?]
-	>=dev-haskell/unbounded-delays-0.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/tasty/tasty-0.11.0.4.ebuild b/dev-haskell/tasty/tasty-0.11.0.4.ebuild
deleted file mode 100644
index 3cf3e111f0fe..000000000000
--- a/dev-haskell/tasty/tasty-0.11.0.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Modern and extensible testing framework"
-HOMEPAGE="http://documentup.com/feuerbach/tasty"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
-	>=dev-haskell/async-2.0:=[profile?]
-	>=dev-haskell/clock-0.4.4.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/optparse-applicative-0.11:=[profile?]
-	>=dev-haskell/regex-tdfa-1.1.8.2:=[profile?]
-	>=dev-haskell/stm-2.3:=[profile?]
-	>=dev-haskell/tagged-0.5:=[profile?]
-	>=dev-haskell/unbounded-delays-0.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/tasty/tasty-0.3.1.ebuild b/dev-haskell/tasty/tasty-0.3.1.ebuild
deleted file mode 100644
index 22ea33f1bb65..000000000000
--- a/dev-haskell/tasty/tasty-0.3.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Modern and extensible testing framework"
-HOMEPAGE="http://hackage.haskell.org/package/tasty"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+colors"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/optparse-applicative-0.6:=[profile?]
-	dev-haskell/regex-posix:=[profile?]
-	>=dev-haskell/stm-2.3:=[profile?]
-	>=dev-haskell/tagged-0.5:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	colors? ( dev-haskell/ansi-terminal:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag colors colors)
-}
diff --git a/dev-haskell/tasty/tasty-0.5.2.ebuild b/dev-haskell/tasty/tasty-0.5.2.ebuild
deleted file mode 100644
index 5182cb9151c2..000000000000
--- a/dev-haskell/tasty/tasty-0.5.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Modern and extensible testing framework"
-HOMEPAGE="http://hackage.haskell.org/package/tasty"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+colors"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/optparse-applicative-0.6:=[profile?]
-	dev-haskell/regex-posix:=[profile?]
-	>=dev-haskell/stm-2.3:=[profile?]
-	>=dev-haskell/tagged-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	colors? ( dev-haskell/ansi-terminal:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag colors colors)
-}
diff --git a/dev-haskell/tasty/tasty-0.8.1.2.ebuild b/dev-haskell/tasty/tasty-0.8.1.2.ebuild
deleted file mode 100644
index a7412eac210a..000000000000
--- a/dev-haskell/tasty/tasty-0.8.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Modern and extensible testing framework"
-HOMEPAGE="http://documentup.com/feuerbach/tasty"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6.1:=[profile?]
-	>=dev-haskell/async-2.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/optparse-applicative-0.6:=[profile?]
-	>=dev-haskell/regex-tdfa-1.2:=[profile?]
-	>=dev-haskell/stm-2.3:=[profile?]
-	>=dev-haskell/tagged-0.5:=[profile?]
-	>=dev-haskell/unbounded-delays-0.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/temporary-1.1.2.4 b/dev-haskell/temporary-1.1.2.4
new file mode 100644
index 000000000000..e7810a844950
--- /dev/null
+++ b/dev-haskell/temporary-1.1.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=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=Portable temporary file and directory support for Windows and Unix
+EAPI=5
+HOMEPAGE=https://github.com/batterseapower/temporary
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/1.1.2.4
+SRC_URI=mirror://hackage/packages/archive/temporary/1.1.2.4/temporary-1.1.2.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=73c2e6379867a744e47f00312e2b470b
diff --git a/dev-haskell/temporary-1.2.0.3 b/dev-haskell/temporary-1.2.0.3
new file mode 100644
index 000000000000..5eccdfa0253d
--- /dev/null
+++ b/dev-haskell/temporary-1.2.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/transformers-0.2.0.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Portable temporary file and directory support for Windows and Unix
+EAPI=5
+HOMEPAGE=https://github.com/batterseapower/temporary
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/transformers-0.2.0.0:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.2.0.3
+SRC_URI=mirror://hackage/packages/archive/temporary/1.2.0.3/temporary-1.2.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0816eede5288264f726462bf84a3ed9e
diff --git a/dev-haskell/temporary-1.2.0.4 b/dev-haskell/temporary-1.2.0.4
new file mode 100644
index 000000000000..aad9647a88ae
--- /dev/null
+++ b/dev-haskell/temporary-1.2.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/transformers-0.2.0.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Portable temporary file and directory support for Windows and Unix
+EAPI=5
+HOMEPAGE=http://www.github.com/feuerbach/temporary
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/transformers-0.2.0.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.0.4
+SRC_URI=mirror://hackage/packages/archive/temporary/1.2.0.4/temporary-1.2.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=31592cb51ae06e1a2ff86d4d195e8b8c
diff --git a/dev-haskell/temporary-rc-1.2.0.3 b/dev-haskell/temporary-rc-1.2.0.3
new file mode 100644
index 000000000000..2856251c3e18
--- /dev/null
+++ b/dev-haskell/temporary-rc-1.2.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/transformers-0.2.0.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Portable temporary file and directory support for Windows and Unix
+EAPI=5
+HOMEPAGE=https://github.com/feuerbach/temporary
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/transformers-0.2.0.0:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.2.0.3
+SRC_URI=mirror://hackage/packages/archive/temporary-rc/1.2.0.3/temporary-rc-1.2.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6f6b946604a71f406814ddbb35a76427
diff --git a/dev-haskell/temporary-rc/Manifest b/dev-haskell/temporary-rc/Manifest
deleted file mode 100644
index c32fecb0cbe8..000000000000
--- a/dev-haskell/temporary-rc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST temporary-rc-1.2.0.3.tar.gz 5285 BLAKE2B 4b0d956bb76914077e3124e539e24c49bb4ef1f47480857ab7bac98c1b296b5e9c467205bf32db9fb7a9ea2e975da66cc3e3786354eebef5009c9f49b2e105d5 SHA512 cb57b33403a69058fd2cfbb5f69bf6bbfe0d6b1baeeefcd67b4dcc68c2c6325d0ddc1d68e672509ca7f83fea6b56332d535b7ba4bd607b058070e89c8b0c88fe
-EBUILD temporary-rc-1.2.0.3.ebuild 669 BLAKE2B 8741ba5dec004ddeb54e4c5d71bd498b667892465b3d03052b166de455147662f3a27bd1f2da75747924a2c39671a5eaafe7a9a6ae82601ce1cfaadd675f5b02 SHA512 149637811071405a854fc2448316e08d73b7164f509221e1e1b6f856b1c832f742f84edbf2db489cd1efcacffb9439b315851de41a9f42cfab930951362d20fc
-MISC metadata.xml 818 BLAKE2B 169b92e2a4447b3275a3b1b650c40bfdfe834737cbe8b0a27ed25df1ff283b4d9b2924d0947e89a9f384637fb3b2bb0e4c1dc7446427f7885f6a43a7ea97623a SHA512 50f4e0737cf58194cbdd8f973eb9a3abbc76388105ef951707701c7b9753cfba074463db98b997f952bafa633161e8afc9679c48ec0317e217f7b7269b63d93e
diff --git a/dev-haskell/temporary-rc/metadata.xml b/dev-haskell/temporary-rc/metadata.xml
deleted file mode 100644
index bbe5b0a30e4e..000000000000
--- a/dev-haskell/temporary-rc/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The functions for creating temporary files and directories in the base library are quite limited. The unixutils
-		package contains some good ones, but they aren't portable to Windows.
-		This library just repackages the Cabal implementations of its own temporary file and folder functions so that
-		you can use them without linking against Cabal or depending on it being installed.
-		This is a better maintained fork of the "temporary" package.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">feuerbach/temporary</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/temporary-rc/temporary-rc-1.2.0.3.ebuild b/dev-haskell/temporary-rc/temporary-rc-1.2.0.3.ebuild
deleted file mode 100644
index c2faca018c9d..000000000000
--- a/dev-haskell/temporary-rc/temporary-rc-1.2.0.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Portable temporary file and directory support for Windows and Unix"
-HOMEPAGE="https://github.com/feuerbach/temporary"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/transformers-0.2.0.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/temporary/Manifest b/dev-haskell/temporary/Manifest
deleted file mode 100644
index 72976e79303e..000000000000
--- a/dev-haskell/temporary/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST temporary-1.1.2.4.tar.gz 5220 BLAKE2B dc5744b92fb2b20a878becbc4c4a5274e8d6ae9d827abfa30333f5f30ba0ac8141c7cf8805de532e241d7379f3fdbe8900a18c471d0405cbedf85c817d1f026c SHA512 ebd2221ed75deba8c411ef4e4c6c45de41beaa1d26521f488b4ab16ee731839cd6193ce987701a224110451138c4eeb1b40d01a65a20b4508bc9fbd2a87e7313
-DIST temporary-1.2.0.3.tar.gz 5308 BLAKE2B 5c570641d27bbda5f28a1f0eac65a89377310cf10f1188b3bb90f5ec0aba67c466f3518a69dc4f1e446031c3e6f6fa6fce65f705db0185401d0986b385072d60 SHA512 ceada89c2166c315b2a54cae0a636eb0b38e6e89481ef32d3d1e4305d4e601305b4cb88fba3069493e8fe2014e3d237348a37567aba61e617c69707f0a16dd34
-DIST temporary-1.2.0.4.tar.gz 5347 BLAKE2B bf1d5740510248d993159aa4e1fba4c023efe1f64e8160c4a6ed33c2f8529907a406600c096f9ea0954f8f635955d2ba47968346f4c62eb3037f6748c862a9f7 SHA512 cc8ba1c43d3e75f13450cbbbea081b5dd42d4a8c0fd33dd4ca9cec636aa91c2cd5c6edbcd86bf7895d6672a46c3e2c8edc57bb2ce88f61fdc05ec75e62c9373f
-EBUILD temporary-1.1.2.4.ebuild 650 BLAKE2B d148fe04fd272df2cdb4af4328eb5248405dac2e5ba51be9731e6f08d75ff4c5f02021581063d9807cdfe35c02f481f84644af0ff89ef6fe3f96ebf10e832c4c SHA512 e80d3c394f33e818c42caae879b9a89a1c1760a83ebde9a07741bd012b3514e1cebd70cd14f4752061317ec21298f0ab83297c1e42484107d70201d4152f15ac
-EBUILD temporary-1.2.0.3.ebuild 676 BLAKE2B e767bca5c6c0c219c4b36e510d446d57c5e6b86c948fe57c8a85b8476a756932621bd4a8d34369838e184e68a24327c34cc54dc15aab3e3a4a8d78a02fe3011c SHA512 492b214479997007fa45f7736d64c6a4f41fd64be5e51e81cf0d95680397366129c4b2cd9802a272bd02399f394f19fd1a4accc3bab5f8ab706f403db591d71a
-EBUILD temporary-1.2.0.4.ebuild 667 BLAKE2B 02aa4b3a69afb2e765fed5a4aae9a82617c748ae2db0557573bac7b81d2b81dde172e823cc64ce0e798ffb34d0011742c48698f0a0fc93ac81e41b93a5cc5e01 SHA512 4e541c0df10580c33a651dcf52ce7e7f996ea1a46fe475b5ea93e9a450e3936122357a1effb71635f37bf7fb958d7e5ade3ef8c65b6ad06dde378728fe5a58f2
-MISC metadata.xml 760 BLAKE2B 657f8412b7add619d5d8827d13da1aebe29087a9334a6bb48271450138710c89e4227ff19f1348426531b3d189d750501ae343835ea9ec77d6e5a8b1e20b8a43 SHA512 bd5b25179a899cd867b1655df9e46e12d7a4a229edd3b1a13eab4688b6018757894be8c0a857231646e39260af604d762e8f7de5727d2366e20026908b3b3ed0
diff --git a/dev-haskell/temporary/metadata.xml b/dev-haskell/temporary/metadata.xml
deleted file mode 100644
index dd1a1cb7cec3..000000000000
--- a/dev-haskell/temporary/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The functions for creating temporary files and directories in the base library are quite limited. The unixutils
-		package contains some good ones, but they aren't portable to Windows.
-		This library just repackages the Cabal implementations of its own temporary file and folder functions so that
-		you can use them without linking against Cabal or depending on it being installed.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">batterseapower/temporary</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/temporary/temporary-1.1.2.4.ebuild b/dev-haskell/temporary/temporary-1.1.2.4.ebuild
deleted file mode 100644
index 8045b67c966c..000000000000
--- a/dev-haskell/temporary/temporary-1.1.2.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Portable temporary file and directory support for Windows and Unix"
-HOMEPAGE="https://github.com/batterseapower/temporary"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	cabal_chdeps \
-		'unix >= 2.3 && < 2.7' 'unix >= 2.3'
-}
diff --git a/dev-haskell/temporary/temporary-1.2.0.3.ebuild b/dev-haskell/temporary/temporary-1.2.0.3.ebuild
deleted file mode 100644
index c33d13a80d9b..000000000000
--- a/dev-haskell/temporary/temporary-1.2.0.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Portable temporary file and directory support for Windows and Unix"
-HOMEPAGE="https://github.com/batterseapower/temporary"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/transformers-0.2.0.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/temporary/temporary-1.2.0.4.ebuild b/dev-haskell/temporary/temporary-1.2.0.4.ebuild
deleted file mode 100644
index ed2f6be03c8f..000000000000
--- a/dev-haskell/temporary/temporary-1.2.0.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Portable temporary file and directory support for Windows and Unix"
-HOMEPAGE="http://www.github.com/feuerbach/temporary"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/transformers-0.2.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/tensor-1.0.0.1 b/dev-haskell/tensor-1.0.0.1
new file mode 100644
index 000000000000..8d72520f7339
--- /dev/null
+++ b/dev-haskell/tensor-1.0.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-lang/ghc-7.4.1:= dev-haskell/cabal doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Tensor data types
+EAPI=5
+HOMEPAGE=http://www.haskell.org/HOpenGL/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.0.1
+SRC_URI=mirror://hackage/packages/archive/Tensor/1.0.0.1/Tensor-1.0.0.1.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=adb4342156f0751c1e31e3199b81e6eb
diff --git a/dev-haskell/tensor/Manifest b/dev-haskell/tensor/Manifest
deleted file mode 100644
index f7da033cc69d..000000000000
--- a/dev-haskell/tensor/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX tensor-1.0.0.1-ghc-7.8.patch 6842 BLAKE2B c25daefecd41ffecf07e08d1354cb85fc8f8bf5b1d17010ee5d17f08ae27afa79fb7863b0fe4a2beed20d22c695d2144fc3206761f8cadbfa0d52a3db2d4f8c9 SHA512 4ef5944b9f7217527f11d68e53d13d020ab7a5ba98cadbf7343fd28695bc84be20c7f1a197eed870513d1a5839ac9fdce476e335f4e79b43fb78fa3daf67c27d
-DIST Tensor-1.0.0.1.tar.gz 3314 BLAKE2B 6863127d023ef0cdc449f1a0a79c902f59b8e88892bf8bc2205a6b3239d81ee2bd6e2896732702c75cc180941882cd00cf8f5386206dd706a3800dea9e5da0c0 SHA512 8808d71cb3a3d19991a07c2652751f35bf6c4a4d5dc4090b1ce4835c4cabe29d04b968555663ec7facd93fbb3239031b6540d8afd0661fa4d7b4652a1bf2fd96
-EBUILD tensor-1.0.0.1.ebuild 641 BLAKE2B 047ce3cd1d78189234f4eaf40beb616c8982f45b63feb2e464bf8145380d57bf9448ac432fb75693a028ab89de0478ba1bb687a577df69a4e695609036087a76 SHA512 db962c7a6af2c194021c52d1a37343665abe9023a4347dac24d1d2e58e5773b933d58a2670ccd2e12603b889f24bdbd0423bde1039649912caa8f0e42266c27d
-MISC metadata.xml 381 BLAKE2B 27c33359d86af5c93547c77dc8c14e14de6f2b2afefa7726514e586b4b2d683a40a842d110508bea566769da26b1f8db030c9a7aa734386a9523a9196a6be81c SHA512 006ec9633cd8840f78485eba4ac7f17288079a22dcdd972616f47a57339b06a79488d3753320c657c319fa583d3a8443ebc358a7891d48b353907fef88411104
diff --git a/dev-haskell/tensor/files/tensor-1.0.0.1-ghc-7.8.patch b/dev-haskell/tensor/files/tensor-1.0.0.1-ghc-7.8.patch
deleted file mode 100644
index 7ef3ed758676..000000000000
--- a/dev-haskell/tensor/files/tensor-1.0.0.1-ghc-7.8.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-diff --git a/src/Data/Tensor.hs b/src/Data/Tensor.hs
-index a5042df..0ba41f0 100644
---- a/src/Data/Tensor.hs
-+++ b/src/Data/Tensor.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DeriveDataTypeable #-}
- --------------------------------------------------------------------------------
- -- |
- -- Module      :  Data.Tensor
-@@ -32,7 +33,7 @@ import Foreign.Storable
- 
- -- | A vertex with /y/=0, /z/=0 and /w/=1.
- newtype Vertex1 a = Vertex1 a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vertex1 where
-    fmap f (Vertex1 x) = Vertex1 (f x)
-@@ -53,12 +54,6 @@ instance Traversable Vertex1 where
-    mapM f (Vertex1 x) = return Vertex1 `ap` f x
-    sequence (Vertex1 x) = return Vertex1 `ap` x
- 
--instance Typeable1 Vertex1 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vertex1") []
--
--instance Typeable a => Typeable (Vertex1 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vertex1 a) where
-    sizeOf    ~(Vertex1 s) = sizeOf s
-    alignment ~(Vertex1 s) = alignment s
-@@ -69,7 +64,7 @@ instance Storable a => Storable (Vertex1 a) where
- 
- -- | A vertex with /z/=0 and /w/=1.
- data Vertex2 a = Vertex2 !a !a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vertex2 where
-    fmap f (Vertex2 x y) = Vertex2 (f x) (f y)
-@@ -90,12 +85,6 @@ instance Traversable Vertex2 where
-    mapM f (Vertex2 x y) = return Vertex2 `ap` f x `ap` f y
-    sequence (Vertex2 x y) = return Vertex2 `ap` x `ap` y
- 
--instance Typeable1 Vertex2 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vertex2") []
--
--instance Typeable a => Typeable (Vertex2 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vertex2 a) where
-    sizeOf ~(Vertex2 x _) = 2 * sizeOf x
-    alignment ~(Vertex2 x _) = alignment x
-@@ -106,7 +95,7 @@ instance Storable a => Storable (Vertex2 a) where
- 
- -- | A vertex with /w/=1.
- data Vertex3 a = Vertex3 !a !a !a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vertex3 where
-    fmap f (Vertex3 x y z) = Vertex3 (f x) (f y) (f z)
-@@ -127,12 +116,6 @@ instance Traversable Vertex3 where
-    mapM f (Vertex3 x y z) = return Vertex3 `ap` f x `ap` f y `ap` f z
-    sequence (Vertex3 x y z) = return Vertex3 `ap` x `ap` y `ap` z
- 
--instance Typeable1 Vertex3 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vertex3") []
--
--instance Typeable a => Typeable (Vertex3 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vertex3 a) where
-    sizeOf ~(Vertex3 x _ _) = 3 * sizeOf x
-    alignment ~(Vertex3 x _ _) = alignment x
-@@ -143,7 +126,7 @@ instance Storable a => Storable (Vertex3 a) where
- 
- -- | A fully-fledged four-dimensional vertex.
- data Vertex4 a = Vertex4 !a !a !a !a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vertex4 where
-    fmap f (Vertex4 x y z w) = Vertex4 (f x) (f y) (f z) (f w)
-@@ -164,12 +147,6 @@ instance Traversable Vertex4 where
-    mapM f (Vertex4 x y z w) = return Vertex4 `ap` f x `ap` f y `ap` f z `ap` f w
-    sequence (Vertex4 x y z w) = return Vertex4 `ap` x `ap` y `ap` z `ap` w
- 
--instance Typeable1 Vertex4 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vertex4") []
--
--instance Typeable a => Typeable (Vertex4 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vertex4 a) where
-    sizeOf ~(Vertex4 x _ _ _) = 4 * sizeOf x
-    alignment ~(Vertex4 x _ _ _) = alignment x
-@@ -180,7 +157,7 @@ instance Storable a => Storable (Vertex4 a) where
- 
- -- | A one-dimensional vector.
- newtype Vector1 a = Vector1 a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vector1 where
-    fmap f (Vector1 x) = Vector1 (f x)
-@@ -201,12 +178,6 @@ instance Traversable Vector1 where
-    mapM f (Vector1 x) = return Vector1 `ap` f x
-    sequence (Vector1 x) = return Vector1 `ap` x
- 
--instance Typeable1 Vector1 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vector1") []
--
--instance Typeable a => Typeable (Vector1 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vector1 a) where
-    sizeOf    ~(Vector1 s) = sizeOf s
-    alignment ~(Vector1 s) = alignment s
-@@ -217,7 +188,7 @@ instance Storable a => Storable (Vector1 a) where
- 
- -- | A two-dimensional vector.
- data Vector2 a = Vector2 !a !a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vector2 where
-    fmap f (Vector2 x y) = Vector2 (f x) (f y)
-@@ -238,12 +209,6 @@ instance Traversable Vector2 where
-    mapM f (Vector2 x y) = return Vector2 `ap` f x `ap` f y
-    sequence (Vector2 x y) = return Vector2 `ap` x `ap` y
- 
--instance Typeable1 Vector2 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vector2") []
--
--instance Typeable a => Typeable (Vector2 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vector2 a) where
-    sizeOf ~(Vector2 x _) = 2 * sizeOf x
-    alignment ~(Vector2 x _) = alignment x
-@@ -254,7 +219,7 @@ instance Storable a => Storable (Vector2 a) where
- 
- -- | A three-dimensional vector.
- data Vector3 a = Vector3 !a !a !a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vector3 where
-    fmap f (Vector3 x y z) = Vector3 (f x) (f y) (f z)
-@@ -275,12 +240,6 @@ instance Traversable Vector3 where
-    mapM f (Vector3 x y z) = return Vector3 `ap` f x `ap` f y `ap` f z
-    sequence (Vector3 x y z) = return Vector3 `ap` x `ap` y `ap` z
- 
--instance Typeable1 Vector3 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vector3") []
--
--instance Typeable a => Typeable (Vector3 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vector3 a) where
-    sizeOf ~(Vector3 x _ _) = 3 * sizeOf x
-    alignment ~(Vector3 x _ _) = alignment x
-@@ -291,7 +250,7 @@ instance Storable a => Storable (Vector3 a) where
- 
- -- | A four-dimensional vector.
- data Vector4 a = Vector4 !a !a !a !a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vector4 where
-    fmap f (Vector4 x y z w) = Vector4 (f x) (f y) (f z) (f w)
-@@ -312,12 +271,6 @@ instance Traversable Vector4 where
-    mapM f (Vector4 x y z w) = return Vector4 `ap` f x `ap` f y `ap` f z `ap` f w
-    sequence (Vector4 x y z w) = return Vector4 `ap` x `ap` y `ap` z `ap` w
- 
--instance Typeable1 Vector4 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vector4") []
--
--instance Typeable a => Typeable (Vector4 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vector4 a) where
-    sizeOf ~(Vector4 x _ _ _) = 4 * sizeOf x
-    alignment ~(Vector4 x _ _ _) = alignment x
diff --git a/dev-haskell/tensor/metadata.xml b/dev-haskell/tensor/metadata.xml
deleted file mode 100644
index 5a39796adcf0..000000000000
--- a/dev-haskell/tensor/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package contains tensor data types and their instances for some basic
-		type classes.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/tensor/tensor-1.0.0.1.ebuild b/dev-haskell/tensor/tensor-1.0.0.1.ebuild
deleted file mode 100644
index f5d374ded40a..000000000000
--- a/dev-haskell/tensor/tensor-1.0.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-MY_PN="Tensor"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tensor data types"
-HOMEPAGE="http://www.haskell.org/HOpenGL/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/cabal
-"
-PATCHES=("${FILESDIR}"/${PN}-1.0.0.1-ghc-7.8.patch)
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/terminal-size-0.3.2.1 b/dev-haskell/terminal-size-0.3.2.1
new file mode 100644
index 000000000000..682ab2f171cc
--- /dev/null
+++ b/dev-haskell/terminal-size-0.3.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Get terminal window height and width
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/terminal-size
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.2.1
+SRC_URI=mirror://hackage/packages/archive/terminal-size/0.3.2.1/terminal-size-0.3.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e3d28065c5f4ed17a1ccc733e4fcddce
diff --git a/dev-haskell/terminal-size/Manifest b/dev-haskell/terminal-size/Manifest
deleted file mode 100644
index 0a3f17c1dbde..000000000000
--- a/dev-haskell/terminal-size/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST terminal-size-0.3.2.1.tar.gz 4175 BLAKE2B d6a2b54298217dfae26e3fccb5aca6813c23b1bdef5c2e22236b6285222ade53842acd0283e862c86f25f94c1b5ce9f990ad583e0f498b57795d6d59bafdd920 SHA512 1e04705dda8ade9a06f8b369f1033a93ffb94a1b959a556e11f2373b25924adbbab4be0f3e077394e1023e0054044739df13406b69153c1542f4083be82a1584
-EBUILD terminal-size-0.3.2.1.ebuild 557 BLAKE2B 77acf4709646f709a5ed97e19a5500411515c6f717c0da09a98c99ca0344bd3072330ccfbec4618260d89dfb4ba0783cb2af1e26cd43622f98333b7e0c626340 SHA512 bc75e5b65429a5d5bb657e999c0bcf1db5726cddbfe237e823235a4337c234b8caf01fd711c1e6191eb362281225d5bd375962a73ba7298b4d170dbe8d3c51c0
-MISC metadata.xml 400 BLAKE2B a5ab678a0634591a81cfcefd13ccc181a5b9e5b33a1151dc4b5fc627d59bb8c5d1f06d1fbbf4cead0093d9910122139dd0e5e04e1e05715f97c334455566ddae SHA512 ea20f290a799f96d47da8d221c60faaa59ac2194c3d5e60c541d6d066ce9eee7860c02ca0cacb72b80f644bb2d90004be216883f2c5f5417fdb24f2ca026ae92
diff --git a/dev-haskell/terminal-size/metadata.xml b/dev-haskell/terminal-size/metadata.xml
deleted file mode 100644
index 079464cfab42..000000000000
--- a/dev-haskell/terminal-size/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Get terminal window height and width without ncurses dependency
-		
-		Only tested to work on GNU/Linux systems
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/terminal-size/terminal-size-0.3.2.1.ebuild b/dev-haskell/terminal-size/terminal-size-0.3.2.1.ebuild
deleted file mode 100644
index 0c4c972ae948..000000000000
--- a/dev-haskell/terminal-size/terminal-size-0.3.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Get terminal window height and width"
-HOMEPAGE="http://hackage.haskell.org/package/terminal-size"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/terminfo-0.4.0.0 b/dev-haskell/terminfo-0.4.0.0
new file mode 100644
index 000000000000..ccabd839858e
--- /dev/null
+++ b/dev-haskell/terminfo-0.4.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.0.1:= sys-libs/ncurses >=dev-haskell/cabal-1.10.0.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=03edb7698f79c250ec4ac844b806ad32
diff --git a/dev-haskell/terminfo-0.4.0.1 b/dev-haskell/terminfo-0.4.0.1
new file mode 100644
index 000000000000..2fc37c57a8be
--- /dev/null
+++ b/dev-haskell/terminfo-0.4.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4f2c752521eaf3c4eb7158711a3560b9
diff --git a/dev-haskell/terminfo-0.4.0.2 b/dev-haskell/terminfo-0.4.0.2
new file mode 100644
index 000000000000..5c507743cc65
--- /dev/null
+++ b/dev-haskell/terminfo-0.4.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=872673b65f042498f860a4a3c51520de
diff --git a/dev-haskell/terminfo/Manifest b/dev-haskell/terminfo/Manifest
deleted file mode 100644
index 09e26a5ea299..000000000000
--- a/dev-haskell/terminfo/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST terminfo-0.4.0.0.tar.gz 45591 BLAKE2B 94986d3301b73458eb83daa99c6a45b631fb83bee2a38724f2ae76b466abe52569529744ffaad014035947358f34761f18c5d1a734f5f2375b80fcfc2b1c4a8b SHA512 ba52ddd60ef899ca0a696813d613d12964b5e73b6450f013f4545cafa1ccd99b6f86916f0d369b4562ece0fa3f9280a7bba8160363cbc6cae93cedc3992fbf70
-DIST terminfo-0.4.0.1.tar.gz 45615 BLAKE2B e763301621d9d55e250ac822b2dbf1a9b652d8f99a205de9e17572f99c3b576424bb555e00d26654ef0acdd06c4ac16ed9c5fb7c207f0eb5aea19325f51eedb5 SHA512 4b21621f4f7ebf656fbfd4278fa970d0211e2b66632b5251cdcd659a71df04294ba334ede97582b5b7f403e15552f3b6c4b5f0cb9ec6453aace502109eaeff46
-DIST terminfo-0.4.0.2.tar.gz 45511 BLAKE2B edf4fae3dc4d6550941f60c2e87bfd2a81757e54e4198cd39751a651b6a09671d5dc8e8199bc25c5a06ae5644d7c30a299cf3aaa1b6256850ea24f64002f038f SHA512 eda799218ee1b1a765d909e9723fbf7e2de33b2946fdaeb92141bbf056a20a66bebc4b72359d1f5bdd5d188a10a3701d73818cee65170e0660daccf8c295897e
-EBUILD terminfo-0.4.0.0.ebuild 677 BLAKE2B f20a78c82242c74c84ef754d049b4990e42a94de8386294cb782248fb11f8482c34d949ca83dc9d8879bace497c0c454b8c731639a55d87bba9aabc86638379f SHA512 255a8012534c401a8e9c24faf11d3b72b63f36187e666464a026ec3109fe7e9121fd475d3128d928024d929e478108f2eb2922fd38e1c9ba95832ecedce62ece
-EBUILD terminfo-0.4.0.1.ebuild 685 BLAKE2B a0f27910d3980b841ca3a46b56b39e35b37e127c940debe7991cd3b8a38bf3fc2ee9e76104c3c72ff1028e1fb911cf8d65ed4dd574e844693683871d352b6fd4 SHA512 426699938bb783a6073adfb9b7ee723df25ce4e578e2b1d6808ec70e28159d316807c1d15c2cdb3ff8116d00dec285124af45f842e3647b5ec2e5f29c6137607
-EBUILD terminfo-0.4.0.2.ebuild 724 BLAKE2B b6ed177c37ca5a9fb1bed107aa4f9c650f104066bb2b473d4bd4bc4e5c21c7192bb2124ff299205fca63564ae94fe846686ea59b213e89d0489ca623c29641c9 SHA512 2fea571492f9f2d4720777cc2d36d7388a1130a120fb22919554ad5277ecbf292a5b8f1c2be282c8b1c166c6fa506d113bc9ebf90700f474c078b5bf33d0b893
-MISC metadata.xml 306 BLAKE2B d582705c23d944c9c5e719cd7e5bd3ec21d51c972a9a6d1745ce7ffe7be67a02cce445aceffe320deceb2a3bd14e259e0f5d0a106f320abb7c8ab8cb6479a3f1 SHA512 265a8a424b9ec088d8f4f0902c294e336b1265a1cb538bf7aca854055a88a2aa2a33c22843b4a98007ff84b6699be0d0e68d7b9e943462a673580f5afd39047b
diff --git a/dev-haskell/terminfo/metadata.xml b/dev-haskell/terminfo/metadata.xml
deleted file mode 100644
index b148b282e3ce..000000000000
--- a/dev-haskell/terminfo/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">judah/terminfo</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/terminfo/terminfo-0.4.0.0.ebuild b/dev-haskell/terminfo/terminfo-0.4.0.0.ebuild
deleted file mode 100644
index 031b163f9df5..000000000000
--- a/dev-haskell/terminfo/terminfo-0.4.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to the terminfo library"
-HOMEPAGE="https://github.com/judah/terminfo"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.0.1:=
-	sys-libs/ncurses
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-"
-
-CABAL_CORE_LIB_GHC_PV="7.8.3 7.8.3.20141119 7.8.4"
diff --git a/dev-haskell/terminfo/terminfo-0.4.0.1.ebuild b/dev-haskell/terminfo/terminfo-0.4.0.1.ebuild
deleted file mode 100644
index 2c82db898a89..000000000000
--- a/dev-haskell/terminfo/terminfo-0.4.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to the terminfo library"
-HOMEPAGE="https://github.com/judah/terminfo"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:7.10.1 PM:7.10.2_rc2 PM:7.10.2 PM:7.10.2-r1 PM:7.10.3"
diff --git a/dev-haskell/terminfo/terminfo-0.4.0.2.ebuild b/dev-haskell/terminfo/terminfo-0.4.0.2.ebuild
deleted file mode 100644
index aaf7baf83060..000000000000
--- a/dev-haskell/terminfo/terminfo-0.4.0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to the terminfo library"
-HOMEPAGE="https://github.com/judah/terminfo"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.0.1_rc2 PM:8.0.1_rc3 PM:8.0.1_rc4 PM:8.0.1 PM:8.0.2_rc1 PM:8.0.2_rc2 PM:8.0.2 PM:9999"
diff --git a/dev-haskell/test-framework-0.8 b/dev-haskell/test-framework-0.8
new file mode 100644
index 000000000000..d4a942bd254e
--- /dev/null
+++ b/dev-haskell/test-framework-0.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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:= >=dev-haskell/cabal-1.2.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Framework for running and organising tests, with HUnit and QuickCheck support
+EAPI=5
+HOMEPAGE=https://batterseapower.github.com/test-framework/
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=32797a03a7796c65fb48a09dfaaedf4e
diff --git a/dev-haskell/test-framework-0.8.1.1 b/dev-haskell/test-framework-0.8.1.1
new file mode 100644
index 000000000000..eb6dedabf19c
--- /dev/null
+++ b/dev-haskell/test-framework-0.8.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=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:= >=dev-haskell/cabal-1.6 test? ( >=dev-haskell/hunit-1.2:=[profile?] >=dev-haskell/libxml-0.1.1:=[profile?] >=dev-haskell/quickcheck-2.3:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?] ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Framework for running and organising tests, with HUnit and QuickCheck support
+EAPI=5
+HOMEPAGE=https://batterseapower.github.io/test-framework/
+IUSE=test doc hscolour profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fd08812be15643dae1b248ad334f8f9b
diff --git a/dev-haskell/test-framework-hunit-0.2.7 b/dev-haskell/test-framework-hunit-0.2.7
new file mode 100644
index 000000000000..e18cb8705a4e
--- /dev/null
+++ b/dev-haskell/test-framework-hunit-0.2.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cabal-1.2.3 >=dev-lang/ghc-6.10 >=dev-haskell/hunit-1.2[profile?] >=dev-haskell/test-framework-0.2.0[profile?] doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a2d51aa39b9ffe7bf1ab6d0dc91c29d9
diff --git a/dev-haskell/test-framework-hunit-0.3.0 b/dev-haskell/test-framework-hunit-0.3.0
new file mode 100644
index 000000000000..5ce2467f7d16
--- /dev/null
+++ b/dev-haskell/test-framework-hunit-0.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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:= >=dev-haskell/cabal-1.2.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=feefa74fdf5635fed0205e6e0b5deb58
diff --git a/dev-haskell/test-framework-hunit-0.3.0.2 b/dev-haskell/test-framework-hunit-0.3.0.2
new file mode 100644
index 000000000000..b38945c56f4c
--- /dev/null
+++ b/dev-haskell/test-framework-hunit-0.3.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=23131526b6ddf674b5e3f556db9651e3
diff --git a/dev-haskell/test-framework-hunit/Manifest b/dev-haskell/test-framework-hunit/Manifest
deleted file mode 100644
index 099bd87a22a0..000000000000
--- a/dev-haskell/test-framework-hunit/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST test-framework-hunit-0.2.7.tar.gz 2633 BLAKE2B 5abebc66e7eddb6631142597d3f0f95e80fb5d58baee50392815e4b00e6b37d5fb216ed582b7e1961bb92a9b954d20003053507689b66898cd67f08ebd72603d SHA512 db3edad323edd8441a0c8ca980a2113901c66dca3076cd971891a692d6772b5df0a863b004094a71b707d9014add2f865f8c1072cb35e2d5fa85351f7f2b49c3
-DIST test-framework-hunit-0.3.0.2.tar.gz 2770 BLAKE2B 48d5d90f215a27402c77967e4656e99cf74740775a98b3fbbd6d3ecd90ec1dc8d31cf462df6f7ba2939b40dd524d5f13a4cde01ce0d03aeb2829726393ef39de SHA512 068ca4326935746769aa4023076e9bd85d1753073c6e67d88daa6ccf2a69f3bafb87c3b03fd5ada612f6ddbdf2447b06ef8f853675cf0efe9eafd80606c40e32
-DIST test-framework-hunit-0.3.0.tar.gz 2679 BLAKE2B 8e224ed1c05d8812b8fad8427350a725926ce150c9381c1f76e10deff0d5f818f3ab672b1e4dc5cbc4e6cdd61496a9d7c95d73ddfc110e263f0e17bbf37dd835 SHA512 39a537a56d3fa7f6a996b58a40971265acf4103608f10386af2c7d8d941cc416afa504af2f2f70b91e43616dac1231d384e2fc14835f5a13e41fd27d42f708ed
-EBUILD test-framework-hunit-0.2.7.ebuild 663 BLAKE2B 701eb29e06d396663bd1f29f3d99bd79f69a692158d19d7ba7a13260225b04e048291ecc069b704d1a73c7388d0867da9f603c003df64ed132a0430a3f66ef82 SHA512 5a4adb2f6446f35d778405c4100c9890d7f54e19149caf1f7703fdb169e492909935883957d62cb0f9de538cd7cdd220e70977e5e4e307d2d1578c08697939ab
-EBUILD test-framework-hunit-0.3.0.2.ebuild 926 BLAKE2B 936cdad6d04b3a8c19677cadf908e8ff826efbfd2e0b7c28c27b46109b7724068c63d66652f87e5afc39d6edda7e0cbf74fc762505ffbc85dedde3cb5782b783 SHA512 23809363d8b037d00a06572b3d9e2f068c35f751ed2e8031c09521d5a31c4b6a465a3ba6981df1a87155dd30c5ec216dbc760eedefcf544e9a54c7398e0346a5
-EBUILD test-framework-hunit-0.3.0.ebuild 835 BLAKE2B 7b1bd5b10f61e99ef9b3b33b79ce553107655bae3e9639a89768c5473b94839ea34d4d93179449dd41c00ec1d3b9c0b3152ab7e509130f6cc7052f0b1724ccbc SHA512 d4fad6c9a563175d4d485eebf05447a739a9c8e413a26adfc009f8f944559d7a208a3f26b1b4ae5ca3c77e6d2ba9cde19fcce6f8ac5e86acf5ec285c67ed9dfb
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/test-framework-hunit/metadata.xml b/dev-haskell/test-framework-hunit/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/test-framework-hunit/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/test-framework-hunit/test-framework-hunit-0.2.7.ebuild b/dev-haskell/test-framework-hunit/test-framework-hunit-0.2.7.ebuild
deleted file mode 100644
index bf5b78a0a239..000000000000
--- a/dev-haskell/test-framework-hunit/test-framework-hunit-0.2.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HUnit support for the test-framework package"
-HOMEPAGE="https://batterseapower.github.com/test-framework/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-HASKELLDEPS=">=dev-haskell/hunit-1.2[profile?]
-		>=dev-haskell/test-framework-0.2.0[profile?]"
-RDEPEND=">=dev-lang/ghc-6.10
-		${HASKELLDEPS}"
-DEPEND=">=dev-haskell/cabal-1.2.3
-		${RDEPEND}"
diff --git a/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2.ebuild b/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2.ebuild
deleted file mode 100644
index 9c24a1e0dd3a..000000000000
--- a/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HUnit support for the test-framework package"
-HOMEPAGE="https://batterseapower.github.io/test-framework/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-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:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=base4
-}
diff --git a/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.ebuild b/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.ebuild
deleted file mode 100644
index ae98e3c0b076..000000000000
--- a/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HUnit support for the test-framework package"
-HOMEPAGE="https://batterseapower.github.com/test-framework/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-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:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2.3"
diff --git a/dev-haskell/test-framework-quickcheck2-0.3.0.2 b/dev-haskell/test-framework-quickcheck2-0.3.0.2
new file mode 100644
index 000000000000..29b204388319
--- /dev/null
+++ b/dev-haskell/test-framework-quickcheck2-0.3.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=858a1b3625406305cc1bc84e673403f9
diff --git a/dev-haskell/test-framework-quickcheck2-0.3.0.3-r2 b/dev-haskell/test-framework-quickcheck2-0.3.0.3-r2
new file mode 100644
index 000000000000..01d1ddbcd601
--- /dev/null
+++ b/dev-haskell/test-framework-quickcheck2-0.3.0.3-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=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:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dd722930dd1901f67150a0586eb69c20
diff --git a/dev-haskell/test-framework-quickcheck2/Manifest b/dev-haskell/test-framework-quickcheck2/Manifest
deleted file mode 100644
index 589143ef92f6..000000000000
--- a/dev-haskell/test-framework-quickcheck2/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST test-framework-quickcheck2-0.3.0.2.tar.gz 3413 BLAKE2B 5dcc3d4e6705ade01dbf6a4da3d8473da87ad1ac53c54b3f164cc40fbe6b56dc91e975376f7c793eb7b1e6ac7ce849e0b7a35ec787b82643fdef8f2f9b5964d6 SHA512 83b3c324edaa0e8809b76dd077b79dc75a0ad26febaecdb824e86bee41dedda422ff2674e1c0e3ea6da5ff1710baad4ae162efd6005a085a88ef4616c66dfea9
-DIST test-framework-quickcheck2-0.3.0.3.tar.gz 3518 BLAKE2B 7eceb9b2860c8918a6391b9ea53fdd2e03db17f4ee470234cb41e960b55c705126eb1f5a4c588f27e67096795b3d513d4f4cd8ee7abb6b8eb1db4cd7d68f8704 SHA512 a61ae17391e66109719ee4da0b0d469f0173a29aec8a9c5f9a4d6d5069c91903d3b3c0d9daa5ec5d611b5654dd25b9a9839f7501df24b489d069511eb7f6eedf
-EBUILD test-framework-quickcheck2-0.3.0.2.ebuild 992 BLAKE2B 764d3a94a884bab3e2e42035c2f5c44306b3f16886eac35a1a664e45dd16ffeb594797f1dc003c6b3d116ef5e515a7d5a3a18cb29784bc7779bde9e215255fe5 SHA512 b05024bfe7e7b23cc4320261f118689e3aae388eb0df047754f2d1a87dedac8db83c68723a94ee7934844ed7918b36d440a21548f7fca2153f2fdd8025210566
-EBUILD test-framework-quickcheck2-0.3.0.3-r2.ebuild 1021 BLAKE2B bddbbb499a2b1a62f846c5d5e14413bc11bd3b807d67999e11f6f22cad11b7f23e3c9b5d6225603008bf14bbff166298705951e0aca0d65a91d488bd0e4ea851 SHA512 c6dd76c6bdbd89ee3ed906db4305331c01f88d558f5537a7ca014821ea93dcaccdac0860e961c51261f7e393c323c6db86897b8ead1e76d6678150a0472de572
-MISC metadata.xml 342 BLAKE2B 76318a533a057c55052f9c4437d1d946108af14871a8c487d3f9b4a1e693e5e6e55b8c21b80b35d428920fde240c1d48d11b5f0a573d31d5588908d8c3d22b25 SHA512 65e222a0ca20f88a7657a2820effe47cf34acee6498986b5d0af6ec100e3123e62223405181e6082397b0c7a273c0a04aecf373be5df25a89715ee4a2068b781
diff --git a/dev-haskell/test-framework-quickcheck2/metadata.xml b/dev-haskell/test-framework-quickcheck2/metadata.xml
deleted file mode 100644
index 0ab08206ed27..000000000000
--- a/dev-haskell/test-framework-quickcheck2/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		QuickCheck2 support for the test-framework package.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.2.ebuild b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.2.ebuild
deleted file mode 100644
index b49088d43f0c..000000000000
--- a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck2 support for the test-framework package"
-HOMEPAGE="https://batterseapower.github.io/test-framework/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-#hackport: ignore-flag base3 : we don't support base3
-#hackport: ignore-flag base4 : we don't support base4
-IUSE=""
-
-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:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.3-r2.ebuild b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.3-r2.ebuild
deleted file mode 100644
index e3b0f8e6f126..000000000000
--- a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.3-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-#hackport: flags: +base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck2 support for the test-framework package"
-HOMEPAGE="https://batterseapower.github.io/test-framework/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-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:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'QuickCheck >= 2.4 && < 2.8' 'QuickCheck >= 2.4'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=base4
-}
diff --git a/dev-haskell/test-framework-th-0.2.4 b/dev-haskell/test-framework-th-0.2.4
new file mode 100644
index 000000000000..76aa23c67d12
--- /dev/null
+++ b/dev-haskell/test-framework-th-0.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/haskell-src-exts:=[profile?] >=dev-haskell/language-haskell-extract-0.2:=[profile?] dev-haskell/regex-posix:=[profile?] dev-haskell/test-framework:=[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=Automagically generate the HUnit and Quickcheck code using Template Haskell
+EAPI=5
+HOMEPAGE=https://github.com/finnsson/test-generator
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/haskell-src-exts:=[profile?] >=dev-haskell/language-haskell-extract-0.2:=[profile?] dev-haskell/regex-posix:=[profile?] dev-haskell/test-framework:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.2.4
+SRC_URI=mirror://hackage/packages/archive/test-framework-th/0.2.4/test-framework-th-0.2.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d0f6c9494181d2c34e579302127de5bd
diff --git a/dev-haskell/test-framework-th-prime-0.0.7 b/dev-haskell/test-framework-th-prime-0.0.7
new file mode 100644
index 000000000000..60718da0b63e
--- /dev/null
+++ b/dev-haskell/test-framework-th-prime-0.0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-haskell/cpphs-0.2.1:=[profile?] dev-haskell/haskell-src-exts:=[profile?] dev-haskell/test-framework:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Template Haskell for test framework
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/test-framework-th-prime
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cpphs-0.2.1:=[profile?] dev-haskell/haskell-src-exts:=[profile?] dev-haskell/test-framework:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.0.7
+SRC_URI=mirror://hackage/packages/archive/test-framework-th-prime/0.0.7/test-framework-th-prime-0.0.7.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bfb6973597e0e3273e5cda875e3e12ee
diff --git a/dev-haskell/test-framework-th-prime-0.0.8 b/dev-haskell/test-framework-th-prime-0.0.8
new file mode 100644
index 000000000000..f16df43372ac
--- /dev/null
+++ b/dev-haskell/test-framework-th-prime-0.0.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cpphs-0.2.1:=[profile?] dev-haskell/haskell-src-exts:=[profile?] dev-haskell/test-framework:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Template Haskell for test framework
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/test-framework-th-prime
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cpphs-0.2.1:=[profile?] dev-haskell/haskell-src-exts:=[profile?] dev-haskell/test-framework:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.0.8
+SRC_URI=mirror://hackage/packages/archive/test-framework-th-prime/0.0.8/test-framework-th-prime-0.0.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f51477206e4e651c8eb4cf3eeb4bac87
diff --git a/dev-haskell/test-framework-th-prime-0.0.9 b/dev-haskell/test-framework-th-prime-0.0.9
new file mode 100644
index 000000000000..d924695eb0f2
--- /dev/null
+++ b/dev-haskell/test-framework-th-prime-0.0.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cpphs-0.2.1:=[profile?] dev-haskell/haskell-src-exts:=[profile?] dev-haskell/test-framework:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Template Haskell for test framework
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/test-framework-th-prime
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cpphs-0.2.1:=[profile?] dev-haskell/haskell-src-exts:=[profile?] dev-haskell/test-framework:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.0.9
+SRC_URI=mirror://hackage/packages/archive/test-framework-th-prime/0.0.9/test-framework-th-prime-0.0.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e85780501191b35db8e4bba0d897c088
diff --git a/dev-haskell/test-framework-th-prime/Manifest b/dev-haskell/test-framework-th-prime/Manifest
deleted file mode 100644
index 1a2c32e5d12c..000000000000
--- a/dev-haskell/test-framework-th-prime/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX test-framework-th-prime-0.0.7-cpphs-1.19.patch 543 BLAKE2B 020b81b3ec3a7aefb0bb090883fbe9f704d194266fdf7a82ace1af4d2374a89f48e45dceac33e38baddd3028e361934b5ad2d5e652c2d7294c4cb5bd4eaee664 SHA512 111948aee97ba397d402b472f557b960cf68c077e049f4c2b87a58cb9e812e85eeeb0d672ac6a2b045a60b0cbbe9f6107a65ed11e17e80004792e621aad3d1a7
-DIST test-framework-th-prime-0.0.7.tar.gz 3832 BLAKE2B 47a4f4cc6884e71e4029290577c4c989fc881b506626ea41ce5598ccef84886b5af755a74f8a92ba68063cf2eaa94de71e098c308edd4c8df4f7a718e27bd8d1 SHA512 724b4de8cfdf10341bc95a6f437359fe0210ab0b7bef63761912d85d71ae552cef230f20bd50a723cf7aafcd45c30def6dc80b37c876986418db6072193f0daa
-DIST test-framework-th-prime-0.0.8.tar.gz 3836 BLAKE2B 7ffa24ed45109319ab111d9b29dfb3beda6624c126eb2c308a5c7b7e0fa36cc5b67564c30220df14ec0db46bf82484446916cb78e0201e1cf995636a53d32b69 SHA512 f988c4c4a1329d9b6f1dc98a840b51787ecc3d2648e8093871970d9a79931cb56cbbef718f052773cb62867c7f0b084e15fa3dfc75c7443d1a94c4df65b8b71e
-DIST test-framework-th-prime-0.0.9.tar.gz 3908 BLAKE2B 4c8794bf66081ffd6eee2b6f0e9d8fd5f2218a90c2522398b13f440aade1244a62e91c3c1e11367f109babd2e78722d94beaac95555be356ce55f25d118adfa3 SHA512 52f64b1705d51f45512da4270d8a80c93602d62a2c33eb3a0146f10a3f737395c9d0294af62cc3ff859dc8292338df892c0262216349109bb4f7b0beb09d3601
-EBUILD test-framework-th-prime-0.0.7.ebuild 762 BLAKE2B d148fedb7709c269c43b9bf96f0ea6819f0199cefce4690eca0f92c12ab04ccf2cee40044366f3b95306986d2032b8a74acb54a61b9939f3fcbece869927f271 SHA512 ae1a35f755ce6333abaa373ee40e509def0b1773b5563d5194181660744c135c49a2cc4b52bb1abd02fde8b0ed6aea7ffdaeb57bbdab08b6c8ac7f53a53278aa
-EBUILD test-framework-th-prime-0.0.8.ebuild 705 BLAKE2B 89cdca2e59aa73b601557bad03234ae5dd8a815aeb6e94478bde4541f765e5786ca83e3434e4dc72ad42e6b96517d5ad94723dd7b6c5825cb2b9599b40f05406 SHA512 2aa59a6426235f428a94d3ebb5bdc7ee33d91705e669e321d4746bdca3daf8137d662f64d4318bf32ff0f608b65e2b56bd33d033c752d5c55faf1c4c6ab7243f
-EBUILD test-framework-th-prime-0.0.9.ebuild 701 BLAKE2B 97b683ce2cbb13415c18a54dcc52ec7ca9959450ffa615fb55bf79a6deda990409e52a4525a9a94c298db24f4c937356ac32261821dfe682880117dfa58c2d2d SHA512 6e630ce2d01d239fdbbe4ae3cd7f90377f2d973bbf6eea00cdfc10593c9ba07719f6236cc7ae045f933df5f426259fcbcb11476ba327ca532e15f1bcdb9df5d0
-MISC metadata.xml 364 BLAKE2B 75e7b23afcf72d32809e7b955b6427fbda3355bb3204ce7e6231d95916ddc4e44da0e5bf7038f5dec0cdf466ce08eb385333b679ead64b3beb68b17e9b9fd9b9 SHA512 b858a5901747207b40d99002ff60eefa7c4d7ccc94739a2c3b71f1e2a742c2345ffadcc3ff3ae97d339937887ae4ae233a5bb795165e667ac13c7e559f24003d
diff --git a/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.7-cpphs-1.19.patch b/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.7-cpphs-1.19.patch
deleted file mode 100644
index a638dcd10106..000000000000
--- a/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.7-cpphs-1.19.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- test-framework-th-prime-0.0.7-orig/Test/Framework/TH/Prime/Parser.hs	2014-10-08 12:01:25.000000000 +1100
-+++ test-framework-th-prime-0.0.7/Test/Framework/TH/Prime/Parser.hs	2015-04-04 23:46:56.120211323 +1100
-@@ -10,7 +10,7 @@
- import Language.Haskell.Exts.Parser
- import Language.Haskell.Exts.Syntax hiding (VarName, Exp)
- import Language.Haskell.TH hiding (Match)
--import Language.Preprocessor.Cpphs
-+import Language.Preprocessor.Cpphs (cppIfdef, defaultBoolOptions)
- 
- ----------------------------------------------------------------
- 
diff --git a/dev-haskell/test-framework-th-prime/metadata.xml b/dev-haskell/test-framework-th-prime/metadata.xml
deleted file mode 100644
index cdcb0fe22e29..000000000000
--- a/dev-haskell/test-framework-th-prime/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Automatically generates a Test list for
-		HUnit, doctest and QuickCheck2.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild
deleted file mode 100644
index a41aebe58617..000000000000
--- a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="Template Haskell for test framework"
-HOMEPAGE="http://hackage.haskell.org/package/test-framework-th-prime"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cpphs-0.2.1:=[profile?]
-	dev-haskell/haskell-src-exts:=[profile?]
-	dev-haskell/test-framework:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-PATCHES=("${FILESDIR}/${PN}-0.0.7-cpphs-1.19.patch")
diff --git a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.8.ebuild b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.8.ebuild
deleted file mode 100644
index b4d9aedef9b3..000000000000
--- a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Template Haskell for test framework"
-HOMEPAGE="http://hackage.haskell.org/package/test-framework-th-prime"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cpphs-0.2.1:=[profile?]
-	dev-haskell/haskell-src-exts:=[profile?]
-	dev-haskell/test-framework:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.9.ebuild b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.9.ebuild
deleted file mode 100644
index e03af93cb5cf..000000000000
--- a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.9.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Template Haskell for test framework"
-HOMEPAGE="http://hackage.haskell.org/package/test-framework-th-prime"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cpphs-0.2.1:=[profile?]
-	dev-haskell/haskell-src-exts:=[profile?]
-	dev-haskell/test-framework:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/test-framework-th/Manifest b/dev-haskell/test-framework-th/Manifest
deleted file mode 100644
index db4ed864d2bb..000000000000
--- a/dev-haskell/test-framework-th/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST test-framework-th-0.2.4.tar.gz 2977 BLAKE2B f43f3f964eecfba401db1fb574ab9ef4bf9b575251a60f196ddd451c23f8c29ea44f90d441eae2f5d923d053061a247820fc0a399e59e1eb088ba31abf38ef44 SHA512 0e8b6898eb7bf481bafb0c9ff9caa615dbf768e538e26b15ab899c5c9a1ad6bd6ed76ef93cf9a823706046d41f49fbb0cbe660bf846e59a608a0e5d21e89686b
-EBUILD test-framework-th-0.2.4.ebuild 766 BLAKE2B 9bdeee5d706ddf3e2d4cfe3bf3135597f4c254d6901c71188901cbe530884e25cd31ea1cb7628267fb1d2ef3b9adc41d513b0555e2f613eec3800b57ab4d733a SHA512 dd5a70871127719b19d232dcea41a8d6247373a55e4f0eaf096304735083daa9150098dc63cd7f8dad6a55e922817b9f9bafab3081e056927742e912cd123325
-MISC metadata.xml 1980 BLAKE2B 5048d5716f585e4b30b73713b513fb44dac589fa4a9b13a96b659159e412c074d3877d201319a72798119f633b49389d9e1643afc3c9935f5970e685625e464f SHA512 6fa19ea53be7c7dc114c6bdc70b41cd0ebf60c7a25f36cd2035ef7225c1da11e5de7d08eaf1bf41df7d305db5be5f3a26aea089a6a117481fd361ed3d0a2701c
diff --git a/dev-haskell/test-framework-th/metadata.xml b/dev-haskell/test-framework-th/metadata.xml
deleted file mode 100644
index a8fce2d224aa..000000000000
--- a/dev-haskell/test-framework-th/metadata.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		@test-framework-th@ contains two interesting functions: @defaultMainGenerator@ and @testGroupGenerator@.
-		
-		@defaultMainGenerator@ will extract all functions beginning with case_ or prop_ in the module and put them in a testGroup.
-		
-		&gt; -- file SomeModule.hs
-		&gt; ( -# LANGUAGE TemplateHaskell #- )
-		&gt; module SomeModule where
-		&gt; import Test.Framework.TH
-		&gt; import Test.Framework
-		&gt; import Test.HUnit
-		&gt; import Test.Framework.Providers.HUnit
-		&gt; import Test.Framework.Providers.QuickCheck2
-		&gt;
-		&gt; -- observe this line!
-		&gt; main = $(defaultMainGenerator)
-		&gt; case_1 = do 1 @=? 1
-		&gt; case_2 = do 2 @=? 2
-		&gt; prop_reverse xs = reverse (reverse xs) == xs
-		&gt;    where types = xs::[Int]
-		
-		is the same as
-		
-		&gt; -- file SomeModule.hs
-		&gt; ( -# LANGUAGE TemplateHaskell #- )
-		&gt; module SomeModule where
-		&gt; import Test.Framework.TH
-		&gt; import Test.Framework
-		&gt; import Test.HUnit
-		&gt; import Test.Framework.Providers.HUnit
-		&gt; import Test.Framework.Providers.QuickCheck2
-		&gt;
-		&gt; -- observe this line!
-		&gt; main =
-		&gt;   defaultMain [
-		&gt;     testGroup "SomeModule" [ testCase "1" case_1, testCase "2" case_2, testProperty "reverse" prop_reverse]
-		&gt;     ]
-		&gt;
-		&gt; case_1 = do 1 @=? 1
-		&gt; case_2 = do 2 @=? 2
-		&gt; prop_reverse xs = reverse (reverse xs) == xs
-		&gt;    where types = xs::[Int]
-		
-		@testGroupGenerator@ is like @defaultMainGenerator@ but without @defaultMain@. It is useful if you need a function for the testgroup
-		(e.g. if you want to be able to call the testgroup from another module).
-	</longdescription>
-	<upstream>
-		<remote-id type="github">finnsson/test-generator</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild b/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild
deleted file mode 100644
index f6ca21ec7769..000000000000
--- a/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Automagically generate the HUnit and Quickcheck code using Template Haskell"
-HOMEPAGE="https://github.com/finnsson/test-generator"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/haskell-src-exts:=[profile?]
-		>=dev-haskell/language-haskell-extract-0.2:=[profile?]
-		dev-haskell/regex-posix:=[profile?]
-		dev-haskell/test-framework:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/test-framework/Manifest b/dev-haskell/test-framework/Manifest
deleted file mode 100644
index 527cd46bad8b..000000000000
--- a/dev-haskell/test-framework/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST test-framework-0.8.1.1.tar.gz 20900 BLAKE2B 4046a76825e645e82c5c2de7d098233b8bd93acbe8c932fe53d67c56350e87a623ffb2b379f95fce567cd4d8ed4459ea883e49d633f6e18c9ebefe058f74906d SHA512 7fd6015a0469623d2738c2a8d14c6b3a356c9463084a1b471f1c1b7b75bd33796ae8a0c01731e7b87dfa345be16bbeb262fcb1cdd4d8f1fdabd79c45f3570cbd
-DIST test-framework-0.8.tar.gz 20253 BLAKE2B 2dc4d0926e529a22776f370bf673c797c77cec97f4d7cf02da85ffcaf245496c2d19159481b2c88a00a04b5f850bd4acffe050c8abf58525f5779799b83a5304 SHA512 5f2238b65d644faf14a1b057abd642c31bcfc337b345d155cd7b04d99589aa269b74ce9b5225b843db8fcab25454b677a05c498c873ee26635c206f6470a438b
-EBUILD test-framework-0.8.1.1.ebuild 1371 BLAKE2B cfd2c541e963c4863917500957f0b0d6b319be8976106ab2419c9b42a29e784cb985d66a2212bf4191b5ec5010382d87b5f639e720c1377f84e42575cf137072 SHA512 bd46ede6c974aeda21c068ea8a3483707f15733c0c6f1a875b6b3d0dcb131445f7ea7b568810ea8c1352faae279568209fc4c4972ba8f7c744de142f8cae54b9
-EBUILD test-framework-0.8.ebuild 955 BLAKE2B 134d6424bb47e7caa33551de67c7808f27435dbbc0be77702b6ad985d37dd06abc3513e7ea86c7b590befb506e0aef658be82690ee3a9e8b62af7b3e9e97d4f8 SHA512 85050399cdc5b9b72bc4237f907a4d2fb620a12c55d57c0f72c0048f1b952e85cc0a371093805433c0a02ed9df4ada149dd34dc4242a7691770392fe52f130eb
-MISC metadata.xml 618 BLAKE2B 8aa3d4fe0748ba4e45564d7f27f8e80559df6927af1cf17d2aca7a19065280d0bf1ed7021aa29a15c408ff4b49a078fb686bb075cfebce096898ac013d53e609 SHA512 a766dac2018919d0d3af4f66ef80b968d4bb70fa7c5ec5c412bded7ee2d2208ea7fcd82cf27f4fdc02f38202146ae21e57efda83e283c083d711eac341e44a11
diff --git a/dev-haskell/test-framework/metadata.xml b/dev-haskell/test-framework/metadata.xml
deleted file mode 100644
index 20be587629d7..000000000000
--- a/dev-haskell/test-framework/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Allows tests such as QuickCheck properties and HUnit test cases to be assembled into test groups, run in
-		parallel (but reported in deterministic order, to aid diff interpretation) and filtered and controlled by
-		command line options. All of this comes with colored test output, progress reporting and test statistics output.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/test-framework/test-framework-0.8.1.1.ebuild b/dev-haskell/test-framework/test-framework-0.8.1.1.ebuild
deleted file mode 100644
index 039cabca33f7..000000000000
--- a/dev-haskell/test-framework/test-framework-0.8.1.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Framework for running and organising tests, with HUnit and QuickCheck support"
-HOMEPAGE="https://batterseapower.github.io/test-framework/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="test"
-RESTRICT="test" # tests are missing
-
-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:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-	test? ( >=dev-haskell/hunit-1.2:=[profile?]
-			>=dev-haskell/libxml-0.1.1:=[profile?]
-			>=dev-haskell/quickcheck-2.3:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?] )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'QuickCheck >= 2.3 && < 2.5' 'QuickCheck >= 2.3 && < 2.9' \
-		'time >= 1.1.2 && < 1.6' 'time >= 1.1.2'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test tests)
-}
diff --git a/dev-haskell/test-framework/test-framework-0.8.ebuild b/dev-haskell/test-framework/test-framework-0.8.ebuild
deleted file mode 100644
index 9615d54a6c6a..000000000000
--- a/dev-haskell/test-framework/test-framework-0.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Framework for running and organising tests, with HUnit and QuickCheck support"
-HOMEPAGE="https://batterseapower.github.com/test-framework/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-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:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2.3"
diff --git a/dev-haskell/testing-feat-0.4.0.3 b/dev-haskell/testing-feat-0.4.0.3
new file mode 100644
index 000000000000..21d601d154c8
--- /dev/null
+++ b/dev-haskell/testing-feat-0.4.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >dev-haskell/quickcheck-2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] <dev-haskell/tagshare-0.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Functional Enumeration of Algebraic Types
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/testing-feat
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >dev-haskell/quickcheck-2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] <dev-haskell/tagshare-0.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.0.3
+SRC_URI=mirror://hackage/packages/archive/testing-feat/0.4.0.3/testing-feat-0.4.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=70f1145d576cb30b0e95f6b41e09347b
diff --git a/dev-haskell/testing-feat/Manifest b/dev-haskell/testing-feat/Manifest
deleted file mode 100644
index 97c038bf2eea..000000000000
--- a/dev-haskell/testing-feat/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST testing-feat-0.4.0.3.tar.gz 17864 BLAKE2B ff57b181e3ed34a5e9794b9c3830122e2bd36a8199a641e2025cd5a2e467dae15cfc5d9cb4e21f198cdb667d7b9b6a5f88850f68c69d00da016200c5a12c33ce SHA512 0dabd9129472d9cf91b87a31aec9265369cdf58ec47fe74997df08097d4e93edb4f4bf52050bbca0c345e5993c12d0fcf755b94dd80093a33ba8fef366b08516
-EBUILD testing-feat-0.4.0.3.ebuild 742 BLAKE2B 7dc6e246cfa5512f866e2392a88873f4e84e44f2d2e8c5acd262757f26c318973c9f0119b420e4f28d677de016d2445863dbd9acf061fcca292322a5f971d363 SHA512 4c868ad7f8cceaa0dbef117d5b1a68b4f79cd47bef6518cf37d1c0887442e5b3e14e86bc229a9cb047aedbda1ca70f3d1e96993d35b8f0218b2994402b092df2
-MISC metadata.xml 896 BLAKE2B 4964075c0807fc2220156ac804d7d9d937f76f62b7fba6634844e70ac4961ddfa43c2868f64fde70f3a77806ee4ecdb9c1b300135059caa6f7bc1c5ddfc1359a SHA512 9b3d49257c04b2b4c836ec19aeb6c10ccf2a13a4266b65bfd31af3785d913f54f32689919c042b0d2a2d191d5bdff76b096cfbbfd48139771b5f208be7de418b
diff --git a/dev-haskell/testing-feat/metadata.xml b/dev-haskell/testing-feat/metadata.xml
deleted file mode 100644
index 665eeb0f74e3..000000000000
--- a/dev-haskell/testing-feat/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Feat (Functional Enumeration of Abstract Types) provides
-		enumerations as functions from natural numbers to values
-		(similar to @toEnum@ but for any algebraic data type). This
-		can be used for SmallCheck-style systematic testing,
-		QuickCheck style random testing, and hybrids of the two.
-		
-		The enumerators are defined in a very boilerplate manner
-		and there is a Template Haskell script for deriving the
-		class instance for most types.
-		"Test.Feat" contain a subset of the other modules that
-		should be sufficient for most test usage. There
-		are some small and large example in the tar
-		ball.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/testing-feat/testing-feat-0.4.0.3.ebuild b/dev-haskell/testing-feat/testing-feat-0.4.0.3.ebuild
deleted file mode 100644
index 2ca1696169bb..000000000000
--- a/dev-haskell/testing-feat/testing-feat-0.4.0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Functional Enumeration of Algebraic Types"
-HOMEPAGE="http://hackage.haskell.org/package/testing-feat"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>dev-haskell/quickcheck-2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
-	<dev-haskell/tagshare-0.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/testpack-2.1.3.0-r1 b/dev-haskell/testpack-2.1.3.0-r1
new file mode 100644
index 000000000000..1b4048b18a37
--- /dev/null
+++ b/dev-haskell/testpack-2.1.3.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/quickcheck-2.1.0.3:2=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Test Utililty Pack for HUnit and QuickCheck (unmaintained)
+EAPI=5
+HOMEPAGE=https://github.com/jgoerzen/testpack
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/quickcheck-2.1.0.3:2=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.1.3.0
+SRC_URI=mirror://hackage/packages/archive/testpack/2.1.3.0/testpack-2.1.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7c2eda2c6cdc309ee4e217e99322237b
diff --git a/dev-haskell/testpack/Manifest b/dev-haskell/testpack/Manifest
deleted file mode 100644
index 24437159ea87..000000000000
--- a/dev-haskell/testpack/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX testpack-2.1.3.0-HUnit-1.3.patch 527 BLAKE2B f594752039c0352b042956a9da050447de8ae9de693be1badd9f036cde6eb36f13b94d5b930f85e24f3d1c7e6904e52bd1d0bc4ef15086c5e8cf28488671f471 SHA512 da98a04f7b1e4e0f511e0dda026915f535ffec1706d441af28e7385a7d259dffd40aeea537c7be10b3bbe7c5f3a66476c4873441e82a903f377e22c7aac88c73
-AUX testpack-2.1.3.0-QC-2.8.2.patch 497 BLAKE2B 769cfc26364d74e13a19d2d6daaee294280c12a399cc1d9da32c741a06c9fff7b993725c1aa8e3c674aa2380ec23503c231c35b177d86faefad6d01c3a4f2ba0 SHA512 5e09f9755b253d3819a0837b2125bd0b4f59f158dd3e0aab07d71be828150969169f71f5fadde04a3283193d33d7c2d120f25329d3aeb4a7f5f591ce216cee20
-AUX testpack-2.1.3.0-qc28.patch 5517 BLAKE2B 8113a56fd3646f2bcf24c52ea8ee93b318eb973297aafbe5963bf40c7cbcb062c8b40d7a8525aacb4e10bf96e333de1e09ad31766341ecc94010c8540cfa776a SHA512 1a65f5115de3fe98860b659c6c9781c05d68f49d7f827872199de01b1c6ba1e34437707cb62a2a2f8e060cec8c12e6710499d8f1d1f8695897fd7555784cf9d4
-DIST testpack-2.1.3.0.tar.gz 15466 BLAKE2B 309d3f6681f7e72522ad7411e9d90c4d02b13ccb4dd6d463bc0c5ec298c94ddd4eb25c71feb839e01aec343ab415ac22a03e14714d4fe69716530835eb0f87d8 SHA512 4e9d08a8065c7f2354445e2e81f07d47a7aabead66a4d474728dc3e6bd6244b9d61fa00f8519fd0d10edea54f232e3f7f45ba67d568daccc128bc317597b4ee8
-EBUILD testpack-2.1.3.0-r1.ebuild 864 BLAKE2B 3986904d27372c04ce827e86288fe0da3ebae251eb20e99747d2755606850530f754bfa3c102baedcbe429f35f0d3873b42331951355fab1b7f4ce3fbbe22e1d SHA512 0e60f8adf02c726c0b515b2262175ef3461438817ba0f2c7319b327fa31b015f47fa17b229c9d08b63f27735d1d717b5d2fc9f1f5e36b057e966be4c18e350b6
-MISC metadata.xml 770 BLAKE2B e92f92162a067193d00f3d3d81699a05d35bcd6a0b0df04a2dd5ef0200a317b7e926aa62f69f86e69a6e3751b80ea96fde9c151f15bffa82d9d256c62edda11f SHA512 0c29a360764ca259bf160096d089dad30f33fcc86c148b317fcfec0329a391755efdb399c452e3f84e1812f236cf19435d30a14ad90f20fa9adbae8da7b700e8
diff --git a/dev-haskell/testpack/files/testpack-2.1.3.0-HUnit-1.3.patch b/dev-haskell/testpack/files/testpack-2.1.3.0-HUnit-1.3.patch
deleted file mode 100644
index 599615a8e5fb..000000000000
--- a/dev-haskell/testpack/files/testpack-2.1.3.0-HUnit-1.3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/Test/HUnit/Tools.hs b/src/Test/HUnit/Tools.hs
-index a24a510..6b8a25e 100644
---- a/src/Test/HUnit/Tools.hs
-+++ b/src/Test/HUnit/Tools.hs
-@@ -97,3 +97,7 @@ runVerbTestText (HU.PutText put us) t = do
-   reportFailure = reportProblem "Failure:" "Failure in: "
--  reportProblem p0 p1 msg ss us = put line True us
-+  reportProblem p0 p1
-+#if MIN_VERSION_HUnit(1,3,0)
-+                      _loc
-+#endif
-+                           msg ss us = put line True us
-    where line  = "### " ++ kind ++ path' ++ '\n' : msg
diff --git a/dev-haskell/testpack/files/testpack-2.1.3.0-QC-2.8.2.patch b/dev-haskell/testpack/files/testpack-2.1.3.0-QC-2.8.2.patch
deleted file mode 100644
index 9ea5f8dfe4d5..000000000000
--- a/dev-haskell/testpack/files/testpack-2.1.3.0-QC-2.8.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/Test/QuickCheck/Instances.hs b/src/Test/QuickCheck/Instances.hs
-index 98367b7..f65eb37 100644
---- a/src/Test/QuickCheck/Instances.hs
-+++ b/src/Test/QuickCheck/Instances.hs
-@@ -30,2 +30,3 @@ import Data.Word
- 
-+#if ! MIN_VERSION_QuickCheck(2,8,2)
- instance (Arbitrary k, Arbitrary v, Eq k, Ord k) => Arbitrary (Map.Map k v) where
-@@ -37,2 +38,3 @@ instance (CoArbitrary k, CoArbitrary v, Eq k, Ord k) => CoArbitrary (Map.Map k v
-     coarbitrary = coarbitrary . Map.keys
-+#endif
- 
diff --git a/dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch b/dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch
deleted file mode 100644
index c1971b29b461..000000000000
--- a/dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff --git a/src/Test/HUnit/Tools.hs b/src/Test/HUnit/Tools.hs
-index 2b66548..a24a510 100644
---- a/src/Test/HUnit/Tools.hs
-+++ b/src/Test/HUnit/Tools.hs
-@@ -18,9 +18,9 @@ module Test.HUnit.Tools (assertRaises, mapassertEqual,
-     where
- import Test.QuickCheck as QC
- import Test.QuickCheck.Text
--import Test.QuickCheck.Test
-+import Test.QuickCheck.Test as TQT
- import Test.QuickCheck.Gen
--import Test.QuickCheck.State
-+import Test.QuickCheck.State as TQS
- import qualified Test.QuickCheck.Property as P
- import Test.QuickCheck.Property hiding (Result(reason))
- import qualified Control.Exception
-@@ -33,6 +33,9 @@ import System.Random (newStdGen, StdGen(..), split)
- #define newStdGen newQCGen
- #define StdGen QCGen
- #endif
-+#if MIN_VERSION_QuickCheck(2,8,0)
-+import qualified Data.Map as Map
-+#endif
- import System.IO
- import Text.Printf
- 
-@@ -205,6 +208,9 @@ localquickCheckWithResult args p =
-                                          Just (_,s) -> \_ _ -> s
-                  , numSuccessTests   = 0
-                  , numDiscardedTests = 0
-+#if MIN_VERSION_QuickCheck(2,8,0)
-+                 , TQS.labels        = Map.empty
-+#endif
-                  , collected         = []
-                  , expectedFailure   = False
-                  , randomSeed        = rnd
-@@ -236,14 +242,14 @@ localquickCheckWithResult args p =
-         theOutput <- terminalOutput (terminal st)
- #endif
-         if expectedFailure st then
--           return Success{ labels = summary st
-+           return Success{ TQT.labels = summary st
- #if MIN_VERSION_QuickCheck(2,3,0)
-                          , numTests = numSuccessTests st
-                          , output = theOutput 
- #endif
-                          }
-            else
--           return NoExpectedFailure{ labels = summary st
-+           return NoExpectedFailure{ TQT.labels = summary st
- #if MIN_VERSION_QuickCheck(2,3,0)
-                                    , numTests = numSuccessTests st
-                                    , output = theOutput 
-@@ -257,7 +263,7 @@ localquickCheckWithResult args p =
-         theOutput <- terminalOutput (terminal st)
- #endif
-         return GaveUp{ numTests = numSuccessTests st
--                     , labels   = summary st
-+                     , TQT.labels   = summary st
- #if MIN_VERSION_QuickCheck(2,3,0)
-                      , output   = theOutput
- #endif
-@@ -306,7 +312,7 @@ localquickCheckWithResult args p =
-                foundFailure st res ts
- #endif
-                if not (expect res) then
--                 return Success{ labels = summary st
-+                 return Success{ TQT.labels = summary st
- #if MIN_VERSION_QuickCheck(2,3,0)
-                                , numTests = numSuccessTests st+1
-                                , output = theOutput
-@@ -316,7 +322,7 @@ localquickCheckWithResult args p =
-                  return Failure{ usedSeed   = randomSeed st -- correct! (this will be split first)
-                                , usedSize   = size
-                                , reason     = P.reason res
--                               , labels     = summary st
-+                               , TQT.labels     = summary st
- #if MIN_VERSION_QuickCheck(2,3,0)
-                                , numTests   = numSuccessTests st + 1
-                                , numShrinks = numShrinks
-diff --git a/src/Test/QuickCheck/Tools.hs b/src/Test/QuickCheck/Tools.hs
-index 712c9bf..506686f 100644
---- a/src/Test/QuickCheck/Tools.hs
-+++ b/src/Test/QuickCheck/Tools.hs
-@@ -20,34 +20,18 @@ Written by John Goerzen, jgoerzen\@complete.org
- module Test.QuickCheck.Tools (-- * Comparisons
-                               (@=?),
-                               (@?=)
--                              
-                              )
- where
--#if MIN_VERSION_QuickCheck(2,6,0)
--import Test.QuickCheck.Property (Result(..), callbacks, expect, theException, ok, reason, stamp)
--#if MIN_VERSION_QuickCheck(2,7,0)
--#else
--import Test.QuickCheck.Property (Result(..), callbacks, expect, interrupted, ok, reason, stamp)
--#endif
--#else
--import Test.QuickCheck hiding (Result, reason)
--import Test.QuickCheck.Property
--#endif
-+
-+import qualified Test.QuickCheck.Property as P
- 
- {- | Compare two values.  If same, the test passes.  If different, the result indicates
- what was expected and what was received as part of the error. -}
--(@=?) :: (Eq a, Show a) => a -> a -> Result
-+(@=?) :: (Eq a, Show a) => a -> a -> P.Result
- expected @=? actual = 
--        MkResult {ok = Just (expected == actual), 
--#if MIN_VERSION_QuickCheck(2,7,0)
--                  expect = True, theException = Nothing,
--#else
--                  expect = True, interrupted = False,
--#endif
--                  reason = "Result: expected " ++ show expected ++ ", got " ++ show actual,
--                  stamp = [], callbacks = []}
--    
-+        P.failed { P.ok = Just (expected == actual)
-+                 , P.reason = "Result: expected " ++ show expected ++ ", got " ++ show actual
-+                 }
- {- | Like '@=?', but with args in a different order. -}
--(@?=) :: (Eq a, Show a) => a -> a -> Result
-+(@?=) :: (Eq a, Show a) => a -> a -> P.Result
- (@?=) = flip (@=?)
--
-diff --git a/testpack.cabal b/testpack.cabal
-index 0873b33..dab77d9 100644
---- a/testpack.cabal
-+++ b/testpack.cabal
-@@ -46,7 +46,7 @@ Library
- 
-  Build-Depends: base >= 3 && < 5,
-                mtl, HUnit,
--               QuickCheck >= 2.1.0.3 && < 2.8
-+               QuickCheck >= 2.1.0.3
- 
-  If flag(splitBase)
-    Build-Depends: base >= 3 && < 5, containers, random
diff --git a/dev-haskell/testpack/metadata.xml b/dev-haskell/testpack/metadata.xml
deleted file mode 100644
index 528469d3e207..000000000000
--- a/dev-haskell/testpack/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Testpack provides utilities for both HUnit and QuickCheck.  These include
-		tools for running QuickCheck properties as HUnit test cases, allowing you to
-		combine both approaches in a single program.  It also includes tools for more
-		helpful displays of running progress in both HUnit and QuickCheck, additional
-		generators for other types for QuickCheck, and shortcuts for quickly defining new.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">jgoerzen/testpack</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild b/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild
deleted file mode 100644
index bce6a2462a59..000000000000
--- a/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Test Utililty Pack for HUnit and QuickCheck (unmaintained)"
-HOMEPAGE="https://github.com/jgoerzen/testpack"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~sparc x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/quickcheck-2.1.0.3:2=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-qc28.patch
-	epatch "${FILESDIR}"/${P}-HUnit-1.3.patch
-	epatch "${FILESDIR}"/${P}-QC-2.8.2.patch
-}
diff --git a/dev-haskell/texmath-0.6.4 b/dev-haskell/texmath-0.6.4
new file mode 100644
index 000000000000..ec77a56726ac
--- /dev/null
+++ b/dev-haskell/texmath-0.6.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/pandoc-types:=[profile?] >=dev-haskell/parsec-3:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-6.10.4:= cgi? ( dev-haskell/cgi:=[profile?] dev-haskell/json:=[profile?] dev-haskell/utf8-string:=[profile?] ) >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Conversion of LaTeX math formulas to MathML or OMML
+EAPI=5
+HOMEPAGE=https://github.com/jgm/texmath
+IUSE=cgi test doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/pandoc-types:=[profile?] >=dev-haskell/parsec-3:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-6.10.4:= cgi? ( dev-haskell/cgi:=[profile?] dev-haskell/json:=[profile?] dev-haskell/utf8-string:=[profile?] )
+SLOT=0/0.6.4
+SRC_URI=mirror://hackage/packages/archive/texmath/0.6.4/texmath-0.6.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ae3d99cf8b4ad4cc759bcd3d434f35f4
diff --git a/dev-haskell/texmath-0.6.6.3 b/dev-haskell/texmath-0.6.6.3
new file mode 100644
index 000000000000..b16b5df16400
--- /dev/null
+++ b/dev-haskell/texmath-0.6.6.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/pandoc-types:=[profile?] >=dev-haskell/parsec-3:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-7.4.1:= cgi? ( dev-haskell/cgi:=[profile?] dev-haskell/json:=[profile?] dev-haskell/utf8-string:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Conversion of LaTeX math formulas to MathML or OMML
+EAPI=5
+HOMEPAGE=https://github.com/jgm/texmath
+IUSE=cgi test doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/pandoc-types:=[profile?] >=dev-haskell/parsec-3:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-7.4.1:= cgi? ( dev-haskell/cgi:=[profile?] dev-haskell/json:=[profile?] dev-haskell/utf8-string:=[profile?] )
+SLOT=0/0.6.6.3
+SRC_URI=mirror://hackage/packages/archive/texmath/0.6.6.3/texmath-0.6.6.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2090330350fafddb271729a1e6d87f11
diff --git a/dev-haskell/texmath-0.8.2.2 b/dev-haskell/texmath-0.8.2.2
new file mode 100644
index 000000000000..2164c95287f0
--- /dev/null
+++ b/dev-haskell/texmath-0.8.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-7.4.1:= executable? ( dev-haskell/aeson:=[profile?] dev-haskell/split:=[profile?] dev-haskell/text:=[profile?] ) network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.10 test? ( dev-haskell/temporary dev-haskell/utf8-string !executable? ( dev-haskell/split dev-haskell/text ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Conversion between formats used to represent mathematics
+EAPI=5
+HOMEPAGE=https://github.com/jgm/texmath
+IUSE=executable +network-uri doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-7.4.1:= executable? ( dev-haskell/aeson:=[profile?] dev-haskell/split:=[profile?] dev-haskell/text:=[profile?] ) network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/0.8.2.2
+SRC_URI=mirror://hackage/packages/archive/texmath/0.8.2.2/texmath-0.8.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8574bdecb22f376cf8fa482b51b0000d
diff --git a/dev-haskell/texmath-0.8.6.3 b/dev-haskell/texmath-0.8.6.3
new file mode 100644
index 000000000000..bf469a7856d0
--- /dev/null
+++ b/dev-haskell/texmath-0.8.6.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.17:=[profile?] >=dev-haskell/parsec-3:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-7.4.1:= executable? ( dev-haskell/aeson:=[profile?] dev-haskell/split:=[profile?] dev-haskell/text:=[profile?] network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) ) >=dev-haskell/cabal-1.10 test? ( dev-haskell/temporary dev-haskell/utf8-string !executable? ( dev-haskell/split dev-haskell/text ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Conversion between formats used to represent mathematics
+EAPI=6
+HOMEPAGE=https://github.com/jgm/texmath
+IUSE=executable +network-uri doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.17:=[profile?] >=dev-haskell/parsec-3:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-7.4.1:= executable? ( dev-haskell/aeson:=[profile?] dev-haskell/split:=[profile?] dev-haskell/text:=[profile?] network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) )
+SLOT=0/0.8.6.3
+SRC_URI=mirror://hackage/packages/archive/texmath/0.8.6.3/texmath-0.8.6.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fd5befa54dac4ddacfa3c200aae15c9e
diff --git a/dev-haskell/texmath-0.8.6.7 b/dev-haskell/texmath-0.8.6.7
new file mode 100644
index 000000000000..d0754c113b14
--- /dev/null
+++ b/dev-haskell/texmath-0.8.6.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] >=dev-haskell/parsec-3:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-7.4.1:= executable? ( dev-haskell/aeson:=[profile?] dev-haskell/split:=[profile?] dev-haskell/text:=[profile?] network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) ) >=dev-haskell/cabal-1.10 test? ( dev-haskell/temporary dev-haskell/utf8-string !executable? ( dev-haskell/split dev-haskell/text ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Conversion between formats used to represent mathematics
+EAPI=6
+HOMEPAGE=https://github.com/jgm/texmath
+IUSE=executable +network-uri doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] >=dev-haskell/parsec-3:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-7.4.1:= executable? ( dev-haskell/aeson:=[profile?] dev-haskell/split:=[profile?] dev-haskell/text:=[profile?] network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) )
+SLOT=0/0.8.6.7
+SRC_URI=mirror://hackage/packages/archive/texmath/0.8.6.7/texmath-0.8.6.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=787890a7080ab65c0490c93dec34dc7a
diff --git a/dev-haskell/texmath-0.9.1 b/dev-haskell/texmath-0.9.1
new file mode 100644
index 000000000000..87906bf2bab7
--- /dev/null
+++ b/dev-haskell/texmath-0.9.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] >=dev-haskell/parsec-3:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-7.4.1:= executable? ( dev-haskell/aeson:=[profile?] dev-haskell/split:=[profile?] dev-haskell/text:=[profile?] network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) ) >=dev-haskell/cabal-1.10 test? ( dev-haskell/temporary dev-haskell/utf8-string !executable? ( dev-haskell/split dev-haskell/text ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Conversion between formats used to represent mathematics
+EAPI=6
+HOMEPAGE=https://github.com/jgm/texmath
+IUSE=executable +network-uri doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] >=dev-haskell/parsec-3:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-7.4.1:= executable? ( dev-haskell/aeson:=[profile?] dev-haskell/split:=[profile?] dev-haskell/text:=[profile?] network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) )
+SLOT=0/0.9.1
+SRC_URI=mirror://hackage/packages/archive/texmath/0.9.1/texmath-0.9.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=99f0ee0725e4b71a5c9e5cab96e7095d
diff --git a/dev-haskell/texmath/Manifest b/dev-haskell/texmath/Manifest
deleted file mode 100644
index c98a865a4cbf..000000000000
--- a/dev-haskell/texmath/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX texmath-0.8.6.3-build-deps.patch 503 BLAKE2B a4ef69b969250fb2f3b400cd570f9852da5de83751624cd3905fc866af38a25f2f0e5755da6a799c746a6cf1605a0d1c1de3f7e92316aff478a3878938ea71a0 SHA512 0b9081cec67289ce4b64bf222d61e4621747bc256717bd347158d344be75762001e4c1a6a36b9bcf70d553fc80dad36b9cb9ae7b5611532b16bbe5a7c4c6e8c9
-DIST texmath-0.6.4.tar.gz 45075 BLAKE2B 3272642b243d693d0cad77b71c1caa9cb3131ca90ea3e047b8944e931885cb778571c25da25ad5f0bad70ee9cbfb029ae3dff1a25a2722f311e300960b8601a5 SHA512 b6d1ff64cd7c758687efd656a8e0efdc9b6a1eac9f0dde5cd5d7d07fe6b3c8fd1a62145413b950b443cddd2a434151bc490148631b75fc853bdaadab2b5b0640
-DIST texmath-0.6.6.3.tar.gz 46983 BLAKE2B ceb6881b7dacd496d252c6a911407d30194254b157d6e84a640dd447646849cfd8ac24f78ecdc848e1cc280cc2084b73403d12ab809f1abbd6b12f8a826a2f5d SHA512 f6e41b28445751a2d296c9d0effaa95bc4962bb7af037ce277a4b59c0eb8e83caf7389cc420e4839b3737764c2bd7c15277771afdadfbb4310112e9ba5477210
-DIST texmath-0.8.2.2.tar.gz 1599187 BLAKE2B f65be60aee417cea0ec9d8e20e257a39de3f64a0288376914f63980c3f13def3473820f0b696f5eb11f210dec80f6d7ceae7c7eced8a64bbd42af712717271fc SHA512 2c8806ab0386acec6ed963a4574a5a24a07eb49a833a51021fef48e3a975012a083bd43fc4172399265430d9599b79f3ce1e5edfe785e80e92f259efc9dc674e
-DIST texmath-0.8.6.3.tar.gz 1605299 BLAKE2B 89f9272b5a19cec18996e0b39f9e39c3f47e21a6990cf8c4467b5d0315d18e37aef506b06b12d470992117d87299972820c15bb1282d22d993936bdbfe3ab80d SHA512 d4ca9f6b6b94f491b2e6a9c110f7f8130047691b62266e6c0c928e3a7aed6c289484d93a9b69b9c3e7454a6bb404e48c5ac09d37f98f7d538d2a2825b96c7478
-DIST texmath-0.8.6.7.tar.gz 1595061 BLAKE2B 9b41f35efd528e924ac8d6c56a8403599ac7ce35954fc6c7e39f38fb26c0fcb153c19a93a4b4b3969102b87156784c19372049d2a68d8431fed5d023011a012e SHA512 792e81395d092b7606d2f4c4cb59afd03f4226e611ca4e7a9b2a087c507345c709a92853cbc5d780729ea47c849cdf3727528bdafcb2b9217b4032041c937202
-DIST texmath-0.9.1.tar.gz 1596703 BLAKE2B 94fae6b9b3d1dec548d8e1b929c355d1cecd2cef638f7cfe5dc4d1e6a96bfb23a56535ee717fc59b18afd7144778666cc1ba6dfcd3211343f6fe9b5d9117a7a0 SHA512 6aba502dfb9f5163115f229ca9484ef1df72e712494b95e6e050a2e655684addec564bfe0a261db2efb45d0a6a0ef4547a856ff85031a9954c04e0fbe7131269
-EBUILD texmath-0.6.4.ebuild 1082 BLAKE2B b14eb96a0690507c7f8c8eabe0dfa30b1db862ceade6d1ae6f81b6a79b4056d683f4680b4fc8ad078687057e1f0101cff6dba53bf715caf2afac32bd1c655754 SHA512 b61fa5364fcfeb69a6ee11a9c4d8091049ae514b8774d14604dd8eed7729e18261784fd5a430c94ebaa4f62b10720c5c10e566ae94a0456d17a49698febe910f
-EBUILD texmath-0.6.6.3.ebuild 910 BLAKE2B c2aecd644a793a2df87c317c380e86fc42f39b836d25774661781dbf9daaf97ce7d71d650868233d36874aa96f051600abc10eaba9da16ddebfbd4d3bda95e30 SHA512 6fa34b84573429087d7034243af738c84461329e59c54a455e298e1fc7f7d8c499c46f70944c3db8b4ba4f4f15b75401e81c871f595f26a2e2ec882d2eb5129e
-EBUILD texmath-0.8.2.2.ebuild 1289 BLAKE2B 5b8184842fe90a85fa136e83c2955580b8ce8345b39762e4c05af804b08c87a4b8543c23ca9173553df585e60c1486e8061ab5795050869e2b81ad49061a4634 SHA512 374e81550a0f45dabfc13c51a917b18cde08b0c32c67680221f3b9286d4f7c9a09519a9a25e1fd4c4abe65d0c6f8518b4a2e9eb461dffe04d7ce53c7d9478ba8
-EBUILD texmath-0.8.6.3.ebuild 1336 BLAKE2B fb89ca709c9025ff8086a67b04be71b13d19ad1e4155e8a7d3f6169809ebdfa46d68320202802201a4cde7279f3003ca68e5a29850f6d7e08c362c15d09913b3 SHA512 767e9217ca707bc739c3f7306435dd671752affe63042dd3440f88c234955675a1785661a88b40b728a5efa66529c4573ff38f1bacb6f14fe986e5816d2cb535
-EBUILD texmath-0.8.6.7.ebuild 1345 BLAKE2B 9a434121f1ea370f7e9a6a8895e2364014a9d5cde1d9574adffd2d55d38bba6119236991b1ffd92f490639843c58d6aa4950135c97ba14f4e15621ca365c64f1 SHA512 e24ce7753cec1a49a6dba926bb86efd9161e2bfeb4bf8634c499dbd19331cc528dc7c5bde4c2b7c7c1ab57753c44ffd1e66a831f51f7b72933c490bd521868f7
-EBUILD texmath-0.9.1.ebuild 1289 BLAKE2B 2db09d51a5dd670ba02853e9ef8cc6f460feb43cdc0c79fcd2b835ca0fbf4d0303c5451cc5f8e7490f968b2e64cfa6da02772df14c1c1c240fb5be213ce6abfe SHA512 3e4ac2246655b1eab183da8d3733853f514fa3106b1f06cabc5a63462013787c79b85a127b7795d3f9b62be72029e69d28f7d83925c458bd979f4731cb92abdf
-MISC metadata.xml 919 BLAKE2B dedb22c3d6a09fd989cd721c54ac1d91263e1f52f18edfdc1cdb7cfb46886318364bfe007fc5eb98fe3455ea0eca2a0d98856f84229f7be3d9cc1ba062033e0b SHA512 2d604c4422425e099e143520d559e645f7ffb4be8187209f59829a03770e2bcc345555b91eca0fd35a32222b25652b3a53514f3448cbb99c27c50608eebcc961
diff --git a/dev-haskell/texmath/files/texmath-0.8.6.3-build-deps.patch b/dev-haskell/texmath/files/texmath-0.8.6.3-build-deps.patch
deleted file mode 100644
index e5bb521239cf..000000000000
--- a/dev-haskell/texmath/files/texmath-0.8.6.3-build-deps.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/texmath.cabal b/texmath.cabal
-index 16f4410..ba61859 100644
---- a/texmath.cabal
-+++ b/texmath.cabal
-@@ -135,8 +135,8 @@ Executable texmath
-                          split, aeson, bytestring, text
-+      if flag(network-uri)
-+        Build-Depends:     network-uri >= 2.6
-+      else
-+        Build-Depends:     network < 2.6
-     else
-       Buildable:         False
--    if flag(network-uri)
--      Build-Depends:     network-uri >= 2.6
--    else
--      Build-Depends:     network < 2.6
- 
diff --git a/dev-haskell/texmath/metadata.xml b/dev-haskell/texmath/metadata.xml
deleted file mode 100644
index 71fb7e7299c4..000000000000
--- a/dev-haskell/texmath/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The texmathml library provides functions to convert LaTeX
-		math formulas to presentation MathML. It supports
-		basic LaTeX and AMS extensions, and it can parse and
-		apply LaTeX macros.
-		
-		Use the @test@ flag to install a standalone executable,
-		@texmath@, that reads a LaTeX formula from @stdin@ and
-		writes MathML to @stdout@.
-		
-		Use the @cgi@ flag to install a cgi script,
-		@texmath-cgi@.
-	</longdescription>
-	<use>
-		<flag name="executable">Compile test executable.</flag>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">jgm/texmath</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/texmath/texmath-0.6.4.ebuild b/dev-haskell/texmath/texmath-0.6.4.ebuild
deleted file mode 100644
index c12bcbffc96f..000000000000
--- a/dev-haskell/texmath/texmath-0.6.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion of LaTeX math formulas to MathML or OMML"
-HOMEPAGE="https://github.com/jgm/texmath"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="cgi test"
-
-RDEPEND="dev-haskell/pandoc-types:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/xml:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	cgi? ( dev-haskell/cgi:=[profile?]
-		dev-haskell/json:=[profile?]
-		dev-haskell/utf8-string:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag cgi cgi) \
-		$(cabal_flag test test)
-}
-
-src_install() {
-	cabal_src_install
-
-	# remove test and it's data
-	rm -f  "${ED}/usr/bin/texmath" 2> /dev/null
-	rm -rf "${ED}/usr/share/${P}"/ghc-*/tests 2> /dev/null
-}
diff --git a/dev-haskell/texmath/texmath-0.6.6.3.ebuild b/dev-haskell/texmath/texmath-0.6.6.3.ebuild
deleted file mode 100644
index 8f239e1a69ac..000000000000
--- a/dev-haskell/texmath/texmath-0.6.6.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion of LaTeX math formulas to MathML or OMML"
-HOMEPAGE="https://github.com/jgm/texmath"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="cgi test"
-
-RDEPEND="dev-haskell/pandoc-types:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/xml:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	cgi? ( dev-haskell/cgi:=[profile?]
-		dev-haskell/json:=[profile?]
-		dev-haskell/utf8-string:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag cgi cgi) \
-		$(cabal_flag test test)
-}
diff --git a/dev-haskell/texmath/texmath-0.8.2.2.ebuild b/dev-haskell/texmath/texmath-0.8.2.2.ebuild
deleted file mode 100644
index 269f65bc2055..000000000000
--- a/dev-haskell/texmath/texmath-0.8.2.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between formats used to represent mathematics"
-HOMEPAGE="https://github.com/jgm/texmath"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="executable +network-uri"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/xml:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	executable? ( dev-haskell/aeson:=[profile?]
-			dev-haskell/split:=[profile?]
-			dev-haskell/text:=[profile?] )
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/temporary
-		dev-haskell/utf8-string
-		!executable? ( dev-haskell/split
-				dev-haskell/text ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/texmath/texmath-0.8.6.3.ebuild b/dev-haskell/texmath/texmath-0.8.6.3.ebuild
deleted file mode 100644
index aefb43b6cda0..000000000000
--- a/dev-haskell/texmath/texmath-0.8.6.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between formats used to represent mathematics"
-HOMEPAGE="https://github.com/jgm/texmath"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable +network-uri"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.17:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/xml:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	executable? ( dev-haskell/aeson:=[profile?]
-			dev-haskell/split:=[profile?]
-			dev-haskell/text:=[profile?]
-			network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-			!network-uri? ( <dev-haskell/network-2.6:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/temporary
-		dev-haskell/utf8-string
-		!executable? ( dev-haskell/split
-				dev-haskell/text ) )
-"
-
-PATCHES=("${FILESDIR}"/${P}-build-deps.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/texmath/texmath-0.8.6.7.ebuild b/dev-haskell/texmath/texmath-0.8.6.7.ebuild
deleted file mode 100644
index 0775d2345d2e..000000000000
--- a/dev-haskell/texmath/texmath-0.8.6.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between formats used to represent mathematics"
-HOMEPAGE="https://github.com/jgm/texmath"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable +network-uri"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/xml:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	executable? ( dev-haskell/aeson:=[profile?]
-			dev-haskell/split:=[profile?]
-			dev-haskell/text:=[profile?]
-			network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-			!network-uri? ( <dev-haskell/network-2.6:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/temporary
-		dev-haskell/utf8-string
-		!executable? ( dev-haskell/split
-				dev-haskell/text ) )
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.8.6.3-build-deps.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/texmath/texmath-0.9.1.ebuild b/dev-haskell/texmath/texmath-0.9.1.ebuild
deleted file mode 100644
index 9a629c28bf4a..000000000000
--- a/dev-haskell/texmath/texmath-0.9.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between formats used to represent mathematics"
-HOMEPAGE="https://github.com/jgm/texmath"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="executable +network-uri"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/xml:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	executable? ( dev-haskell/aeson:=[profile?]
-			dev-haskell/split:=[profile?]
-			dev-haskell/text:=[profile?]
-			network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-			!network-uri? ( <dev-haskell/network-2.6:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/temporary
-		dev-haskell/utf8-string
-		!executable? ( dev-haskell/split
-				dev-haskell/text ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/text-0.11.3.1 b/dev-haskell/text-0.11.3.1
new file mode 100644
index 000000000000..6f5be8af2ba8
--- /dev/null
+++ b/dev-haskell/text-0.11.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 >=dev-haskell/quickcheck-2.4 dev-haskell/random >=dev-haskell/test-framework-0.4 >=dev-haskell/test-framework-hunit-0.2 >=dev-haskell/test-framework-quickcheck2-0.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1faef5eabe82a3c4ad1dc3369488d17f
diff --git a/dev-haskell/text-1.1.1.3 b/dev-haskell/text-1.1.1.3
new file mode 100644
index 000000000000..cd5a46e453b6
--- /dev/null
+++ b/dev-haskell/text-1.1.1.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=26c9b97a8e9899c57c37732180a6ef6f
diff --git a/dev-haskell/text-1.2.2.0 b/dev-haskell/text-1.2.2.0
new file mode 100644
index 000000000000..c03c0c8a74ef
--- /dev/null
+++ b/dev-haskell/text-1.2.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/binary:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 >=dev-haskell/quickcheck-2.7 dev-haskell/quickcheck-unicode dev-haskell/random >=dev-haskell/test-framework-0.4 >=dev-haskell/test-framework-hunit-0.2 >=dev-haskell/test-framework-quickcheck2-0.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b17d0ac7185f62e74702470003cb8939
diff --git a/dev-haskell/text-1.2.2.1 b/dev-haskell/text-1.2.2.1
new file mode 100644
index 000000000000..4fb38dce5df4
--- /dev/null
+++ b/dev-haskell/text-1.2.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/binary:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 >=dev-haskell/quickcheck-2.7 dev-haskell/quickcheck-unicode dev-haskell/random >=dev-haskell/test-framework-0.4 >=dev-haskell/test-framework-hunit-0.2 >=dev-haskell/test-framework-quickcheck2-0.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7f0e21c93c4ad35e34014ba280eda24a
diff --git a/dev-haskell/text-binary-0.2.1.1 b/dev-haskell/text-binary-0.2.1.1
new file mode 100644
index 000000000000..aa0120733bad
--- /dev/null
+++ b/dev-haskell/text-binary-0.2.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binary instances for text types
+EAPI=6
+HOMEPAGE=https://github.com/kawu/text-binary
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.1.1
+SRC_URI=mirror://hackage/packages/archive/text-binary/0.2.1.1/text-binary-0.2.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=abff658d88b570d454a4144d8e23acb5
diff --git a/dev-haskell/text-binary/Manifest b/dev-haskell/text-binary/Manifest
deleted file mode 100644
index fe72f9e2fd3a..000000000000
--- a/dev-haskell/text-binary/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST text-binary-0.2.1.1.tar.gz 1729 BLAKE2B fb69d6b86e18a86ac9b49074e662afe0205e2ea8253ebbefb4c9dbee51ed8126ce7ad1d1f5f8c7ef3c94e1a4778f68750d7889a75a930a20b5733cb0093d58f1 SHA512 eea91648ddc63f2997432abd2cc3d78efa27e3745c199eeccd01114df6a67dae948a16a6f784e09ba380047101fefab802f1812b0833d3e02deb45b6292c34a1
-EBUILD text-binary-0.2.1.1.ebuild 568 BLAKE2B c56f8a5fd8f02d168b6f47a4520c8b943cfe6b614cbce08f833a9737d1e6d2c78a765a653291bec38f88bcef06b29185ee1a3a563a140a95e64d8298934fba9d SHA512 257bfd0ffd271e40bd893f1f2ac6e2c07b5a059fdd8e616beca26bacad0edf31a740602086b06988169db45ea81c63ede81d8448c93628a1a65101f4010d2bc5
-MISC metadata.xml 457 BLAKE2B 89447e910de317ceaf1b99772780fedbfd600d28628b800ba608ce4b22e3cb96db9907cf31641d6f3aa795d6214e9272c5f9807b6d5d74e72fa601bdda409235 SHA512 39839d522a756bc903f06b1854df7c8cdd6a0705331c55edbb0063c54fcac7677f11e5d0a6433cd2b2e81d289372aa40f35ced478fe48d81fcc39c207b33bc7e
diff --git a/dev-haskell/text-binary/metadata.xml b/dev-haskell/text-binary/metadata.xml
deleted file mode 100644
index 1845f50353d3..000000000000
--- a/dev-haskell/text-binary/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A compatibility layer providing Binary instances for strict
-		and lazy text types for versions older than 1.2.1 of
-		&lt;https://hackage.haskell.org/package/text&gt;.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/text-binary/text-binary-0.2.1.1.ebuild b/dev-haskell/text-binary/text-binary-0.2.1.1.ebuild
deleted file mode 100644
index 9fccf239ec5d..000000000000
--- a/dev-haskell/text-binary/text-binary-0.2.1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binary instances for text types"
-HOMEPAGE="https://github.com/kawu/text-binary"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/text-icu-0.7.0.1 b/dev-haskell/text-icu-0.7.0.1
new file mode 100644
index 000000000000..dbcc5f0a040f
--- /dev/null
+++ b/dev-haskell/text-icu-0.7.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-0.9.1.0:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/icu:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hunit-1.2 >=dev-haskell/quickcheck-2.4 dev-haskell/random >=dev-haskell/test-framework-0.4 >=dev-haskell/test-framework-hunit-0.2 >=dev-haskell/test-framework-quickcheck2-0.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Bindings to the ICU library
+EAPI=5
+HOMEPAGE=https://github.com/bos/text-icu
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-0.9.1.0:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/icu:=
+SLOT=0/0.7.0.1
+SRC_URI=mirror://hackage/packages/archive/text-icu/0.7.0.1/text-icu-0.7.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fbbfb1d4263901a68e484e0046404760
diff --git a/dev-haskell/text-icu/Manifest b/dev-haskell/text-icu/Manifest
deleted file mode 100644
index 24e028cfd658..000000000000
--- a/dev-haskell/text-icu/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST text-icu-0.7.0.1.tar.gz 45533 BLAKE2B 1eda34ad7a8bcaa26814cb4fdb864e67531aca5dc80ece9a71dd770022ec7729e7e2960729c707ab9b5d4e8ad3b112e50572d26a2f2a573ffd6f3c914a0b5545 SHA512 54551ce0d629bffcca32fc855bfcdf2e24282359ce3a32578a98de4f4ad15378fa7df98c59d73323549a2ac873b10a10202bda02f5be83fbe1ab945aac5e50a9
-EBUILD text-icu-0.7.0.1.ebuild 806 BLAKE2B d30aa4cad290b8aca4715a946ff207f5f33ae384bf7f356b5c0de2eca84f5a85c283be83de6b8d1ff21a035943510fda7904e1d9010f496e88ea8acb9e72d999 SHA512 e62603b7ac3eaf9025717ee2dda9c82d0ca053acb1068771f3d46554e2b3a90c4a6500ff115c31d56e57672519a8da33e23efec5e1982265a7644e4d4ddbcfef
-MISC metadata.xml 1375 BLAKE2B 598c2f18ecd8c76ae5b8de8f9bf78c75e4d185f49e2ca74425b7379240018fcbef5c390bcc23747c919855fa3be2357f7fe8c5367fe3d30aedb7510dbb789f9c SHA512 0ff41b1b72b3cc09947f6937b969a07e98c9d04bb0967cf4feb066c755ea1da415a6138099aff4550cc7423a02d1c5f95a16e865c2c127e3551a62521e05d79f
diff --git a/dev-haskell/text-icu/metadata.xml b/dev-haskell/text-icu/metadata.xml
deleted file mode 100644
index bf8841a2a444..000000000000
--- a/dev-haskell/text-icu/metadata.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haskell bindings to the International Components for Unicode (ICU)
-		libraries.  These libraries provide robust and full-featured Unicode
-		services on a wide variety of platforms.
-		
-		Features include:
-		
-		* Both pure and impure bindings, to allow for fine control over efficiency
-		and ease of use.
-		
-		* Breaking of strings on character, word, sentence, and line boundaries.
-		
-		* Access to the Unicode Character Database (UCD) of character metadata.
-		
-		* String collation functions, for locales where the conventions for
-		lexicographic ordering differ from the simple numeric ordering of
-		character codes.
-		
-		* Character set conversion functions, allowing conversion between
-		Unicode and over 220 character encodings.
-		
-		* Unicode normalization.  (When implementations keep strings in a
-		normalized form, they can be assured that equivalent strings have a
-		unique binary representation.)
-		
-		* Regular expression search and replace.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bos/text-icu</remote-id>
-		<remote-id type="bitbucket">bos/text-icu</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/text-icu/text-icu-0.7.0.1.ebuild b/dev-haskell/text-icu/text-icu-0.7.0.1.ebuild
deleted file mode 100644
index 5ca406411cc3..000000000000
--- a/dev-haskell/text-icu/text-icu-0.7.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to the ICU library"
-HOMEPAGE="https://github.com/bos/text-icu"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.9.1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/icu:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/quickcheck-2.4
-		dev-haskell/random
-		>=dev-haskell/test-framework-0.4
-		>=dev-haskell/test-framework-hunit-0.2
-		>=dev-haskell/test-framework-quickcheck2-0.2 )
-"
diff --git a/dev-haskell/text-metrics-0.2.0 b/dev-haskell/text-metrics-0.2.0
new file mode 100644
index 000000000000..2f7a23141a3d
--- /dev/null
+++ b/dev-haskell/text-metrics-0.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-2:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-3.0 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Calculate various string metrics efficiently
+EAPI=6
+HOMEPAGE=https://github.com/mrkkrp/text-metrics
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-2:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.2.0
+SRC_URI=mirror://hackage/packages/archive/text-metrics/0.2.0/text-metrics-0.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d3a882d965264c7813fcfb59c9f4fa20
diff --git a/dev-haskell/text-metrics/Manifest b/dev-haskell/text-metrics/Manifest
deleted file mode 100644
index 2febd1051c93..000000000000
--- a/dev-haskell/text-metrics/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST text-metrics-0.2.0.tar.gz 8660 BLAKE2B 4b849422bb7b9ebad240037295e6ba5dc5a9f427436ca844dce02ba64d142ea559f2a4a10ed1dc8a0fee0aa3ef6d7d0c05dc33eca87286e2aaedfdc99d7524fd SHA512 6a7a2b78fcb7efd03e32bf093b2820837f5b9997574d724fd6e67b789a8fcb166ed1396e49d925c55c278e0e72615ba99e40f630092e961871a7821e5b513d70
-EBUILD text-metrics-0.2.0.ebuild 912 BLAKE2B 6c6a062753035693e94a371e9869865a9dcef9b36e96acd610dd6aa6512726aed4512a4497c87bca817d80a98226d7f3ae161aa2767be25f5e7043f2663aa932 SHA512 f0bc46a307a5c3df1e4687ae67aaefb8b07fe9a440a9367f6d34d2e741e11486e003059de4eeffdf21c7c79906be624f0fdc66eef06a21a4b34089701bc3b49d
-MISC metadata.xml 336 BLAKE2B 9ba78e993c1f379bb032e24feae087b6d449d3113981aa7a9c98a4117c241289401e07e0c6a9896720abc7bca0fa498168e7b9cc77f53a34a4e8f481a15f488c SHA512 eacd97d1db8c4ec90bf90d2b676e70d6a0d38693f02a589151e30c968027b97b8c67d5fd270659d646e5270c6c25954a44d0f58d709aaa2b6072f364c4513174
diff --git a/dev-haskell/text-metrics/metadata.xml b/dev-haskell/text-metrics/metadata.xml
deleted file mode 100644
index a94b82566b9e..000000000000
--- a/dev-haskell/text-metrics/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Calculate various string metrics efficiently.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/text-metrics/text-metrics-0.2.0.ebuild b/dev-haskell/text-metrics/text-metrics-0.2.0.ebuild
deleted file mode 100644
index 0e6d539734e3..000000000000
--- a/dev-haskell/text-metrics/text-metrics-0.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -dev
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Calculate various string metrics efficiently"
-HOMEPAGE="https://github.com/mrkkrp/text-metrics"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-2:=[profile?]
-	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0
-		>=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-3.0 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-dev
-}
diff --git a/dev-haskell/text-show-3.4 b/dev-haskell/text-show-3.4
new file mode 100644
index 000000000000..145f99dcbdaf
--- /dev/null
+++ b/dev-haskell/text-show-3.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-compat-0.8.1:=[profile?] <dev-haskell/base-compat-1:=[profile?] >=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?] dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/generic-deriving-1.11:=[profile?] <dev-haskell/generic-deriving-2:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/th-lift-0.7.6:=[profile?] <dev-haskell/th-lift-1:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/base-compat-0.8.2 <dev-haskell/base-compat-1 >=dev-haskell/base-orphans-0.5.2 <dev-haskell/base-orphans-1 >=dev-haskell/deriving-compat-0.3 <dev-haskell/deriving-compat-1 >=dev-haskell/hspec-2 <dev-haskell/hspec-3 >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-3 >=dev-haskell/quickcheck-instances-0.1 <dev-haskell/quickcheck-instances-0.4 >=dev-haskell/tagged-0.8.3 <dev-haskell/tagged-1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient conversion of values into Text
+EAPI=6
+HOMEPAGE=https://github.com/RyanGlScott/text-show
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-compat-0.8.1:=[profile?] <dev-haskell/base-compat-1:=[profile?] >=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?] dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/generic-deriving-1.11:=[profile?] <dev-haskell/generic-deriving-2:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/th-lift-0.7.6:=[profile?] <dev-haskell/th-lift-1:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/3.4
+SRC_URI=mirror://hackage/packages/archive/text-show/3.4/text-show-3.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6c61257f0161ae729d9125d4dea6243d
diff --git a/dev-haskell/text-show/Manifest b/dev-haskell/text-show/Manifest
deleted file mode 100644
index 453ccd9d86e0..000000000000
--- a/dev-haskell/text-show/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST text-show-3.4.tar.gz 105127 BLAKE2B 4ea8f7cddaaad4630f0c8317dbe4d5505f27f3008c5e17117d9100f94bb49439edd2761acef60696ef8a97dc8412964d0a9750353f91b30257b025c9e88fd054 SHA512 48b7fdd801c4fc31e12f14a9ba0589e0971481a2f8562d00c697a9fd48f6420e73df0a7318ff4579a786cd606a1fda2287eab3f8c423810c0d00919c68eeebed
-EBUILD text-show-3.4.ebuild 2024 BLAKE2B 8d55cb9316c90d3fba95b4b8ad356a702878490ef0a5933e3e4d96461ea35ae56c3d394c8a31fe63a8528138d4ba598da8ceb828f64f5095d81bdd7a36be60f5 SHA512 ad337b2cb8e35f51d48e4430251334fa94f70a8cff40a764213b8ca0caa009dcdc9b204044e1cf8d04486a867180a93ce0ded829acdeb65cab13bdd9f02d4a99
-MISC metadata.xml 1745 BLAKE2B d094818a5099ee07ad3d768a300b456f1d5e62b11fcf1c5bbfcf6fb4ec0417709d96bb1f6f76eceb89e5154dfd19ce57fd281ef1011c1885e947992ebdaaeb05 SHA512 ee8e1085322a3ecfc53b35f651757515b214be5e3511931390e0e79b65d449a8cc15af6d50b695cd777abe5508c662b0bb9bb5cf4943399bd01809c9b124b2c7
diff --git a/dev-haskell/text-show/metadata.xml b/dev-haskell/text-show/metadata.xml
deleted file mode 100644
index a6729c09cb4b..000000000000
--- a/dev-haskell/text-show/metadata.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		@text-show@ offers a replacement for the @Show@ typeclass intended
-		for use with @Text@ instead of @String@s. This package was created
-		in the spirit of
-		@&lt;http://hackage.haskell.org/package/bytestring-show bytestring-show&gt;@.
-		
-		At the moment, @text-show@ provides instances for most data
-		types in the @&lt;http://hackage.haskell.org/package/array array&gt;@,
-		@&lt;http://hackage.haskell.org/package/base base&gt;@,
-		@&lt;http://hackage.haskell.org/package/bytestring bytestring&gt;@, and
-		@&lt;http://hackage.haskell.org/package/text text&gt;@ packages.
-		Therefore, much of the source code for @text-show@ consists of
-		borrowed code from those packages in order to ensure that the
-		behaviors of @Show@ and @TextShow@ coincide.
-		
-		For most uses, simply importing "TextShow"
-		will suffice:
-		
-		@
-		module Main where
-		
-		import TextShow
-		
-		main :: IO ()
-		main = printT (Just \"Hello, World!\")
-		@
-		
-		If you desire it, there are also monomorphic versions of the @showb@
-		function available in the submodules of "TextShow". See the
-		&lt;https://github.com/RyanGlScott/text-show/wiki/Naming-conventions naming conventions&gt;
-		page for more information.
-		
-		Support for automatically deriving @TextShow@ instances can be found
-		in the "TextShow.TH" and "TextShow.Generic" modules. If you don't
-		know which one to use, use "TextShow.TH".
-	</longdescription>
-	<upstream>
-		<remote-id type="github">RyanGlScott/text-show</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/text-show/text-show-3.4.ebuild b/dev-haskell/text-show/text-show-3.4.ebuild
deleted file mode 100644
index c6ed34cc4d8d..000000000000
--- a/dev-haskell/text-show/text-show-3.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient conversion of values into Text"
-HOMEPAGE="https://github.com/RyanGlScott/text-show"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-compat-0.8.1:=[profile?] <dev-haskell/base-compat-1:=[profile?]
-	>=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/generic-deriving-1.11:=[profile?] <dev-haskell/generic-deriving-2:=[profile?]
-	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?]
-	>=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.11.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/th-lift-0.7.6:=[profile?] <dev-haskell/th-lift-1:=[profile?]
-	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/base-compat-0.8.2 <dev-haskell/base-compat-1
-		>=dev-haskell/base-orphans-0.5.2 <dev-haskell/base-orphans-1
-		>=dev-haskell/deriving-compat-0.3 <dev-haskell/deriving-compat-1
-		>=dev-haskell/hspec-2 <dev-haskell/hspec-3
-		>=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-3
-		>=dev-haskell/quickcheck-instances-0.1 <dev-haskell/quickcheck-instances-0.4
-		>=dev-haskell/tagged-0.8.3 <dev-haskell/tagged-1 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/text-stream-decode-0.1.0.5 b/dev-haskell/text-stream-decode-0.1.0.5
new file mode 100644
index 000000000000..ad65789d2859
--- /dev/null
+++ b/dev-haskell/text-stream-decode-0.1.0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-1.1:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Streaming decoding functions for UTF encodings. (deprecated)
+EAPI=5
+HOMEPAGE=https://github.com/fpco/text-stream-decode
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/text-1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.1.0.5
+SRC_URI=mirror://hackage/packages/archive/text-stream-decode/0.1.0.5/text-stream-decode-0.1.0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3b047873b96ac8f7dfcbae45cf38e791
diff --git a/dev-haskell/text-stream-decode/Manifest b/dev-haskell/text-stream-decode/Manifest
deleted file mode 100644
index 721885ee5452..000000000000
--- a/dev-haskell/text-stream-decode/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST text-stream-decode-0.1.0.5.tar.gz 12335 BLAKE2B 68c52959743e76b167f968817f128ea6e8c7d91ed091a4a19e75e7965b4dfa9d6374b21e8e68d69ccab9db95e7c431bf5736494c3923d24a1d00ea796f7eced4 SHA512 9005cc7013f56809cb0a86fa57aa6bbe97936095d100e35d86ae7e9013e0bbcced3f5522da08f5fe76585fda1e8f55b364a1ad787f9c7c7be30fae6555083a5d
-EBUILD text-stream-decode-0.1.0.5.ebuild 749 BLAKE2B 3d66f11ff67a0fd9e6fadc00a37f54df21c6bc2f5cc84ae1fcfb7263b2d208944df972db3d4f1fb7c786d99812896b3eed7523fb836589cf4d7e04adb379928f SHA512 040dfea5b15a2e9401fb217dd26cdee9c7f3c81eace09a676fdade26be8d92989280ad5cf70a495d7c0288993741977048d8a342f15df722a3180148f896ba69
-MISC metadata.xml 861 BLAKE2B 37da117b21a0d18222ba0f817b05a3385c8fdd1e5616a15eb420526b0308dad9405290399131d6eda747323cf9df3a6f6f287873ae1253cc5362d3b622393049 SHA512 9d1f9f82f3c3e75f81460cba8873f4204c5804635032a3ab3b094ecc2abc636deb2f0290fe95c6cff1177e445fa825e2a2ca23f0132e48f528c704ba5a775616
diff --git a/dev-haskell/text-stream-decode/metadata.xml b/dev-haskell/text-stream-decode/metadata.xml
deleted file mode 100644
index 9b39024523a5..000000000000
--- a/dev-haskell/text-stream-decode/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The @text@ package provides high performance functions for decoding strict and lazy @ByteString@s into @Text@. However, these functions present two issues for streaming data libraries: they throw exceptions from pure code, and are not designed for incremental consumption. This library addresses both issues with a unified API for UTF-8, -16LE, -16BE, -32LE, and -32BE. It is intended for use by high level streaming data libraries, such as conduit, enumerator, iteratee, and pipes.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">fpco/text-stream-decode</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/text-stream-decode/text-stream-decode-0.1.0.5.ebuild b/dev-haskell/text-stream-decode/text-stream-decode-0.1.0.5.ebuild
deleted file mode 100644
index 6b6ff748f6e5..000000000000
--- a/dev-haskell/text-stream-decode/text-stream-decode-0.1.0.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-#hackport: flags: +text11
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Streaming decoding functions for UTF encodings. (deprecated)"
-HOMEPAGE="https://github.com/fpco/text-stream-decode"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-1.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.8 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=text11
-}
diff --git a/dev-haskell/text/Manifest b/dev-haskell/text/Manifest
deleted file mode 100644
index 908ba4764fae..000000000000
--- a/dev-haskell/text/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX text-1.1.1.3-deepseq-1.4.patch 1113 BLAKE2B a98e12d81af76e7e36292156023f2b8e7ebdf712db2a4307e9719b03cb858c85ea2c9ae9b7f77288e817701d0b7bbe539dbc026133c8b9c0948a7b9655230f65 SHA512 c2f194ff78318895e8f676d1c0600ed1473ad71ddb7a8bb73ec5c86fcad9cbe15888ad1b7d6fc0087fcf4797b97ce4027ae0e9cdd292a04b02d96419c87c78f4
-AUX text-1.2.2.0-integer-simple.patch 2310 BLAKE2B cfcf4642d9c2aa8d0303c91db10216406412f4e5a9bc994d7fbd65e73246b410f26b61892903a789155de56a2ea2b9cff91cea70553e6d3ecc4bafeb53264df3 SHA512 1eb170e1ebd3368853078e9e6830cebab4dd7734a6f473e11c12cb2aca8a1d9f1b1cc078098abe9b4f57ad35d309e74dc74014b70bdbb30e87877f67e327392f
-DIST text-0.11.3.1.tar.gz 126477 BLAKE2B 27c135a5815eeeabd5791e4f0a16cce12def262d427096d7656a8932d59c4fdab91a7b196951b917ff8bd731034d8015e75d8016be1f3f9300fd3d29511a7634 SHA512 78e9b795ebcb4e43be42b34c3f5829e0f5030d93cb6dad59ca2eb4c7df3a5e338f65dc9f90da7b752cf2b1c15e8d973a25293a6418a4abed6e0ddac9222fb3e6
-DIST text-1.1.1.3.tar.gz 138063 BLAKE2B 150151cd991c2e905d75087dde7b889850a5b51bb1d95838c1969dd851f64af5d8594c333d49e4e1fe269479d8e59bf17bca33ad64e7ff36fcf45f529354bd99 SHA512 bfa5301827c72cbb3346fdb485e10094326a7cac71e01bba700ca0344bd4069c5b16c590dd7c38ee85969be06a2d3fcd760b34ff6f98eef176e7e8c325739490
-DIST text-1.2.2.0.tar.gz 148894 BLAKE2B 9a3e2d72f38f10b9e1e021ad7cf5cf182657a32f98fe5889befe1bf9fbd8da5a2a1e405177805774fca911b57279e3db73cd7e0ee22315210cb3c0f728633ad7 SHA512 832b0430581a06cfdfa2a5c83fa2720e3f4825ee0aa9c6b12ff6ccd424a9e3a061c9ae7eeda48fe7a9f077c50e379abe2eee3fb05bdbdec4d38115b5e3695f20
-DIST text-1.2.2.1.tar.gz 149888 BLAKE2B 6ef907f42f89f0d1a0b109ef3f277cb3a653fae9564e35a772945f88eca64b3250d7db1d5124d73358046f6c729c0b7f345b4e747383f305af8a66f9f55acae1 SHA512 f0615f7614127d86dbfb3fba5dd1753af3d0774c46e11ee4a99d4510f73b59cf1bd8c73ca0387dba4fbcea3936aaaf0e92561cf6aab1a98d08fcad481d3795e4
-EBUILD text-0.11.3.1.ebuild 956 BLAKE2B 32d42f0f840b47e5758f7fa12c052b98ad10c02a4f8bfbab31a05dc16ff694c4703be09ce9ac235a39e6fe031fd1509c0ceeee201d22e7234ea9922056ccfb25 SHA512 c1dc9cf65887bcd8be55202597773abd29e13a2bddc112bec7513289e271ef32ec21f17e3bac6897e658711fd5300fb73721dd1f64beff01106fb82abd3612f9
-EBUILD text-1.1.1.3.ebuild 1105 BLAKE2B 5c61f7e256de98cddaec637204d0bdb8cb9f9e651ef114697ec6c0ac118c6dd6f97230798f2b50ef3b167923f298b6424a5037a362cdd5fc6fe86af892a67caa SHA512 278eeb7f36e3b226c30720291ddc3e1270d46c55619a314e1a2ee8fd2f66f179f3a4d085031eae60759b9f7812007e58a0f857bc96e3429a13b1a5251eeb44e9
-EBUILD text-1.2.2.0.ebuild 1148 BLAKE2B b2a1806ffc6ef42066147d86243ee6f0645ff661507834efff0edee86deb49f641ca503003081ea6273ffa4b9a1ee5452fb8b0e996bce751cfeeecbefee727f3 SHA512 987e0d369a5e37e6c32772f593cbb309cfddfb6b04da451352729156d99e9b20f5c2ee0e42ed5369db953f00024f7f5b22e9eac8c39268749b6d54b6b1ef2a31
-EBUILD text-1.2.2.1.ebuild 1065 BLAKE2B 4c74a4490ea5e54b1e15798e6c1948d1eb0a2e69b828679a02a1105e5ec95aa006b8fce1f24663659e3686f8ebfb3dc3beef3adc5ed2dd0b87316b18ebb8bfef SHA512 327626f367d827e13152f8f295191f2b038f96840526450170439ce610a465ae09216a4c802bb3580a13fc41931157b8ef5155685b82b64fd5c89f21d841ff67
-MISC metadata.xml 1581 BLAKE2B 104f716f948006fb03fdfca08393a442a26767588a86e5f98ca12cbe54157b9448720e096888b47e0d4f6fdf30491fd6a77e62176985571a045d86f22d0de31a SHA512 398b1ba4d7eb16bd1517cd446278b42f2f15196faad1a59b0d9b04fefc9a63ccef0e871c614561ac7f0db5a3807ea4bd6a4ee5082a1a6915d525cdaedb6752c0
diff --git a/dev-haskell/text/files/text-1.1.1.3-deepseq-1.4.patch b/dev-haskell/text/files/text-1.1.1.3-deepseq-1.4.patch
deleted file mode 100644
index 524ebac371ed..000000000000
--- a/dev-haskell/text/files/text-1.1.1.3-deepseq-1.4.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 4115e196bde073d5deaa3759807a8647f3f3c6fa
-Author: Herbert Valerio Riedel <hvr@gnu.org>
-Date:   Mon Nov 17 09:53:24 2014 +0100
-
-    Add support for `deepseq-1.4.0.0` (addresses #100)
-    
-    The default method implementation has changed in `deepseq-1.4.0.0`.
-    (see haskell/deepseq#1 for details). This simply sets the `rnf`
-    implementation explicitly to avoid relying on the default method's
-    semantics.
-
-diff --git a/Data/Text.hs b/Data/Text.hs
-index 3bd34a7..b826acd 100644
---- a/Data/Text.hs
-+++ b/Data/Text.hs
-@@ -199,7 +199,7 @@ import Prelude (Char, Bool(..), Int, Maybe(..), String,
-                 (&&), (||), (+), (-), (.), ($), ($!), (>>),
-                 not, return, otherwise, quot)
- #if defined(HAVE_DEEPSEQ)
--import Control.DeepSeq (NFData)
-+import Control.DeepSeq (NFData(rnf))
- #endif
- #if defined(ASSERTS)
- import Control.Exception (assert)
-@@ -346,7 +346,7 @@ instance Exts.IsList Text where
- #endif
- 
- #if defined(HAVE_DEEPSEQ)
--instance NFData Text
-+instance NFData Text where rnf !_ = ()
- #endif
- 
- -- | This instance preserves data abstraction at the cost of inefficiency.
diff --git a/dev-haskell/text/files/text-1.2.2.0-integer-simple.patch b/dev-haskell/text/files/text-1.2.2.0-integer-simple.patch
deleted file mode 100644
index 349fd79f8b37..000000000000
--- a/dev-haskell/text/files/text-1.2.2.0-integer-simple.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-https://bugs.gentoo.org/575120
-https://github.com/bos/text/issues/138
-
-commit 6c69034c81974b3fab9dba2993f22cc0a80f1b9e
-Author: Herbert Valerio Riedel <hvr@gnu.org>
-Date:   Sat Feb 13 12:44:20 2016 +0100
-
-    Revert "Rename integer-simple to integer-pure (gh-138)"
-    
-    This basically reverts commit b806d9491c740dfcbf172d2936f1eeb3b72d3492.
-    and therefore resolve #138
-
-diff --git a/Data/Text/Lazy/Builder/Int.hs b/Data/Text/Lazy/Builder/Int.hs
-index 6d26ecd..1cb0651 100644
---- a/Data/Text/Lazy/Builder/Int.hs
-+++ b/Data/Text/Lazy/Builder/Int.hs
-@@ -36,14 +36,14 @@ import Control.Monad.ST
- #ifdef  __GLASGOW_HASKELL__
- # if defined(INTEGER_GMP)
- import GHC.Integer.GMP.Internals (Integer(S#))
--# elif defined(INTEGER_PURE)
-+# elif defined(INTEGER_SIMPLE)
- import GHC.Integer
- # else
--# error "You need to use either GMP or integer-pure."
-+# error "You need to use either GMP or integer-simple."
- # endif
- #endif
- 
--#if defined(INTEGER_GMP) || defined(INTEGER_PURE)
-+#if defined(INTEGER_GMP) || defined(INTEGER_SIMPLE)
- # define PAIR(a,b) (# a,b #)
- #else
- # define PAIR(a,b) (a,b)
-diff --git a/text.cabal b/text.cabal
-index ffb92cf..5fa1be0 100644
---- a/text.cabal
-+++ b/text.cabal
-@@ -69,10 +69,10 @@ flag developer
-   default: False
-   manual: True
- 
--flag integer-pure
--  description: Use the pure-Haskell integer library instead of GMP
-+flag integer-simple
-+  description: Use the simple integer library instead of GMP
-   default: False
--  manual: True
-+  manual: False
- 
- library
-   c-sources:    cbits/cbits.c
-@@ -145,9 +145,9 @@ library
-     ghc-options: -Werror
-     cpp-options: -DASSERTS
- 
--  if flag(integer-pure)
--    cpp-options: -DINTEGER_PURE
--    build-depends: integer-pure >= 1.0
-+  if flag(integer-simple)
-+    cpp-options: -DINTEGER_SIMPLE
-+    build-depends: integer-simple >= 0.1 && < 0.5
-   else
-     cpp-options: -DINTEGER_GMP
-     build-depends: integer-gmp >= 0.2
-@@ -181,9 +181,9 @@ test-suite tests
-     test-framework-hunit >= 0.2,
-     test-framework-quickcheck2 >= 0.2
- 
--  if flag(integer-pure)
--    cpp-options: -DINTEGER_PURE
--    build-depends: integer-pure >= 0.1 && < 0.5
-+  if flag(integer-simple)
-+    cpp-options: -DINTEGER_SIMPLE
-+    build-depends: integer-simple >= 0.1 && < 0.5
-   else
-     cpp-options: -DINTEGER_GMP
-     build-depends: integer-gmp >= 0.2
diff --git a/dev-haskell/text/metadata.xml b/dev-haskell/text/metadata.xml
deleted file mode 100644
index 707e40e47f20..000000000000
--- a/dev-haskell/text/metadata.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		
-		An efficient packed, immutable Unicode text type (both strict and
-		lazy), with a powerful loop fusion optimization framework.
-		
-		The 'Text' type represents Unicode character strings, in a time and
-		space-efficient manner. This package provides text processing
-		capabilities that are optimized for performance critical use, both
-		in terms of large data quantities and high speed.
-		
-		The 'Text' type provides character-encoding, type-safe case
-		conversion via whole-string case conversion functions. It also
-		provides a range of functions for converting 'Text' values to and from
-		'ByteStrings', using several standard encodings.
-		
-		Efficient locale-sensitive support for text IO is also supported.
-		
-		These modules are intended to be imported qualified, to avoid name
-		clashes with Prelude functions, e.g.
-		
-		&gt; import qualified Data.Text as T
-		
-		To use an extended and very rich family of functions for working
-		with Unicode text (including normalization, regular expressions,
-		non-standard encodings, text breaking, and locales), see
-		the @text-icu@ package:
-		&lt;http://hackage.haskell.org/package/text-icu&gt;
-		
-	</longdescription>
-	<use>
-		<flag name="developer">operate in developer mode</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">bos/text</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/text/text-0.11.3.1.ebuild b/dev-haskell/text/text-0.11.3.1.ebuild
deleted file mode 100644
index 7ff2ab68a5e4..000000000000
--- a/dev-haskell/text/text-0.11.3.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An efficient packed Unicode text type"
-HOMEPAGE="https://github.com/bos/text"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="developer"
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hunit-1.2
-			>=dev-haskell/quickcheck-2.4
-			dev-haskell/random
-			>=dev-haskell/test-framework-0.4
-			>=dev-haskell/test-framework-hunit-0.2
-			>=dev-haskell/test-framework-quickcheck2-0.2
-		)"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag developer developer)
-}
diff --git a/dev-haskell/text/text-1.1.1.3.ebuild b/dev-haskell/text/text-1.1.1.3.ebuild
deleted file mode 100644
index 5aa1c86f2f19..000000000000
--- a/dev-haskell/text/text-1.1.1.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An efficient packed Unicode text type"
-HOMEPAGE="https://github.com/bos/text"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-RESTRICT="test" # quickcheck-2.7 is missing keywords due to new tf-random dep
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-#	test? ( >=dev-haskell/hunit-1.2
-#		>=dev-haskell/quickcheck-2.7
-#		dev-haskell/random
-#		>=dev-haskell/test-framework-0.4
-#		>=dev-haskell/test-framework-hunit-0.2
-#		>=dev-haskell/test-framework-quickcheck2-0.2 )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-deepseq-1.4.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/text/text-1.2.2.0.ebuild b/dev-haskell/text/text-1.2.2.0.ebuild
deleted file mode 100644
index 676fcecd71a6..000000000000
--- a/dev-haskell/text/text-1.2.2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -developer,-integer-pure
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An efficient packed Unicode text type"
-HOMEPAGE="https://github.com/bos/text"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RESTRICT=test # break cyclic dependencies
-
-RDEPEND="dev-haskell/binary:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/quickcheck-2.7
-		dev-haskell/quickcheck-unicode
-		dev-haskell/random
-		>=dev-haskell/test-framework-0.4
-		>=dev-haskell/test-framework-hunit-0.2
-		>=dev-haskell/test-framework-quickcheck2-0.2 )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-integer-simple.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/text/text-1.2.2.1.ebuild b/dev-haskell/text/text-1.2.2.1.ebuild
deleted file mode 100644
index 5cb8a0849ae1..000000000000
--- a/dev-haskell/text/text-1.2.2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An efficient packed Unicode text type"
-HOMEPAGE="https://github.com/bos/text"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RESTRICT=test # break cyclic dependencies
-
-RDEPEND="dev-haskell/binary:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/quickcheck-2.7
-		dev-haskell/quickcheck-unicode
-		dev-haskell/random
-		>=dev-haskell/test-framework-0.4
-		>=dev-haskell/test-framework-hunit-0.2
-		>=dev-haskell/test-framework-quickcheck2-0.2 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/tf-random-0.5 b/dev-haskell/tf-random-0.5
new file mode 100644
index 000000000000..67cb109f0ef1
--- /dev/null
+++ b/dev-haskell/tf-random-0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/primitive-0.3:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8
+DESCRIPTION=High-quality splittable pseudorandom number generator
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/tf-random
+IUSE=profile
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/primitive-0.3:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.5
+SRC_URI=mirror://hackage/packages/archive/tf-random/0.5/tf-random-0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4a8dd4c343914a9e9e49d697be78bc6a
diff --git a/dev-haskell/tf-random/Manifest b/dev-haskell/tf-random/Manifest
deleted file mode 100644
index 4ee608f84578..000000000000
--- a/dev-haskell/tf-random/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tf-random-0.5.tar.gz 18483 BLAKE2B 5fba820aa028077a1cc65e3e27b7e580f834750beb2df6dffb2488890df7e95247804a7384f18f03bb1584f5f34637bbc079b9c2445af1c6c1e3378bf0735d77 SHA512 a766909571b4b37daaaaa9fa1aa9739bd2db8c32c0f64452fd7c3717f4578090e5227b763772858c6c311c5f366dd461421ffc3beb295455902fea1fb133deb7
-EBUILD tf-random-0.5.ebuild 694 BLAKE2B 2424266e0163144b3297272a53453266e423bf16c318abb4b3602464490636dc818589026b4d158ce2c43a181e1c380eb5f2f366a57755ab15590bfa15f9e933 SHA512 dafa4e6f1beab0054a42f3a57542fa0075d7508f4b1984136230fa7263131c5cd25084086ef81a116233fcab6a414c7fc9e30fbae37a6316eacf53920d94449b
-MISC metadata.xml 1762 BLAKE2B 831805d32a97a3ecd820c9a1122cec524b3eafb3be41142b0677219d7e541d4b47ed8b22dad9fc466cfae5e301c9b469604b8a3eeafd9a1906b25dd2b91b7081 SHA512 56185586f7239dcac266f54e781e431643a80011ea73d340ac1e0bf5dd3937610d2d5433189fd59eb3736e71d3b1eeabe1a4cef804ace1369beb10b35bc93c5d
diff --git a/dev-haskell/tf-random/metadata.xml b/dev-haskell/tf-random/metadata.xml
deleted file mode 100644
index 5635c16285eb..000000000000
--- a/dev-haskell/tf-random/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package contains an implementation of a high-quality splittable pseudorandom number generator. The generator is based on a cryptographic hash function built on top of the ThreeFish block cipher. See the paper /Splittable Pseudorandom Number Generators Using Cryptographic Hashing/ by Claessen, PaBka for details and the rationale of the design.
-		
-		The package provides the following:
-		
-		* A splittable PRNG that implements the standard 'System.Random.RandomGen' class.
-		
-		* The generator also implements an alternative version of the 'System.Random.TF.Gen.RandomGen' class (exported from "System.Random.TF.Gen"), which requires the generator to return pseudorandom integers from the full 32-bit range, and contains an n-way split function.
-		
-		* An alternative version of the @Random@ class is provided, which is linked to the new @RandomGen@ class, together with @Random@ instances for some integral types.
-		
-		* Two functions for initialising the generator with a non-deterministic seed: one using the system time, and one using the @\/dev\/urandom@ UNIX special file.
-		
-		The package uses an adapted version of the reference C implementation of ThreeFish from the reference package of the Skein hash function (&lt;https://www.schneier.com/skein.html&gt;), originally written by Doug Whiting.
-		
-		Please note that even though the generator provides very high-quality pseudorandom numbers, it has not been designed with cryptographic applications in mind.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/tf-random/tf-random-0.5.ebuild b/dev-haskell/tf-random/tf-random-0.5.ebuild
deleted file mode 100644
index 8f79546a69cb..000000000000
--- a/dev-haskell/tf-random/tf-random-0.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile" # non-ASCII in .cabal: haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="High-quality splittable pseudorandom number generator"
-HOMEPAGE="http://hackage.haskell.org/package/tf-random"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/primitive-0.3:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/th-expand-syns-0.3.0.6 b/dev-haskell/th-expand-syns-0.3.0.6
new file mode 100644
index 000000000000..c1f15677a0f8
--- /dev/null
+++ b/dev-haskell/th-expand-syns-0.3.0.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Expands type synonyms in Template Haskell ASTs
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/th-expand-syns
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.0.6
+SRC_URI=mirror://hackage/packages/archive/th-expand-syns/0.3.0.6/th-expand-syns-0.3.0.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0146c642110e79298cf5537ced112e5d
diff --git a/dev-haskell/th-expand-syns-0.4.2.0 b/dev-haskell/th-expand-syns-0.4.2.0
new file mode 100644
index 000000000000..07f04002f1d8
--- /dev/null
+++ b/dev-haskell/th-expand-syns-0.4.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Expands type synonyms in Template Haskell ASTs
+EAPI=6
+HOMEPAGE=https://github.com/DanielSchuessler/th-expand-syns
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.2.0
+SRC_URI=mirror://hackage/packages/archive/th-expand-syns/0.4.2.0/th-expand-syns-0.4.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=84ac4d8cc07905dba7d03978219ee7dc
diff --git a/dev-haskell/th-expand-syns/Manifest b/dev-haskell/th-expand-syns/Manifest
deleted file mode 100644
index 4f9ae8b68d4f..000000000000
--- a/dev-haskell/th-expand-syns/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST th-expand-syns-0.3.0.6.tar.gz 6395 BLAKE2B 2a5e4c94b6e9c5f129c36c16c2259c36691e0795d8997a6917c39ba0c958e92dda2c670798761db1af4616493c2ae79306cb3ce489e8b7473046b3ee10dfb25e SHA512 ffface5d571b6af659e37910c22aaca93c04dac3a58483b53a8c197389ef94173027b3e446f96e7de7239c9139f7901aa85a2e990f9d2a2d83a5e641d7f37365
-DIST th-expand-syns-0.4.2.0.tar.gz 7237 BLAKE2B c8179e95c870f601fb862756f0861e1b519d1c4d1378f3af5d78bc5381dae92190c8acbd3451dd51a701ed5935baf4a140026722a012a2731d7d90951e486159 SHA512 c0af0f38793cad2ddf96b75fb19641f791dab51f053b4d8c68c6081f0cd2e29f1d76fd2436b596c10718dfd84e4715740499cf95675e22013c7ce3a1655ba8b9
-EBUILD th-expand-syns-0.3.0.6.ebuild 605 BLAKE2B f841ae2fa4b82f46a82e813d3bd6b7f423f02454ac6a4191a4aabc515ec83f58eae05b46479a62951b09cab14a3cf246d513b1056e261634ad1c2e562c649bdb SHA512 777d47c2b021df21987bbfca30a8e850f8cf7b198cfd856e3765b9cbabcddd39710e47da2f11bfbb63ba383ce3be2b06c7acdf67ef981433f01e4856677e24a6
-EBUILD th-expand-syns-0.4.2.0.ebuild 606 BLAKE2B f928b7af0117728d1dde6972ec28748543f64d75b0406d7ad32645052303e91b2fbb24a6a49f8faa9b76dd92ed7256157c2aba2aa2034b772c442f1e30282d75 SHA512 7e11524b47fd85361c04c05af7e42094ab832c3dc648d87005ed4db9e2af1c323b298fc5c53463b8fa6faf17d661c95ddb105ed0c6d70b4c3b6e7e76a1881933
-MISC metadata.xml 433 BLAKE2B a4c56830c882682082902f36798ec4164596fb02fbd9433b0ed1cd1e3795bbdd8d8c8932789721021b7e15b2846e4fb1daa828084980cba39504b972d001fb6e SHA512 f13a7f7d99f21e8b564cbd9968c6579d1e678af4660d82c19ef6e9ccd785b183ceed9874279f32ddb59cc9613e3b2551ab60e0c826dafafb734398ffc643716b
diff --git a/dev-haskell/th-expand-syns/metadata.xml b/dev-haskell/th-expand-syns/metadata.xml
deleted file mode 100644
index 23320d5b348f..000000000000
--- a/dev-haskell/th-expand-syns/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Expands type synonyms in Template Haskell ASTs
-	</longdescription>
-	<upstream>
-		<remote-id type="github">DanielSchuessler/th-expand-syns</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/th-expand-syns/th-expand-syns-0.3.0.6.ebuild b/dev-haskell/th-expand-syns/th-expand-syns-0.3.0.6.ebuild
deleted file mode 100644
index 3c4a083b520f..000000000000
--- a/dev-haskell/th-expand-syns/th-expand-syns-0.3.0.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Expands type synonyms in Template Haskell ASTs"
-HOMEPAGE="http://hackage.haskell.org/package/th-expand-syns"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/th-expand-syns/th-expand-syns-0.4.2.0.ebuild b/dev-haskell/th-expand-syns/th-expand-syns-0.4.2.0.ebuild
deleted file mode 100644
index 60223402e13d..000000000000
--- a/dev-haskell/th-expand-syns/th-expand-syns-0.4.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Expands type synonyms in Template Haskell ASTs"
-HOMEPAGE="https://github.com/DanielSchuessler/th-expand-syns"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/th-lift-0.7.2 b/dev-haskell/th-lift-0.7.2
new file mode 100644
index 000000000000..08f6f206fa37
--- /dev/null
+++ b/dev-haskell/th-lift-0.7.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Derive Template Haskell's Lift class for datatypes
+EAPI=5
+HOMEPAGE=https://github.com/mboes/th-lift
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.2
+SRC_URI=mirror://hackage/packages/archive/th-lift/0.7.2/th-lift-0.7.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ecfbd8543631f824d7b56039a177b61a
diff --git a/dev-haskell/th-lift-0.7.5 b/dev-haskell/th-lift-0.7.5
new file mode 100644
index 000000000000..d685a9a25746
--- /dev/null
+++ b/dev-haskell/th-lift-0.7.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Derive Template Haskell's Lift class for datatypes
+EAPI=5
+HOMEPAGE=https://github.com/mboes/th-lift
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.5
+SRC_URI=mirror://hackage/packages/archive/th-lift/0.7.5/th-lift-0.7.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fac6ff9cb823f002b5a6f4ed73efb11a
diff --git a/dev-haskell/th-lift-0.7.6 b/dev-haskell/th-lift-0.7.6
new file mode 100644
index 000000000000..735d6c132cc6
--- /dev/null
+++ b/dev-haskell/th-lift-0.7.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Derive Template Haskell's Lift class for datatypes
+EAPI=5
+HOMEPAGE=https://github.com/mboes/th-lift
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.6
+SRC_URI=mirror://hackage/packages/archive/th-lift/0.7.6/th-lift-0.7.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=638cb515606d4fe53c64fdf27797d57e
diff --git a/dev-haskell/th-lift-0.7.7 b/dev-haskell/th-lift-0.7.7
new file mode 100644
index 000000000000..8911eba7ed49
--- /dev/null
+++ b/dev-haskell/th-lift-0.7.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Derive Template Haskell's Lift class for datatypes
+EAPI=6
+HOMEPAGE=https://github.com/mboes/th-lift
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.7
+SRC_URI=mirror://hackage/packages/archive/th-lift/0.7.7/th-lift-0.7.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=09f4d9568bd360e0baff507241c36d27
diff --git a/dev-haskell/th-lift-instances-0.1.11 b/dev-haskell/th-lift-instances-0.1.11
new file mode 100644
index 000000000000..6077f8430a25
--- /dev/null
+++ b/dev-haskell/th-lift-instances-0.1.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] >=dev-haskell/vector-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.6 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lift instances for template-haskell for common data types
+EAPI=6
+HOMEPAGE=https://github.com/bennofs/th-lift-instances/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] >=dev-haskell/vector-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.11
+SRC_URI=mirror://hackage/packages/archive/th-lift-instances/0.1.11/th-lift-instances-0.1.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=eed395b579dfb2e592c4a4dcb0101301
diff --git a/dev-haskell/th-lift-instances/Manifest b/dev-haskell/th-lift-instances/Manifest
deleted file mode 100644
index b4ff5f078fca..000000000000
--- a/dev-haskell/th-lift-instances/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST th-lift-instances-0.1.11.tar.gz 4477 BLAKE2B 22816020076245c154003ddb5a1523176368ceea47ba8d4e5c1f428227a2268079db59aae204c0a9012c565ae6c87991c6ede112926d12804d9a40efed5d4f35 SHA512 e4e443637c10cd21d9b6159f29ad8eb61a65bda2b625dff48ccbf1310c9abdbb1f48ff0c7e74974b78e0517db6af2889abb3c5cfeaed202c7b3efbe1c83dbc7a
-EBUILD th-lift-instances-0.1.11.ebuild 727 BLAKE2B 50c4c13335439cb6093b6bf535f3e6c3fc902bcf88be61d7e1729d672ed14d0aa08e4dbf03b31e75e1f0eddbb67a76236fe514a6dc1219ec82cbcb2a20a1d5ad SHA512 27fb3d80824d40c980857750b99ebcaf440b393ed3d12fa5b2a04fd0397203b7b7fc5c3729acb38568ece6e3f2d9896d1a862f7135538a9e64f09f135a63a200
-MISC metadata.xml 440 BLAKE2B 0309320a428a71aff074e04b2e20e62905f909b1d199212162e8aaaab7e5ab1862b02648cc4c1404f64cb0d04129624b491539ad64914788d0bfc1219ed21413 SHA512 1a710e960f2ca951491c37074a9cff05926b77897533a69d45645f5c3d17eec377106dbafe542d9bc3b7e7695f879a2059387dc2e1573d67de662732eb9e8e86
diff --git a/dev-haskell/th-lift-instances/metadata.xml b/dev-haskell/th-lift-instances/metadata.xml
deleted file mode 100644
index 0d764dc95edd..000000000000
--- a/dev-haskell/th-lift-instances/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Most data types in haskell platform do not have Lift instances. This package provides orphan instances
-		for containers, text, bytestring and vector.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/th-lift-instances/th-lift-instances-0.1.11.ebuild b/dev-haskell/th-lift-instances/th-lift-instances-0.1.11.ebuild
deleted file mode 100644
index 5213fdf2b696..000000000000
--- a/dev-haskell/th-lift-instances/th-lift-instances-0.1.11.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lift instances for template-haskell for common data types"
-HOMEPAGE="https://github.com/bennofs/th-lift-instances/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	dev-haskell/th-lift:=[profile?]
-	>=dev-haskell/vector-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.6 )
-"
diff --git a/dev-haskell/th-lift/Manifest b/dev-haskell/th-lift/Manifest
deleted file mode 100644
index 755b533aa80e..000000000000
--- a/dev-haskell/th-lift/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST th-lift-0.7.2.tar.gz 10980 BLAKE2B b430d5730447332fffe56722a51aac7c8e113d9504e375ed4389b7702bf8ec03e4dd049ee11afa6029b318a3dcd225d544c0bbe93d3ac019d749d0bfb6b35d07 SHA512 a560d9b7737a1b8a9ebb656edea035dd452349e4dc95af92bc152843b50960ebe498a1577a5c16eecaf6cb937fa72b67d7eff19aaa70293904adaa10e99e4f50
-DIST th-lift-0.7.5.tar.gz 12147 BLAKE2B 4751beec45d3f0af90644946682b75a9490ef403d6fbef8ad9d6f5a3c367e8a37b7727f629db5a6d92d6be2f938e9eeecb26a79a0dfd977f34e108d17dab8069 SHA512 79d01b50d424206602c810d2cd2c810b85a098737926f343c47c818bd43b2dd09c32964b52fa6fe4acc2462be16bcb4142b386337207321352f3e6d450158589
-DIST th-lift-0.7.6.tar.gz 12390 BLAKE2B e038e75631f3dac943b3baff060259c8daaeb0d7d7f0d62e081d85d0d2da7f49223b3106438ec8b01edbb4ed0911ab8312c214a5c7bee7ee2ce6ff8f5a97c1a0 SHA512 701d0064ab55414706e664ce8d8fa006329b3db6d04647204e1039ca267a5e5a2f7bbce477c4530070ccc1e2b23ac1653da24b765ea6340cafc696a077cdaf83
-DIST th-lift-0.7.7.tar.gz 12399 BLAKE2B 1dda0ef48694ea9d9f25b6f44ef7c7e3b16f2492d78de04b0d16a0b1cb7d2f36987ce92578df1286e869158cadd778cff92813638ea13be0c6710fa4d92f3cc5 SHA512 490d349ef2985defcf58eb49686c89ab79f8f9a3e29f3edb195440fe7995ecec6b2538767855ae0a5b9f43e5b00fe0bee167513486be99c111776ab7855d37d2
-EBUILD th-lift-0.7.2.ebuild 558 BLAKE2B cf46e30c6091f5f3297805c66783d250eea8b692b1c6abc14d459909872b836e77f20549dc43d49e1458dfad05881212558e28032b6292ab9936f3321b7e5c7c SHA512 fdf730395ac4724db2263fcd4c2cce6d63372c1bf71bd341594dfd738fd9889cfac3ee9aad6e08a3e9c3b0af36dfcdd51af552cdbdc258495a65e97b019897f2
-EBUILD th-lift-0.7.5.ebuild 565 BLAKE2B 9b5b3acfdf355761d54bb4fbaa6cafc9eb8fc1bca22f07af1900027dba206e2a58dc9fbf4906ec554af4d8ec6afbc2c3d527cf114564114ffb10134c5d8ef30f SHA512 be35541b7d2b5fcd2cc473d628cab9672e31bd834caf584387e8150cc66c6fa1c7ab4f511e429c3eaf3026e39d09c27ef37e1471e0cd3d6041abd0ff765c206e
-EBUILD th-lift-0.7.6.ebuild 565 BLAKE2B 67015c719700987c593b47e2af91259b6718a5fb700e5550e574c0376f4bce87e8a21d12164c6f0d2c92b67170e92471f840bdb03475f625684f60c15422b7c3 SHA512 23d9a467f26c480e225ce06b1972450cbe7f31ce43fd5e8e8af82361f543731e81e7725b57d3285332e5971a63dea0d5d150c540538e325d6ac101f8a464d786
-EBUILD th-lift-0.7.7.ebuild 563 BLAKE2B 369887525e79aeb5c3911948455b6804bab344f9bb6fcb37cac741e159155c5422412186f6ff685ae1675095e51cf233113111e0173d04535ab5a8ecdfc1c6b5 SHA512 4ab5fddb6b0d17593220cec92fa5d76a10e43fa02c02734193c97c9f2e3a9ae68a307f473c8f4b61a3e43d5da3a5377a71274b69ff27a32d81857a31ce55363b
-MISC metadata.xml 420 BLAKE2B 7941a77b62dbbe6e315c3bf6458fb0fef97a4cd3861012378aaf784bbd43cac2bbeb9d9195c42c2d4333f440b45a94cf50d5eb4949ae6d1e43e33c944fbf0676 SHA512 8805d1ba9be8842c874e915b742fbff33e5c20a236858e0371e7fc402b8c7bbc0adc16b57c7f86bad097ff98db2ca3295df1b12abd885a134caa421e61bc0175
diff --git a/dev-haskell/th-lift/metadata.xml b/dev-haskell/th-lift/metadata.xml
deleted file mode 100644
index 1d3597389241..000000000000
--- a/dev-haskell/th-lift/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Derive Template Haskell's Lift class for datatypes.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">mboes/th-lift</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/th-lift/th-lift-0.7.2.ebuild b/dev-haskell/th-lift/th-lift-0.7.2.ebuild
deleted file mode 100644
index 89720bd62090..000000000000
--- a/dev-haskell/th-lift/th-lift-0.7.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Derive Template Haskell's Lift class for datatypes"
-HOMEPAGE="https://github.com/mboes/th-lift"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/th-lift/th-lift-0.7.5.ebuild b/dev-haskell/th-lift/th-lift-0.7.5.ebuild
deleted file mode 100644
index 4d897a2b47ed..000000000000
--- a/dev-haskell/th-lift/th-lift-0.7.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Derive Template Haskell's Lift class for datatypes"
-HOMEPAGE="https://github.com/mboes/th-lift"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/th-lift/th-lift-0.7.6.ebuild b/dev-haskell/th-lift/th-lift-0.7.6.ebuild
deleted file mode 100644
index eeb609a15651..000000000000
--- a/dev-haskell/th-lift/th-lift-0.7.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Derive Template Haskell's Lift class for datatypes"
-HOMEPAGE="https://github.com/mboes/th-lift"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/th-lift/th-lift-0.7.7.ebuild b/dev-haskell/th-lift/th-lift-0.7.7.ebuild
deleted file mode 100644
index 91a935817fef..000000000000
--- a/dev-haskell/th-lift/th-lift-0.7.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Derive Template Haskell's Lift class for datatypes"
-HOMEPAGE="https://github.com/mboes/th-lift"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/th-orphans-0.11.1 b/dev-haskell/th-orphans-0.11.1
new file mode 100644
index 000000000000..0d41d7aff2b2
--- /dev/null
+++ b/dev-haskell/th-orphans-0.11.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?] >=dev-haskell/th-lift-0.7.1:=[profile?] >=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Orphan instances for TH datatypes
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/th-orphans
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?] >=dev-haskell/th-lift-0.7.1:=[profile?] >=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.11.1
+SRC_URI=mirror://hackage/packages/archive/th-orphans/0.11.1/th-orphans-0.11.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8d010a10c809aa9b5d75f0b09ac00822
diff --git a/dev-haskell/th-orphans-0.13.3 b/dev-haskell/th-orphans-0.13.3
new file mode 100644
index 000000000000..7edfd49aa06d
--- /dev/null
+++ b/dev-haskell/th-orphans-0.13.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/generic-deriving-1.9:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/th-lift-0.7.1:=[profile?] dev-haskell/th-lift-instances:=[profile?] >=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Orphan instances for TH datatypes
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/th-orphans
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/generic-deriving-1.9:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/th-lift-0.7.1:=[profile?] dev-haskell/th-lift-instances:=[profile?] >=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.13.3
+SRC_URI=mirror://hackage/packages/archive/th-orphans/0.13.3/th-orphans-0.13.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=430e2df7db1487aba13101f60b584ce2
diff --git a/dev-haskell/th-orphans-0.8.2 b/dev-haskell/th-orphans-0.8.2
new file mode 100644
index 000000000000..bbb44b1c077f
--- /dev/null
+++ b/dev-haskell/th-orphans-0.8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/th-lift-0.5:=[profile?] >=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Orphan instances for TH datatypes
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/th-orphans
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/th-lift-0.5:=[profile?] >=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.8.2
+SRC_URI=mirror://hackage/packages/archive/th-orphans/0.8.2/th-orphans-0.8.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6a41218b80813a5bf526f94529f0c92e
diff --git a/dev-haskell/th-orphans/Manifest b/dev-haskell/th-orphans/Manifest
deleted file mode 100644
index 401360dea876..000000000000
--- a/dev-haskell/th-orphans/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST th-orphans-0.11.1.tar.gz 5511 BLAKE2B 0849cc48fbce6cc8d73e1089fc3a7b0d0f89319ec920d5373b93103071f190843df4758e7aff2353174e194c286e4a10e75c9551a304bbe706f3499548ffd3d8 SHA512 49f3467ed2a8365ccd3ab2f3a7281e04a4b42fb81b6411f0553b1770974710df6005ecd3e3e41724ac02602c47150daad51010c107564d330d7b08cf52320503
-DIST th-orphans-0.13.3.tar.gz 6549 BLAKE2B 1a23b345fd5cf43715deac8c1f21df56bb75e6d683b7d8ab2b28ce3c72ece178e0a0096d970f04e947d0977ce4a7062c4f47616e0c56e046e0deb8f621dec60f SHA512 5adc55392c2575d885365631ec90c6f26186fcb5ccc42f0e53cace064f1bf5ce389519aa78939a6390054a3ce144484de09205147fe06cbecbc0663898b0371d
-DIST th-orphans-0.8.2.tar.gz 4116 BLAKE2B 643ba6bc66d4096c21cbefcc5120836886b1158eb5f6f2f9d14a486dee7e738c25ca237ccadebbd8a4d87be6c4d1109983aaddf3d6f556a7682ac2a5bb85ac33 SHA512 d0cad737caebcf943a7289fd5ba771530553ff57d40dd3ac7dc7fb4ffe949ab04d7af660a3b84491366119ffdcf607819135bfd160c94a1f8401376d2b7b49a7
-EBUILD th-orphans-0.11.1.ebuild 815 BLAKE2B 202641a9878359afc881719ef6beff25cb1bfaac2beaf3542099e009f706934c8f88f025f9ee155daf96dea4db0b77a6089a56b579d10840a2db336205c7a24d SHA512 ffd62863428c8935697e47aefe3d92295a80c5d2d516eda4a46afbdcc54cb1a1a91ca7c24b173d86041266669aec74b737a6b4e270cdf39ca69f68f2a436dc91
-EBUILD th-orphans-0.13.3.ebuild 840 BLAKE2B c6ee63817b649899991f44794a3164f7dba7c355b434fad42d5e7a1a6fcca2b5568aa02df8642d24e4cd839c55e7e5c3488608f63536bf5d4229dc8b6e3a027d SHA512 0d67f9c0d8f8ecba72602bbdb95076f8ae1ab109b84c39b1c19701db01176686d14c4cfc80d8952fdb2a4be520b0b7128feebb6f8beeb003cbfccdd348b17533
-EBUILD th-orphans-0.8.2.ebuild 677 BLAKE2B cc687f1734cc3e4c02f858ba19e5ec5c0d11c2fc2319b43d0432cd82bcb0329ee245453c32405ce98bc7c5f4b95b8cde5ed15495c53bde0cbd50b53e50e714ce SHA512 7731b80511d4e3a331184478af96e7610d88cfbaa0324a56e232045ecfae0fe440aeded2664b4443b91dcf44db922afa4b1092131868bd941fb123993660bd01
-MISC metadata.xml 507 BLAKE2B 99ba933aab8c90265fa2794e4dc5b9c8b3012421b07b3a4375225cab2b544f3eeb485bfd3877f1ce2fe7f447ca272d6d64700e36333e5df562af463c532a24c2 SHA512 4bdb62e70a857bba59d2abe32dd5a28fa4ca20b0756c785323fcdc39327d89b85c9e936c767454dadfa60f52cccda99a08f8d5bf3dae1a758a0be9102fd8e4c2
diff --git a/dev-haskell/th-orphans/metadata.xml b/dev-haskell/th-orphans/metadata.xml
deleted file mode 100644
index 68da81290c55..000000000000
--- a/dev-haskell/th-orphans/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Orphan instances for TH datatypes.  In particular, instances
-		for Ord and Lift, as well as a few missing Show / Eq.  These
-		instances used to live in haskell-src-meta, and that's where
-		the version number started.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/th-orphans/th-orphans-0.11.1.ebuild b/dev-haskell/th-orphans/th-orphans-0.11.1.ebuild
deleted file mode 100644
index fd2971267740..000000000000
--- a/dev-haskell/th-orphans/th-orphans-0.11.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Orphan instances for TH datatypes"
-HOMEPAGE="http://hackage.haskell.org/package/th-orphans"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?]
-	>=dev-haskell/th-lift-0.7.1:=[profile?]
-	>=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/th-orphans/th-orphans-0.13.3.ebuild b/dev-haskell/th-orphans/th-orphans-0.13.3.ebuild
deleted file mode 100644
index 454122d489f4..000000000000
--- a/dev-haskell/th-orphans/th-orphans-0.13.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Orphan instances for TH datatypes"
-HOMEPAGE="http://hackage.haskell.org/package/th-orphans"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/generic-deriving-1.9:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/th-lift-0.7.1:=[profile?]
-	dev-haskell/th-lift-instances:=[profile?]
-	>=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/th-orphans/th-orphans-0.8.2.ebuild b/dev-haskell/th-orphans/th-orphans-0.8.2.ebuild
deleted file mode 100644
index 0bfbecff5d7d..000000000000
--- a/dev-haskell/th-orphans/th-orphans-0.8.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Orphan instances for TH datatypes"
-HOMEPAGE="http://hackage.haskell.org/package/th-orphans"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/th-lift-0.5:=[profile?]
-	>=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/th-reify-many-0.1.3 b/dev-haskell/th-reify-many-0.1.3
new file mode 100644
index 000000000000..515998e5c174
--- /dev/null
+++ b/dev-haskell/th-reify-many-0.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/th-expand-syns:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Recurseively reify template haskell datatype info
+EAPI=5
+HOMEPAGE=https://github.com/mgsloan/th-reify-many
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/th-expand-syns:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.3
+SRC_URI=mirror://hackage/packages/archive/th-reify-many/0.1.3/th-reify-many-0.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=669f8e0d554773e884d7cb765a0c08d0
diff --git a/dev-haskell/th-reify-many-0.1.6 b/dev-haskell/th-reify-many-0.1.6
new file mode 100644
index 000000000000..c56a1458109c
--- /dev/null
+++ b/dev-haskell/th-reify-many-0.1.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/th-expand-syns:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Recurseively reify template haskell datatype info
+EAPI=6
+HOMEPAGE=https://github.com/mgsloan/th-reify-many
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/th-expand-syns:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.6
+SRC_URI=mirror://hackage/packages/archive/th-reify-many/0.1.6/th-reify-many-0.1.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c0fab3af6f08e99ed14b9b2f4ee97b60
diff --git a/dev-haskell/th-reify-many/Manifest b/dev-haskell/th-reify-many/Manifest
deleted file mode 100644
index 6b80ce151712..000000000000
--- a/dev-haskell/th-reify-many/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST th-reify-many-0.1.3.tar.gz 5481 BLAKE2B dbc554fbf805fc4b63a51ec17dfc8f11008072d22372ee6a52899b242fe3f138aef11ad379141a37df3cbc4c13ff0e1792edc39a16a8cad22b5641291005acb7 SHA512 1e258d9d9ae28537ce3b7eca2de2434ad1a84a474de131bc307a74d3cb6527c70ce2fa23987896e5c3804404acdfc515d08437fbdf9940b4fdab3374574a93ed
-DIST th-reify-many-0.1.6.tar.gz 5651 BLAKE2B 33a29ed0e860888d00c9d05f742c20e54916980f5e572b839b611d7ee8bae8f3e7d584fce361aa4cb8ef4107e9871513ddf07070f30f6f613326f3493c7a4d6f SHA512 dccd91f4767e29a69ad81b754085040f45a6a8ce627c435f3ca3b14cd723e390df27a462f7ba74f3d652b239c2383d84305c947ccf4fb1906ddda52f9069b589
-EBUILD th-reify-many-0.1.3.ebuild 670 BLAKE2B e6740cdb43d855a8a2520b4b0a16bdc143dc188000fda0dfea800fd8a9026b578a3c2b1b884daf8db471c6ff8b7779d49bdaa44b9cf1f6576f671493c49cc8ed SHA512 025064c8655a19e88ca73a8103c2ecc249b1ca5cba02dee8bbb9ecd80a323a6d247ed28ff236bceb538abe8e4150c69321faceb9a17e290859d89e82a3c88666
-EBUILD th-reify-many-0.1.6.ebuild 668 BLAKE2B b143b42486d4d182a037982659f30ed35bc00ba0ed99036fdcbb439e1eaacae9bb302d4f0b2294cc55f673b21fe49daeb1ce9855fd94db973cb5bae07103ca59 SHA512 067e4f2f73c7e14497a6df4b824a483b04c3860f49c4f60c2a7d0cac43d2cf7535ec3a7422c08d70e532d46c2c868ea01f5838b01a3d2035563adbd2c27582d8
-MISC metadata.xml 640 BLAKE2B 3b28ed2379e816b690ff1ef27e5cbae5e4f252b4dd0703d764aeb82a6402fa111de8a586a56b060baa8cb935b6e40a020b25546c06ba39ce55a5183b96c26c84 SHA512 611cf79c5d709a401dc3830d178911e6bd5cf223d2260fd7a424f1eb4733e1937f242473d95a81723da173ef21186fe93ee10c7944aaa9e45535073009baaea4
diff --git a/dev-haskell/th-reify-many/metadata.xml b/dev-haskell/th-reify-many/metadata.xml
deleted file mode 100644
index c5a39e2ffbb7..000000000000
--- a/dev-haskell/th-reify-many/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		@th-reify-many@ provides functions for recursively reifying top
-		level declarations.  The main intended use case is for enumerating
-		the names of datatypes reachable from an initial datatype, and
-		passing these names to some function which generates instances.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">mgsloan/th-reify-many</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/th-reify-many/th-reify-many-0.1.3.ebuild b/dev-haskell/th-reify-many/th-reify-many-0.1.3.ebuild
deleted file mode 100644
index 1e9c8ce7e7bb..000000000000
--- a/dev-haskell/th-reify-many/th-reify-many-0.1.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Recurseively reify template haskell datatype info"
-HOMEPAGE="https://github.com/mgsloan/th-reify-many"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/th-expand-syns:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/th-reify-many/th-reify-many-0.1.6.ebuild b/dev-haskell/th-reify-many/th-reify-many-0.1.6.ebuild
deleted file mode 100644
index 608c3760d633..000000000000
--- a/dev-haskell/th-reify-many/th-reify-many-0.1.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Recurseively reify template haskell datatype info"
-HOMEPAGE="https://github.com/mgsloan/th-reify-many"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/th-expand-syns:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/th-utilities-0.2.0.1 b/dev-haskell/th-utilities-0.2.0.1
new file mode 100644
index 000000000000..fde2c65e36d7
--- /dev/null
+++ b/dev-haskell/th-utilities-0.2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/primitive:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-orphans:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec dev-haskell/vector ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Collection of useful functions for use with Template Haskell
+EAPI=6
+HOMEPAGE=https://github.com/fpco/th-utilities#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/primitive:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-orphans:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.2.0.1
+SRC_URI=mirror://hackage/packages/archive/th-utilities/0.2.0.1/th-utilities-0.2.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=512093bd57b64bc2fa03bc53358c5e99
diff --git a/dev-haskell/th-utilities/Manifest b/dev-haskell/th-utilities/Manifest
deleted file mode 100644
index 460d27f53058..000000000000
--- a/dev-haskell/th-utilities/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST th-utilities-0.2.0.1.tar.gz 14996 BLAKE2B dc39e7f282a2b5cc4ae2442f76080e042bc0fd3fc28e29ef7e6313bd4685ed33c855c10fa9313e5b7d3c6e9fd3c8cfbe4a64d8131a156b34eabd0f437b99b850 SHA512 30cb5c09071beb1f8e029d217fefc6e58aa6eaa8a28994990d1549091fc174195b04a10e7873b1ac5f894cb4a528bf9764256ff1ad5c969493fbf5f872f1749f
-EBUILD th-utilities-0.2.0.1.ebuild 771 BLAKE2B b10e742a8119d255b9f87f65cde288fe1581556a49b7f2a26005a9d55d444640e5b421b20f0eb5b5e50ba68a3ce2a848961864c0fef722766849c4942a2ea154 SHA512 d677175408155d2fcbf1f4a612b611531980e40072a670da7d90240b9e3193f1b5e984dfb162291eb55f3bf25bddb9b51fce554982b13b2e407be6925051b830
-MISC metadata.xml 351 BLAKE2B d6d56e943b01e18fe1b9be3422620e2e59b9264c70a01c15abb29427ad82d744457ffc2fe7cc05ba8cf7c22ecff9190d1f2bdee73da42e833ac1e50e918e0a6d SHA512 22a6f9ed3b20b27470841ad774539597e351b6abd0c51fc2644c8762b7e1d08da11600c08b3cc7744984354518e046542a6409f89dac11f6c9fd0a8d87c7fb3a
diff --git a/dev-haskell/th-utilities/metadata.xml b/dev-haskell/th-utilities/metadata.xml
deleted file mode 100644
index 93ba8d9ecc21..000000000000
--- a/dev-haskell/th-utilities/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Collection of useful functions for use with Template Haskell
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/th-utilities/th-utilities-0.2.0.1.ebuild b/dev-haskell/th-utilities/th-utilities-0.2.0.1.ebuild
deleted file mode 100644
index 26d2cbd60e01..000000000000
--- a/dev-haskell/th-utilities/th-utilities-0.2.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Collection of useful functions for use with Template Haskell"
-HOMEPAGE="https://github.com/fpco/th-utilities#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/th-orphans:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec
-		dev-haskell/vector )
-"
diff --git a/dev-haskell/threads-0.5.1.4 b/dev-haskell/threads-0.5.1.4
new file mode 100644
index 000000000000..9fd9420e90bf
--- /dev/null
+++ b/dev-haskell/threads-0.5.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/stm-2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 test? ( >=dev-haskell/concurrent-extra-0.5.1 <dev-haskell/concurrent-extra-0.8 >=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.4 >=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fork threads and wait for their result
+EAPI=5
+HOMEPAGE=https://github.com/basvandijk/threads
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/stm-2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.5.1.4
+SRC_URI=mirror://hackage/packages/archive/threads/0.5.1.4/threads-0.5.1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=60733ddcf094a420fd1973584e818174
diff --git a/dev-haskell/threads/Manifest b/dev-haskell/threads/Manifest
deleted file mode 100644
index 4867718ebe24..000000000000
--- a/dev-haskell/threads/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST threads-0.5.1.4.tar.gz 7395 BLAKE2B ca81e06509d5dd9603e6b8affb248eb397040845e0fff26adda91086e08eb2d78982a9342f0d6bb0b3b6aab4ead33b3b26500683e221db60f5833b3ff4c280bd SHA512 4fcce77d88bf5eeb0ef172efec8525327ae11739c89a7d31b775ed686ad943aecb53f8140539262fdc8992b338943e9f905ebf97bc7c01312a12a88ac4c08129
-EBUILD threads-0.5.1.4.ebuild 909 BLAKE2B 10be59723378144f05acae8a262e2c83e632d524afd780eb8dabbc0aa67b87d7ae18649585274911aad0222895d28b5a2c5833fb6f0fb77821e28a3d51fc602a SHA512 dc5e71dd61b09e2d23c69e40d114bac1f2470dde6907faa0c9adeeef7e44fc55d9729b7502dbb0b87876d3f971c8fe5bf79290e8fa941556d4cb1090daf02fe5
-MISC metadata.xml 1018 BLAKE2B 405986db23ff3277088864efb403b7fa20d998c37a75dcc953b6a0c490d442d469843cf856142e43f2a46ac458b1f7bb6c9e8476ac85e1ea7214cda51552c88b SHA512 b50d6d809ae35893296cf851ecf03c5a5b69342eee6db42ef13907afe224b4d46047b4bd68dafcab51e972a7cbff0e28aa6ed2b1123d1fb9d15dc6b512be564d
diff --git a/dev-haskell/threads/metadata.xml b/dev-haskell/threads/metadata.xml
deleted file mode 100644
index 2baf8cca4f23..000000000000
--- a/dev-haskell/threads/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides functions to fork threads and
-		wait for their result, whether it's an exception or a
-		normal value.
-		
-		Besides waiting for the termination of a single thread
-		this packages also provides functions to wait for a
-		group of threads to terminate.
-		
-		This package is similar to the
-		@threadmanager@, @async@ and @spawn@ packages.
-		The advantages of this package are:
-		
-		* Simpler API.
-		
-		* More efficient in both space and time.
-		
-		* No space-leak when forking a large number of threads.
-		
-		* Correct handling of asynchronous exceptions.
-		
-		* GHC specific functionality like @forkOn@ and @forkIOWithUnmask@.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">basvandijk/threads</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/threads/threads-0.5.1.4.ebuild b/dev-haskell/threads/threads-0.5.1.4.ebuild
deleted file mode 100644
index b7c1db28f512..000000000000
--- a/dev-haskell/threads/threads-0.5.1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fork threads and wait for their result"
-HOMEPAGE="https://github.com/basvandijk/threads"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( >=dev-haskell/concurrent-extra-0.5.1 <dev-haskell/concurrent-extra-0.8
-		>=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4 )
-"
diff --git a/dev-haskell/thyme-0.3.5.5 b/dev-haskell/thyme-0.3.5.5
new file mode 100644
index 000000000000..a72dc1a3f3d6
--- /dev/null
+++ b/dev-haskell/thyme-0.3.5.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-haskell/vector-space-0.8:=[profile?] >=dev-haskell/vector-th-unbox-0.2.1.0:=[profile?] >=dev-lang/ghc-7.4.1:= lens? ( >=dev-haskell/lens-3.9:=[profile?] ) !lens? ( >=dev-haskell/profunctors-3.1.2:=[profile?] ) >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/system-posix-redirect-1.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A faster time library
+EAPI=5
+HOMEPAGE=https://github.com/liyang/thyme
+IUSE=+bug-for-bug lens show-internal doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-haskell/vector-space-0.8:=[profile?] >=dev-haskell/vector-th-unbox-0.2.1.0:=[profile?] >=dev-lang/ghc-7.4.1:= lens? ( >=dev-haskell/lens-3.9:=[profile?] ) !lens? ( >=dev-haskell/profunctors-3.1.2:=[profile?] )
+RESTRICT=test
+SLOT=0/0.3.5.5
+SRC_URI=mirror://hackage/packages/archive/thyme/0.3.5.5/thyme-0.3.5.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7be8adc5d99c075f6246166b2acc0601
diff --git a/dev-haskell/thyme/Manifest b/dev-haskell/thyme/Manifest
deleted file mode 100644
index 95f3839dbbd7..000000000000
--- a/dev-haskell/thyme/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST thyme-0.3.5.5.tar.gz 37220 BLAKE2B 16c72f436d8587f5102458a9013f1244e223dd675e610cfb8216d95a2ff01ec1b90bacd23dd50440ac87f6a73e22b2580a0dd4c0da3ca2c336d8e521b31fe23f SHA512 2f8bb307a49e441b3fe2a0337a25ef9adc94d3fe2f04369759bbdfba9ee788568016e8e9ce6dde2ef1ba51c61f98621f4dd35b833cab1757b022bf43524174b5
-EBUILD thyme-0.3.5.5.ebuild 1356 BLAKE2B 1e96201026af2dfdc573abc5399a9cd0343b44a1751b0fa6559acecd2d6ae20e777ace5acdb8513616df993d36fedec70af952bbece777a7ce15038e5166667b SHA512 058ba8305eef933fb8e78498debca9ce4e6c14b2ea6d2107523e7be8d6f8c7df061f07658bc5084d7c7d92be9bb37e95ae40c0b89c2b37f4cd0ad83bbcd598fc
-MISC metadata.xml 768 BLAKE2B 4a2c19070a42c59d074bee59efb4d5727a9556119e9d6f2ba0f1717e2099087fb1ad09b5a19023ed18abd6d233ece0b4b4514c346b80bad410f6dacf000d8391 SHA512 ef57041acbcd716294f3c1c5a120977170c415c4149966414e340817d75e99b80c1efdf37c841b323275d444ff4c824573bf4953d7d663e309d04414c95342e7
diff --git a/dev-haskell/thyme/metadata.xml b/dev-haskell/thyme/metadata.xml
deleted file mode 100644
index 61acd72e3cce..000000000000
--- a/dev-haskell/thyme/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Thyme is a rewrite of the fine @time@ library, with a particular focus
-		on performance for applications that make heavy use of timestamps.
-		
-		See "Data.Thyme" for a full description.
-	</longdescription>
-	<use>
-		<flag name="bug-for-bug">bug-for-bug compatibility with time</flag>
-		<flag name="lens">use the full lens package</flag>
-		<flag name="show-internal">instance Show of internal representation</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">liyang/thyme</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/thyme/thyme-0.3.5.5.ebuild b/dev-haskell/thyme/thyme-0.3.5.5.ebuild
deleted file mode 100644
index 4c00e65bfb7a..000000000000
--- a/dev-haskell/thyme/thyme-0.3.5.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -werror,-hlint
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A faster time library"
-HOMEPAGE="https://github.com/liyang/thyme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bug-for-bug lens show-internal"
-
-RESTRICT=test # optimization-dependent
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?]
-	>=dev-haskell/quickcheck-2.4:2=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?]
-	>=dev-haskell/vector-space-0.8:=[profile?]
-	>=dev-haskell/vector-th-unbox-0.2.1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	lens? ( >=dev-haskell/lens-3.9:=[profile?] )
-	!lens? ( >=dev-haskell/profunctors-3.1.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/system-posix-redirect-1.1 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bug-for-bug bug-for-bug) \
-		--flag=-hlint \
-		$(cabal_flag lens lens) \
-		$(cabal_flag show-internal show-internal) \
-		--flag=-werror
-}
diff --git a/dev-haskell/time-compat-0.1.0.3 b/dev-haskell/time-compat-0.1.0.3
new file mode 100644
index 000000000000..50b7bc22b654
--- /dev/null
+++ b/dev-haskell/time-compat-0.1.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/old-time:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Compatibility with old-time for the time package
+EAPI=5
+HOMEPAGE=https://hub.darcs.net/dag/time-compat
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/old-time:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0.3
+SRC_URI=mirror://hackage/packages/archive/time-compat/0.1.0.3/time-compat-0.1.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bb9e383dd3d4cf610a4d6d83ea69ad36
diff --git a/dev-haskell/time-compat/Manifest b/dev-haskell/time-compat/Manifest
deleted file mode 100644
index bbab6c31725e..000000000000
--- a/dev-haskell/time-compat/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST time-compat-0.1.0.3.tar.gz 2256 BLAKE2B eb94a09bfa0f1feaf41272c2fc7825e88c557cbfc6a9946886e871a75adcacb3aec03eac970baa409dbec1d2a9c6dc637ef121a0ba26416b59263a08c70fe767 SHA512 d7034e47654c4d73b4a0f3a7b1d0d5d2bfcc1eb028f288b7ccd0baceae49a6436493bf8a7a8af34ef3668f59a8b6f6047809a448125607c8af4aaee01deacfa6
-EBUILD time-compat-0.1.0.3.ebuild 592 BLAKE2B 9e0fb0dc7b932fcaedd101b9a77ed3a0fd93f0627dded521ed35326f02187086637c41f7ff3b4c957f884f456753e932a8f222cf0381cf0e770bf76c68d40d27 SHA512 3de853ce3ea8dafcc89d7e3f47f8d803e823ca04c36aec4398250d537a3348015d541c36d31671830efc6868fe6e51aabaa562796e44a743ef1ccd9d4fb5e4d6
-MISC metadata.xml 378 BLAKE2B d1e98a535cbfdcb0f93c390b06035c173db8ac7dc0c65fa79ed3112c5767915b786cb12466df936e2ac548832580fdbb37f471f7c438f5abbd137c682127abae SHA512 1233288c38cbab9385bc4dc903e883229b083fe05a6e2b4e85a48f36681c310d4e718d460aadc6ad32edf37acfa7b01ea0cc5a67e7b2da3e5d2f65bf413a3259
diff --git a/dev-haskell/time-compat/metadata.xml b/dev-haskell/time-compat/metadata.xml
deleted file mode 100644
index e5927f581861..000000000000
--- a/dev-haskell/time-compat/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Compatibility with the &lt;old-time&gt; package for the \"new\"
-		&lt;time&gt; package.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/time-compat/time-compat-0.1.0.3.ebuild b/dev-haskell/time-compat/time-compat-0.1.0.3.ebuild
deleted file mode 100644
index aff251cfd09e..000000000000
--- a/dev-haskell/time-compat/time-compat-0.1.0.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Compatibility with old-time for the time package"
-HOMEPAGE="https://hub.darcs.net/dag/time-compat"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/old-time:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/time-locale-compat-0.1.1.1 b/dev-haskell/time-locale-compat-0.1.1.1
new file mode 100644
index 000000000000..75df4813b00c
--- /dev/null
+++ b/dev-haskell/time-locale-compat-0.1.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/old-locale:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Compatibility of TimeLocale between old-locale and time-1.5
+EAPI=5
+HOMEPAGE=https://github.com/khibino/haskell-time-locale-compat
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/old-locale:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.1.1
+SRC_URI=mirror://hackage/packages/archive/time-locale-compat/0.1.1.1/time-locale-compat-0.1.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=789f21f8bd905690ed44461c0f6fbc4c
diff --git a/dev-haskell/time-locale-compat-0.1.1.3 b/dev-haskell/time-locale-compat-0.1.1.3
new file mode 100644
index 000000000000..4efb34f9863c
--- /dev/null
+++ b/dev-haskell/time-locale-compat-0.1.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/old-locale:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Compatibility of TimeLocale between old-locale and time-1.5
+EAPI=6
+HOMEPAGE=https://github.com/khibino/haskell-time-locale-compat
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/old-locale:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.1.3
+SRC_URI=mirror://hackage/packages/archive/time-locale-compat/0.1.1.3/time-locale-compat-0.1.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=eda088c9b30eee8db83dabdb8fd6cd93
diff --git a/dev-haskell/time-locale-compat/Manifest b/dev-haskell/time-locale-compat/Manifest
deleted file mode 100644
index 5b37acc5afa2..000000000000
--- a/dev-haskell/time-locale-compat/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST time-locale-compat-0.1.1.1.tar.gz 1861 BLAKE2B 526ec59b96310249b98a286a0e79934ca29460057cad3847780f0bff1b384c1491996000f26ed0aa68dc45cb910de990d94bbec1fe97039afff44bcb61fffd99 SHA512 69adcc66c933900768de5dc73a654aa226f074ce0dbe0c9db8773d31cc79753e5148145faaae198d4040cc6a23da6372fea6e3f48e1c8f6110a318591e9d6f48
-DIST time-locale-compat-0.1.1.3.tar.gz 1925 BLAKE2B a25ad359cf0fcba2375113d7b5e2f8f489865526261c6905b4f8435c454f7bda5e0fb92f0c86138b90edfe9f0217a37754af4cdd4ba0df00737ed83ab881b12a SHA512 62fd86d0b1f3707fb820a15dddc01d02fb701e942493e26927745556f19430706ae342a810942c511105cfa848f0d40e109aab471c8c0441caaf6ed4afb233a2
-EBUILD time-locale-compat-0.1.1.1.ebuild 619 BLAKE2B 2fa573c4b81255799985315c3dea63f5d5ae151d6b6edbb96f5e65d692c6ff36435b324923aa60d91e0474e3e1dfdc392e96fdf1a5ca210d4b359b5875fe2103 SHA512 8e5c0de869645ee65a929f4ed90fda45890b5900b1e0da814136e9447367ee909dea91ea531336b4e09feb021204b64ef914feefc3b4eba2530b49065618791c
-EBUILD time-locale-compat-0.1.1.3.ebuild 619 BLAKE2B 4aa757a646ab119360cffc22921b43dd701d5f21e57b799244059fb7d10bab9edf4e4c578beaac46eb3669a900cf38e50af77c3ea92ecf6b83c8eccb85ed80e7 SHA512 cea1888b7e585aaabf286d4c87dd991e13eb40f10c2089962ea40d2ac50ec2b46844cee3e5a099e7b05b86903ae87e85cebce0d9457da7c5c1d99ea67c5315d4
-MISC metadata.xml 447 BLAKE2B e3cf8b68f7afa1a9c0770fbbc5c5040f60718a704c35000abf1fc8b567b046c803c870e742d44be41a59e90d0f4ae2436f0df9496193b5b99b3ad1bbc15ee8d9 SHA512 06bd239ae0f0d7c305c5c484e91cacb7f7a8b90fa0917d9a0a17a7ab50676bcd0876f425d82a96c868964ecd9a355cdf3c67f6e57abbace27e28df0f2bb5dcaa
diff --git a/dev-haskell/time-locale-compat/metadata.xml b/dev-haskell/time-locale-compat/metadata.xml
deleted file mode 100644
index 1ab2ab0beca4..000000000000
--- a/dev-haskell/time-locale-compat/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package contains wrapped name module for TimeLocale.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">khibino/haskell-time-locale-compat</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.1.ebuild b/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.1.ebuild
deleted file mode 100644
index 644d904a1147..000000000000
--- a/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Compatibility of TimeLocale between old-locale and time-1.5"
-HOMEPAGE="https://github.com/khibino/haskell-time-locale-compat"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/old-locale:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.3.ebuild b/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.3.ebuild
deleted file mode 100644
index 30434954ae3d..000000000000
--- a/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Compatibility of TimeLocale between old-locale and time-1.5"
-HOMEPAGE="https://github.com/khibino/haskell-time-locale-compat"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/old-locale:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/timezone-olson-0.1.7 b/dev-haskell/timezone-olson-0.1.7
new file mode 100644
index 000000000000..13345811f1f6
--- /dev/null
+++ b/dev-haskell/timezone-olson-0.1.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/extensible-exceptions-0.1.0:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/timezone-series-0.1.0:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A pure Haskell parser and renderer for binary Olson timezone files
+EAPI=5
+HOMEPAGE=http://projects.haskell.org/time-ng/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/extensible-exceptions-0.1.0:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/timezone-series-0.1.0:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.7
+SRC_URI=mirror://hackage/packages/archive/timezone-olson/0.1.7/timezone-olson-0.1.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4f928c7b784fcc0030e1210a36f505b6
diff --git a/dev-haskell/timezone-olson-0.1.7-r1 b/dev-haskell/timezone-olson-0.1.7-r1
new file mode 100644
index 000000000000..51755122376e
--- /dev/null
+++ b/dev-haskell/timezone-olson-0.1.7-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/extensible-exceptions-0.1.0:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/timezone-series-0.1.0:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A pure Haskell parser and renderer for binary Olson timezone files
+EAPI=5
+HOMEPAGE=http://projects.haskell.org/time-ng/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/extensible-exceptions-0.1.0:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/timezone-series-0.1.0:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.7
+SRC_URI=mirror://hackage/packages/archive/timezone-olson/0.1.7/timezone-olson-0.1.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=14c5be145e668dc7cf1b601dcda655f1
diff --git a/dev-haskell/timezone-olson/Manifest b/dev-haskell/timezone-olson/Manifest
deleted file mode 100644
index 3703a51a790f..000000000000
--- a/dev-haskell/timezone-olson/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST timezone-olson-0.1.7.tar.gz 11313 BLAKE2B c2bb71f949beac730e9fe9ff6a5aacbe301ffb8012b6e622179a029523784d0f3a2745ff3dd8a86ecb109fed90f44a121a4b5e8f4766bf6061a7233429267221 SHA512 136bca829b40edd3c46f83e2d19b496da7b6e7268825ff017fa598f9dc8a9de5fd65101f417e9c22ae8b845c61c98347944971f8f41072be60d894ea148a4e0a
-EBUILD timezone-olson-0.1.7-r1.ebuild 910 BLAKE2B 66936573e05739b92b9855495f0fbd227dadcd3bddeb2e650f4742b532fc6b7d507235b060b3777d72f1690aa044ff51518deda018c5e6983f628f34ae8d3ed8 SHA512 0d55040a4d9940763d81104b1bcb5b7e4be5ab05861d7dcc65504a5b6fbdb735af928e003fc7fb7b0e8fa299aa29891148bce84600aadeb8886923375a416440
-EBUILD timezone-olson-0.1.7.ebuild 849 BLAKE2B 85304efe9e8551b40542ba84ae2f1b14236381e89405e117fe0c6ca54617496cd64f5801f92c7006435eece6fa7f17e93e021edbd7c172a3b81cf92551cd2e70 SHA512 64e3ef4a64a27a63c86f99a157c8b902a86e7263a44e4b4992f358f2a4afcbdcda52f79aebd073ee107ed7213e6c96067c3633fde1bce7069ec5a717464b949b
-MISC metadata.xml 821 BLAKE2B ad98bfb2a5a5854e2cae7091dca6c206a37dccffa001bed5df75a0f318b200a1571e265042857d1e74abf019deda50557ee655f811737eb63f8a7a67b18f1818 SHA512 1ee91c0270137d4710f9052eadf7f522006108d9d6d2939ae44641d365078daec9671699e09aa69c19d0a8e5e503f1bceb6a0458ef3ca6f123c73bb3f774c2de
diff --git a/dev-haskell/timezone-olson/metadata.xml b/dev-haskell/timezone-olson/metadata.xml
deleted file mode 100644
index dec7b007d319..000000000000
--- a/dev-haskell/timezone-olson/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A parser and renderer for binary Olson timezone
-		files whose format is specified by the tzfile(5)
-		man page on Unix-like systems. For more
-		information about this format, see
-		&lt;http://www.twinsun.com/tz/tz-link.htm&gt;. Functions
-		are provided for converting the parsed data into
-		'TimeZoneSeries' objects from the timezone-series
-		package. On many platforms, binary Olson timezone
-		files suitable for use with this package are
-		available in the directory /usr/share/zoneinfo
-		and its subdirectories on your computer.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/timezone-olson/timezone-olson-0.1.7-r1.ebuild b/dev-haskell/timezone-olson/timezone-olson-0.1.7-r1.ebuild
deleted file mode 100644
index ea8b76b4ea8e..000000000000
--- a/dev-haskell/timezone-olson/timezone-olson-0.1.7-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A pure Haskell parser and renderer for binary Olson timezone files"
-HOMEPAGE="http://projects.haskell.org/time-ng/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/extensible-exceptions-0.1.0:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
-	>=dev-haskell/timezone-series-0.1.0:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'binary >= 0.4.1 && < 0.8' 'binary >= 0.4.1' \
-		'time >= 1.1.4 && < 1.6' 'time >= 1.1.4'
-}
diff --git a/dev-haskell/timezone-olson/timezone-olson-0.1.7.ebuild b/dev-haskell/timezone-olson/timezone-olson-0.1.7.ebuild
deleted file mode 100644
index 8e70bf87d783..000000000000
--- a/dev-haskell/timezone-olson/timezone-olson-0.1.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A pure Haskell parser and renderer for binary Olson timezone files"
-HOMEPAGE="http://projects.haskell.org/time-ng/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.8:=[profile?]
-	>=dev-haskell/extensible-exceptions-0.1.0:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
-	>=dev-haskell/timezone-series-0.1.0:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/timezone-series-0.1.5.1 b/dev-haskell/timezone-series-0.1.5.1
new file mode 100644
index 000000000000..be3295431cc9
--- /dev/null
+++ b/dev-haskell/timezone-series-0.1.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Enhanced timezone handling for Data.Time
+EAPI=5
+HOMEPAGE=http://projects.haskell.org/time-ng/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.5.1
+SRC_URI=mirror://hackage/packages/archive/timezone-series/0.1.5.1/timezone-series-0.1.5.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b22bfebe8ed91d31963816baa5475f89
diff --git a/dev-haskell/timezone-series-0.1.6.1 b/dev-haskell/timezone-series-0.1.6.1
new file mode 100644
index 000000000000..ae231aa3a5ab
--- /dev/null
+++ b/dev-haskell/timezone-series-0.1.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Enhanced timezone handling for Data.Time
+EAPI=6
+HOMEPAGE=http://projects.haskell.org/time-ng/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.6.1
+SRC_URI=mirror://hackage/packages/archive/timezone-series/0.1.6.1/timezone-series-0.1.6.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3ff7c813b3bb84a080e115a4ad88334c
diff --git a/dev-haskell/timezone-series/Manifest b/dev-haskell/timezone-series/Manifest
deleted file mode 100644
index 41ea4e3ebee1..000000000000
--- a/dev-haskell/timezone-series/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST timezone-series-0.1.5.1.tar.gz 5330 BLAKE2B a61ab72f91269485730255d80d51adf9aeed7ce52e524c722a827dcbc46df3888e1e6edfd3654be498e648682431ca348ce86c54be3755b88c6040e58d853196 SHA512 7f080455f58c8aefb8ac7e34e9b91724a294537069d8acf65865cc481fd3053816dd3e5ce3ef7a41c85f7d983764b7c472c13e47cc20d458c74a256c394f2d03
-DIST timezone-series-0.1.6.1.tar.gz 6021 BLAKE2B f830aae655c92aa444551840dd4ba41bbc60ad5a2dd8a1df6f053a419a9816cd4fcb7c0ceaa20a19c1ea4af4980b76441d2271cf904d09c7058cfbb29418c65a SHA512 d4cee3725651ad25174857ff4df1dd7ef0a8d15cbc6e4547b43c0499eea68e8ba2df45763975987184032bc1e17f6f39e21220bb102084633014ccb723b5ed74
-EBUILD timezone-series-0.1.5.1.ebuild 547 BLAKE2B 5cbde472420d704dbd16d9d74394f9d8409ab05df5cb5f2260dcf30f31e0797170442d83259d73cec3556cad3980899488c78bc387d5626ecbd7236be5661a12 SHA512 9853f5fb0f4136589ffc9251db880683cf0e2800eb7840dfbdf5f126f4049c9331fb266330a0f19b5cad54d99c0fbca3149a4aeb71ebd3833ecbd612c1502587
-EBUILD timezone-series-0.1.6.1.ebuild 545 BLAKE2B e40033f93280e5eb32dd4439a8f1e19b1d19792cd457077c6539daa9bf810981047526fe0076ce61766dd9b331c35688295ce3942ae350af95531059a7570d44 SHA512 48fba471983a74a347f8228d207cd4226d4ac2da6571a9a6b8e72f6445538e04613ea3b350b2838241365d5539aa11bad92550aa38e0b08d62d2747ba37f97b3
-MISC metadata.xml 499 BLAKE2B 9fb00e434d3af8d44d166fd9393c30f5b817095c9e9fd972b0801a1591c03997388dd0a5ac93189f42ca2f58a652187ca76378169b40903ff66e0aabeb9fa61a SHA512 dcb6faaa9c24cbf69dcd2e0544177c128421aeeb2cfae5382f054e0a04970697a0d0512b42488c5e096cb6317233cc5f5b2415d85385bcc95733a865a1725760
diff --git a/dev-haskell/timezone-series/metadata.xml b/dev-haskell/timezone-series/metadata.xml
deleted file mode 100644
index 2d2f96b3ebcc..000000000000
--- a/dev-haskell/timezone-series/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package endows Data.Time, from the time
-		package, with several data types and functions
-		for enhanced processing of timezones. For one way
-		to create timezone series, see the timezone-olson
-		package.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/timezone-series/timezone-series-0.1.5.1.ebuild b/dev-haskell/timezone-series/timezone-series-0.1.5.1.ebuild
deleted file mode 100644
index 102568e59c31..000000000000
--- a/dev-haskell/timezone-series/timezone-series-0.1.5.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Enhanced timezone handling for Data.Time"
-HOMEPAGE="http://projects.haskell.org/time-ng/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/timezone-series/timezone-series-0.1.6.1.ebuild b/dev-haskell/timezone-series/timezone-series-0.1.6.1.ebuild
deleted file mode 100644
index 24f52cd0fb36..000000000000
--- a/dev-haskell/timezone-series/timezone-series-0.1.6.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Enhanced timezone handling for Data.Time"
-HOMEPAGE="http://projects.haskell.org/time-ng/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/tls-1.2.18 b/dev-haskell/tls-1.2.18
new file mode 100644
index 000000000000..d87c189ee2bb
--- /dev/null
+++ b/dev-haskell/tls-1.2.18
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/asn1-encoding:=[profile?] >=dev-haskell/asn1-types-0.2.0:=[profile?] dev-haskell/async:=[profile?] dev-haskell/byteable:=[profile?] >=dev-haskell/cereal-0.4:=[profile?] >=dev-haskell/cipher-aes-0.2:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?] dev-haskell/cipher-des:=[profile?] dev-haskell/cipher-rc4:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.8:=[profile?] dev-haskell/crypto-numbers:=[profile?] >=dev-haskell/crypto-pubkey-0.2.8:=[profile?] >=dev-haskell/crypto-pubkey-types-0.4:=[profile?] >=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] >=dev-haskell/cryptohash-0.6:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/x509-1.5.0:=[profile?] <dev-haskell/x509-1.6.0:=[profile?] >=dev-haskell/x509-store-1.5.0:=[profile?] >=dev-haskell/x509-validation-1.5.1:=[profile?] <dev-haskell/x509-validation-1.6.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/cprng-aes-0.5 dev-haskell/hourglass dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=TLS/SSL protocol native implementation (Server and Client)
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-tls
+IUSE=+compat doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/asn1-encoding:=[profile?] >=dev-haskell/asn1-types-0.2.0:=[profile?] dev-haskell/async:=[profile?] dev-haskell/byteable:=[profile?] >=dev-haskell/cereal-0.4:=[profile?] >=dev-haskell/cipher-aes-0.2:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?] dev-haskell/cipher-des:=[profile?] dev-haskell/cipher-rc4:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.8:=[profile?] dev-haskell/crypto-numbers:=[profile?] >=dev-haskell/crypto-pubkey-0.2.8:=[profile?] >=dev-haskell/crypto-pubkey-types-0.4:=[profile?] >=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] >=dev-haskell/cryptohash-0.6:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/x509-1.5.0:=[profile?] <dev-haskell/x509-1.6.0:=[profile?] >=dev-haskell/x509-store-1.5.0:=[profile?] >=dev-haskell/x509-validation-1.5.1:=[profile?] <dev-haskell/x509-validation-1.6.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.18
+SRC_URI=mirror://hackage/packages/archive/tls/1.2.18/tls-1.2.18.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=80658e77c4db93d984dc0127ec58af47
diff --git a/dev-haskell/tls-1.3.4 b/dev-haskell/tls-1.3.4
new file mode 100644
index 000000000000..4228a8f08e72
--- /dev/null
+++ b/dev-haskell/tls-1.3.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/asn1-encoding:=[profile?] >=dev-haskell/asn1-types-0.2.0:=[profile?] dev-haskell/async:=[profile?] >=dev-haskell/cereal-0.4:=[profile?] >=dev-haskell/cryptonite-0.7:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/mtl-2:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/x509-1.6.2:=[profile?] <dev-haskell/x509-1.7.0:=[profile?] >=dev-haskell/x509-store-1.6:=[profile?] >=dev-haskell/x509-validation-1.6.3:=[profile?] <dev-haskell/x509-validation-1.7.0:=[profile?] >=dev-lang/ghc-7.4.1:= network? ( dev-haskell/network:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/hourglass dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=TLS/SSL protocol native implementation (Server and Client)
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-tls
+IUSE=+compat +network doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/asn1-encoding:=[profile?] >=dev-haskell/asn1-types-0.2.0:=[profile?] dev-haskell/async:=[profile?] >=dev-haskell/cereal-0.4:=[profile?] >=dev-haskell/cryptonite-0.7:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/mtl-2:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/x509-1.6.2:=[profile?] <dev-haskell/x509-1.7.0:=[profile?] >=dev-haskell/x509-store-1.6:=[profile?] >=dev-haskell/x509-validation-1.6.3:=[profile?] <dev-haskell/x509-validation-1.7.0:=[profile?] >=dev-lang/ghc-7.4.1:= network? ( dev-haskell/network:=[profile?] )
+SLOT=0/1.3.4
+SRC_URI=mirror://hackage/packages/archive/tls/1.3.4/tls-1.3.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cde03db323928131a502535e762621e9
diff --git a/dev-haskell/tls-1.3.9 b/dev-haskell/tls-1.3.9
new file mode 100644
index 000000000000..76ff99062805
--- /dev/null
+++ b/dev-haskell/tls-1.3.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/asn1-encoding:=[profile?] >=dev-haskell/asn1-types-0.2.0:=[profile?] dev-haskell/async:=[profile?] >=dev-haskell/cereal-0.4:=[profile?] >=dev-haskell/cryptonite-0.21:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/x509-1.6.5:=[profile?] <dev-haskell/x509-1.7.0:=[profile?] >=dev-haskell/x509-store-1.6:=[profile?] >=dev-haskell/x509-validation-1.6.5:=[profile?] <dev-haskell/x509-validation-1.7.0:=[profile?] >=dev-lang/ghc-7.8.2:= network? ( dev-haskell/network:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hourglass dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=TLS/SSL protocol native implementation (Server and Client)
+EAPI=6
+HOMEPAGE=https://github.com/vincenthz/hs-tls
+IUSE=+compat +network doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/asn1-encoding:=[profile?] >=dev-haskell/asn1-types-0.2.0:=[profile?] dev-haskell/async:=[profile?] >=dev-haskell/cereal-0.4:=[profile?] >=dev-haskell/cryptonite-0.21:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/x509-1.6.5:=[profile?] <dev-haskell/x509-1.7.0:=[profile?] >=dev-haskell/x509-store-1.6:=[profile?] >=dev-haskell/x509-validation-1.6.5:=[profile?] <dev-haskell/x509-validation-1.7.0:=[profile?] >=dev-lang/ghc-7.8.2:= network? ( dev-haskell/network:=[profile?] )
+SLOT=0/1.3.9
+SRC_URI=mirror://hackage/packages/archive/tls/1.3.9/tls-1.3.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6ff0529ed5092a5a86444c207feb8315
diff --git a/dev-haskell/tls/Manifest b/dev-haskell/tls/Manifest
deleted file mode 100644
index 1a5b67d4d069..000000000000
--- a/dev-haskell/tls/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST tls-1.2.18.tar.gz 74115 BLAKE2B 5fda3b303d095afc079516e55dfa403cf01de4c77d5c1cb09ba39ad4604b021fae13932bf5d544f9d888aa42214c946fa1597bfb70595f8b5bb76bf9c4afe03b SHA512 34648a2f42c2a0f54b50a10daf3f9b8fb8452aa48e811122f8c69336621c45214a293fa85f8db5a9d568a5cbe7f114c8eef97968c76147d9ef016a8c3d2375ab
-DIST tls-1.3.4.tar.gz 77920 BLAKE2B d82deb31a6fc08b2c9b4ae1ae33b130f05b0de52fbded6af42ce8f503fd504951446d0ba5220281b3b27120e91ada05668177294fc1362515dc3cfb5f94ebb48 SHA512 8b90cd2e9f31ea5dabe0fc8669bea43ac144ee7dfa3fdcb465a31975c35c45fb8b82cdc6175801fce7dbb9f52aaa594b82e16ededdbb7fd697d5fa673ed7c777
-DIST tls-1.3.9.tar.gz 88354 BLAKE2B 1d3d6be5ead5074c5583a2238a2f3352ba4b1f4398a891642e3ff2e5fc4375c669a81de64f9f10f1b13ade6c3a2e57e3b6507ea0d31bae0e6a218107558115c4 SHA512 bb7d573e44707121fef65c66b83086b0bd477d3fe526d0bcc9dfa0a59059d340eea6091bb0d6b36819bd2999d2ffa581d3591dbc4b2000bf5e1ba6dd40923446
-EBUILD tls-1.2.18.ebuild 1821 BLAKE2B 1d85da5b4896f6cb84faa614fc56507cc2b765b317fb912765996d7a7f47a4c6950f91b58b895badce7c39567dea21df11379371a854f42926f6fd2620839205 SHA512 d88a017d9b3de4856b54f5f831418dcfe74b16f6714b120bc534d01a86e274d1594b9707969b1c20ed8eec736780ee9e68d46ccc5065d05a021ba4a71626fc58
-EBUILD tls-1.3.4.ebuild 1457 BLAKE2B 1c97179dee99e33f42db86701d8fd38e65dc2aed2b351e620b62c778fa5c2406912507fa88faf520800f288e2d48461fb2226f8e8540f4251eb2f15ce51d1369 SHA512 12a767f3f3e7a462cad90844653b589da3e5c5b039b10d30da87badf249de619119548e623f8775ad90e27edec2a906f03c3dd4623a769d28f4a5c47c3006435
-EBUILD tls-1.3.9.ebuild 1384 BLAKE2B 29a7a7bccdd7156612f1a54b6774cfef55db3bb675dd705b630634b6ab725fbc5f3cb8771b4bb401d3949a1da68527157c1361c6a1af5ba323fd0d7c805f5c0c SHA512 0b3293d0b404268a17c4b7c1e2709fedbad329e3a619f0550c113289bda92c6fb4fdf3a91a2e469b0a3bbdf313160b284e035b6985c5402f2d9ca4acab9bce8a
-MISC metadata.xml 1116 BLAKE2B 9d00bcd54e0705289cfaa53b4de66f26abe5aced518e3a2297e006c3831a47211a765fc4b67546e99ece24df406dfa27c2917bbfb886becaa9c322cc981b9fd7 SHA512 d2edc3311ce239a521e6f941e5cd4a98c25b70376b18b8700643e06e580532d7d6d1b760b5229871f3fe938c89e47cde3734a7c87de1427b83950cd22d73c590
diff --git a/dev-haskell/tls/metadata.xml b/dev-haskell/tls/metadata.xml
deleted file mode 100644
index b95ef7b625de..000000000000
--- a/dev-haskell/tls/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Native Haskell TLS and SSL protocol implementation for server and client.
-		
-		This provides a high-level implementation of a sensitive security protocol,
-		eliminating a common set of security issues through the use of the advanced
-		type system, high level constructions and common Haskell features.
-		
-		Currently implement the SSL3.0, TLS1.0, TLS1.1 and TLS1.2 protocol,
-		with only RSA supported for Key Exchange.
-		
-		Only core protocol available here, have a look at the
-		&lt;http://hackage.haskell.org/package/tls-extra/&gt; package for default
-		ciphers, compressions and certificates functions.
-	</longdescription>
-	<use>
-		<flag name="compat">Accept SSLv2 compatible handshake.</flag>
-		<flag name="network">Use the base network library.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-tls</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/tls/tls-1.2.18.ebuild b/dev-haskell/tls/tls-1.2.18.ebuild
deleted file mode 100644
index fab96dceabf5..000000000000
--- a/dev-haskell/tls/tls-1.2.18.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="TLS/SSL protocol native implementation (Server and Client)"
-HOMEPAGE="https://github.com/vincenthz/hs-tls"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+compat"
-
-RDEPEND="dev-haskell/asn1-encoding:=[profile?]
-	>=dev-haskell/asn1-types-0.2.0:=[profile?]
-	dev-haskell/async:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	>=dev-haskell/cereal-0.4:=[profile?]
-	>=dev-haskell/cipher-aes-0.2:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?]
-	dev-haskell/cipher-des:=[profile?]
-	dev-haskell/cipher-rc4:=[profile?]
-	>=dev-haskell/crypto-cipher-types-0.0.8:=[profile?]
-	dev-haskell/crypto-numbers:=[profile?]
-	>=dev-haskell/crypto-pubkey-0.2.8:=[profile?]
-	>=dev-haskell/crypto-pubkey-types-0.4:=[profile?]
-	>=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?]
-	>=dev-haskell/cryptohash-0.6:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/x509-1.5.0:=[profile?] <dev-haskell/x509-1.6.0:=[profile?]
-	>=dev-haskell/x509-store-1.5.0:=[profile?]
-	>=dev-haskell/x509-validation-1.5.1:=[profile?] <dev-haskell/x509-validation-1.6.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/cprng-aes-0.5
-		dev-haskell/hourglass
-		dev-haskell/quickcheck
-		dev-haskell/tasty
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag compat compat)
-}
diff --git a/dev-haskell/tls/tls-1.3.4.ebuild b/dev-haskell/tls/tls-1.3.4.ebuild
deleted file mode 100644
index d953d574bf3d..000000000000
--- a/dev-haskell/tls/tls-1.3.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -hans
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="TLS/SSL protocol native implementation (Server and Client)"
-HOMEPAGE="https://github.com/vincenthz/hs-tls"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+compat +network"
-
-RDEPEND="dev-haskell/asn1-encoding:=[profile?]
-	>=dev-haskell/asn1-types-0.2.0:=[profile?]
-	dev-haskell/async:=[profile?]
-	>=dev-haskell/cereal-0.4:=[profile?]
-	>=dev-haskell/cryptonite-0.7:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	dev-haskell/memory:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/x509-1.6.2:=[profile?] <dev-haskell/x509-1.7.0:=[profile?]
-	>=dev-haskell/x509-store-1.6:=[profile?]
-	>=dev-haskell/x509-validation-1.6.3:=[profile?] <dev-haskell/x509-validation-1.7.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network? ( dev-haskell/network:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hourglass
-		dev-haskell/quickcheck
-		dev-haskell/tasty
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag compat compat) \
-		--flag=-hans \
-		$(cabal_flag network network)
-}
diff --git a/dev-haskell/tls/tls-1.3.9.ebuild b/dev-haskell/tls/tls-1.3.9.ebuild
deleted file mode 100644
index 12a030d8ecf1..000000000000
--- a/dev-haskell/tls/tls-1.3.9.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="TLS/SSL protocol native implementation (Server and Client)"
-HOMEPAGE="https://github.com/vincenthz/hs-tls"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+compat +network"
-
-RDEPEND="dev-haskell/asn1-encoding:=[profile?]
-	>=dev-haskell/asn1-types-0.2.0:=[profile?]
-	dev-haskell/async:=[profile?]
-	>=dev-haskell/cereal-0.4:=[profile?]
-	>=dev-haskell/cryptonite-0.21:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	dev-haskell/memory:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	>=dev-haskell/x509-1.6.5:=[profile?] <dev-haskell/x509-1.7.0:=[profile?]
-	>=dev-haskell/x509-store-1.6:=[profile?]
-	>=dev-haskell/x509-validation-1.6.5:=[profile?] <dev-haskell/x509-validation-1.7.0:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	network? ( dev-haskell/network:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hourglass
-		dev-haskell/quickcheck
-		dev-haskell/tasty
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag compat compat) \
-		$(cabal_flag network network)
-}
diff --git a/dev-haskell/top-1.7 b/dev-haskell/top-1.7
new file mode 100644
index 000000000000..a4613584efce
--- /dev/null
+++ b/dev-haskell/top-1.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10.1.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Constraint solving framework employed by the Helium Compiler
+EAPI=5
+HOMEPAGE=http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.7
+SRC_URI=mirror://hackage/packages/archive/Top/1.7/Top-1.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dc81e2c85df0e423ac890e3e79f8b669
diff --git a/dev-haskell/top/Manifest b/dev-haskell/top/Manifest
deleted file mode 100644
index 1b81c94c4e76..000000000000
--- a/dev-haskell/top/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX top-1.7-ghc-7.10.patch 2305 BLAKE2B 13dd321a0e6f4a3fd935c650361a2c65f4ac015fefe66cee4c419e9960b98ec17738cbfc679b51bfa0e3eb10eef3809d37e3d4895b91ad22147d7d2cb6c4da9a SHA512 e5b6d8ad618787e70e06ad08e92b53c5d66dd4464a7cc476f55da86b740bf835a9e3c1e35a03dd3a390bb7798459afbdf7aed19c91491bb6d16c53092cd4a0fb
-DIST Top-1.7.tar.gz 70721 BLAKE2B 90ddda99ab4dac209712494c28e15e90ffd2996151ab7df0a57fb8162bec09da6b28fd52b36672e081d10fa0b79d25bb2da2fd58d220573cea006d70c61229f0 SHA512 90d5f1042c07101c35bc1722c18667f551fa4d9034e70a4b7466ff25906899053a054f1227fed8d6d534d04fe9a1c2420585143cde44badfe98e08bf9a6225b4
-EBUILD top-1.7.ebuild 785 BLAKE2B 9e28bbc619041f8b4324d4b290a697f3e1e253d81ea62e811b64a49068496d639677928595761173b4a5b663f87285b6a5e1de97a8d5e575f0a4ff81c8886bec SHA512 2110d6b9f5f1799fc9502531724fd3481c1a57a6b6e5567101f5e6c3de110d13b09525e5a7ba63f9c05b4b30c367aa4f6ae685e9352773d515c8d87c5201a6e6
-MISC metadata.xml 662 BLAKE2B b039247722ec544417c47f53e9d7f4034e5097cc1d0874f26b735d71fa5b8a341e42f297531b15aa8fced4337dd300cf4e778406c59f58383fe74a1e8a876d9c SHA512 f335204b8139d294a18034055d76797412a4af6b98beb052878478b4246d6b2161c147fad254be262fd7732d96affe9952f231311debbd2a52fa9e338f0267be
diff --git a/dev-haskell/top/files/top-1.7-ghc-7.10.patch b/dev-haskell/top/files/top-1.7-ghc-7.10.patch
deleted file mode 100644
index 3acbda19e171..000000000000
--- a/dev-haskell/top/files/top-1.7-ghc-7.10.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --git a/src/Top/Implementation/TypeGraph/DefaultHeuristics.hs b/src/Top/Implementation/TypeGraph/DefaultHeuristics.hs
-index 2cc5210..faf4c8c 100644
---- a/src/Top/Implementation/TypeGraph/DefaultHeuristics.hs
-+++ b/src/Top/Implementation/TypeGraph/DefaultHeuristics.hs
-@@ -1,2 +1,3 @@
-+{-# LANGUAGE FlexibleContexts #-}
- -----------------------------------------------------------------------------
- -- | License      :  GPL
-diff --git a/src/Top/Monad/Select.hs b/src/Top/Monad/Select.hs
-index e5953cb..72276b4 100644
---- a/src/Top/Monad/Select.hs
-+++ b/src/Top/Monad/Select.hs
-@@ -16,4 +16,6 @@ module Top.Monad.Select
- import Top.Util.Embedding
- import Control.Monad.State
-+import Control.Monad
-+import Control.Applicative
- 
- --------------------------------------------------------
-@@ -22,4 +24,11 @@ import Control.Monad.State
- newtype Select t m a = Select (m a)
- 
-+instance Monad m => Functor (Select t m) where
-+    fmap  = liftM
-+
-+instance Monad m => Applicative (Select t m) where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad m => Monad (Select t m) where
-    return a       = Select (return a) 
-@@ -43,4 +52,11 @@ select = Select
- data SelectFix (t :: (* -> *) -> *) (m :: * -> *) a = SelectFix (m a)
- 
-+instance Monad m => Functor (SelectFix t m) where
-+    fmap  = liftM
-+
-+instance Monad m => Applicative (SelectFix t m) where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad m => Monad (SelectFix t m) where
-    return a          = SelectFix (return a)
-diff --git a/src/Top/Monad/StateFix.hs b/src/Top/Monad/StateFix.hs
-index d77919d..bd8fb76 100644
---- a/src/Top/Monad/StateFix.hs
-+++ b/src/Top/Monad/StateFix.hs
-@@ -16,4 +16,6 @@ import Control.Monad.State
- import Control.Monad.Identity
- import Control.Monad.Writer
-+import Control.Monad
-+import Control.Applicative
- 
- type StateFix s = StateFixT s Identity
-@@ -21,4 +23,11 @@ type StateFix s = StateFixT s Identity
- data StateFixT s m a = Fix { unFix :: StateT (s (StateFixT s m)) m a }
- 
-+instance Monad m => Functor (StateFixT s m) where
-+    fmap  = liftM
-+
-+instance Monad m => Applicative (StateFixT s m) where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad m => Monad (StateFixT s m) where 
-    return  = Fix . return
diff --git a/dev-haskell/top/metadata.xml b/dev-haskell/top/metadata.xml
deleted file mode 100644
index 20445cc8ffae..000000000000
--- a/dev-haskell/top/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		At its most general, Top is a framework for constructing abstract interpretations
-		which focuses on giving good feedback on why an abstract interpretation does not give
-		any useful information. In a mathematical notation this is usually made explicit by
-		returning the top element of a (complete) lattice. This is also one of the reasons
-		for the name of the project.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/top/top-1.7.ebuild b/dev-haskell/top/top-1.7.ebuild
deleted file mode 100644
index 284c027fe079..000000000000
--- a/dev-haskell/top/top-1.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-MY_PN="Top"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Constraint solving framework employed by the Helium Compiler"
-HOMEPAGE="http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.1.0
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-}
diff --git a/dev-haskell/torrent-10000.0.0 b/dev-haskell/torrent-10000.0.0
new file mode 100644
index 000000000000..f40023d0a0a4
--- /dev/null
+++ b/dev-haskell/torrent-10000.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bencode-0.2:=[profile?] dev-haskell/binary:=[profile?] dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=BitTorrent file parser and generater
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/torrent
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bencode-0.2:=[profile?] dev-haskell/binary:=[profile?] dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/10000.0.0
+SRC_URI=mirror://hackage/packages/archive/torrent/10000.0.0/torrent-10000.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=068684c4b66eb05ce9aa5fc9ffc5f63a
diff --git a/dev-haskell/torrent-10000.0.1 b/dev-haskell/torrent-10000.0.1
new file mode 100644
index 000000000000..499d4dae5cc1
--- /dev/null
+++ b/dev-haskell/torrent-10000.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bencode-0.2:=[profile?] dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=BitTorrent file parser and generater
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/torrent
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bencode-0.2:=[profile?] dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/10000.0.1
+SRC_URI=mirror://hackage/packages/archive/torrent/10000.0.1/torrent-10000.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=03e296033a4229c185babdb6b8a5c926
diff --git a/dev-haskell/torrent/Manifest b/dev-haskell/torrent/Manifest
deleted file mode 100644
index 5ddf2f64f4c0..000000000000
--- a/dev-haskell/torrent/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST torrent-10000.0.0.tar.gz 3549 BLAKE2B 414547b6cd8a090a8da198dd82122fcdfe87af4db59ff06f558461550ee6c041de7f69758bae184961ff8772ccbd17523a8c0fa4dc6f6729db1293da90ee1c9a SHA512 361f7ca99196278dccdf4ac20dbe5d9861fd979ea1c84786a93928cc46e51f949618e34e55342f08e19ce935a8313526c580fed6413209a6365efc306b5165d5
-DIST torrent-10000.0.1.tar.gz 3819 BLAKE2B f2a1569c697bbd732fe4f801ff797e2cea6efa69bbd08779f36d729496dd1cd6ccc0d55dd2fca40a6c07f0e1b577213a93f13a1a2b92f9b90030037af5de481e SHA512 66b69a0bb2b7dc08fb738c60bf6402ad69a5e60c6ccc1002e9d394c9faf75e49f444ed690dd3d17c1de978d1ac85ac48f03b6dda143445019c698db83dea3fcb
-EBUILD torrent-10000.0.0.ebuild 650 BLAKE2B c07024fee8b1218d0ecb397d20e55874e7f86c17a1b8feaaaf72f95fdffab8f1833cf66c6f0c5850cb678639bc96b70b536b82c8ab2215f56ba3503db11f9716 SHA512 73f2a201a269c50be88a8fa7d72356ebd5ec1ed4e72eb6512f0e566fa3d82f0cd32aeadb6a1a4bccaaca4318f2544127ad829f5f02f7d43eacdc63d0d056eace
-EBUILD torrent-10000.0.1.ebuild 618 BLAKE2B 09fb7fddfcfb1aa247bf3f245d31650737327903af7f3c7f9f9014ecad2d960e7413c6cbfeb914d149fac26492cdd7ce8ece53ac20e4da181514a75ddd5689a8 SHA512 c10650d097abb57ce7f76f98c644c6fe0adea931f39009ca0e2deeea6082b6a3380328f02c7821b597bda9390d96768f6fef766991dc7680cf8018e0ef8b93d9
-MISC metadata.xml 327 BLAKE2B 623fd681553ed644e9708f183a159ce52e453c170e002158ac27434868083dd16d6552b62d6e86aa291ce1e6bea80e9d83ba5acface8d3b7bd4b1d8b9136398e SHA512 c7b6ac893521cc21a96055dff085a186e55a6fe20a1903bf40d3af032c3e227d82a1a93efa31ff7d0a13a1f5c124acf0bbd6b1941a6ea3208b339cd0e5056556
diff --git a/dev-haskell/torrent/metadata.xml b/dev-haskell/torrent/metadata.xml
deleted file mode 100644
index 93afc894883d..000000000000
--- a/dev-haskell/torrent/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		BitTorrent file parser and generater
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/torrent/torrent-10000.0.0.ebuild b/dev-haskell/torrent/torrent-10000.0.0.ebuild
deleted file mode 100644
index a15e03441d2b..000000000000
--- a/dev-haskell/torrent/torrent-10000.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="BitTorrent file parser and generater"
-HOMEPAGE="http://hackage.haskell.org/package/torrent"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bencode-0.2:=[profile?]
-	dev-haskell/binary:=[profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/torrent/torrent-10000.0.1.ebuild b/dev-haskell/torrent/torrent-10000.0.1.ebuild
deleted file mode 100644
index 3d7a18338405..000000000000
--- a/dev-haskell/torrent/torrent-10000.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="BitTorrent file parser and generater"
-HOMEPAGE="http://hackage.haskell.org/package/torrent"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bencode-0.2:=[profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/transformers-0.3.0.0-r1 b/dev-haskell/transformers-0.3.0.0-r1
new file mode 100644
index 000000000000..9aaff91ec258
--- /dev/null
+++ b/dev-haskell/transformers-0.3.0.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= <dev-lang/ghc-7.10:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4b22c394675317fff0d779284082df9c
diff --git a/dev-haskell/transformers-0.4.1.0 b/dev-haskell/transformers-0.4.1.0
new file mode 100644
index 000000000000..b399871c6ab0
--- /dev/null
+++ b/dev-haskell/transformers-0.4.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a894de0c989a75dd606dc88e9f88a6a5
diff --git a/dev-haskell/transformers-0.4.2.0 b/dev-haskell/transformers-0.4.2.0
new file mode 100644
index 000000000000..0682d2c7dbf1
--- /dev/null
+++ b/dev-haskell/transformers-0.4.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b089524bdde35f4ff7e8653cdd41bb53
diff --git a/dev-haskell/transformers-0.4.3.0 b/dev-haskell/transformers-0.4.3.0
new file mode 100644
index 000000000000..4b0022ea8a78
--- /dev/null
+++ b/dev-haskell/transformers-0.4.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=89782af94280fcde3950923fc61b2200
diff --git a/dev-haskell/transformers-0.5.2.0 b/dev-haskell/transformers-0.5.2.0
new file mode 100644
index 000000000000..8529bb507b35
--- /dev/null
+++ b/dev-haskell/transformers-0.5.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=07de0494f2ee7a739e7bef6514321005
diff --git a/dev-haskell/transformers-base-0.4.4 b/dev-haskell/transformers-base-0.4.4
new file mode 100644
index 000000000000..75acd278f86a
--- /dev/null
+++ b/dev-haskell/transformers-base-0.4.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/transformers-compat-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lift computations from the bottom of a transformer stack
+EAPI=5
+HOMEPAGE=https://github.com/mvv/transformers-base
+IUSE=+orphaninstances doc hscolour profile
+KEYWORDS=amd64 x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/transformers-compat-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.4
+SRC_URI=mirror://hackage/packages/archive/transformers-base/0.4.4/transformers-base-0.4.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fbdfd9e9a68a26bc61523ce08cb0a72b
diff --git a/dev-haskell/transformers-base/Manifest b/dev-haskell/transformers-base/Manifest
deleted file mode 100644
index a961aa78bd05..000000000000
--- a/dev-haskell/transformers-base/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST transformers-base-0.4.4.tar.gz 2550 BLAKE2B 39bb717561d9cd44737787c6770fd3306726caf6fca50b74015f6b28b47ca330edcefbd3ab2f1131875b3d918d1df6d44890463119ada422fd84f735046c4cb5 SHA512 5dbcbb321c7dc07a70af426cf3426433e9000e94278449ecbea025b79ec14f49cd9c8c35ea56ffa2b18444798c088a9db05badc2c819739b6ddd583c04114ea5
-EBUILD transformers-base-0.4.4.ebuild 822 BLAKE2B e025c709735207f838e7c6a5cd6ea9e6e46fdb4d62a0d2baf1bee7617c31528754d5b8cd5e5bea62576e9c442b278c7fb5079e205e72612c803284d835a8d986 SHA512 a3f168222021a622affd68f3f3681fa4a15b027420df924b789efc02b78de02aeb4a49a360e7f322adf722fa4e1da51994858377fdfea6a7b9e9e57921826e87
-MISC metadata.xml 565 BLAKE2B 636eb3403e0f9e00e87d4f1136dd524a1be1afddc18fd6a550d67266a2e3a50f03de43d1c398e3cdfcae4b2ce292fb7454b06d192fa49b9d15c68d940c75b7a7 SHA512 b965edfe8de254fd4968dd092f9248521a2089da39469206779ea841f45655d39b496bb20f37f3e529e71b5fb1ce8f32cc569ccdc0577f108cdfd137343705c0
diff --git a/dev-haskell/transformers-base/metadata.xml b/dev-haskell/transformers-base/metadata.xml
deleted file mode 100644
index 64a0fc2d9473..000000000000
--- a/dev-haskell/transformers-base/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides a straightforward port of @monadLib@'s BaseM
-		typeclass to @transformers@.
-	</longdescription>
-	<use>
-		<flag name="orphaninstances">Build instances for orphan datatypes.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">mvv/transformers-base</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/transformers-base/transformers-base-0.4.4.ebuild b/dev-haskell/transformers-base/transformers-base-0.4.4.ebuild
deleted file mode 100644
index b91c24043d57..000000000000
--- a/dev-haskell/transformers-base/transformers-base-0.4.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lift computations from the bottom of a transformer stack"
-HOMEPAGE="https://github.com/mvv/transformers-base"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="+orphaninstances"
-
-RDEPEND=">=dev-haskell/stm-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/transformers-compat-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag orphaninstances orphaninstances)
-}
diff --git a/dev-haskell/transformers-compat-0.1.1.1 b/dev-haskell/transformers-compat-0.1.1.1
new file mode 100644
index 000000000000..b7004b20246d
--- /dev/null
+++ b/dev-haskell/transformers-compat-0.1.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.0.1:= =dev-haskell/transformers-0.3*:=[profile?] >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A small compatibility shim for dev-haskell/transformers
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/transformers-compat/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.0.1:= =dev-haskell/transformers-0.3*:=[profile?]
+SLOT=0/0.1.1.1
+SRC_URI=mirror://hackage/packages/archive/transformers-compat/0.1.1.1/transformers-compat-0.1.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=16b5d91c747e36467a2c3fd202de38bc
diff --git a/dev-haskell/transformers-compat-0.3.3.4 b/dev-haskell/transformers-compat-0.3.3.4
new file mode 100644
index 000000000000..bc574dce098e
--- /dev/null
+++ b/dev-haskell/transformers-compat-0.3.3.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= three? ( >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.4:=[profile?] ) !three? ( >=dev-haskell/transformers-0.4.1:=[profile?] <dev-haskell/transformers-0.5:=[profile?] ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A small compatibility shim for dev-haskell/transformers
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/transformers-compat/
+IUSE=three doc hscolour profile
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:= three? ( >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.4:=[profile?] ) !three? ( >=dev-haskell/transformers-0.4.1:=[profile?] <dev-haskell/transformers-0.5:=[profile?] )
+SLOT=0/0.3.3.4
+SRC_URI=mirror://hackage/packages/archive/transformers-compat/0.3.3.4/transformers-compat-0.3.3.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=11e02feeeace3bcf46ffe559a1c948c6
diff --git a/dev-haskell/transformers-compat-0.4.0.4 b/dev-haskell/transformers-compat-0.4.0.4
new file mode 100644
index 000000000000..28b8c1b38309
--- /dev/null
+++ b/dev-haskell/transformers-compat-0.4.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A small compatibility shim for dev-haskell/transformers
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/transformers-compat/
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ppc ~ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
+SLOT=0/0.4.0.4
+SRC_URI=mirror://hackage/packages/archive/transformers-compat/0.4.0.4/transformers-compat-0.4.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5563402103f79de82f1b33d3eb3b391f
diff --git a/dev-haskell/transformers-compat-0.5.1.4 b/dev-haskell/transformers-compat-0.5.1.4
new file mode 100644
index 000000000000..9eac0ab72367
--- /dev/null
+++ b/dev-haskell/transformers-compat-0.5.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A small compatibility shim for dev-haskell/transformers
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/transformers-compat/
+IUSE=doc hscolour profile
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/transformers-0.3:=[profile?]
+SLOT=0/0.5.1.4
+SRC_URI=mirror://hackage/packages/archive/transformers-compat/0.5.1.4/transformers-compat-0.5.1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e0789b109d51a35822ec74976cf893fe
diff --git a/dev-haskell/transformers-compat/Manifest b/dev-haskell/transformers-compat/Manifest
deleted file mode 100644
index 72b187c8fcba..000000000000
--- a/dev-haskell/transformers-compat/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST transformers-compat-0.1.1.1.tar.gz 5221 BLAKE2B b8c050fb67bfe43529619bc14b6e035fb44626e276c36ba89d56a95fc4af91f887dd2612e21f668e9d36e4c8e231caa7144fb2555a7be2a35f79f554d61fc3fc SHA512 326873df4a316948d64ddbee351f0bf2855b5f2bac1913eed3ca490305363771fc031ff6cad1e6de5849ab375ace9364ffb18e56cb8a57f0406508377f521a54
-DIST transformers-compat-0.3.3.4.tar.gz 11143 BLAKE2B 3fd082d92945620acbe1cf043c73b9d22322581df782473a40b507260bd8c5eaaa6b475f9659863a2b922d4edff388d336946ff423cc9a99e934ec0a5a03d2ad SHA512 1f50ddeaec4ea2e17ec348194a6efcfab35c4b9d49f9eba9e70a0c1ebfdfd39387461c133fb99e6cdad234b7facae74fa73c99f604807d7f3ad7c31d0188d462
-DIST transformers-compat-0.4.0.4.tar.gz 12048 BLAKE2B a72513e0a5b482067ee912e467c29166bdebef75bf70cee9661b6f8e3a649cbdca57cd159483f4187e520425b46a8dd600e7f5b409705f67e851d9d11ec91c24 SHA512 5850fa8ed63684b3dc37897c22d1d32d7412374dcd892e42db7ed975d493fdc8e216630735813ed00203f83dcd17722484a6ec182ccffb6fc8794b4b82b6c951
-DIST transformers-compat-0.5.1.4.tar.gz 18574 BLAKE2B e08bbb9b6104a9e46b17478b156d4e5b9198ab9e93ecc1e0faec4402a8b403b19ee517bb81a1f4c0d8633ff6a74ec59470d6a27a3c3df947ee25ce11312a84a0 SHA512 7e4ff75cdae7afbf640b3ddbfc0a260be8bb3b06cdb1be803bfd7cdb333d289919164923ab4fcde4b270883548cce115643f908410ed394aec67efa389d5aeb2
-EBUILD transformers-compat-0.1.1.1.ebuild 620 BLAKE2B bdb7a0b053435d90f4768aba82b56f6e68f04e9b2a3731f225fa7f2378b34b9b3e4735583f7a9386b329ae9e538c1c3eac1745d09155675bf5402322b699be03 SHA512 585ac47a41de68d35cdab0cba76b2bcd37eba1e8294f09b534ba934d84b945c8efc38a2ebfe5c14a632e2eb77ab0a088f16b6d718b1e7770f19241862806fc63
-EBUILD transformers-compat-0.3.3.4.ebuild 913 BLAKE2B f56bf3b4261d29773965825293371d858057241d94764c67f9adedb929f6db02e9fa5f621267b9118de6e547c3bc354679377217c5e19b04466e28565b15b81e SHA512 475cba97dcd38619e717c0a8d5f558313ec2d4cb1a06ad1529cac824f68b9833b8c5fbd62e06be6de203967cd5a98ee175cd2997c6ee0da6b300eab4f63cb020
-EBUILD transformers-compat-0.4.0.4.ebuild 1014 BLAKE2B a1f82bb3e1341b9aee310c83d06a9609b1f8320c0c79a3e5661255974729d88abfe962f0b73cb11adb9cefb1e7e94f23d658d2b1a0064283214d507a9a27e14c SHA512 675bb11bdd28c309c65199c0c76e00eb704d185a550a55e2da379b4bf639b60baf069299faf77d2be939850398d3b462f97cb3e8139452e3ed96f39f37d20b92
-EBUILD transformers-compat-0.5.1.4.ebuild 937 BLAKE2B cca317e0d1bf498c6c8dbaf630aea6a777847511ef4a5306f25d8398229f4b312cea7fc23c7a540ef3f7f2107f9bceb55ba7dff5d3a78358eccb6dbe3a7f7e9a SHA512 80dac56f2569bf97aaafe7b446f17132094e0a9172275397d12ff61f9fe2f6e33f94d8ec7114df4b154744eb4e085a3444633d5f4e310d6cfdd39310d2dcec1c
-MISC metadata.xml 876 BLAKE2B ed51724530e82f2003a7ad612a2f18f22cc89879610b0bdf269461c1c72aab6ddb62e8a4154852e941859ea7658b095af3681e74b11b7f907f0c91cc30c35fe1 SHA512 f83fabfaa75fe7598f14e80ae17846a9f525cf5fae8b407d6ef45ca7e7816b3b04fc0c6ad02f9b2ed0c5cc4ded499d7b9afab922943991fb96d630597a9f4adf
diff --git a/dev-haskell/transformers-compat/metadata.xml b/dev-haskell/transformers-compat/metadata.xml
deleted file mode 100644
index 207a9e0eb759..000000000000
--- a/dev-haskell/transformers-compat/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package includes backported versions of types that were added
-		to transformers in transformers 0.3 for users who need strict
-		transformers 0.2 compatibility to run on old versions of the
-		platform, but also need those types.
-		
-		Those users should be able to just depend on @transformers &gt;= 0.2@
-		and @transformers-compat@.
-		
-		Note: missing methods are not supplied
-		but this at least permits the types to be used.
-	</longdescription>
-	<use>
-		<flag name="three">Use transformers-0.3</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ekmett/transformers-compat</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.1.1.1.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.1.1.1.ebuild
deleted file mode 100644
index a9413adbcf83..000000000000
--- a/dev-haskell/transformers-compat/transformers-compat-0.1.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A small compatibility shim for dev-haskell/transformers"
-HOMEPAGE="https://github.com/ekmett/transformers-compat/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.0.1:=
-		=dev-haskell/transformers-0.3*:=[profile?]
-		"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.3.3.4.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.3.3.4.ebuild
deleted file mode 100644
index e812864030b0..000000000000
--- a/dev-haskell/transformers-compat/transformers-compat-0.3.3.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -two
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A small compatibility shim for dev-haskell/transformers"
-HOMEPAGE="https://github.com/ekmett/transformers-compat/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="three"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	three? ( >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.4:=[profile?] )
-	!three? ( >=dev-haskell/transformers-0.4.1:=[profile?] <dev-haskell/transformers-0.5:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag three three) \
-		--flag=-two
-}
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.4.0.4.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.4.0.4.ebuild
deleted file mode 100644
index b61b4bafe037..000000000000
--- a/dev-haskell/transformers-compat/transformers-compat-0.4.0.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -two,+mtl
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A small compatibility shim for dev-haskell/transformers"
-HOMEPAGE="https://github.com/ekmett/transformers-compat/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ppc ~ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/mtl-2.1:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	local tf_arg=()
-
-	has_version '=dev-haskell/transformers-0.3*' && \
-		tf_arg+=(--flag=three)
-
-	has_version '=dev-haskell/transformers-0.4*' && \
-		tf_arg+=(--flag=-three)
-
-	haskell-cabal_src_configure \
-		--flag=mtl \
-		--flag=-two \
-		${tf_arg[@]}
-}
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild
deleted file mode 100644
index 48796375b7da..000000000000
--- a/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -two,+mtl
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A small compatibility shim for dev-haskell/transformers"
-HOMEPAGE="https://github.com/ekmett/transformers-compat/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/mtl-2.1:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	local tf_arg=()
-
-	if has_version '=dev-haskell/transformers-0.3*'; then
-		tf_arg+=(--flag=three)
-	else
-		tf_arg+=(--flag=-three)
-	fi
-
-	haskell-cabal_src_configure \
-		--flag=mtl \
-		--flag=-two \
-		${tf_arg[@]}
-}
diff --git a/dev-haskell/transformers/Manifest b/dev-haskell/transformers/Manifest
deleted file mode 100644
index a42b05617f1a..000000000000
--- a/dev-haskell/transformers/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST transformers-0.3.0.0.tar.gz 20087 BLAKE2B f299971fcd23e6e41a8386371370490601b8736b66168885b0369679e023222fa828a9b03870b2de815a453177eb872ff587ac1792fc8d7a49a1fe84faccc443 SHA512 aa444d01ea2296f9a94908872f167f383b0299768b8599b7f488c1d7499b027a90ffd1ef56e250b474d7c547e0acd94ae91b1cc80cdbd4943b5dca2770e2ab93
-DIST transformers-0.4.1.0.tar.gz 27287 BLAKE2B 77ed52e3a8f8b9e2511044da19f3cb59c5398c0c36c380fa08bcd307aa6d094189342a1aae91eceee89de26e2926af523546ab35217c648382ba5e42d94f178a SHA512 bf6561e63e9e0108aa34d946f7e8ff4eb3b9a5539779dd064d27406d05997f038570b93fbbdd4bf7a1bbe9144c042ad5b89648896821e8c6527c619d02b074c3
-DIST transformers-0.4.2.0.tar.gz 27866 BLAKE2B 3501ef6fd01852e19f1e410f2990b8060f61e2dde4fe6f2bc3850344a08d97644e8f5a554ae2d0d8c4248d87331aecf7d0f66330811deb4ba1546065fb032433 SHA512 8b508731cbcbb3221ad6afa17b8ddb9b47db29bafe0fc4ee654538e20c2a0551394e8c7591f3b0abc01e02eaec271f44056629f0fbf26fb077c4499af1d6debf
-DIST transformers-0.4.3.0.tar.gz 28632 BLAKE2B 92cabcb654bb11854a3bffbb1262f5cd62eda1aff447157086a61ebc451ebf2fddec53b6a2cc058174f24f0f0e32df671d3717e30a542c8dc90cb87e327d990c SHA512 c3ec0893ebba4fbd6087c3202e919552c4a9bff3350b5c0589e7ebb18751a515d98b8cac15b0a3252906ea72b5a0eb09b7fe88c8da88b09d6ce4fbf0f50b2780
-DIST transformers-0.5.2.0.tar.gz 34696 BLAKE2B 426a597c6a23358af72344b0809d9d6890ca8ec315344643853e2549efb47d80cf5008d99175b9352ac704c24a7fc02c4369901cd880190645e3fcd1a5213861 SHA512 4fcccab5cb3dce3430c64ff19705208a03ee993c872f7b2581b3c84d44a835f344f253d98cb371fbce4839b393eff67d95bf57e079fd75e347f1a37bc85c6c5b
-EBUILD transformers-0.3.0.0-r1.ebuild 736 BLAKE2B 30202caaef7a3aa93a417abbe32454d5b5b683e7cd01cda918028ce13ec57450cb627377c0722e9978002699f6c01f27c9620d936d802d8623fdda2d4dceca2b SHA512 c1456aa9cffc94cdfddd79cf20179c927a4d99c75af43c05382091e1d73372c87d6c015983aaf91d3edd8aa41470c57e843df7b166e15ea8198ba392947c381b
-EBUILD transformers-0.4.1.0.ebuild 664 BLAKE2B 6bfe05483a46656d06154cfb5a3b2eeeaa82371190cad3c4997521149ce01f17702c42f1e20e47830d966361c58e45c1a05eb2c38e1c17f83de2c6cad672e6dd SHA512 e7358fdb1e8fa2ec31557bf12a5e9f76a50792f7b9478a45e8b3bc928c1698eb9a3c86db9c4f07da73cb813280e8d9681fab4c20651941278b4c7ed2e31031f3
-EBUILD transformers-0.4.2.0.ebuild 756 BLAKE2B cc3bf9a97a73216562f6deacaa6806b80095e330801c40d5126b78b3c9c8705e4b3794af1445d64e2d7f603aac11c3d8e177bd033e664b08aab8b11d476e893f SHA512 512475ab9652fa95c226b8a87827e193d2a86ea7585cc7f223f3193b897a852eb5e081ba89b5f9cf1840d9d26d37ee8e9e87671728219999d308694940d5747e
-EBUILD transformers-0.4.3.0.ebuild 766 BLAKE2B 3a8ffda9d29ec28a3d622835da3b9cc962067ba682c0496ce8cff96dc89d1310a169a72b6a5f0f2ab727b834a901221426a00081bd6516d0bc628c8c1a3a061f SHA512 037358c0016b46a290c0a8a66276ba52604351aacf9eede978b36804705617ce6c326fbe325ae280402931e6580e95b506183eb7fe9c3ccb094c876abe5bd292
-EBUILD transformers-0.5.2.0.ebuild 757 BLAKE2B 90b159e1ddd1fb4539d8a8ef372f227b6be98eb9d29ff89ddf0bdf2ebf833cc40fba35c011e1f49cbae9000afe8b9d9854de05997cfdf041f499302078730f25 SHA512 11be0a9bc019b5abb5f0af9cb2c0b635c66a93178f02e2eedd05832a944d69a563a3f4672cd72b902d1cd9118cbd932922c6132c05bee4e73337d3ead8eb06a3
-MISC metadata.xml 877 BLAKE2B 0586dc1fc804e0bde37650495e3edcdc5a8725e34a0dbe9dec382438718c4fda1ee68f9bfe23e3467c8a86dea0b6483007d92648c51ae8339e0eebfd5a8c5725 SHA512 a010fb14b9affd54a82308f792aff1f28a5ed4bbe4f1ac8be99c4d4cbde84b78ad49c71d12979bd40fae84e19a429b93de50c64bb345ca188a16ee375f45ae84
diff --git a/dev-haskell/transformers/metadata.xml b/dev-haskell/transformers/metadata.xml
deleted file mode 100644
index 75455fdc5e9d..000000000000
--- a/dev-haskell/transformers/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-	</maintainer>
-	<longdescription>
-		Haskell 98 part of a monad transformer library, inspired by the paper
-		\"Functional Programming with Overloading and Higher-Order Polymorphism\",
-		by Mark P Jones, in /Advanced School of Functional Programming/, 1995
-		(&lt;http://web.cecs.pdx.edu/~mpj/pubs/springschool.html&gt;).
-		
-		This part contains the monad transformer class, the concrete monad
-		transformers, operations and liftings.  It can be used on its own
-		in Haskell 98 code, or with the monad classes in the @monads-fd@ or
-		@monads-tf@ packages, which automatically lift operations introduced
-		by monad transformers through other transformers.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild b/dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild
deleted file mode 100644
index bbab28fc16a8..000000000000
--- a/dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Concrete functor and monad transformers"
-HOMEPAGE="http://hackage.haskell.org/package/transformers"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:= <dev-lang/ghc-7.10:="
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6"
-
-CABAL_CORE_LIB_GHC_PV="7.8.1 7.8.2 7.8.3 7.8.3.20141119 7.8.4"
diff --git a/dev-haskell/transformers/transformers-0.4.1.0.ebuild b/dev-haskell/transformers/transformers-0.4.1.0.ebuild
deleted file mode 100644
index dd73f8f9c88c..000000000000
--- a/dev-haskell/transformers/transformers-0.4.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Concrete functor and monad transformers"
-HOMEPAGE="http://hackage.haskell.org/package/transformers"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/transformers/transformers-0.4.2.0.ebuild b/dev-haskell/transformers/transformers-0.4.2.0.ebuild
deleted file mode 100644
index 18d2b9743dfb..000000000000
--- a/dev-haskell/transformers/transformers-0.4.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Concrete functor and monad transformers"
-HOMEPAGE="http://hackage.haskell.org/package/transformers"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:7.8.4-r1 PM:7.8.4-r2  PM:7.8.4-r3 PM:7.10.1_rc3 PM:7.10.1 7.11.2015*"
diff --git a/dev-haskell/transformers/transformers-0.4.3.0.ebuild b/dev-haskell/transformers/transformers-0.4.3.0.ebuild
deleted file mode 100644
index c9f530e1d7f1..000000000000
--- a/dev-haskell/transformers/transformers-0.4.3.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Concrete functor and monad transformers"
-HOMEPAGE="http://hackage.haskell.org/package/transformers"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:7.8.4-r4 7.11.2015* PM:7.10.2_rc2 PM:7.10.2 PM:7.10.2-r1 PM:7.10.3_rc1 PM:7.10.3"
diff --git a/dev-haskell/transformers/transformers-0.5.2.0.ebuild b/dev-haskell/transformers/transformers-0.5.2.0.ebuild
deleted file mode 100644
index c3ca26298211..000000000000
--- a/dev-haskell/transformers/transformers-0.5.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Concrete functor and monad transformers"
-HOMEPAGE="http://hackage.haskell.org/package/transformers"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-#keep in sync with ghc-8.0.2_rc2
-KEYWORDS="~alpha amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.0.1_rc3 PM:8.0.1_rc4 PM:8.0.1 PM:8.0.2_rc1 PM:8.0.2_rc2 PM:8.0.2 PM:9999"
diff --git a/dev-haskell/uhc-light-1.1.9.5 b/dev-haskell/uhc-light-1.1.9.5
new file mode 100644
index 000000000000..5306d378955d
--- /dev/null
+++ b/dev-haskell/uhc-light-1.1.9.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/fgl:=[profile?] >=dev-haskell/hashable-1.2.4:=[profile?] <dev-haskell/hashable-1.3:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/uhc-util-0.1.6.7:=[profile?] <dev-haskell/uhc-util-0.1.7:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/uulib-0.9.19:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3
+DESCRIPTION=Part of UHC packaged as cabal/hackage installable library
+EAPI=6
+HOMEPAGE=https://github.com/UU-ComputerScience/uhc
+IUSE=profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/fgl:=[profile?] >=dev-haskell/hashable-1.2.4:=[profile?] <dev-haskell/hashable-1.3:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/uhc-util-0.1.6.7:=[profile?] <dev-haskell/uhc-util-0.1.7:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/uulib-0.9.19:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.1.9.5
+SRC_URI=mirror://hackage/packages/archive/uhc-light/1.1.9.5/uhc-light-1.1.9.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ef4b70803d49fac418899429daeed51f
diff --git a/dev-haskell/uhc-light/Manifest b/dev-haskell/uhc-light/Manifest
deleted file mode 100644
index 36b3ffa58c5e..000000000000
--- a/dev-haskell/uhc-light/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST uhc-light-1.1.9.5.tar.gz 4546645 BLAKE2B df1d0303af2ca9b59d508582a90a490204cb6dca4c5431e130c3551017d2c066b7fe93ee323ce765f6cededa77563de4dbf29a740e15e42193383fa9928a9cd5 SHA512 1d31cf2be92689dc0fd989db158623ba36455f33dad70905063cd0849e65cd3f2b78d29a6ed7a943a371e14afc45c95dc552c5a6c64109b192b9ca57cacc7fea
-EBUILD uhc-light-1.1.9.5.ebuild 1057 BLAKE2B 43d48aa41aa7210fca9275c965d05cf7d56d792a273d6313fd5d8e8c33fb8af65ce25309e76dfc3ba2f247486858c5b0729a5661832c2b36ffe4004450dfa5d4 SHA512 0ce624da7dd02944a0ef58834268b9023ff942a2e15cd51b504a68895421271e73c9cdcd47233de1a533aaef66ce62f8e6dd511b31a32f412177e55656f1454a
-MISC metadata.xml 710 BLAKE2B 2411b1890459eea90145859fdbae06de58bf1beedf16d178e8d3c2b60814a9bcb7350f236bf18277075f98c0b7cad8713112cef730437a4cf0bd1abe3873805c SHA512 e652a332e09923a7cb6c132c0b86bb87eb3d3d6cfe3f16d443514ad5cf48aafa4ef5ebbe00cab08a6a4987841df9ea240977a7326975ceaa6e6cf3b42c1e7fd1
diff --git a/dev-haskell/uhc-light/metadata.xml b/dev-haskell/uhc-light/metadata.xml
deleted file mode 100644
index cd3392e2775f..000000000000
--- a/dev-haskell/uhc-light/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A 'light' variant of UHC including only an API and executables for compiling to Core representation (uhcl) and running CoreRun (uhcr). This version is just to test the infrastructure. Later versions will provide a fleshing out of the API and completion of the now rudimentary platform independent (Haskell) interpreted running etc..
-	</longdescription>
-	<upstream>
-		<remote-id type="github">UU-ComputerScience/uhc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/uhc-light/uhc-light-1.1.9.5.ebuild b/dev-haskell/uhc-light/uhc-light-1.1.9.5.ebuild
deleted file mode 100644
index ecb05424cbe2..000000000000
--- a/dev-haskell/uhc-light/uhc-light-1.1.9.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile" # broken markup: haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Part of UHC packaged as cabal/hackage installable library"
-HOMEPAGE="https://github.com/UU-ComputerScience/uhc"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/fgl:=[profile?]
-	>=dev-haskell/hashable-1.2.4:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/uhc-util-0.1.6.7:=[profile?] <dev-haskell/uhc-util-0.1.7:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-haskell/uulib-0.9.19:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/uhc-util-0.1.6.7 b/dev-haskell/uhc-util-0.1.6.7
new file mode 100644
index 000000000000..162ad642323c
--- /dev/null
+++ b/dev-haskell/uhc-util-0.1.6.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/fclabels-2.0.3:=[profile?] >=dev-haskell/fgl-5.4:=[profile?] >=dev-haskell/hashable-1.2.4:=[profile?] >=dev-haskell/logict-state-0.1.0.2:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/pqueue-1.3.1:=[profile?] >=dev-haskell/time-compat-0.1.0.1:=[profile?] >=dev-haskell/uulib-0.9.19:=[profile?] >=dev-lang/ghc-7.10.2:= >=dev-haskell/cabal-1.22.4.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=UHC utilities
+EAPI=6
+HOMEPAGE=https://github.com/UU-ComputerScience/uhc-util
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/fclabels-2.0.3:=[profile?] >=dev-haskell/fgl-5.4:=[profile?] >=dev-haskell/hashable-1.2.4:=[profile?] >=dev-haskell/logict-state-0.1.0.2:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/pqueue-1.3.1:=[profile?] >=dev-haskell/time-compat-0.1.0.1:=[profile?] >=dev-haskell/uulib-0.9.19:=[profile?] >=dev-lang/ghc-7.10.2:=
+SLOT=0/0.1.6.7
+SRC_URI=mirror://hackage/packages/archive/uhc-util/0.1.6.7/uhc-util-0.1.6.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2ab4299bd6320fa6a7e821f5761fdb75
diff --git a/dev-haskell/uhc-util/Manifest b/dev-haskell/uhc-util/Manifest
deleted file mode 100644
index e8a2be9bfce1..000000000000
--- a/dev-haskell/uhc-util/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST uhc-util-0.1.6.7.tar.gz 113857 BLAKE2B 3115383b3951c9dbe38dfb17248c59ef0f1af4857c9479e1164c7a64983748b2e937fb7669e70fa7c0369653e038cc739d4aaf50e7552d8e91e7a3af912f7a8b SHA512 02c8ce0af2aa19f2f9870aa03822860ec6285028867c5e0d7e28fc8bc3ec57cc308d428c8a48c7aa8c78301ac68d9e0ace0721eb35d91c5ae6caf3661236efad
-EBUILD uhc-util-0.1.6.7.ebuild 864 BLAKE2B 7402b0ef4244784e72e0ac8364faf90fa910bb38696b58f5c155c4a8b56c0529efdfd059705f639499fc15d96081fbeac3695a0acff1ef7ffc34829f1081e39d SHA512 9956d8bcb261129211c9eb16257795d74117b99803e6ffe6b70c421fc168615f302fdeda6658cdc867a618c8c43c8673a969b6bec3178ea3949b538e7a497edd
-MISC metadata.xml 434 BLAKE2B 1864e9d10efe12f2dd5f07eadd93a82f8e0eaf843185c8739548a48a19d1a0abe1b333094d4c5c51baa0549702608ec0a2f48a59be53f31e59f81a54c7f9a2e1 SHA512 72a042adc195853350c28bb522749e7853143d6abed38b01e7cc244a22a46a55fff892021bfae56a9dc7024e8a283157f8dbc333b4b0bb6c656575688d06403a
diff --git a/dev-haskell/uhc-util/metadata.xml b/dev-haskell/uhc-util/metadata.xml
deleted file mode 100644
index 46a18af5a380..000000000000
--- a/dev-haskell/uhc-util/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		General purpose utilities for UHC and related tools
-	</longdescription>
-	<upstream>
-		<remote-id type="github">UU-ComputerScience/uhc-util</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/uhc-util/uhc-util-0.1.6.7.ebuild b/dev-haskell/uhc-util/uhc-util-0.1.6.7.ebuild
deleted file mode 100644
index ec9de57c2576..000000000000
--- a/dev-haskell/uhc-util/uhc-util-0.1.6.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="UHC utilities"
-HOMEPAGE="https://github.com/UU-ComputerScience/uhc-util"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fclabels-2.0.3:=[profile?]
-	>=dev-haskell/fgl-5.4:=[profile?]
-	>=dev-haskell/hashable-1.2.4:=[profile?]
-	>=dev-haskell/logict-state-0.1.0.2:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	>=dev-haskell/pqueue-1.3.1:=[profile?]
-	>=dev-haskell/time-compat-0.1.0.1:=[profile?]
-	>=dev-haskell/uulib-0.9.19:=[profile?]
-	>=dev-lang/ghc-7.10.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.4.0
-"
diff --git a/dev-haskell/unbounded-delays-0.1.0.9 b/dev-haskell/unbounded-delays-0.1.0.9
new file mode 100644
index 000000000000..e22fdf32be2a
--- /dev/null
+++ b/dev-haskell/unbounded-delays-0.1.0.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Unbounded thread delays and timeouts
+EAPI=5
+HOMEPAGE=https://github.com/basvandijk/unbounded-delays
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0.9
+SRC_URI=mirror://hackage/packages/archive/unbounded-delays/0.1.0.9/unbounded-delays-0.1.0.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f5ccad60447c4915a9f85fd9da3f972f
diff --git a/dev-haskell/unbounded-delays/Manifest b/dev-haskell/unbounded-delays/Manifest
deleted file mode 100644
index a867ead93ca6..000000000000
--- a/dev-haskell/unbounded-delays/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST unbounded-delays-0.1.0.9.tar.gz 4199 BLAKE2B 92d31c926c202f8bfe4323433ad365de57e507712b81ea65a3780c0b1321a739b72e24546e93770830996b970cb082098f2f3ac7556b5f20719a54856ae48704 SHA512 808d45b3123cc68ab1021f44b90c8a8f803ff8fa933c8e93cc241ba10e8b960281d96403ccd85b5f9af382becc9a05817c0de12ec483fa3e813c2ca78266b592
-EBUILD unbounded-delays-0.1.0.9.ebuild 552 BLAKE2B 96598b5d563537b9d073abad425f12013eb33aad7245c395965f737bbfc4f0a123b9111b2f90622acfd817526f3061d5839388f9a9f6446456b56218703de0b4 SHA512 9b57b4ddf5c7fffacac9e5b7ddc23e6c5fca5f834ca937397e9754e7359f0d8da38e7aa95ffa9b57aacf676e2057fa5776ce4f2287c50dcb2ab1c433f77b01ff
-MISC metadata.xml 601 BLAKE2B c662d527e0bfd817db1dab15ee44389e00d0adeb2d5b8931e24f8e4c5efc20cc9fa7eac23640ec2ccf1356234f4c327f5573d9d4483441cacebb22a4e95a6b49 SHA512 99f9c703965b90237d69ce27878de6f85293be37b1f0e26d3fa83ecd0d84ce99a5c1cc756fae595c8bd5f302471c70e8ed49b36c7b2e913c82b4399042e95923
diff --git a/dev-haskell/unbounded-delays/metadata.xml b/dev-haskell/unbounded-delays/metadata.xml
deleted file mode 100644
index 4a5fd6aa060d..000000000000
--- a/dev-haskell/unbounded-delays/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The @threadDelay@ and @timeout@ functions from the @base@ library
-		use the bounded @Int@ type for specifying the delay or timeout
-		period. This packages provides alternatives which use the
-		unbounded @Integer@ type.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">basvandijk/unbounded-delays</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/unbounded-delays/unbounded-delays-0.1.0.9.ebuild b/dev-haskell/unbounded-delays/unbounded-delays-0.1.0.9.ebuild
deleted file mode 100644
index 1c69940d24b0..000000000000
--- a/dev-haskell/unbounded-delays/unbounded-delays-0.1.0.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Unbounded thread delays and timeouts"
-HOMEPAGE="https://github.com/basvandijk/unbounded-delays"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/unexceptionalio-0.3.0 b/dev-haskell/unexceptionalio-0.3.0
new file mode 100644
index 000000000000..f0f3e81e2d03
--- /dev/null
+++ b/dev-haskell/unexceptionalio-0.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=IO without any non-error, synchronous exceptions
+EAPI=5
+HOMEPAGE=https://github.com/singpolyma/unexceptionalio
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.0
+SRC_URI=mirror://hackage/packages/archive/unexceptionalio/0.3.0/unexceptionalio-0.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c7c911f776542600efd481b2d08d7e73
diff --git a/dev-haskell/unexceptionalio/Manifest b/dev-haskell/unexceptionalio/Manifest
deleted file mode 100644
index c240c4c82dbc..000000000000
--- a/dev-haskell/unexceptionalio/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST unexceptionalio-0.3.0.tar.gz 2335 BLAKE2B e2d3a7f63dece9631bcbe602d2f8c06b151d103f85ad3bb84de869b3194f20e2f8483523f15a828a8526af856fce53d7fa6f669c2a659c957b7ccca10466c878 SHA512 be6479cfdb39707473e07639b3a35c4e178571ec2b45a356e278c9bb20710775fe26c086239aa65c2d5f201730df223b5ca3e42ea61e1ffb9a285f384e62f4b6
-EBUILD unexceptionalio-0.3.0.ebuild 565 BLAKE2B 2f6f3269e8212b5de75506da5187bbfb00d05f74a24dd0aecf73c875dfe6f709298aacd24ddc3933ac62341db3342e115e42d4d0661cffda3d66b97533b962b7 SHA512 3d95cda056b7658d641fbd55ae39643025c23a3f7825063daa8d5e25558bde72a299cac54839c4be3976d8b84d858198fe66c939537bae723a8530b94c4f78d4
-MISC metadata.xml 636 BLAKE2B a45a7539e3dca76bfe3b5dcc7e3dd5bc36b55f9d0357f02cbb726f4b6c6a38d4845cacf62ad27c40136850fb9102ce96e64cdacf750577d87fbb76f0559d91b7 SHA512 04828cdccb54886eeec3e13425a91b2f3924a7758428a4adc9db513e5a6475a635026f4540c23ba1f739dd821f7ea8bd75a25c823a14d724648b47f0cccb67fb
diff --git a/dev-haskell/unexceptionalio/metadata.xml b/dev-haskell/unexceptionalio/metadata.xml
deleted file mode 100644
index 7e8b34c0ddcc..000000000000
--- a/dev-haskell/unexceptionalio/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		When you've caught all the exceptions that can be handled safely,
-		this is what you're left with.
-		
-		It is intended that you use qualified imports with this library.
-		
-		&gt; import UnexceptionalIO (UIO)
-		&gt; import qualified UnexceptionalIO as UIO
-	</longdescription>
-	<upstream>
-		<remote-id type="github">singpolyma/unexceptionalio</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/unexceptionalio/unexceptionalio-0.3.0.ebuild b/dev-haskell/unexceptionalio/unexceptionalio-0.3.0.ebuild
deleted file mode 100644
index bdb5e4de104c..000000000000
--- a/dev-haskell/unexceptionalio/unexceptionalio-0.3.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="IO without any non-error, synchronous exceptions"
-HOMEPAGE="https://github.com/singpolyma/unexceptionalio"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/unicode-transforms-0.2.1 b/dev-haskell/unicode-transforms-0.2.1
new file mode 100644
index 000000000000..291e4dcbff2f
--- /dev/null
+++ b/dev-haskell/unicode-transforms-0.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bitarray-0.0.1:=[profile?] <dev-haskell/bitarray-0.1:=[profile?] >=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/getopt-generics-0.11 <dev-haskell/getopt-generics-0.14 >=dev-haskell/quickcheck-2.1 <dev-haskell/quickcheck-2.10 >=dev-haskell/split-0.1 <dev-haskell/split-0.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Unicode normalization
+EAPI=6
+HOMEPAGE=https://github.com/harendra-kumar/unicode-transforms
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bitarray-0.0.1:=[profile?] <dev-haskell/bitarray-0.1:=[profile?] >=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.2.1
+SRC_URI=mirror://hackage/packages/archive/unicode-transforms/0.2.1/unicode-transforms-0.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a8f1db145fe9350f4382bd9a3f8b59fd
diff --git a/dev-haskell/unicode-transforms/Manifest b/dev-haskell/unicode-transforms/Manifest
deleted file mode 100644
index 08fbee48177a..000000000000
--- a/dev-haskell/unicode-transforms/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST unicode-transforms-0.2.1.tar.gz 714210 BLAKE2B b2ccc7273e9f37c990e48d06aaa83a353546b22722a575d1686de30bd5434ad8a24903fa5c9ddac1d3937c6f7b32b91fcd766666ed1c816ede322935626855c0 SHA512 9bdd7c6bb75ae6b71152371663e2c37a828574a782039f94059b3d68832680958749ab36df9eb4aca45a81d45ae91e791dc243b921dc24b4a8e8ad6337e6e082
-EBUILD unicode-transforms-0.2.1.ebuild 1051 BLAKE2B ded4da567882def8eb755c06aea6c5fafef400a0af81d566c7f0f7637979f28bad700333edc0b435ebe36cd54f2d68e02339c2eb0cb93756ef60c9d829062322 SHA512 4768bc5324d40cff10d4f0747082356bb9032eb36eec1febbeaf5f79294c96f708060638280e3bb1c5b23f3f455bd441ed815a6d155ae6d785fe34d09104903a
-MISC metadata.xml 356 BLAKE2B eeac0a1ca1766fc3c20f6117f2ea003315ad3d9d8f00d17fd12a8dfb7f9d2e0697d10b978ec7b0e1b107b5057367b3d109ba9eb69565c7502c5e6b860e8e212f SHA512 bf0c5ce6664bb77903f34306f75143d89e850cd2365357fd972b54cbb3d05dad4397287fa8512235985b086f1694adda4231c77ff93b30ee0a5cf5edadbf8982
diff --git a/dev-haskell/unicode-transforms/metadata.xml b/dev-haskell/unicode-transforms/metadata.xml
deleted file mode 100644
index 38ea7b682ea6..000000000000
--- a/dev-haskell/unicode-transforms/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Fast Unicode 8.0 normalization in Haskell (NFC, NFKC, NFD, NFKD).
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/unicode-transforms/unicode-transforms-0.2.1.ebuild b/dev-haskell/unicode-transforms/unicode-transforms-0.2.1.ebuild
deleted file mode 100644
index 676ee2cb0a43..000000000000
--- a/dev-haskell/unicode-transforms/unicode-transforms-0.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -dev,-has-icu,-has-llvm
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Unicode normalization"
-HOMEPAGE="https://github.com/harendra-kumar/unicode-transforms"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bitarray-0.0.1:=[profile?] <dev-haskell/bitarray-0.1:=[profile?]
-	>=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/getopt-generics-0.11 <dev-haskell/getopt-generics-0.14
-		>=dev-haskell/quickcheck-2.1 <dev-haskell/quickcheck-2.10
-		>=dev-haskell/split-0.1 <dev-haskell/split-0.3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-dev \
-		--flag=-has-icu \
-		--flag=-has-llvm
-}
diff --git a/dev-haskell/uniplate-1.6.12 b/dev-haskell/uniplate-1.6.12
new file mode 100644
index 000000000000..647069625d40
--- /dev/null
+++ b/dev-haskell/uniplate-1.6.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Help writing simple, concise and fast generic operations
+EAPI=5
+HOMEPAGE=http://community.haskell.org/~ndm/uniplate/
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.6.12
+SRC_URI=mirror://hackage/packages/archive/uniplate/1.6.12/uniplate-1.6.12.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=90510ecd4c69e115bb13342677054856
diff --git a/dev-haskell/uniplate/Manifest b/dev-haskell/uniplate/Manifest
deleted file mode 100644
index 69341dec7f4a..000000000000
--- a/dev-haskell/uniplate/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST uniplate-1.6.12.tar.gz 30055 BLAKE2B 557c3eeb14c0b292d4e0325a711babec39a76829822aee07e38ee49f7a4c3f82e72e6231c00fad1c7831864a7df4a9e12b3e913b60fe0e227d651d39c73300af SHA512 049b07e8a57db7e44d91fc9c8dcfb5c49b78a692a730061763cb8bcc4fbc3ed1065bd7a4c337e3d344693df882a0718b6d3bb6a6ea1e7d520a36d252d7038b07
-EBUILD uniplate-1.6.12.ebuild 944 BLAKE2B adc59c98510ddd9a3f778a2a81bb29bc7b1c8154e884d011636e30e72f4d210736f0f305fc93d97058555ea78cb633a6c1bd541ac898464848caed932dc1fe12 SHA512 ce4958e139d1c6060aafd56f2adb5296890a90050028604f51bb45b6ab9bc1605d8c47f428bbc1933a440bdcdf9d847d4829cd15eade5f4bda676afa6715808f
-MISC metadata.xml 1613 BLAKE2B 635834b68d6f154f689302e4713069a66dc6165e2f78c8d2dc5be80919db983be9fada67cfe6961321658130b8da8cee13300c72d9ce9a0c61ae91ce04e567d2 SHA512 d29dfda9d4b53863b51928c40ccf25a6082f150a054fe9da9d48cf462fdf181d90e1b19b19312b72421b68637c8593481beaedf1d28e95278bf567151948dad9
diff --git a/dev-haskell/uniplate/metadata.xml b/dev-haskell/uniplate/metadata.xml
deleted file mode 100644
index fd8349c40e4b..000000000000
--- a/dev-haskell/uniplate/metadata.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Uniplate is library for writing simple and concise generic operations.
-		Uniplate has similar goals to the original Scrap Your Boilerplate work,
-		but is substantially simpler and faster. The Uniplate manual is available at
-		&lt;http://community.haskell.org/~ndm/darcs/uniplate/uniplate.htm&gt;.
-		
-		To get started with Uniplate you should import one of the three following
-		modules:
-		
-		* "Data.Generics.Uniplate.Data" - to quickly start writing generic functions.
-		Most users should start by importing this module.
-		
-		* "Data.Generics.Uniplate.Direct" - a replacement for "Data.Generics.Uniplate.Data"
-		with substantially higher performance (around 5 times), but requires writing
-		instance declarations.
-		
-		* "Data.Generics.Uniplate.Operations" - definitions of all the operations defined
-		by Uniplate. Both the above two modules re-export this module.
-		
-		In addition, some users may want to make use of the following modules:
-		
-		* "Data.Generics.Uniplate.Zipper" - a zipper built on top of Uniplate instances.
-		
-		* "Data.Generics.SYB" - users transitioning from the Scrap Your Boilerplate library.
-		
-		* "Data.Generics.Compos" - users transitioning from the Compos library.
-		
-		* "Data.Generics.Uniplate.DataOnly" - users making use of both @Data@ and @Direct@
-		to avoid getting instance conflicts.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/uniplate/uniplate-1.6.12.ebuild b/dev-haskell/uniplate/uniplate-1.6.12.ebuild
deleted file mode 100644
index fb5353dc4319..000000000000
--- a/dev-haskell/uniplate/uniplate-1.6.12.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-#hackport: flags: +separate_syb,+typeable_fingerprint
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Help writing simple, concise and fast generic operations"
-HOMEPAGE="http://community.haskell.org/~ndm/uniplate/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=separate_syb \
-		--flag=typeable_fingerprint
-}
diff --git a/dev-haskell/uniqueid-0.1.1 b/dev-haskell/uniqueid-0.1.1
new file mode 100644
index 000000000000..17f30db2c7b4
--- /dev/null
+++ b/dev-haskell/uniqueid-0.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.8.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Splittable Unique Identifier Supply
+EAPI=5
+HOMEPAGE=https://github.com/sebfisch/uniqueid/wikis
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.8.1:=
+SLOT=0/0.1.1
+SRC_URI=mirror://hackage/packages/archive/uniqueid/0.1.1/uniqueid-0.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3acbd334c4dfbef17bc0776615f1993e
diff --git a/dev-haskell/uniqueid/Manifest b/dev-haskell/uniqueid/Manifest
deleted file mode 100644
index b5ac27f07d8a..000000000000
--- a/dev-haskell/uniqueid/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX uniqueid-0.1.1-ghc-7.8.patch 1383 BLAKE2B 92ea3035b38b4f86559fff85d346940cd9f2222e4ef2e922128b14051db2b48ac70531146289bcd7a526d8498ab6f9440f1a8a4b6e38d5b3a88353f80a4acdec SHA512 2cb2bc04bc8ee52279ec953ed1435411d4715dec009012d191bd07df4ccd334ca4a60be123d00bf9a74a8f9e94e01b2fcea0c0692fdcf77c7d7a0c5d7b0948e5
-DIST uniqueid-0.1.1.tar.gz 2779 BLAKE2B 73ad9af177f20575caaefb12261d58801a391bfcbaa6b8ef1596538fd7536ec8b6aa35997277a39454250bc779c4c6174b1b3e7853bad5cc21d9ed72764ce517 SHA512 4a1f753a320a5ddae8dd47c3e3729144cf28effaaa6f16a8cf13ad614e4aba3f720f82025f86d7c04ae5c28d03825b4d3442caa01cd534dfa05a70c6c9cadc68
-EBUILD uniqueid-0.1.1.ebuild 612 BLAKE2B 8376f2a0d435428a811478463769faaa3290dfc3cf407d28a22056da8d7576c34565bbc0dc3772a9ca76710ccec4e4284fe4961043adcbd5503ba72156bad224 SHA512 d2f59d6c18195d618eaaaef78e64f0fe058f398640ac9ed37579bd2c13f1baa1aec1252223b1ed787dda049f7b29a20a369ca20c5b7afb858b5a26163f06a380
-MISC metadata.xml 628 BLAKE2B 57879a83e3a6279bde5c6061154b7c35f62ff4bb0e6272c8b3f31fde6fadcc5673c19dfd74e5220ea4e0f448b316f76feb4a0e1bfb594ca35d216ca4b86ea758 SHA512 1f422717c439530df37fcad80a491643d1f9754eb130acdff4991a1f0e98a87db6c43bea2eea5ad1837aefe251a492085730773aae68f2a3de9c7a48aaa43e83
diff --git a/dev-haskell/uniqueid/files/uniqueid-0.1.1-ghc-7.8.patch b/dev-haskell/uniqueid/files/uniqueid-0.1.1-ghc-7.8.patch
deleted file mode 100644
index a48815ecda0e..000000000000
--- a/dev-haskell/uniqueid/files/uniqueid-0.1.1-ghc-7.8.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/Data/Unique/Id.hs b/Data/Unique/Id.hs
-index f41127e..56853d9 100644
---- a/Data/Unique/Id.hs
-+++ b/Data/Unique/Id.hs
-@@ -14,7 +14,7 @@ module Data.Unique.Id (
-  ) where
- 
- import GHC.Exts
--import GHC.IOBase ( unsafeDupableInterleaveIO )
-+import GHC.IO ( unsafeDupableInterleaveIO )
- 
- import Data.IORef
- import System.IO.Unsafe ( unsafePerformIO )
-@@ -55,15 +55,15 @@ splitIdSupplyL ids = ids1 : splitIdSupplyL ids2
- idFromSupply :: IdSupply -> Id
- idFromSupply (IdSupply n _ _) = Id (I# n)
- 
--instance Eq Id where Id (I# x) == Id (I# y) = x ==# y
-+instance Eq Id where Id (I# x) == Id (I# y) = isTrue# (x ==# y)
- 
- instance Ord Id
-  where
--  Id (I# x) <  Id (I# y) = x <#  y
--  Id (I# x) <= Id (I# y) = x <=# y
-+  Id (I# x) <  Id (I# y) = isTrue# (x <#  y)
-+  Id (I# x) <= Id (I# y) = isTrue# (x <=# y)
- 
-   compare (Id (I# x)) (Id (I# y)) =
--   if x ==# y then EQ else if x <# y then LT else GT
-+   if isTrue# (x ==# y) then EQ else if isTrue# (x <# y) then LT else GT
- 
- instance Show Id
-  where
-diff --git a/uniqueid.cabal b/uniqueid.cabal
-index 8099520..83aaa39 100644
---- a/uniqueid.cabal
-+++ b/uniqueid.cabal
-@@ -18,7 +18,7 @@ Build-Type:    Simple
- Stability:     experimental
- 
- Library
--  Build-Depends:   base >= 3 && < 5
-+  Build-Depends:   base >= 3 && < 5, ghc-prim
-   Exposed-Modules: Data.Unique.Id
-   Extensions:      MagicHash
-   Ghc-Options:     -Wall
diff --git a/dev-haskell/uniqueid/metadata.xml b/dev-haskell/uniqueid/metadata.xml
deleted file mode 100644
index 12547a354095..000000000000
--- a/dev-haskell/uniqueid/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides splittable supplies of unique
-		identifiers. The implementation mimics (only) essential
-		parts of the code that is used internally in GHC for
-		the same purpose. After improvements of the value-supply
-		package it is now deprecated.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">sebfisch/uniqueid</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/uniqueid/uniqueid-0.1.1.ebuild b/dev-haskell/uniqueid/uniqueid-0.1.1.ebuild
deleted file mode 100644
index 89a693e9b6c9..000000000000
--- a/dev-haskell/uniqueid/uniqueid-0.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Splittable Unique Identifier Supply"
-HOMEPAGE="https://github.com/sebfisch/uniqueid/wikis"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.1:="
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.8.patch
-}
diff --git a/dev-haskell/unix-compat-0.4.1.3 b/dev-haskell/unix-compat-0.4.1.3
new file mode 100644
index 000000000000..ff347907daf4
--- /dev/null
+++ b/dev-haskell/unix-compat-0.4.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Portable POSIX-compatibility layer
+EAPI=5
+HOMEPAGE=https://github.com/jystic/unix-compat
+IUSE=old-time doc hscolour profile
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.1.3
+SRC_URI=mirror://hackage/packages/archive/unix-compat/0.4.1.3/unix-compat-0.4.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=25fdd8ce89af5f192277f1c58d903e1d
diff --git a/dev-haskell/unix-compat-0.4.1.4 b/dev-haskell/unix-compat-0.4.1.4
new file mode 100644
index 000000000000..96875d4db041
--- /dev/null
+++ b/dev-haskell/unix-compat-0.4.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Portable POSIX-compatibility layer
+EAPI=5
+HOMEPAGE=https://github.com/jystic/unix-compat
+IUSE=old-time doc hscolour profile
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.1.4
+SRC_URI=mirror://hackage/packages/archive/unix-compat/0.4.1.4/unix-compat-0.4.1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=caf4c9e06d3d4184e48cbf34cec55c04
diff --git a/dev-haskell/unix-compat-0.4.2.0 b/dev-haskell/unix-compat-0.4.2.0
new file mode 100644
index 000000000000..d04ded13e66e
--- /dev/null
+++ b/dev-haskell/unix-compat-0.4.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Portable POSIX-compatibility layer
+EAPI=6
+HOMEPAGE=https://github.com/jystic/unix-compat
+IUSE=old-time doc hscolour profile
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.2.0
+SRC_URI=mirror://hackage/packages/archive/unix-compat/0.4.2.0/unix-compat-0.4.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e4b1ed0ce536f740e23a71ae00d42e71
diff --git a/dev-haskell/unix-compat-0.4.3.1 b/dev-haskell/unix-compat-0.4.3.1
new file mode 100644
index 000000000000..f62125b2cad3
--- /dev/null
+++ b/dev-haskell/unix-compat-0.4.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Portable POSIX-compatibility layer
+EAPI=6
+HOMEPAGE=https://github.com/jystic/unix-compat
+IUSE=old-time doc hscolour profile
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.3.1
+SRC_URI=mirror://hackage/packages/archive/unix-compat/0.4.3.1/unix-compat-0.4.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0a895a58d092afe3166aba5ae1a7a5d7
diff --git a/dev-haskell/unix-compat/Manifest b/dev-haskell/unix-compat/Manifest
deleted file mode 100644
index 855fabda2869..000000000000
--- a/dev-haskell/unix-compat/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX unix-compat-0.4.2.0-majmin.patch 260 BLAKE2B 6246f3dcf751b4da4fa04dad98a116b8ca4b65560e37ee5b349c3a7142322c280c42a56202a9dce54963466cf740a36b1cb7e7e4296e883be80d014ea4e67bc1 SHA512 cbde5119d830ae94f8460b3d91fb58169f5955dc4b8d645fd62d7c37dc32dbe61174c84e572c991a4857497c4007e677225af5281d85abbd97fc4523d2e52ade
-DIST unix-compat-0.4.1.3.tar.gz 12823 BLAKE2B 0cf1fa6c1b9f10c39fcbe8e0fa54085d7eb93d3177ba15d16e7f3a0f7b64178cea2f2be29e3b91f3611cc49528058e8f226febb941a57378c9156ee5eb609a2c SHA512 6065c2ec39e96ea8a7f91964a0e3ad93fa3a46625dfe831f0b4641e181e1ebbdac8cb5f954ee6a1fe8061896e97f437670605f0b4684183fc84f69725c3cf7a5
-DIST unix-compat-0.4.1.4.tar.gz 12830 BLAKE2B b3b94ff1733d8df2b7105ea6956db7d37d5af445373dad3dd4583a7c515d742835c781da106a7c7b8ecabc55b877f648892308aae9706e94365b4e8c5e50afca SHA512 bc2aa14231b294ada9006d18e54f353f9c5b4bde387f585fc6e3adc38efd18d81819295255f0e385a9cde0fcc423db556801c9285767781eeedf32123b7639af
-DIST unix-compat-0.4.2.0.tar.gz 12895 BLAKE2B df4f07a36b7371f658f533eabf4faa3880d1935371ae46fd05c3567e5f922b35999c7d71af2103c9b88b81ee4328aee6b002d54658e88422fa037c21a209939b SHA512 c3271dc7bbb35948cc2edb143ffe2ab0d14c53115668c257eeba8ccc148b586ee994f417ccfabb58fcd6533e786dcccac3062ece1923afaf20fcd05055fdad39
-DIST unix-compat-0.4.3.1.tar.gz 13152 BLAKE2B a2fc2d7ab23c0b26349181cfcfa98d864944c5347f7a8177fa467e8b963883c32c042dce3d36dfabd7008dda9efe632f7cf1edb6485178d8b2695ca8d73dc4a0 SHA512 ff6d7f52d1e0e21c3739831ae33b34b13815aadfce7f90efe2cfa10325b55aac982824d4cdaf112af03e8d51824d091d8781ff1caf529f02f8d251ada5c9e63b
-EBUILD unix-compat-0.4.1.3.ebuild 662 BLAKE2B 8ac829109b656884692a8578c35dbba4d5b9798c1b82e035c7e738bc6747b0f224d6e65987075918f454faf5b8b6cb69edc856eea33bdab0fff333ea127a3b15 SHA512 4442542443409cdfd5a94e78e220e3ce56aa0c9c5a45c875a64e87eb001a0678057fff2adcdd35e1ea915d1664288c96f2b9a422369ebd5c70282706de86e6d5
-EBUILD unix-compat-0.4.1.4.ebuild 669 BLAKE2B fd8d1aa3a1a0095661b2c1be9974ebe9e1709064e068e16e950d398184b5351030ce64bc780b9adc6f09e198a4333a84b6dba682123701d76d5422cd56d27e70 SHA512 38113d9ada373977625304bda66843977bdf2465f9011e3c09157559af9d7effd3c42371581015635edf0f20483da4c7ca74dea21e0c5772f856cf5e97980df2
-EBUILD unix-compat-0.4.2.0.ebuild 667 BLAKE2B 391e0351e618dc5ae5f75b45cb7d8514db757666c6d891f77c5a9a0e3b1152798da3bd6b20fa208dd577263fe8b66b9971a354249fbe71173fe6da197c8ae99e SHA512 edabb7d0f4d9492299c9a557f0384d400c6b0d1bf16a7a2746ef83498e146b277638b67564e5e3aff8ad4dc02480319369d57d12621772183010ce3fe5212d9a
-EBUILD unix-compat-0.4.3.1.ebuild 721 BLAKE2B 0170a1dfda5b3c882c572abc2fda9460614b2c2ce71de7940d340714d469d1e44e4f7039b410ce94d8db790fe0f4ca7ffaab01c6059ca73389a66a63d3cc425d SHA512 7130275b6901407136904d061c6a8cd4a4cb7dd83328ff46b055710dd9f76e7abfc6624b226293584de2931b90c4fa466da54cd3df968c92cb203274c389e389
-MISC metadata.xml 650 BLAKE2B 99476ccce782fab6a1f6c8a571e49cbec4ed9f97738669a0654a567868a7d3106dd0d36c562bbb232dd2763ef4e5504fc56bfcb39fa1eb8dbe7d74d8843ff037 SHA512 7ffb0c501a229a3e3bf2d94f72d9c63ffd7b11033392a8fca8b90e180fd299f97902d5d601402754608654930f2611ec05a2e9df0622d3c2ad6dbfc2cc9435c1
diff --git a/dev-haskell/unix-compat/files/unix-compat-0.4.2.0-majmin.patch b/dev-haskell/unix-compat/files/unix-compat-0.4.2.0-majmin.patch
deleted file mode 100644
index 1a07b6883ad2..000000000000
--- a/dev-haskell/unix-compat/files/unix-compat-0.4.2.0-majmin.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/cbits/HsUnixCompat.c b/cbits/HsUnixCompat.c
-index 1f7f189..5de35f5 100644
---- a/cbits/HsUnixCompat.c
-+++ b/cbits/HsUnixCompat.c
-@@ -6,2 +6,4 @@
- 
-+#include <sys/sysmacros.h> /* TODO: glibc()-specific macro */
-+
- unsigned int unix_major(dev_t dev)
diff --git a/dev-haskell/unix-compat/metadata.xml b/dev-haskell/unix-compat/metadata.xml
deleted file mode 100644
index f5e70e297b55..000000000000
--- a/dev-haskell/unix-compat/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides portable implementations of parts
-		of the unix package. This package re-exports the unix
-		package when available. When it isn't available,
-		portable implementations are used.
-	</longdescription>
-	<use>
-		<flag name="old-time">build against old-time package</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">jystic/unix-compat</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/unix-compat/unix-compat-0.4.1.3.ebuild b/dev-haskell/unix-compat/unix-compat-0.4.1.3.ebuild
deleted file mode 100644
index 32e805bd5200..000000000000
--- a/dev-haskell/unix-compat/unix-compat-0.4.1.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Portable POSIX-compatibility layer"
-HOMEPAGE="https://github.com/jystic/unix-compat"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="old-time"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag old-time old-time)
-}
diff --git a/dev-haskell/unix-compat/unix-compat-0.4.1.4.ebuild b/dev-haskell/unix-compat/unix-compat-0.4.1.4.ebuild
deleted file mode 100644
index a71171f6d636..000000000000
--- a/dev-haskell/unix-compat/unix-compat-0.4.1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Portable POSIX-compatibility layer"
-HOMEPAGE="https://github.com/jystic/unix-compat"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="old-time"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag old-time old-time)
-}
diff --git a/dev-haskell/unix-compat/unix-compat-0.4.2.0.ebuild b/dev-haskell/unix-compat/unix-compat-0.4.2.0.ebuild
deleted file mode 100644
index aa83cb5f7ac3..000000000000
--- a/dev-haskell/unix-compat/unix-compat-0.4.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Portable POSIX-compatibility layer"
-HOMEPAGE="https://github.com/jystic/unix-compat"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="old-time"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag old-time old-time)
-}
diff --git a/dev-haskell/unix-compat/unix-compat-0.4.3.1.ebuild b/dev-haskell/unix-compat/unix-compat-0.4.3.1.ebuild
deleted file mode 100644
index 6f41770493f6..000000000000
--- a/dev-haskell/unix-compat/unix-compat-0.4.3.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Portable POSIX-compatibility layer"
-HOMEPAGE="https://github.com/jystic/unix-compat"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="old-time"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.4.2.0-majmin.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag old-time old-time)
-}
diff --git a/dev-haskell/unix-time-0.3.5 b/dev-haskell/unix-time-0.3.5
new file mode 100644
index 000000000000..4c2a2b23e0a4
--- /dev/null
+++ b/dev-haskell/unix-time-0.3.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/binary:=[profile?] dev-haskell/old-time:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/doctest-0.9.3 >=dev-haskell/hspec-1.5 dev-haskell/old-locale dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Unix time parser/formatter and utilities
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/unix-time
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/binary:=[profile?] dev-haskell/old-time:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.5
+SRC_URI=mirror://hackage/packages/archive/unix-time/0.3.5/unix-time-0.3.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cafc7177a645819acee930ce20474056
diff --git a/dev-haskell/unix-time-0.3.6 b/dev-haskell/unix-time-0.3.6
new file mode 100644
index 000000000000..daac3b27af76
--- /dev/null
+++ b/dev-haskell/unix-time-0.3.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/binary:=[profile?] dev-haskell/old-time:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/doctest-0.9.3 >=dev-haskell/hspec-1.5 dev-haskell/old-locale dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Unix time parser/formatter and utilities
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/unix-time
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/binary:=[profile?] dev-haskell/old-time:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.6
+SRC_URI=mirror://hackage/packages/archive/unix-time/0.3.6/unix-time-0.3.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b95d7a36851a3c279d79618c7ede51b7
diff --git a/dev-haskell/unix-time-0.3.7 b/dev-haskell/unix-time-0.3.7
new file mode 100644
index 000000000000..a971678d499f
--- /dev/null
+++ b/dev-haskell/unix-time-0.3.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/old-time:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/doctest-0.9.3 >=dev-haskell/hspec-1.5 dev-haskell/old-locale dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Unix time parser/formatter and utilities
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/unix-time
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/old-time:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.7
+SRC_URI=mirror://hackage/packages/archive/unix-time/0.3.7/unix-time-0.3.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9fba0c2feaf7102ebd637fc6aba53e7e
diff --git a/dev-haskell/unix-time/Manifest b/dev-haskell/unix-time/Manifest
deleted file mode 100644
index 6b58d6e79f40..000000000000
--- a/dev-haskell/unix-time/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST unix-time-0.3.5.tar.gz 40201 BLAKE2B 398b47f43b6b56131f42842ad691b45e7fe987478583d498ad44885d480b14068b1d956d035e371f48518d62bff70f1f7f0ea34e398355d37bde9d76c5442dcb SHA512 8da13cd8e9a32ee8ce4ab9430eab951d84350e4c459948f4e5e833444f1f266fbac6b6fc08876e326313eaf92e31500b325825b1b2c4fb22c551efdf6e5b9db5
-DIST unix-time-0.3.6.tar.gz 40180 BLAKE2B 0233c673459f967e78a4a8985b0951efd224c57b172739413cb41950abbae05d29c575e128020b2ca6b8f96595326073e45d1bf4e040c81db10d1da3304d3def SHA512 a7ca1086d2a2a15bebdaad80e3e31cc3be403548650d6c490dd7aa3af14b017ad2034320f82c3c7729661a046156e41bb50acf6a8fc1aa1db8dc8a62522c03a1
-DIST unix-time-0.3.7.tar.gz 40549 BLAKE2B 86aa4e6b9d4b7adf55f27491dff7d4197c9540b7390fbfb93ccde33f618892be6c21387812cf41481d5863cff24bdbc29d213edf6c9bb13bdc1ca95e12889f95 SHA512 d10335af434e79980fd4221ade86dafa71d2aa9b30d7aaa13da25b8e75114430a143be5b9c6c1fa885d6ba01f6e6677484b04cd9e2cb263c650a945e954c44bd
-EBUILD unix-time-0.3.5.ebuild 747 BLAKE2B a76f0c991005635297027d21e7e365bd681a32b9ce2174303df836f631fd260acc4e140e9c323425b5ff26f38f9c093d1e198eb8a215eff784ab7c8b2f274afe SHA512 fd4a4e831232cdda6e5a280cfe1be788a9374d291426f44b736b43866c7df6a7bc64a7b5a5aded8bac6e29022a7f633a022bcdfb6592797d86467a44b7b92e25
-EBUILD unix-time-0.3.6.ebuild 749 BLAKE2B 92f014c36d76d36241bcc660cd571c54d6742a65d4e355d81701c0c1145fbf9d4fc453952f04470235fda81de0a66af30996d24c23fd9cef01f16c51fe4789e9 SHA512 4700f974f02960280c87d1e4fe6219c427640a1927c3e66207ea02670fd0e90068530bc5cdabf2c114fe21dac0c67ec4502c9f150afe8f6e669119d8ed431a0e
-EBUILD unix-time-0.3.7.ebuild 715 BLAKE2B dbc7ac2ea5eddfe44c396d4e6c13ba1a35b97c86bea0fc2af40532d81ecee5774bfddac1627712a7822062aef79f96f8afa02c7b9af15cd89d7818b2b63db1b0 SHA512 35063aeb39604c1540534bb6c81438d255d40c42693406cc497452e4c8d340e4ad0b186ab70e271144918c3857735f4856a9df7d3d552b804db360664e00ec7a
-MISC metadata.xml 338 BLAKE2B 81aeb9ddd2ebe58011cece155d563ef83d59cb0ef762b85da7d43c053361f9f9994631a63fd4815c67e3ec81edb0eff2592a0a6804c90c195a7e1b4c2f8f3532 SHA512 3f3da8a70deabaeefdb28541bc5b398a03c0106098261811e3e1f7dba6ffaccc64bbe9905a7184d8cf84cddee7498f06bd9ed1b65909450262fa35da3f4f80d5
diff --git a/dev-haskell/unix-time/metadata.xml b/dev-haskell/unix-time/metadata.xml
deleted file mode 100644
index 382110aec947..000000000000
--- a/dev-haskell/unix-time/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Fast parser\/formatter\/utilities for Unix time
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/unix-time/unix-time-0.3.5.ebuild b/dev-haskell/unix-time/unix-time-0.3.5.ebuild
deleted file mode 100644
index bb74e6b0be18..000000000000
--- a/dev-haskell/unix-time/unix-time-0.3.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Unix time parser/formatter and utilities"
-HOMEPAGE="http://hackage.haskell.org/package/unix-time"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/binary:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/doctest-0.9.3
-		>=dev-haskell/hspec-1.5
-		dev-haskell/old-locale
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/unix-time/unix-time-0.3.6.ebuild b/dev-haskell/unix-time/unix-time-0.3.6.ebuild
deleted file mode 100644
index 774cebaeddad..000000000000
--- a/dev-haskell/unix-time/unix-time-0.3.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Unix time parser/formatter and utilities"
-HOMEPAGE="http://hackage.haskell.org/package/unix-time"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/binary:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/doctest-0.9.3
-		>=dev-haskell/hspec-1.5
-		dev-haskell/old-locale
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/unix-time/unix-time-0.3.7.ebuild b/dev-haskell/unix-time/unix-time-0.3.7.ebuild
deleted file mode 100644
index 458d1f9cc477..000000000000
--- a/dev-haskell/unix-time/unix-time-0.3.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Unix time parser/formatter and utilities"
-HOMEPAGE="http://hackage.haskell.org/package/unix-time"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/old-time:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/doctest-0.9.3
-		>=dev-haskell/hspec-1.5
-		dev-haskell/old-locale
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/unixutils-1.54.1 b/dev-haskell/unixutils-1.54.1
new file mode 100644
index 000000000000..d7b4896622b1
--- /dev/null
+++ b/dev-haskell/unixutils-1.54.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/exceptions:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/process-extras-0.3:=[profile?] dev-haskell/puremd5:=[profile?] dev-haskell/regex-tdfa:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/libc >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A crude interface between Haskell and Unix-like operating systems
+EAPI=5
+HOMEPAGE=https://github.com/seereason/haskell-unixutils.git
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/exceptions:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/process-extras-0.3:=[profile?] dev-haskell/puremd5:=[profile?] dev-haskell/regex-tdfa:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/libc
+SLOT=0/1.54.1
+SRC_URI=mirror://hackage/packages/archive/Unixutils/1.54.1/Unixutils-1.54.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5abe67760ada202c5dc11c3e628ca3b7
diff --git a/dev-haskell/unixutils/Manifest b/dev-haskell/unixutils/Manifest
deleted file mode 100644
index 0e3c24ffad5f..000000000000
--- a/dev-haskell/unixutils/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Unixutils-1.54.1.tar.gz 12177 BLAKE2B d330150c36ac3cdfb3b9eea4a26109cb76a96207c5db40d306479696082fe2017e1ae3892fa06571af96ae5cd4c3204e56860ab204ad9192fc5160d18f663bc3 SHA512 b8395cf6778c18a2f36a45a927d24042fd144ab70c6c092e1be36b22c59bbd1f0151cbe703d9db98dc769eba41ca9eb89cf60e87f5a6bbb32d6b64ef97c45665
-EBUILD unixutils-1.54.1.ebuild 882 BLAKE2B 978511c46ea4a9c15245e5d8af8a22ff0685443cae09b513a5c5a806b7386ec89db80f6126dea32c1794605ed040c7406b9a65d625bc7037edc6147fab32ff39 SHA512 fcc3a6db830648bb6ea84215ddcde4d5a37b14140a5cce394c270af6d6627ad60adc14f61c46764566b5d194816d820da6545160c0d036dded4bc678e2701dd0
-MISC metadata.xml 537 BLAKE2B 9bd4698a44bb3e48a14898703238c81dd41def7f9c9d14c27dead5f79cad407af6356f6e7e472f1266a600b9c303d581e2dd265cd64cde0587aabcdd9b63f96b SHA512 953beaf766eedd3e86783a772d39919d3abbd4ebeb7bfeb0f757f6ebedff74c48bdf67638a29dd0b2f9b7ec485369c497e253e4ebe45a0679840ba930ca9f20f
diff --git a/dev-haskell/unixutils/metadata.xml b/dev-haskell/unixutils/metadata.xml
deleted file mode 100644
index 6d8b18715fc5..000000000000
--- a/dev-haskell/unixutils/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A collection of useful and mildly useful functions that you might
-		expect to find in System.* which a heavy bias towards Unix-type operating systems.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">seereason/haskell-unixutils.git</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/unixutils/unixutils-1.54.1.ebuild b/dev-haskell/unixutils/unixutils-1.54.1.ebuild
deleted file mode 100644
index d2ad84ea1434..000000000000
--- a/dev-haskell/unixutils/unixutils-1.54.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Unixutils"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A crude interface between Haskell and Unix-like operating systems"
-HOMEPAGE="https://github.com/seereason/haskell-unixutils.git"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/exceptions:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/process-extras-0.3:=[profile?]
-	dev-haskell/puremd5:=[profile?]
-	dev-haskell/regex-tdfa:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	virtual/libc
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/unordered-containers-0.2.3.3 b/dev-haskell/unordered-containers-0.2.3.3
new file mode 100644
index 000000000000..e5449091641e
--- /dev/null
+++ b/dev-haskell/unordered-containers-0.2.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.0.1.1:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/chasingbottoms dev-haskell/hunit >=dev-haskell/quickcheck-2.4.0.1 >=dev-haskell/test-framework-0.3.3 dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient hashing-based container types
+EAPI=5
+HOMEPAGE=https://github.com/tibbe/unordered-containers
+IUSE=debug doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.0.1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.2.3.3
+SRC_URI=mirror://hackage/packages/archive/unordered-containers/0.2.3.3/unordered-containers-0.2.3.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ed6e9a052251a8f304e2ffead3566ae8
diff --git a/dev-haskell/unordered-containers-0.2.6.0 b/dev-haskell/unordered-containers-0.2.6.0
new file mode 100644
index 000000000000..b65954bb01ff
--- /dev/null
+++ b/dev-haskell/unordered-containers-0.2.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/chasingbottoms dev-haskell/hunit >=dev-haskell/quickcheck-2.4.0.1 >=dev-haskell/test-framework-0.3.3 dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient hashing-based container types
+EAPI=5
+HOMEPAGE=https://github.com/tibbe/unordered-containers
+IUSE=debug doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.6.0
+SRC_URI=mirror://hackage/packages/archive/unordered-containers/0.2.6.0/unordered-containers-0.2.6.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=baa0f48d659534b6b3aeea7023eb0168
diff --git a/dev-haskell/unordered-containers-0.2.7.0 b/dev-haskell/unordered-containers-0.2.7.0
new file mode 100644
index 000000000000..c8aa483eddd2
--- /dev/null
+++ b/dev-haskell/unordered-containers-0.2.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/chasingbottoms dev-haskell/hunit >=dev-haskell/quickcheck-2.4.0.1 >=dev-haskell/test-framework-0.3.3 dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient hashing-based container types
+EAPI=5
+HOMEPAGE=https://github.com/tibbe/unordered-containers
+IUSE=debug doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.7.0
+SRC_URI=mirror://hackage/packages/archive/unordered-containers/0.2.7.0/unordered-containers-0.2.7.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=831d5ee6a343f4c9b062c47650119a08
diff --git a/dev-haskell/unordered-containers-0.2.7.1 b/dev-haskell/unordered-containers-0.2.7.1
new file mode 100644
index 000000000000..2a392c942ddb
--- /dev/null
+++ b/dev-haskell/unordered-containers-0.2.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/chasingbottoms dev-haskell/hunit >=dev-haskell/quickcheck-2.4.0.1 >=dev-haskell/test-framework-0.3.3 dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient hashing-based container types
+EAPI=6
+HOMEPAGE=https://github.com/tibbe/unordered-containers
+IUSE=debug doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.7.1
+SRC_URI=mirror://hackage/packages/archive/unordered-containers/0.2.7.1/unordered-containers-0.2.7.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=09631442a66224f726beb71d8359aedb
diff --git a/dev-haskell/unordered-containers-0.2.7.2 b/dev-haskell/unordered-containers-0.2.7.2
new file mode 100644
index 000000000000..6174d027bd5f
--- /dev/null
+++ b/dev-haskell/unordered-containers-0.2.7.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/chasingbottoms dev-haskell/hunit >=dev-haskell/quickcheck-2.4.0.1 >=dev-haskell/test-framework-0.3.3 dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient hashing-based container types
+EAPI=6
+HOMEPAGE=https://github.com/tibbe/unordered-containers
+IUSE=debug doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.2.7.2
+SRC_URI=mirror://hackage/packages/archive/unordered-containers/0.2.7.2/unordered-containers-0.2.7.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5ec398cf74348deb4bb6d8ad3f466c3e
diff --git a/dev-haskell/unordered-containers/Manifest b/dev-haskell/unordered-containers/Manifest
deleted file mode 100644
index c1a435640beb..000000000000
--- a/dev-haskell/unordered-containers/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST unordered-containers-0.2.3.3.tar.gz 25782 BLAKE2B e2ec5b8430ae573538b56ddfed956eeaa392e8a03e7bbc680ec2845f036913d9a933297221bf548ee9c3ab4292f72a94d3fc532f9b0883486e941861ce794fbe SHA512 f869ea72abce17cdaa1d97dbd566cf7ff08f4fae3b45b435c36da5ee1250ca4a5cb4dc852e8713948c8f3dd8bf0662e5a95e370cbe7d18756e1ee60493fc84b2
-DIST unordered-containers-0.2.6.0.tar.gz 29415 BLAKE2B 5366373df5758f998753a72d68a94bf640b0ad319769d7a210575dfd48c107dd4c15e72d8633d30998f23fd930821820f24dd1622813e79188f74b8d46f2966d SHA512 9038bfa20f6c24129ea5136bfc236ac16a8fe43b1fd617c33df00393eca4d07e425cb371455b81a7eda27c610d0ffd5a8a6039f59fbfa67418dfedeacc06c1f9
-DIST unordered-containers-0.2.7.0.tar.gz 29818 BLAKE2B c0ec82a2e0a74f56dce70db6a462f18923c785e1d673a4b465369b2022974c36d761fd5e65a89ea8ec03ca7d09ca6aaa781b50a3c8330b39487e1af1dbc8e380 SHA512 adfaf0336e5306ec17b66741f3509f6513e5fd840708176e5d0ca36ebeaa98ba55aa5d2519aa18f46270d26f85f18b9da280de07628b994c0c22670f2d1c3a07
-DIST unordered-containers-0.2.7.1.tar.gz 29507 BLAKE2B a162a978a01ffca486589e69c6ad4e0fc5a7f9d380407ef0d8e1ca7244e9fe67916c9fdb007c365dcb593b08de2f9250cd2f0a03edf34bccc9fd28b8c9fe6ccc SHA512 229493357eda5992c1da28e3a3aaef56291b4a458caf814442d494fa81ffa90aff35da92a167117b9730f8b8e8c01240be426b5ecaf88b71262dc6181011759b
-DIST unordered-containers-0.2.7.2.tar.gz 30847 BLAKE2B d52e2496054adcde7a8adf79759309f12d79a8e1105233f2f2ad466ef22a1dfac6a799ce1a134d0215ee0c5759ec82a43947a3106c7360208349ce81939ead45 SHA512 622eeaf2355a01cc0b8caab2f75fe79bae5b5039b189a5463d519a91e244d4786b91fb319c04cbd8f666e7faeb8a2780c71d37a1b4a4b3da4c42511fba1fc453
-EBUILD unordered-containers-0.2.3.3.ebuild 909 BLAKE2B b3f86ce28efb8f77a5b9ec716a31a01f749bc6821593da7e6c71e871b05f67290fa03348cd3e9286ef888388a069f301864e3c884a42a34d3164e3c600031c49 SHA512 b3061f575f89b762cedef8f285c0dd377a5b6a477edff3b5569ac19168c1d6687a793e149685511c8d70790be2f8eb0dbbe339b4030b6a81489c5ed77ef8d9d0
-EBUILD unordered-containers-0.2.6.0.ebuild 948 BLAKE2B 858281fe7745b7779db2d6654a27e98822025ff4072091eb0137031b2f96518842632a4b82cdc3ed9fcf9c5b2d1b14428567db7cae796523f0581eb68d35ed5f SHA512 e70725c922330a5cddba8d4037aa709238c60ad61e640193604e8de0e4a9024e72941ad832e4669e9dd04bfbcd344d04d9141b2a0950a8661550594d4d46e98d
-EBUILD unordered-containers-0.2.7.0.ebuild 946 BLAKE2B 78d1f79257b479232812f62a891845da371c1d3fe0365cc7b5dd4ef964b4fdde8924d6138e868225f888618572af6dc003428ae29e81d2576baf6ec32894dff3 SHA512 cde60d3175d8c5eeb906942e5a3b51d605d8f34c41bd731e2a90282773cc7f663a7afb68e987454a73ad973b1097484298aa8444f9a291ed80a4df8b23cc7551
-EBUILD unordered-containers-0.2.7.1.ebuild 946 BLAKE2B e6cfbef05d77539becc0820408d828fc9a5a25824fb81b2dcf22a52763e4ba457ceecb448fec8df193c104845670d09b225f7a48f4df1fdf663b93b2f60a387b SHA512 0b8a68bb9acecbf4fa181d66755265f43c8e1a9a7aa3560502f13bf0fe58c9f596ecf417c88d307ddf12870271fbf5f944e22653e83dc700d34f96c3654875ed
-EBUILD unordered-containers-0.2.7.2.ebuild 1053 BLAKE2B b4077a72ca2f094ab5b9440fa04c9ddbd62ad91813fe18e272e5f6f09058bb59757b4673e57fcac392f90e756c763dac85a2de1afbdb7f6656a91b27284f26d5 SHA512 b90141b2b61ec20f09a490d036ce4d41f0ca8a9a62e5c922f5db8f656969145513fdd94d70cc167647b6f91570ba1e8e04f48f3a9527600d4f567f65d08283dc
-MISC metadata.xml 674 BLAKE2B 6ca653344cf995547e0bc05cdfdc151e6873e2ac6f73a969eb65e9c01b15ba94dcdec3f5d3a73195000cd8af7b5bbb18eaab01b2c6439f0c367033e12bb4400d SHA512 55f0804d9c89984a7ba7132c9e58329d82124adf9029e91eee7587ffd3e3fb3be12a18aace8f616411e21b5236892482e7710dc625e7fdf27214a94575333677
diff --git a/dev-haskell/unordered-containers/metadata.xml b/dev-haskell/unordered-containers/metadata.xml
deleted file mode 100644
index e77d777d75f5..000000000000
--- a/dev-haskell/unordered-containers/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Efficient hashing-based container types.  The containers have been
-		optimized for performance critical use, both in terms of large data
-		quantities and high speed.
-		
-		The declared cost of each operation is either worst-case or
-		amortized, but remains valid even if structures are shared.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">tibbe/unordered-containers</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/unordered-containers/unordered-containers-0.2.3.3.ebuild b/dev-haskell/unordered-containers/unordered-containers-0.2.3.3.ebuild
deleted file mode 100644
index 327ac001e407..000000000000
--- a/dev-haskell/unordered-containers/unordered-containers-0.2.3.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient hashing-based container types"
-HOMEPAGE="https://github.com/tibbe/unordered-containers"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND=">=dev-haskell/hashable-1.0.1.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/chasingbottoms
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.4.0.1
-		>=dev-haskell/test-framework-0.3.3
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug)
-}
diff --git a/dev-haskell/unordered-containers/unordered-containers-0.2.6.0.ebuild b/dev-haskell/unordered-containers/unordered-containers-0.2.6.0.ebuild
deleted file mode 100644
index 8464004b1590..000000000000
--- a/dev-haskell/unordered-containers/unordered-containers-0.2.6.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient hashing-based container types"
-HOMEPAGE="https://github.com/tibbe/unordered-containers"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/chasingbottoms
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.4.0.1
-		>=dev-haskell/test-framework-0.3.3
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug)
-}
diff --git a/dev-haskell/unordered-containers/unordered-containers-0.2.7.0.ebuild b/dev-haskell/unordered-containers/unordered-containers-0.2.7.0.ebuild
deleted file mode 100644
index 70e67c27f03e..000000000000
--- a/dev-haskell/unordered-containers/unordered-containers-0.2.7.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient hashing-based container types"
-HOMEPAGE="https://github.com/tibbe/unordered-containers"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND=">=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/chasingbottoms
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.4.0.1
-		>=dev-haskell/test-framework-0.3.3
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug)
-}
diff --git a/dev-haskell/unordered-containers/unordered-containers-0.2.7.1.ebuild b/dev-haskell/unordered-containers/unordered-containers-0.2.7.1.ebuild
deleted file mode 100644
index 1038499c77e4..000000000000
--- a/dev-haskell/unordered-containers/unordered-containers-0.2.7.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient hashing-based container types"
-HOMEPAGE="https://github.com/tibbe/unordered-containers"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/chasingbottoms
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.4.0.1
-		>=dev-haskell/test-framework-0.3.3
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug)
-}
diff --git a/dev-haskell/unordered-containers/unordered-containers-0.2.7.2.ebuild b/dev-haskell/unordered-containers/unordered-containers-0.2.7.2.ebuild
deleted file mode 100644
index 2c8096cc219e..000000000000
--- a/dev-haskell/unordered-containers/unordered-containers-0.2.7.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient hashing-based container types"
-HOMEPAGE="https://github.com/tibbe/unordered-containers"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RESTRICT=test # circular deps: unordered-containers[test]->quickcheck->semigroups->unordered-containers
-
-RDEPEND=">=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/chasingbottoms
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.4.0.1
-		>=dev-haskell/test-framework-0.3.3
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug)
-}
diff --git a/dev-haskell/uri-0.1.6.4 b/dev-haskell/uri-0.1.6.4
new file mode 100644
index 000000000000..b14d85394579
--- /dev/null
+++ b/dev-haskell/uri-0.1.6.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/parsec-3.0:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Library for working with URIs
+EAPI=5
+HOMEPAGE=https://hackage.haskell.org/package/uri
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.6.4
+SRC_URI=mirror://hackage/packages/archive/uri/0.1.6.4/uri-0.1.6.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e7e199d12ff9758a662209bc76ea6415
diff --git a/dev-haskell/uri-bytestring-0.2.2.1 b/dev-haskell/uri-bytestring-0.2.2.1
new file mode 100644
index 000000000000..296354f9d7ba
--- /dev/null
+++ b/dev-haskell/uri-bytestring-0.2.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/blaze-builder-0.3.0.0:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/generics-sop-0.2 dev-haskell/hunit dev-haskell/lens-simple dev-haskell/quickcheck dev-haskell/quickcheck-instances dev-haskell/semigroups dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell URI parsing as ByteStrings
+EAPI=6
+HOMEPAGE=https://github.com/Soostone/uri-bytestring
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/blaze-builder-0.3.0.0:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/0.2.2.1
+SRC_URI=mirror://hackage/packages/archive/uri-bytestring/0.2.2.1/uri-bytestring-0.2.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3aaf71fb2e99aaba7d3c56f1bfa5e375
diff --git a/dev-haskell/uri-bytestring/Manifest b/dev-haskell/uri-bytestring/Manifest
deleted file mode 100644
index c4c23b96a94c..000000000000
--- a/dev-haskell/uri-bytestring/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST uri-bytestring-0.2.2.1.tar.gz 20755 BLAKE2B a91e0de79e3493e342349dfb45d443bbed19265dc78fbd52f9c20e4ff66e2a64433d0dd4f0e3ccee280091ddb843392ae1e8fac15dd5eaa293ac9a80d55eb74a SHA512 d540722657b80039de25a6893067ea8fa50228420725ea22b95a6b7fb3e99803e41b18006b307973fd38fe5ba58d611d3115d1b677e3a36c38168b92289fee97
-EBUILD uri-bytestring-0.2.2.1.ebuild 1091 BLAKE2B 4dc425445d788d22aff0caac070202fd2a56fcc9249c0c0c2a10e941cd02af83ff10b116399d681c2f60a1efde79e011af25fb95da62360de51a77857d2d3e1c SHA512 23875303ea0a540ef864e0f754f29b8f86e7dcc4e0a9ff823c6afa2c2efb980b199c13e0ff976b6132ec704611e964bb6b005ec2be23ed3902478067c1c0175a
-MISC metadata.xml 511 BLAKE2B eb475c8f280a44c0f4b09e34c344ed478a2503d2821711b57d12c40971d4c75081455e1cb4e13350846a4cd2cc0a92bc1b69228f4e8ecfa9d90439fcc10a5d27 SHA512 d21aadfa0df81fe2542de2a92f94fe055c0040e5c963d33bbdab5a8a2da085b64788f4141fad8ddf6c5e0959c275ae650be95298e7a984e7535045503b257a42
diff --git a/dev-haskell/uri-bytestring/metadata.xml b/dev-haskell/uri-bytestring/metadata.xml
deleted file mode 100644
index 16a771dc5920..000000000000
--- a/dev-haskell/uri-bytestring/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		uri-bytestring aims to be an RFC3986 compliant URI parser that uses efficient ByteStrings for parsing and representing the URI data.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">Soostone/uri-bytestring</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/uri-bytestring/uri-bytestring-0.2.2.1.ebuild b/dev-haskell/uri-bytestring/uri-bytestring-0.2.2.1.ebuild
deleted file mode 100644
index 4c8313e17e44..000000000000
--- a/dev-haskell/uri-bytestring/uri-bytestring-0.2.2.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -lib-werror
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell URI parsing as ByteStrings"
-HOMEPAGE="https://github.com/Soostone/uri-bytestring"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/blaze-builder-0.3.0.0:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/generics-sop-0.2
-		dev-haskell/hunit
-		dev-haskell/lens-simple
-		dev-haskell/quickcheck
-		dev-haskell/quickcheck-instances
-		dev-haskell/semigroups
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-lib-werror
-}
diff --git a/dev-haskell/uri/Manifest b/dev-haskell/uri/Manifest
deleted file mode 100644
index fdd048a1f6de..000000000000
--- a/dev-haskell/uri/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST uri-0.1.6.4.tar.gz 5343 BLAKE2B b2c55a9d8313bafad3e2fa74ddb350ebbb548f59b1174d741f6120724994ec1cf164bcbc0c42492b8ff1c844f36b6c9c4fa3bd4d7f82c976574691c5ec9a3634 SHA512 0daa5e03fa7a3b767b4c523bd334017116432898d04c2b3250e1335ac217ed0f9b915785b200f6eb73127d349954b50dae6b5f979a5ba9f39d4d1ae2589c2a07
-EBUILD uri-0.1.6.4.ebuild 645 BLAKE2B 7c2246deafc992ce13129367360bed197541ed50e1bd153bfbce6e8169225540edb008a09d2b3824cab526a21ae03232664abf996e61e32d8da52061734d050a SHA512 aff568b30dbc2bdad1d88c1a519c3a8850f9850250cbb2b7735bd981d44ea43bf0494bfb10f5e0f81fe65fe972740afe13d627873ab4782ea955ecaea2a6bea0
-MISC metadata.xml 369 BLAKE2B 566c37f99fd8bb1aa8f88aebdf29c8efec7f7a958dc19a9fd24e1290a6283e03d70c3ec8944e46216f4a0c38f4a0d54eb8ab3818afbeddd9f3b48a72e5e07abb SHA512 a1c4775d2c342680ee5180063d4dcfe15dd989166a89d70ea8dc1c25fbe17e654bb6545fdaa1f616b067f32a1982ef2cde26afef901bc2cc910e8db88d1001d4
diff --git a/dev-haskell/uri/metadata.xml b/dev-haskell/uri/metadata.xml
deleted file mode 100644
index 943153e6ae5b..000000000000
--- a/dev-haskell/uri/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Library for working with URIs, including parsing, rendering, merging, escaping
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/uri/uri-0.1.6.4.ebuild b/dev-haskell/uri/uri-0.1.6.4.ebuild
deleted file mode 100644
index f523c71f5603..000000000000
--- a/dev-haskell/uri/uri-0.1.6.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Library for working with URIs"
-HOMEPAGE="https://hackage.haskell.org/package/uri"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/url-2.1.3-r1 b/dev-haskell/url-2.1.3-r1
new file mode 100644
index 000000000000..e321b6a8c443
--- /dev/null
+++ b/dev-haskell/url-2.1.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/utf8-string-0.3.4:=[profile?] <dev-haskell/utf8-string-2:=[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 library for working with URLs
+EAPI=5
+HOMEPAGE=http://www.haskell.org/haskellwiki/Url
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/utf8-string-0.3.4:=[profile?] <dev-haskell/utf8-string-2:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/2.1.3
+SRC_URI=mirror://hackage/packages/archive/url/2.1.3/url-2.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5f096e221f4ad3209192ec8dc543a362
diff --git a/dev-haskell/url/Manifest b/dev-haskell/url/Manifest
deleted file mode 100644
index 477b42b4671f..000000000000
--- a/dev-haskell/url/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST url-2.1.3.tar.gz 4180 BLAKE2B 53dd6a8343cc394ea91b94d62d4dfcf0e8b5268c86058c8daf7a1de58e280eabea7fdb04a4b777bd853b5b35848df36aa67af5b1ae50ccc7a9b1149af41c33ce SHA512 53ee2aabc877c91d06c7e029ff807057f88bb4ce712ad02d47655d43869ad83af9032eea85d0ecddf3cad19839827bb723c9bf0a17b580ee7018f4b08c691cd8
-EBUILD url-2.1.3-r1.ebuild 635 BLAKE2B 990063eac01bd6f30dff968a68333cbe1bc553f9d93b45c2ead84143f63d8e326546fc6e48c1b7d16b5e60b4e9ea4d6d9291afa3dd6cfb8b25100f12c7d444e9 SHA512 36dd770efc004fcefcc71f4dc3697d8316de72f41a01facc08e4edd143c02c89eae373b8d871bd7aa98cfeb50222bdca442aebd3d320b69368176d6878f032de
-MISC metadata.xml 323 BLAKE2B c1ac60de2a619441d1069e68da1d76a0422c889b056a5af18d0f9241a16c48ba9f5f0c8a609e5b852638a0d8e549efe52c8922278d63c8d62e69990f6fe6be55 SHA512 9af209c1465b6d57a36a82cae44ba2508f03a2b3474516de3446101edad3e109b54ba448488b8a57d984ced874a89781af02d23004e3420cead6fc614891849d
diff --git a/dev-haskell/url/metadata.xml b/dev-haskell/url/metadata.xml
deleted file mode 100644
index 91744f242f48..000000000000
--- a/dev-haskell/url/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A library for working with URLs.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/url/url-2.1.3-r1.ebuild b/dev-haskell/url/url-2.1.3-r1.ebuild
deleted file mode 100644
index 6410dbd26c79..000000000000
--- a/dev-haskell/url/url-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A library for working with URLs"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Url"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/utf8-string-0.3.4:=[profile?]
-		<dev-haskell/utf8-string-2:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/utf8-light-0.4.2 b/dev-haskell/utf8-light-0.4.2
new file mode 100644
index 000000000000..25fac541f40c
--- /dev/null
+++ b/dev-haskell/utf8-light-0.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Unicode
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/utf8-light
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.4.2
+SRC_URI=mirror://hackage/packages/archive/utf8-light/0.4.2/utf8-light-0.4.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ed6026fe3b1568c4e566580d83872c37
diff --git a/dev-haskell/utf8-light/Manifest b/dev-haskell/utf8-light/Manifest
deleted file mode 100644
index 035b70032644..000000000000
--- a/dev-haskell/utf8-light/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST utf8-light-0.4.2.tar.gz 5821 BLAKE2B 50f9ed9201458c90306200538e583f9a696f99aac394851da430dd69263789dccf9c4b188319bdbfeaec3542eccbbe7f4b336028953d513973b98718a4a22c18 SHA512 83777117a24a4c456134c0591e59ec010cbb938a5ddac8fc68b8204c7999aa2a36ab158b14e5b7bded1ca9cc4596f448b0e7aa5d194081130d7aef623d7c6bc0
-EBUILD utf8-light-0.4.2.ebuild 529 BLAKE2B af362c9705c207c52666a7635f8ef53c4fd4c8abd974e0d2b98c3c228bd7066ca9563908963f6a633896799c74d23c03f60e350944cefe715c1464b56175274f SHA512 08fabf5f27ca5171858e2418ce9111fc80cbaaed7eed25a15f539d7bcd3040f4e1802779b80e80940193f435849d9ab5b2e46583533fb74f7a01e343b20b7582
-MISC metadata.xml 317 BLAKE2B 3786d1e2bfe86a5e9aa876d4e0da0acbd12393357b99bc69fdfd63b5ac495e802fb25778c086ff61cce6b1cb07a925fd0f6e7dc5d3d7a58a4a63bd7c217fcb66 SHA512 fb8865cc90459b5c8c5eb8117b20e378984c521246e4e0cd3c6bc47d43c1f892e19c273937a9875fd420d861f737b5f5133dda1e3236349d46639a7733635c69
diff --git a/dev-haskell/utf8-light/metadata.xml b/dev-haskell/utf8-light/metadata.xml
deleted file mode 100644
index 0971007ab134..000000000000
--- a/dev-haskell/utf8-light/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Lightweight UTF8 handling.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/utf8-light/utf8-light-0.4.2.ebuild b/dev-haskell/utf8-light/utf8-light-0.4.2.ebuild
deleted file mode 100644
index 14be48ce34c0..000000000000
--- a/dev-haskell/utf8-light/utf8-light-0.4.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Unicode"
-HOMEPAGE="http://hackage.haskell.org/package/utf8-light"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/utf8-string-0.3.8 b/dev-haskell/utf8-string-0.3.8
new file mode 100644
index 000000000000..20655aca7015
--- /dev/null
+++ b/dev-haskell/utf8-string-0.3.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b51a3d2ba88861f8040c521f0b8620c0
diff --git a/dev-haskell/utf8-string-1.0.1.1 b/dev-haskell/utf8-string-1.0.1.1
new file mode 100644
index 000000000000..2e38d79dbfb5
--- /dev/null
+++ b/dev-haskell/utf8-string-1.0.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fb60a7cbc4c014396a1c4bf2eb5053c5
diff --git a/dev-haskell/utf8-string/Manifest b/dev-haskell/utf8-string/Manifest
deleted file mode 100644
index 124194df93f5..000000000000
--- a/dev-haskell/utf8-string/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST utf8-string-0.3.8.tar.gz 9129 BLAKE2B 9ee624a9a1258b19134ac63e6b15fbb71a17e03e78be49c464c3c76eeaf2f052c65f8df360900a1e9badb31d7f27059aa33642e6244bd665e62519abe663065a SHA512 70f6ceaf4d9d6e6fe7b787facbb733f276ac5ba10c49c43e0da283b481f0579e0933f6343f5158973a6f0aac342f5b76258281dbd0c420bf652ad3c3787eb1fb
-DIST utf8-string-1.0.1.1.tar.gz 8667 BLAKE2B db2f899e0f78e44700cec859fd71982024e05f971ab5fef36071410c207a23dce1fa7430ce6cdeefdb5b2c28509eb5848946e2207e046ab7a4105c56e25fce16 SHA512 2dd647625478c9738b3af5e23e1e5ff92968449ad74e6d53dc308fa0f2b08b63c421a1cbe5491dd260b9b32770ec626843d320a09b80eb984211dba53934b965
-EBUILD utf8-string-0.3.8.ebuild 691 BLAKE2B bfaab36dc35a91e2411de2bf2776d558bbaa182d931749fc684dcc3c0679d07dfc6189ad5ba67410cd7db1a2e96daeeb08dcded0ff5f8819f0067211eb30632e SHA512 49789d1ad0591842a25882a56e77a8011e146487cf3677226cc9b793ef056758dd84028ce65d8783a5e9dcdeca438f498d4adb99eab3267e6938666ed5398ba6
-EBUILD utf8-string-1.0.1.1.ebuild 704 BLAKE2B 65cd6bcdd233920b1770287469f5a92d2dbb0c39cd03465b39e5388d39ff252c285a47bedc143e1df37ea2167d571e7252ffd593bfae54732350d7ae8e0b1821 SHA512 5a76578650b05a51bd653134d867f79704707e40366167a26f4e0b537104ad3d6f7ebc3f22704511f7bb2e4c4d8fd01927a0ff35c79dbfa278e0d150e3cd51c0
-MISC metadata.xml 309 BLAKE2B 41ec5100a1fe355f798d48894322ecf00bc7802fac10222f95e96674335f9537e23f04c37bddc1e1cdec7728b33c3a6d3781dbaf2be464fc5643b0468e1ec4d8 SHA512 ce8b570dcd924d3409d3dd5c2d27601799b30ba8a166f502d262b66d02c63f5110bbcf92fb5ad5a610a68d4a97cd55a70bf5730d17a2a590a0df83d4e00c2deb
diff --git a/dev-haskell/utf8-string/metadata.xml b/dev-haskell/utf8-string/metadata.xml
deleted file mode 100644
index 91873f17286f..000000000000
--- a/dev-haskell/utf8-string/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">glguy/utf8-string</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild b/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild
deleted file mode 100644
index 127cba44d0c7..000000000000
--- a/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Support for reading and writing UTF8 Strings"
-HOMEPAGE="https://github.com/glguy/utf8-string/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >= 3 && < 4.8' 'base >= 3'
-}
diff --git a/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild b/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
deleted file mode 100644
index 3435d32f2ec0..000000000000
--- a/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Support for reading and writing UTF8 Strings"
-HOMEPAGE="https://github.com/glguy/utf8-string/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >= 4.3 && < 4.9' 'base >= 4.3'
-}
diff --git a/dev-haskell/uuagc-0.9.24 b/dev-haskell/uuagc-0.9.24
new file mode 100644
index 000000000000..b26c9a7035b2
--- /dev/null
+++ b/dev-haskell/uuagc-0.9.24
@@ -0,0 +1,13 @@
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=62b509f71038cd857c8abb0cb8e3010b
diff --git a/dev-haskell/uuagc-0.9.52.1 b/dev-haskell/uuagc-0.9.52.1
new file mode 100644
index 000000000000..bff9203e320f
--- /dev/null
+++ b/dev-haskell/uuagc-0.9.52.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/haskell-src-exts-1.11.1:=[profile?] >=dev-haskell/mtl-1.1.1.1:=[profile?] >=dev-haskell/uuagc-cabal-1.0.2.0:=[profile?] >=dev-haskell/uulib-0.9.14:=[profile?] >=dev-lang/ghc-7.4.1:= with-loag? ( dev-haskell/minisat:=[profile?] ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Attribute Grammar System of Universiteit Utrecht
+EAPI=5
+HOMEPAGE=http://www.cs.uu.nl/wiki/HUT/WebHome
+IUSE=with-loag doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/haskell-src-exts-1.11.1:=[profile?] >=dev-haskell/mtl-1.1.1.1:=[profile?] >=dev-haskell/uuagc-cabal-1.0.2.0:=[profile?] >=dev-haskell/uulib-0.9.14:=[profile?] >=dev-lang/ghc-7.4.1:= with-loag? ( dev-haskell/minisat:=[profile?] )
+SLOT=0/0.9.52.1
+SRC_URI=mirror://hackage/packages/archive/uuagc/0.9.52.1/uuagc-0.9.52.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=02aa1fb1e8d30e04546a6283a385ff5f
diff --git a/dev-haskell/uuagc-cabal-1.0.6.0 b/dev-haskell/uuagc-cabal-1.0.6.0
new file mode 100644
index 000000000000..e8a9fb1f0a5c
--- /dev/null
+++ b/dev-haskell/uuagc-cabal-1.0.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cabal-1.8.0.6:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] >=dev-haskell/uulib-0.9.14:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Cabal plugin for the Universiteit Utrecht Attribute Grammar System
+EAPI=5
+HOMEPAGE=http://www.cs.uu.nl/wiki/HUT/WebHome
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cabal-1.8.0.6:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] >=dev-haskell/uulib-0.9.14:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.6.0
+SRC_URI=mirror://hackage/packages/archive/uuagc-cabal/1.0.6.0/uuagc-cabal-1.0.6.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e35ac8d3c7ea083a8226d88261ee2c2b
diff --git a/dev-haskell/uuagc-cabal/Manifest b/dev-haskell/uuagc-cabal/Manifest
deleted file mode 100644
index e9e60e59352b..000000000000
--- a/dev-haskell/uuagc-cabal/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST uuagc-cabal-1.0.6.0.tar.gz 14781 BLAKE2B 8c68bf07e6e5e579cf59968e887728080c9c4233069bdc253402a8eae5e124d17bf52b3acd0e0a01e64e7d31bb948ff61c210c5afb4a64a3b449c8c302dcea00 SHA512 778edb1c5d209836b38de93ecde8fe9bf37e2b5ececfe5a6d9c92ddac01b1dc1ee865fe861bacb07617a317f2dc1d0a2a967aa9ec2682270e0bf58efb85c27a7
-EBUILD uuagc-cabal-1.0.6.0.ebuild 694 BLAKE2B ad2cee4ef15bb78c10414334b56d4c125ec817ec5d2e86abccc244a3b3e4dcd2525672dd4bf947a69c117c976dd0456c16cefda87486c385cc546598d8363dc6 SHA512 c18445ad2805a63ca09a7cb55e75574962d09998620be62473ab540de2d8a4375911b2828697b561fc39ecbb527a75a6a5342ac9507b1a1f57ac9d85305f6f97
-MISC metadata.xml 313 BLAKE2B e37706cc8dd0cfa164ad3bee76d018a25ddf74c3000a813c88b87d4e8d24532469c22c2bff5122b20519474507e392233143f231bb25adb30155aa75d50f8647 SHA512 5cab25179e93ab008b146006ff3eea87140f98eb65d6938486cb6a6a2ab492db00edd7b2ff4af466dd2fe2f901647f16cc569aabd7cc57811a449a707bf2f5ca
diff --git a/dev-haskell/uuagc-cabal/metadata.xml b/dev-haskell/uuagc-cabal/metadata.xml
deleted file mode 100644
index 2ae6a4652d2a..000000000000
--- a/dev-haskell/uuagc-cabal/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Cabal plugin for UUAGC
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/uuagc-cabal/uuagc-cabal-1.0.6.0.ebuild b/dev-haskell/uuagc-cabal/uuagc-cabal-1.0.6.0.ebuild
deleted file mode 100644
index 48815f301324..000000000000
--- a/dev-haskell/uuagc-cabal/uuagc-cabal-1.0.6.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Cabal plugin for the Universiteit Utrecht Attribute Grammar System"
-HOMEPAGE="http://www.cs.uu.nl/wiki/HUT/WebHome"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cabal-1.8.0.6:=[profile?]
-	>=dev-haskell/mtl-2.0.1.0:=[profile?]
-	>=dev-haskell/uulib-0.9.14:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/uuagc/Manifest b/dev-haskell/uuagc/Manifest
deleted file mode 100644
index 027aecfff888..000000000000
--- a/dev-haskell/uuagc/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX uuagc-0.9.24-ghc-7.8.patch 8165 BLAKE2B bcb064455e27d2de42f64ebe54bbbd5f25fe47befc573a5a2c4a1fb1adc4f1fb74ca94c5e90d22c54414c47a7c22978c619c6db08aaa4277c541993c1c3e6489 SHA512 692d8dc68fae40ade8cf1308d2bc7733ff7e1e9f94988b8f901f45a983d9c506283eb1b839617776bd8e12ff23c8855c9edcaa1afe41288ff16add278ac85a17
-DIST uuagc-0.9.24.tar.gz 253310 BLAKE2B 6272ffe87bc2a661262d3a43344bbe24c50d1e577ae75cba550233c88bafee30876a171b32512315ef7025d1db3193d0b126822338b99c44d26585b01b37f14f SHA512 9fac31311c1e3983c42b013dd934893b2347755c1b49295a0d82093aa53dadc36bad1d6c996a20526099bcef6b71c4e5ad17c37e550aa1b6ad84de79b1186494
-DIST uuagc-0.9.52.1.tar.gz 795294 BLAKE2B 58dddafabd99d4b2a2d1adde26691f419a07c1882619258c2e327066d20d16640c00bfdf124fc5d245a2c39fb719580e0c3ea3c35279fd2ba39c5bcef075d456 SHA512 f5de27bb06a9453f1d9f4105f10b98636c0bebf351f69f122c420efdcff3dc0c25cbc9a69c8a804b8618f2ff1cb216acea8119b333a130a30a840cc00b268c8c
-EBUILD uuagc-0.9.24.ebuild 746 BLAKE2B adf83c30258e720000c9ead3779c0d46cd0e58ae54034c9b712b3f8596688bc84760179f6b9357c38e4a17c6961cdf610b1fb77c528e4b2292b3c8a295ab8fe1 SHA512 d5d5e97b607c302e2f22d0f221e979808feef317605e1cdc451a75993b0a3f4d3108e0277bcf93b39e1f7a171e1cece88a57ede145d6d032a4fd52069bf85f4a
-EBUILD uuagc-0.9.52.1.ebuild 947 BLAKE2B 154f3f4f0e2042443decb604694d772dd8e328910116747ff1eb716b2820639fe2bc2cd546c7710a7d95cca13c6fcedb35272d279ce9945338646aca42046be7 SHA512 3eaace822fdb242ef19f7d717dadf4e25cced792f60cd0935ad30e0f06a4b999baf7a537862f4bf5d4655c3f5d3b49800d507268a6070355707c3aa38409be69
-MISC metadata.xml 492 BLAKE2B db8ee582b4cdfb1cd0edff60db39ee07aa10bd4c420f65db58646d176a61092670cdf12702e4805e8967e9e0347df340b116d2a355903f694e770396e9314c82 SHA512 1b7216608f305a53ecfdd08a0bcd9d63d6d80e5850afc12bb73d11af034db28439bdb39cf11df470c91911622ce532cabdb0d94904a1a494400fd9f14a624fb1
diff --git a/dev-haskell/uuagc/files/uuagc-0.9.24-ghc-7.8.patch b/dev-haskell/uuagc/files/uuagc-0.9.24-ghc-7.8.patch
deleted file mode 100644
index bfe30c62da9f..000000000000
--- a/dev-haskell/uuagc/files/uuagc-0.9.24-ghc-7.8.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src/Ag.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src/Ag.hs
---- uuagc-0.9.24/work/uuagc-0.9.24/src/Ag.hs	2010-06-04 14:03:54.000000000 +0100
-+++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src/Ag.hs	2015-05-05 09:05:06.300665157 +0100
-@@ -1,9 +1,10 @@
- module Main where
- 
--import System                        (getArgs, getProgName, exitFailure)
-+import System.Environment            (getArgs, getProgName)
-+import System.Exit                   (exitFailure)
- import System.Console.GetOpt         (usageInfo)
--import List                          (isSuffixOf)
--import Monad                         (zipWithM_)
-+import Data.List                     (isSuffixOf)
-+import Control.Monad                 (zipWithM_)
- import Data.Maybe
- 
- import qualified Data.Set as Set
-diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src/DepTypes.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src/DepTypes.hs
---- uuagc-0.9.24/work/uuagc-0.9.24/src/DepTypes.hs	2010-06-04 14:03:54.000000000 +0100
-+++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src/DepTypes.hs	2015-05-05 09:07:11.471671524 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE FlexibleInstances #-}
- module DepTypes where
- 
- import CommonTypes
-diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src/HsTokenScanner.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src/HsTokenScanner.hs
---- uuagc-0.9.24/work/uuagc-0.9.24/src/HsTokenScanner.hs	2010-06-04 14:03:54.000000000 +0100
-+++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src/HsTokenScanner.hs	2015-05-05 09:05:06.300665157 +0100
-@@ -2,11 +2,11 @@
- module HsTokenScanner where
- import HsToken
- import UU.Scanner.Position
--import List(sort)
-+import Data.List(sort)
- import UU.Util.BinaryTrees
- import CommonTypes
--import Maybe
--import Char
-+import Data.Maybe
-+import Data.Char
- isAGesc c = c == '@'
- 
- lexTokens :: Pos -> String -> [HsToken]
-diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src/Parser.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src/Parser.hs
---- uuagc-0.9.24/work/uuagc-0.9.24/src/Parser.hs	2010-06-04 14:03:54.000000000 +0100
-+++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src/Parser.hs	2015-05-05 09:05:06.300665157 +0100
-@@ -8,10 +8,10 @@
- import Patterns
- import UU.Pretty(text,PP_Doc,empty,(>-<))
- import TokenDef
--import List (intersperse)
--import Char
-+import Data.List (intersperse)
-+import Data.Char
- import Scanner (Input(..),scanLit,input)
--import List
-+import Data.List
- import Expression
- import UU.Scanner.Token
- import UU.Scanner.TokenParser
-diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src/Scanner.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src/Scanner.hs
---- uuagc-0.9.24/work/uuagc-0.9.24/src/Scanner.hs	2010-06-04 14:03:54.000000000 +0100
-+++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src/Scanner.hs	2015-05-05 09:05:06.301665157 +0100
-@@ -6,9 +6,9 @@
- import UU.Scanner.Position

- import UU.Scanner.Token

- import UU.Parsing(InputState(..),Either'(..))

--import Maybe

--import List

--import Char

-+import Data.Maybe

-+import Data.List

-+import Data.Char

- import UU.Scanner.GenToken

- import Options

- 

-diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src/TokenDef.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src/TokenDef.hs
---- uuagc-0.9.24/work/uuagc-0.9.24/src/TokenDef.hs	2010-06-04 14:03:54.000000000 +0100
-+++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src/TokenDef.hs	2015-05-05 09:05:06.301665157 +0100
-@@ -7,7 +7,7 @@
- import UU.Scanner.GenTokenOrd

- import UU.Scanner.Position

- import UU.Parsing.MachineInterface(Symbol(..))
--import Char(isPrint,ord)
-+import Data.Char(isPrint,ord)
- import HsToken
- import CommonTypes
- 
-diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src-derived/DefaultRules.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/DefaultRules.hs
---- uuagc-0.9.24/work/uuagc-0.9.24/src-derived/DefaultRules.hs	2010-06-04 14:03:54.000000000 +0100
-+++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/DefaultRules.hs	2015-05-05 09:05:06.294665157 +0100
-@@ -4,7 +4,7 @@
- module DefaultRules where
- {-# LINE 10 "DefaultRules.ag" #-}
- 
--import qualified List (delete,intersperse)
-+import qualified Data.List as List (delete,intersperse)
- 
- import qualified Data.Set as Set
- import qualified Data.Map as Map
-@@ -13,7 +13,7 @@
- import Data.Sequence(Seq,(><))
- import UU.Scanner.Position(noPos)
- import Pretty
--import Maybe
-+import Data.Maybe
- import HsToken
- import HsTokenScanner
- import Data.List(intersperse)
-diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src-derived/Desugar.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/Desugar.hs
---- uuagc-0.9.24/work/uuagc-0.9.24/src-derived/Desugar.hs	2010-06-04 14:03:54.000000000 +0100
-+++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/Desugar.hs	2015-05-05 09:05:06.295665157 +0100
-@@ -10,7 +10,7 @@
- import qualified Data.Sequence as Seq
- import Data.Sequence(Seq,(><))
- import UU.Scanner.Position(Pos(..))
--import Maybe
-+import Data.Maybe
- import Data.List(intersperse)
- 
- import AbstractSyntax
-diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src-derived/GenerateCode.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/GenerateCode.hs
---- uuagc-0.9.24/work/uuagc-0.9.24/src-derived/GenerateCode.hs	2010-06-04 14:03:54.000000000 +0100
-+++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/GenerateCode.hs	2015-05-05 09:05:06.296665157 +0100
-@@ -26,7 +26,7 @@
- import HsTokenScanner
- 
- import Data.List(partition,intersperse,intersect,(\\))
--import Maybe(fromJust,isJust)
-+import Data.Maybe(fromJust,isJust)
- {-# LINE 31 "../src-derived/GenerateCode.hs" #-}
- 
- {-# LINE 2 "./CodeSyntax.ag" #-}
-diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src-derived/Order.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/Order.hs
---- uuagc-0.9.24/work/uuagc-0.9.24/src-derived/Order.hs	2010-06-04 14:03:54.000000000 +0100
-+++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/Order.hs	2015-05-05 09:05:06.297665157 +0100
-@@ -37,7 +37,7 @@
- import Data.Array((!),bounds,inRange)
- import Data.List(elemIndex,partition,sort,mapAccumL,find,nubBy,intersperse,groupBy,transpose)
- import qualified Data.Tree as Tree
--import Maybe
-+import Data.Maybe
- {-# LINE 42 "../src-derived/Order.hs" #-}
- 
- {-# LINE 2 "./Patterns.ag" #-}
-diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src-derived/PrintCode.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/PrintCode.hs
---- uuagc-0.9.24/work/uuagc-0.9.24/src-derived/PrintCode.hs	2010-06-04 14:03:54.000000000 +0100
-+++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/PrintCode.hs	2015-05-05 09:05:06.298665157 +0100
-@@ -4,7 +4,7 @@
- module PrintCode where
- {-# LINE 10 "PrintCode.ag" #-}
- 
--import Char (isAlphaNum)
-+import Data.Char (isAlphaNum)
- import Pretty
- import Code
- import Patterns
-diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src-derived/PrintVisitCode.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/PrintVisitCode.hs
---- uuagc-0.9.24/work/uuagc-0.9.24/src-derived/PrintVisitCode.hs	2010-06-04 14:03:54.000000000 +0100
-+++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/PrintVisitCode.hs	2015-05-05 09:05:06.299665157 +0100
-@@ -22,7 +22,7 @@
- import UU.Scanner.Position
- 
- import Data.List(partition,intersperse,intersect,(\\))
--import Maybe(fromJust,isJust)
-+import Data.Maybe(fromJust,isJust)
- {-# LINE 27 "../src-derived/PrintVisitCode.hs" #-}
- 
- {-# LINE 2 "./CodeSyntax.ag" #-}
-diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/src-derived/Transform.hs uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/Transform.hs
---- uuagc-0.9.24/work/uuagc-0.9.24/src-derived/Transform.hs	2010-06-04 14:03:54.000000000 +0100
-+++ uuagc-0.9.24-r0/work/uuagc-0.9.24/src-derived/Transform.hs	2015-05-05 09:05:06.300665157 +0100
-@@ -5,7 +5,7 @@
- {-# LINE 8 "Transform.ag" #-}
- 
- import Control.Monad(mplus,mzero)
--import List (partition, elem, nub,intersperse)
-+import Data.List as List (partition, elem, nub,intersperse)
- import Data.Maybe
- import qualified Data.Map as Map
- import Data.Map (Map)
-diff -uraN -U0 uuagc-0.9.24/work/uuagc-0.9.24/uuagc.cabal uuagc-0.9.24-r0/work/uuagc-0.9.24/uuagc.cabal
---- uuagc-0.9.24/work/uuagc-0.9.24/uuagc.cabal	2010-06-04 14:03:54.000000000 +0100
-+++ uuagc-0.9.24-r0/work/uuagc-0.9.24/uuagc.cabal	2015-05-05 09:05:06.301665157 +0100
-@@ -28,7 +28,7 @@
-   else
-     build-depends: base < 3
- 
--  build-depends: haskell98, uulib>=0.9.12
-+  build-depends: uulib>=0.9.12
-   main-is: Ag.hs
-   other-modules: Ag
-     , CommonTypes
diff --git a/dev-haskell/uuagc/metadata.xml b/dev-haskell/uuagc/metadata.xml
deleted file mode 100644
index dd049f92501f..000000000000
--- a/dev-haskell/uuagc/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="with-loag">Use <pkg>dev-haskell/minisat</pkg> external SAT-solver to schedule all Linear Ordered AGs.</flag>
-	</use>
-	<longdescription>
-		Generates Haskell files from an attribute grammar specification
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/uuagc/uuagc-0.9.24.ebuild b/dev-haskell/uuagc/uuagc-0.9.24.ebuild
deleted file mode 100644
index a4a892de6b0b..000000000000
--- a/dev-haskell/uuagc/uuagc-0.9.24.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-CABAL_FEATURES="bin lib profile haddock"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Attribute Grammar System of Universiteit Utrecht"
-HOMEPAGE="http://www.cs.uu.nl/wiki/HUT/WebHome"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-HASKELLDEPS="dev-haskell/cabal
-		>=dev-haskell/uulib-0.9.12"
-RDEPEND=">=dev-lang/ghc-6.10
-		${HASKELLDEPS}"
-DEPEND=">=dev-haskell/cabal-1.2
-		${RDEPEND}"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-ghc-7.8.patch
-
-	sed \
-		-e 's/{-# LINE/{- # LINE/g' \
-		-i "${S}"/src-derived/*.hs
-}
diff --git a/dev-haskell/uuagc/uuagc-0.9.52.1.ebuild b/dev-haskell/uuagc/uuagc-0.9.52.1.ebuild
deleted file mode 100644
index 7468cdca24dd..000000000000
--- a/dev-haskell/uuagc/uuagc-0.9.52.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.5.5.9999
-#hackport: flags: -bootstrap_external
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Attribute Grammar System of Universiteit Utrecht"
-HOMEPAGE="http://www.cs.uu.nl/wiki/HUT/WebHome"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="with-loag"
-
-RDEPEND=">=dev-haskell/haskell-src-exts-1.11.1:=[profile?]
-	>=dev-haskell/mtl-1.1.1.1:=[profile?]
-	>=dev-haskell/uuagc-cabal-1.0.2.0:=[profile?]
-	>=dev-haskell/uulib-0.9.14:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	with-loag? ( dev-haskell/minisat:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bootstrap_external \
-		$(cabal_flag with-loag with-loag)
-}
diff --git a/dev-haskell/uuid-1.3.11-r2 b/dev-haskell/uuid-1.3.11-r2
new file mode 100644
index 000000000000..b29aa223ae39
--- /dev/null
+++ b/dev-haskell/uuid-1.3.11-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/cryptohash-0.7:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/network-info-0.2:=[profile?] <dev-haskell/network-info-0.3:=[profile?] >=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/uuid-types-1.0.2:=[profile?] <dev-haskell/uuid-types-2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9 >=dev-haskell/tasty-0.10 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=For creating, comparing, parsing and printing Universally Unique Identifiers
+EAPI=5
+HOMEPAGE=https://github.com/aslatter/uuid
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/cryptohash-0.7:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/network-info-0.2:=[profile?] <dev-haskell/network-info-0.3:=[profile?] >=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/uuid-types-1.0.2:=[profile?] <dev-haskell/uuid-types-2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.3.11
+SRC_URI=mirror://hackage/packages/archive/uuid/1.3.11/uuid-1.3.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=accdf704be9c8de7809d132b32b1535e
diff --git a/dev-haskell/uuid-1.3.12 b/dev-haskell/uuid-1.3.12
new file mode 100644
index 000000000000..914b0202a30b
--- /dev/null
+++ b/dev-haskell/uuid-1.3.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.9:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/network-info-0.2:=[profile?] <dev-haskell/network-info-0.3:=[profile?] >=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/uuid-types-1.0.2:=[profile?] <dev-haskell/uuid-types-2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 >=dev-haskell/quickcheck-2.4 >=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.12 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=For creating, comparing, parsing and printing Universally Unique Identifiers
+EAPI=5
+HOMEPAGE=https://github.com/aslatter/uuid
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.9:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/network-info-0.2:=[profile?] <dev-haskell/network-info-0.3:=[profile?] >=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/uuid-types-1.0.2:=[profile?] <dev-haskell/uuid-types-2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.3.12
+SRC_URI=mirror://hackage/packages/archive/uuid/1.3.12/uuid-1.3.12.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=00713ca1f5a1c7d2d3b7d491d0a6ce19
diff --git a/dev-haskell/uuid-types-1.0.3 b/dev-haskell/uuid-types-1.0.3
new file mode 100644
index 000000000000..7549e5ef00fd
--- /dev/null
+++ b/dev-haskell/uuid-types-1.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/hashable-1.1.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 >=dev-haskell/quickcheck-2.4 >=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.12 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Type definitions for Universally Unique Identifiers
+EAPI=5
+HOMEPAGE=https://github.com/aslatter/uuid
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/hashable-1.1.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+SLOT=0/1.0.3
+SRC_URI=mirror://hackage/packages/archive/uuid-types/1.0.3/uuid-types-1.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3bd18c5cad7351b6832a6acc5346404c
diff --git a/dev-haskell/uuid-types/Manifest b/dev-haskell/uuid-types/Manifest
deleted file mode 100644
index d5c64cc6f36c..000000000000
--- a/dev-haskell/uuid-types/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST uuid-types-1.0.3.tar.gz 11999 BLAKE2B 71941bf6abf554e2fa4fb64ae2cc5d61354643c07fe757920c19b60f762a7ffdce87c222d1f1a4a993b50f95e58ac4a011e2ae10c73108a6b71f65ebff209600 SHA512 039bccea9ee22388a50e3e233c95afdd3a59f01aa5f552dcd8e8c1ded8f9da210933c58a4d9cc0913c768b587c24ee27fa0eed15e531846ea841b666f513df9e
-EBUILD uuid-types-1.0.3.ebuild 1233 BLAKE2B 54930a7253fcd8624a11398cec46b16170903ace19a1a5670cd1a35dbd931571e4c31354ff0bc0633057fbb5ee6613369aa5bc59fccc928811bb0a02356b66a1 SHA512 29e510ec72d268fe2ea0c26d8edb7751f552535be43f6bd8d1ed7f4e1218cb74bae1edc31f6b274a70f0f2313311ad68b346f1880b44488909a25bb7b70beb9c
-MISC metadata.xml 547 BLAKE2B d688b78a2d939de354f5691e59416d43eca488e1737cf2ea4dd577a9aa985e38bbfc464f5b3e1d5b586df990204b384897d34b0816c8b23877e43a70acfb81b7 SHA512 00ed619a88824b0a64195d255528cb6e4e2e6578feafdc2b6b2f38d1ff630f0469b2f16a922477cde922c9f7474ce6f16f6bb68e0350c7563e3671ddaaf64917
diff --git a/dev-haskell/uuid-types/metadata.xml b/dev-haskell/uuid-types/metadata.xml
deleted file mode 100644
index 6ed8d01282ae..000000000000
--- a/dev-haskell/uuid-types/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library contains type definitions for Universally Unique Identifiers
-		and basic conversion functions.
-		See &lt;https://en.wikipedia.org/wiki/UUID&gt; for the general idea.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">aslatter/uuid</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/uuid-types/uuid-types-1.0.3.ebuild b/dev-haskell/uuid-types/uuid-types-1.0.3.ebuild
deleted file mode 100644
index cee98c8a80a9..000000000000
--- a/dev-haskell/uuid-types/uuid-types-1.0.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type definitions for Universally Unique Identifiers"
-HOMEPAGE="https://github.com/aslatter/uuid"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	>=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/hashable-1.1.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck >=2.4 && < 2.9' 'QuickCheck >=2.4'
-}
diff --git a/dev-haskell/uuid/Manifest b/dev-haskell/uuid/Manifest
deleted file mode 100644
index 7c097bd4a9e5..000000000000
--- a/dev-haskell/uuid/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST uuid-1.3.11.tar.gz 8578 BLAKE2B ab865736dda4ca4188b9b21b06649fde81d8de1ef4939bf0a5945353d17da691fcd267faded8f64edec7371727a99239f961b25b3402f8fb68b5f0ad89052bae SHA512 3b94c13ff8b6a631f9411a313a99251ee961234d0322e446e22b04110728a4acb687f4bb4b83f9b09268fed9238b1265dc53c5214ae4bb8e18c12455c41c41e5
-DIST uuid-1.3.12.tar.gz 8738 BLAKE2B a6e8fe96d6c20b9294c1535d367ad3ce0a91dfec4c9cd408d5b7e2ec0988326721db3d7a6ea3addded81c12f86692ed898e14612c20fcaf16f0ea6be6f2ef21c SHA512 53d1a9e69dbc3ce2cb2e35aeca9b116e5fbf176fe048d4afaaff1bfaae80445da8e3d53c4652ada41791fb3e237e2cd24d3ac15e6a786242844fdf076588dae9
-EBUILD uuid-1.3.11-r2.ebuild 1426 BLAKE2B 5f66a85c5a55e29b1a56b3ec26892d4e793de6a65bebfa334ea0e324ffbc9e8f0e1a556a04c1c276fa229a9a9fd906c6bea33ef0d63679665422134524974c7c SHA512 b32a34fcdecc7398bc15cf24b2cf5aaa204780f73b3e6cc4b66a26f40d25ed3e897dd55874c2c352dda67ad6fc29f56406a26dadf4cddd66a2f3a36db7c60853
-EBUILD uuid-1.3.12.ebuild 1402 BLAKE2B 8ef15b537d8b5cf13325518f383b49ee0aad3fe9bc5d095eb7facd0769c2603d2f0d24d9a0c037baab3b197b335798ffda07a8bc2155cca0d61e7c9729ab7598 SHA512 1d4eebd9532a0ee3932e8cc4bc2be536d9345e367c38676f5457bc88ae885f59bdc60f40fbb936754093e1d8503f3098145da1c564c611d244e10a648eb4b83f
-MISC metadata.xml 542 BLAKE2B 043a99892b12c9c72f1f89226f5e82edf49ae91fa5f9c4fad7c15d06893266f9ce1bff7acaa06f83e62c3639116e23dbf9c67daba5791673b4c349e79393a370 SHA512 8088a28c040b916c0aa47ca6a1e05dae3b834da258a747c2d4836d8d1b44cb6ac85ebf3c6c88b948e08ff6baff09002c5dda486b1553e5f416f17949e0b571e3
diff --git a/dev-haskell/uuid/metadata.xml b/dev-haskell/uuid/metadata.xml
deleted file mode 100644
index 7c9c76c8d405..000000000000
--- a/dev-haskell/uuid/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library is useful for creating, comparing, parsing and
-		printing Universally Unique Identifiers.
-		See &lt;https://en.wikipedia.org/wiki/UUID&gt; for the general idea.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">aslatter/uuid</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/uuid/uuid-1.3.11-r2.ebuild b/dev-haskell/uuid/uuid-1.3.11-r2.ebuild
deleted file mode 100644
index 0d6d222b39c5..000000000000
--- a/dev-haskell/uuid/uuid-1.3.11-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="For creating, comparing, parsing and printing Universally Unique Identifiers"
-HOMEPAGE="https://github.com/aslatter/uuid"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.8:=[profile?]
-	>=dev-haskell/cryptohash-0.7:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
-	>=dev-haskell/network-info-0.2:=[profile?] <dev-haskell/network-info-0.3:=[profile?]
-	>=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/uuid-types-1.0.2:=[profile?] <dev-haskell/uuid-types-2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/tasty-0.10
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'HUnit >=1.2 && < 1.3' 'HUnit >=1.2' \
-		'tasty == 0.10.*' 'tasty >= 0.10'
-}
diff --git a/dev-haskell/uuid/uuid-1.3.12.ebuild b/dev-haskell/uuid/uuid-1.3.12.ebuild
deleted file mode 100644
index 0d2303555b0d..000000000000
--- a/dev-haskell/uuid/uuid-1.3.12.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="For creating, comparing, parsing and printing Universally Unique Identifiers"
-HOMEPAGE="https://github.com/aslatter/uuid"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	dev-haskell/cryptonite:=[profile?]
-	dev-haskell/memory:=[profile?]
-	>=dev-haskell/network-info-0.2:=[profile?] <dev-haskell/network-info-0.3:=[profile?]
-	>=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/uuid-types-1.0.2:=[profile?] <dev-haskell/uuid-types-2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'QuickCheck >=2.4 && < 2.9' 'QuickCheck >=2.4'
-}
diff --git a/dev-haskell/uulib-0.9.16 b/dev-haskell/uulib-0.9.16
new file mode 100644
index 000000000000..ffa3f21e5e6f
--- /dev/null
+++ b/dev-haskell/uulib-0.9.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell Utrecht Tools Library
+EAPI=5
+HOMEPAGE=http://www.cs.uu.nl/wiki/HUT/WebHome
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ppc ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.9.16
+SRC_URI=mirror://hackage/packages/archive/uulib/0.9.16/uulib-0.9.16.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9644c99f414a65dff1f02be610866882
diff --git a/dev-haskell/uulib-0.9.22 b/dev-haskell/uulib-0.9.22
new file mode 100644
index 000000000000..e7a1812e590f
--- /dev/null
+++ b/dev-haskell/uulib-0.9.22
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell Utrecht Tools Library
+EAPI=5
+HOMEPAGE=https://github.com/UU-ComputerScience/uulib
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.9.22
+SRC_URI=mirror://hackage/packages/archive/uulib/0.9.22/uulib-0.9.22.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=485a54574f0d9abfe53ac6de485d46ea
diff --git a/dev-haskell/uulib/Manifest b/dev-haskell/uulib/Manifest
deleted file mode 100644
index a92c028a5b63..000000000000
--- a/dev-haskell/uulib/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST uulib-0.9.16.tar.gz 44333 BLAKE2B a99c29d41f6ba34d4e62bb134bf7917e93ba7924b2838e43db2070c581af8eb8337f78f6e021b41c380453b7631e57bcc680c533216d96caefbde60c9c35acaf SHA512 89a9a2d34e8cd5e367a479f3d9bd6083abc140c247ba48cce5a39f2ea0835bee67c57b7c6c5850968d2f4b5cbc78b2835e85c8255c041981650d62d40070cc78
-DIST uulib-0.9.22.tar.gz 45487 BLAKE2B d2a597ae5a011b46c80886331a91130400ec01d338cc65829d20a65e64014a5b41704d8eed64fb93fdca474909cf036d61f64670d6961fcdfcb30ba90cae014a SHA512 34803448aa29870ec4776128565b52ac52da4395425ba4fdb6fa38ec45b5af59cb89b2b88e3502e409707491863f88b6d95b13093a15cf04a7c58d24244955f7
-EBUILD uulib-0.9.16.ebuild 549 BLAKE2B 8ec9d07a3f1090f74f3de6105486a23c5ffa31aa01100d6067ff9109e340195dea21e9a1c8927d391dd07aa6f9c77d93d8197af78e03f91986145e90720e3960 SHA512 fd28488166f8c22dd8a9fd11c27ce91ba16071ade629a4f24154ca878c50b98a9b8372c3d840a336020e34129b0648e8efc28fd44943304fab134b3ff54f25be
-EBUILD uulib-0.9.22.ebuild 561 BLAKE2B b51a8c37c9ecf269169e568235599600eca980cb807f01d9d060fa88c6e3cea8c9a6ca74769361e2625ad4fa0ddadc66c5eb61213dce1a722040ebb7e0fbe509 SHA512 72a0d56e276d687651a2fba1a19ea0afe37c8875a8ad5c3e87be2e13fc0106273c9797cae344969693ccd6639f62fefc617b627c78fd920a91a0a3f9bbf64612
-MISC metadata.xml 316 BLAKE2B 429f8ee2f019f1283eb5b06f47cc1f7f8843427b778fba99e4a1a9a195b79ed64434ec5d05a5bba168ac6fdcd4ded5cabe18145d6bb225422fc8d2a2372e7fce SHA512 83f1ff662ca76ca62ed4e626aa1fd65112a0a124cb4188b387f6a32e84c2717e2a721710fb3e1142f646be6190e5214cb99a7a40fdc5ae5aaf9bfc7326c6bd1e
diff --git a/dev-haskell/uulib/metadata.xml b/dev-haskell/uulib/metadata.xml
deleted file mode 100644
index 6d3d94e01d7f..000000000000
--- a/dev-haskell/uulib/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">UU-ComputerScience/uulib</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/uulib/uulib-0.9.16.ebuild b/dev-haskell/uulib/uulib-0.9.16.ebuild
deleted file mode 100644
index d77f56ff8371..000000000000
--- a/dev-haskell/uulib/uulib-0.9.16.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell Utrecht Tools Library"
-HOMEPAGE="http://www.cs.uu.nl/wiki/HUT/WebHome"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/uulib/uulib-0.9.22.ebuild b/dev-haskell/uulib/uulib-0.9.22.ebuild
deleted file mode 100644
index dfdef8ca4c30..000000000000
--- a/dev-haskell/uulib/uulib-0.9.22.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell Utrecht Tools Library"
-HOMEPAGE="https://github.com/UU-ComputerScience/uulib"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/vault-0.3.0.3 b/dev-haskell/vault-0.3.0.3
new file mode 100644
index 000000000000..51c64d63366f
--- /dev/null
+++ b/dev-haskell/vault-0.3.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=a persistent store for values of arbitrary types
+EAPI=5
+HOMEPAGE=https://github.com/HeinrichApfelmus/vault
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.0.3
+SRC_URI=mirror://hackage/packages/archive/vault/0.3.0.3/vault-0.3.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fab2c7a77139d516557d2317f7a8097f
diff --git a/dev-haskell/vault-0.3.0.5 b/dev-haskell/vault-0.3.0.5
new file mode 100644
index 000000000000..6ea2bafb9bde
--- /dev/null
+++ b/dev-haskell/vault-0.3.0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=a persistent store for values of arbitrary types
+EAPI=5
+HOMEPAGE=https://github.com/HeinrichApfelmus/vault
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.0.5
+SRC_URI=mirror://hackage/packages/archive/vault/0.3.0.5/vault-0.3.0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a74a1fa41442f4d9a756ca5da9376b64
diff --git a/dev-haskell/vault-0.3.0.6 b/dev-haskell/vault-0.3.0.6
new file mode 100644
index 000000000000..73c8466ab4cc
--- /dev/null
+++ b/dev-haskell/vault-0.3.0.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=a persistent store for values of arbitrary types
+EAPI=5
+HOMEPAGE=https://github.com/HeinrichApfelmus/vault
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.0.6
+SRC_URI=mirror://hackage/packages/archive/vault/0.3.0.6/vault-0.3.0.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=627a19b3a190e773dc8d0038d2ab1522
diff --git a/dev-haskell/vault/Manifest b/dev-haskell/vault/Manifest
deleted file mode 100644
index 58bed2c253d1..000000000000
--- a/dev-haskell/vault/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST vault-0.3.0.3.tar.gz 4906 BLAKE2B 75f24dee6bfe17755304b36becb6584120c23ed2a09efb81ef332b7bb81797f2afdfd1ff9ae1029e3cf7ebae36571ce8a2bba5a076e13722f622cfbcfbc158e6 SHA512 142bd654c5ea0cdda17429d130bf44901cfb197068db2aa671f564bd2ff1ce61f517d4fa598990bd3c3ce33181f784b5e4524190895d0efe8f4b57d163096fb5
-DIST vault-0.3.0.5.tar.gz 5142 BLAKE2B ced3a0bef6347d1177d807c1b2e403775a345b058ae6ae50f8fe35619181049cc1c9e1aa0087daabc1d45f3c536ddc9936c1168ef53311d5432bb02523315a3b SHA512 be66e8f3028cdf14ac89dbff64e326a11db23dfece1e3f39d2e70eb1e391bebbe7b569969c7c48a1fabae94ac2ee9623f6b3dbb75139f34dd28f2f2ef8eb69c1
-DIST vault-0.3.0.6.tar.gz 5142 BLAKE2B 1e93e900c7d90a2a14616b3c8b06efe50ddc2ea0b0123af274c25e208b91f2b5855aa49c0510ecc22fd5fafa88d9f122b56494466d188965a240d2f8bcbf7a91 SHA512 5e8842900378a371352c1c5a23ea19920e66a18710c6a52fe809b80e679363cbb44e5254351ee435404ec2064390b3746d97ad07779eee70f0bff5e41cec12b9
-EBUILD vault-0.3.0.3.ebuild 821 BLAKE2B 9c3a95af4e30040f4f1be678759cc36ce6fc607b3461bedb7bfe714bcf39c63ba9a81986e55fef7a914c227dcf7b69660557c32d7a7aab24aff896ec65a9b2c7 SHA512 68e2d5a42b7f2b64aea8b2b1ec55426b30f79259097e9127c25383a2d77606a9b61e9a8acffa83680acc1be22a095748cdb94c9e64bd6a786794ee6b1cc4e730
-EBUILD vault-0.3.0.5.ebuild 843 BLAKE2B 0318f110ba6b65bc1ace0d9ba1b7a5394727ce582a43cbb6cdf4aca3b676bbddf04d2a79f7aae96421e6e053ca7b88c08c9e1597111e130de43e45015f1b7ae9 SHA512 50e3327e5fada2e15172197846cdaa8d97d7b9fd6184be8de20b0534c06475cb2fcb5ed84f0218e57632ecb414b30f16c749b0108e90b596b434352d97e18e60
-EBUILD vault-0.3.0.6.ebuild 843 BLAKE2B 769c434e49971a5df5c7b689e346538b7243f8d54f6c9e4aa3769afb0061a638cc302558807d254d25555808694c4be0f880b3fdda6c60a0eb3150e861dc6732 SHA512 8cabe62a8eddd51f33a8fba397cb105bf4b9bf515f11ec7f9a106caa02668ad9f5fcdfbcfb2f35c946d0b05091858197a2d8a529790900004a4d1e30753f660a
-MISC metadata.xml 658 BLAKE2B 9dd8c71a6edeb66e554b41232200643af326c4d89c8ce87f187462b46abdb52a2275c4f19b9679fb6ee0e038dc7589f02b19636f19df42f6d3a8242796e62d27 SHA512 e76c19492190a13feb99f15f8cfb283ed55525dbdfe786bd33fe9e123b1fb344d45d8751da292d10dbdc906b8348b6840810aac2c871c9c39f5b4fc3823dc169
diff --git a/dev-haskell/vault/metadata.xml b/dev-haskell/vault/metadata.xml
deleted file mode 100644
index 437acd12b91d..000000000000
--- a/dev-haskell/vault/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A /vault/ is a typed, persistent store for values of arbitrary types.
-		It's like having first-class access to the storage space behind IORefs.
-		
-		The data structure is analogous to a bank vault,
-		where you can access different bank boxes with different keys;
-		hence the name.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">HeinrichApfelmus/vault</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/vault/vault-0.3.0.3.ebuild b/dev-haskell/vault/vault-0.3.0.3.ebuild
deleted file mode 100644
index 56f58aa46648..000000000000
--- a/dev-haskell/vault/vault-0.3.0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="a persistent store for values of arbitrary types"
-HOMEPAGE="https://github.com/HeinrichApfelmus/vault"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >= 4.5 && < 4.8' 'base >= 4.5'
-}
diff --git a/dev-haskell/vault/vault-0.3.0.5.ebuild b/dev-haskell/vault/vault-0.3.0.5.ebuild
deleted file mode 100644
index b296aa5fb1c6..000000000000
--- a/dev-haskell/vault/vault-0.3.0.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +useghc
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="a persistent store for values of arbitrary types"
-HOMEPAGE="https://github.com/HeinrichApfelmus/vault"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=useghc
-}
diff --git a/dev-haskell/vault/vault-0.3.0.6.ebuild b/dev-haskell/vault/vault-0.3.0.6.ebuild
deleted file mode 100644
index e143cee0f47d..000000000000
--- a/dev-haskell/vault/vault-0.3.0.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: +useghc
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="a persistent store for values of arbitrary types"
-HOMEPAGE="https://github.com/HeinrichApfelmus/vault"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=useghc
-}
diff --git a/dev-haskell/vector-0.10.12.3 b/dev-haskell/vector-0.10.12.3
new file mode 100644
index 000000000000..bb4fba050a17
--- /dev/null
+++ b/dev-haskell/vector-0.10.12.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9 dev-haskell/random dev-haskell/test-framework dev-haskell/test-framework-quickcheck2 >=dev-haskell/transformers-0.2.0.0 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dc254aa1aeed151901ded1fd967eedd6
diff --git a/dev-haskell/vector-0.11.0.0 b/dev-haskell/vector-0.11.0.0
new file mode 100644
index 000000000000..6c44b876a5f1
--- /dev/null
+++ b/dev-haskell/vector-0.11.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.7 dev-haskell/random dev-haskell/test-framework dev-haskell/test-framework-quickcheck2 >=dev-haskell/transformers-0.2.0.0 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient Arrays
+EAPI=6
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e76573434faff363cdc94aca34d01861
diff --git a/dev-haskell/vector-algorithms-0.5.4.2 b/dev-haskell/vector-algorithms-0.5.4.2
new file mode 100644
index 000000000000..9ad044e9aaeb
--- /dev/null
+++ b/dev-haskell/vector-algorithms-0.5.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-haskell/primitive-0.3[profile?] <dev-haskell/primitive-0.6[profile?] >=dev-haskell/vector-0.6[profile?] <dev-haskell/vector-0.11[profile?] >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.2.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient algorithms for vector arrays
+EAPI=4
+HOMEPAGE=http://code.haskell.org/~dolio/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/primitive-0.3[profile?] <dev-haskell/primitive-0.6[profile?] >=dev-haskell/vector-0.6[profile?] <dev-haskell/vector-0.11[profile?] >=dev-lang/ghc-6.8.2
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/vector-algorithms/0.5.4.2/vector-algorithms-0.5.4.2.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e719202a6df2b9adfb8a12234312120e
diff --git a/dev-haskell/vector-algorithms-0.6.0.4 b/dev-haskell/vector-algorithms-0.6.0.4
new file mode 100644
index 000000000000..befefa937063
--- /dev/null
+++ b/dev-haskell/vector-algorithms-0.6.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/mwc-random:=[profile?] >=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.7:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 test? ( properties? ( >=dev-haskell/quickcheck-2 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient algorithms for vector arrays
+EAPI=5
+HOMEPAGE=http://code.haskell.org/~dolio/
+IUSE=bench +boundschecks internalchecks +properties unsafechecks doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/mwc-random:=[profile?] >=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.7:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.6.0.4
+SRC_URI=mirror://hackage/packages/archive/vector-algorithms/0.6.0.4/vector-algorithms-0.6.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=09d5001c1bb559a1764f3b49f2ab0c5e
diff --git a/dev-haskell/vector-algorithms-0.7.0.1 b/dev-haskell/vector-algorithms-0.7.0.1
new file mode 100644
index 000000000000..d46cb3526d40
--- /dev/null
+++ b/dev-haskell/vector-algorithms-0.7.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/mwc-random:=[profile?] >=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.7:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 test? ( properties? ( >=dev-haskell/quickcheck-2 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient algorithms for vector arrays
+EAPI=6
+HOMEPAGE=http://code.haskell.org/~dolio/
+IUSE=bench +boundschecks internalchecks +properties unsafechecks doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/mwc-random:=[profile?] >=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.7:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.0.1
+SRC_URI=mirror://hackage/packages/archive/vector-algorithms/0.7.0.1/vector-algorithms-0.7.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8d19fe1e937529db74e633723192d951
diff --git a/dev-haskell/vector-algorithms/Manifest b/dev-haskell/vector-algorithms/Manifest
deleted file mode 100644
index 04d0d34be775..000000000000
--- a/dev-haskell/vector-algorithms/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX vector-algorithms-0.5.4.1-ghc-7.4.patch 572 BLAKE2B a15668a5a6d0bc85e2a9b864cd81cc3b55949f9eb949001fc7fa92a9d724f900847febe95e42056d16778a9c6186024b713a0c0faceaac1d99a44a3cc97ffa7b SHA512 51b42eadba9515a9e0bfae85b1b24c0567f54a8d526380e30566abc50ebc0d8063cdf23321986524abf7a3f72a874582848ffe69d80a15eade6d60045612481f
-AUX vector-algorithms-0.7.0.1-ghc-8.0.2_rc1.patch 2344 BLAKE2B 8902fb6e1946589e79577408d6a4c34b7512f3dea6bad7ab73a95498ca41e758d8115d7c005ad83ef14a845df792009bb9190f8b584086c9dc63898f481a5940 SHA512 f92d82039f56c9ae5cba5c93e0df041877dba1a3f5be7a8be1efd9f5a652ff2c1a06c7091faab76247876b9018614688d404aa6542b59ccedc3b199bad3dcf2c
-DIST vector-algorithms-0.5.4.2.tar.gz 22938 BLAKE2B f2af4c6ef45d6af25e750ef497c15b4d80767aadc37c3ef05a6d893515b340297777064f9c8ef406ff7881b0c72c39c01727e2ee50b39ecbfab5daebd3ebb7a5 SHA512 10f376697e39561eeb4f9148db5ba71fcc3eecb8d9bdc796d8edb4b39a0567592b7740c40ea3ba402d594b3e0b46c365d26776f8ea0cc675fd79ab3c6ecb17fe
-DIST vector-algorithms-0.6.0.4.tar.gz 20455 BLAKE2B 0d0c4ef7ed8996d1ebe65971a451d4cb49118faedbf9cb4a987afb281adf563808778a689df608d2fb3c8fe9398af995d1c5e31cc89fd4f2075c2ebdd7ca4277 SHA512 5e99a77771831f0b9a4485f48aa7be5f5928e811512f0a68e18fa65ecace185dfea74ec09037b05d56e1a9208d2cdbcfed94ce2678d504f6d12267496a3616bf
-DIST vector-algorithms-0.7.0.1.tar.gz 25435 BLAKE2B f9cb3bf592316c92bff4313d264370cc35d62c64e7dec6f14ee9954c0fc12f573e799172793501e1b4f9c556fa1ea8e3db1ac3381ff71bb143e33520c69c18b8 SHA512 1ea718eeb062defee830fa7dba323981678691c5d320b8929dcd695af17f82d65007cfd35103310026dab51cf10462dbead09082fc0ba5ddd0c2e18e305c4c6a
-EBUILD vector-algorithms-0.5.4.2.ebuild 746 BLAKE2B b5236d575dd91c9dd92c917a2b56c5ac59900e8a97c322e41f791644aa12cea52f9d6fb48bf7e7717e58ab54ded322822bdd7dc2ed08ff2451582f3aaf84d81a SHA512 ab5da6bfc564100184de7368051efef42776f112df906cd9346dab1168e1d87335cbf69a2e289c28c662e425a584b4b64b274f8117dca374ef530da3592f32e3
-EBUILD vector-algorithms-0.6.0.4.ebuild 1170 BLAKE2B bcb30ced4652e5f3ef1eea77cb99bb02a0c94841f1c494849fe1615e0a067c927d21f8db4764d503007644361da721f8023593aeaeb40e65f0a313c46de820c0 SHA512 35e418b1ec4d05e99395aadf2d52e858d3c2bfa41e68e9ba9e79851b7ccf5a6e9d3dcf6e1558fa2fbddc0893aba36ebb2baac15924518e06499f8cf7e4185c83
-EBUILD vector-algorithms-0.7.0.1.ebuild 1197 BLAKE2B 92022eb10e507f3a2c4ecfbda0c47da9f14bb365b825941a340e15ea8cf30bdb216b17048ddf17334942de7dc67d2a7fb84c3777920f35b3ec94e1671e2e1dea SHA512 8973c52e6709587e097ccbb92e568a08936b7fd61b93e4e03f5cb4ad21e8c690d0b024ae0f7ac9877b1e4bdd91b7b671f212bcf0c442048f867b77b032c0c08f
-MISC metadata.xml 770 BLAKE2B 1d7320d9f761a8668d4cdb7868edc4eb543841ca23849fc16ee451a7c1ada0b531ca7f05129a144c67319b67b2948caf31b10d45f04775e0abf13de70ee5d334 SHA512 081492732eda3a8884417445a79cec19f7f84cdfe3c3e84743f86d00a5051c7e936d3c286ba414c13a6813d7cf1d740408c44a597aa82e3489d012c75c9eeef8
diff --git a/dev-haskell/vector-algorithms/files/vector-algorithms-0.5.4.1-ghc-7.4.patch b/dev-haskell/vector-algorithms/files/vector-algorithms-0.5.4.1-ghc-7.4.patch
deleted file mode 100644
index edabcf2e8b54..000000000000
--- a/dev-haskell/vector-algorithms/files/vector-algorithms-0.5.4.1-ghc-7.4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- vector-algorithms-0.5.4.1-orig/vector-algorithms.cabal	2012-08-16 06:39:54.000000000 +1000
-+++ vector-algorithms-0.5.4.1/vector-algorithms.cabal	2012-08-17 17:05:37.875993915 +1000
-@@ -52,9 +52,15 @@
-         FlexibleContexts,
-         CPP
- 
--    GHC-Options:
--        -Odph
--        -funbox-strict-fields
-+    if impl(ghc >= 7.4.0)
-+        GHC-Options:
-+            -Odph
-+            -funbox-strict-fields
-+            -fsimpl-tick-factor=153
-+    else
-+        GHC-Options:
-+           -Odph
-+           -funbox-strict-fields
- 
-     Include-Dirs:
-         include
diff --git a/dev-haskell/vector-algorithms/files/vector-algorithms-0.7.0.1-ghc-8.0.2_rc1.patch b/dev-haskell/vector-algorithms/files/vector-algorithms-0.7.0.1-ghc-8.0.2_rc1.patch
deleted file mode 100644
index 3616dd76d82c..000000000000
--- a/dev-haskell/vector-algorithms/files/vector-algorithms-0.7.0.1-ghc-8.0.2_rc1.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/tests/properties/Tests.hs b/tests/properties/Tests.hs
-index a0b7d35..8fcfd36 100644
---- a/tests/properties/Tests.hs
-+++ b/tests/properties/Tests.hs
-@@ -1,2 +1,2 @@
--{-# LANGUAGE ImpredicativeTypes, RankNTypes, TypeOperators, FlexibleContexts #-}
-+{-# LANGUAGE ImpredicativeTypes, RankNTypes, TypeOperators, FlexibleContexts, ScopedTypeVariables #-}
- 
-@@ -44,4 +44,4 @@ args = stdArgs
- 
--check_Int_sort = forM_ algos $ \(name,algo) ->
--  quickCheckWith args (label name . prop_fullsort algo)
-+check_Int_sort = forM_ algos (\(name,algo :: Algo Int ()) ->
-+  quickCheckWith args (label name . prop_fullsort algo))
-  where
-@@ -55,4 +55,4 @@ check_Int_sort = forM_ algos $ \(name,algo) ->
- 
--check_Int_partialsort = forM_ algos $ \(name,algo) ->
--  quickCheckWith args (label name . prop_partialsort algo)
-+check_Int_partialsort = forM_ algos (\(name,algo :: SizeAlgo Int ()) ->
-+  quickCheckWith args (label name . prop_partialsort algo))
-  where
-@@ -63,4 +63,4 @@ check_Int_partialsort = forM_ algos $ \(name,algo) ->
- 
--check_Int_select = forM_ algos $ \(name,algo) ->
--  quickCheckWith args (label name . prop_select algo)
-+check_Int_select = forM_ algos (\(name,algo :: SizeAlgo Int ()) ->
-+  quickCheckWith args (label name . prop_select algo))
-  where
-@@ -119,10 +119,10 @@ check_permutation = do
-   qc $ label "introsort"    . prop_permutation (INT.sort :: Algo Int ())
--  qc $ label "intropartial" . prop_sized (const . prop_permutation)
-+  qc $ label "intropartial" . prop_sized (\x -> const (prop_permutation x))
-                                          (INT.partialSort :: SizeAlgo Int ())
--  qc $ label "introselect"  . prop_sized (const . prop_permutation)
-+  qc $ label "introselect"  . prop_sized (\x -> const (prop_permutation x))
-                                          (INT.select :: SizeAlgo Int ())
-   qc $ label "heapsort"     . prop_permutation (H.sort :: Algo Int ())
--  qc $ label "heappartial"  . prop_sized (const . prop_permutation)
-+  qc $ label "heappartial"  . prop_sized (\x -> const (prop_permutation x))
-                                          (H.partialSort :: SizeAlgo Int ())
--  qc $ label "heapselect"   . prop_sized (const . prop_permutation)
-+  qc $ label "heapselect"   . prop_sized (\x -> const (prop_permutation x))
-                                          (H.select :: SizeAlgo Int ())
diff --git a/dev-haskell/vector-algorithms/metadata.xml b/dev-haskell/vector-algorithms/metadata.xml
deleted file mode 100644
index 4a0d9fc89df7..000000000000
--- a/dev-haskell/vector-algorithms/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="bench">Build a benchmarking program.</flag>
-		<flag name="boundschecks">Enable bounds checking.</flag>
-		<flag name="internalchecks">Enable internal consistency checks at the cost of a significant performance penalty.</flag>
-		<flag name="properties">Enable quickcheck tests.</flag>
-		<flag name="unsafechecks">Enable bounds checking in unsafe operations at the cost of a significant performance penalty.</flag>
-	</use>
-	<longdescription>
-		Efficient algorithms for vector arrays
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/vector-algorithms/vector-algorithms-0.5.4.2.ebuild b/dev-haskell/vector-algorithms/vector-algorithms-0.5.4.2.ebuild
deleted file mode 100644
index 4c05e7e221ee..000000000000
--- a/dev-haskell/vector-algorithms/vector-algorithms-0.5.4.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="Efficient algorithms for vector arrays"
-HOMEPAGE="http://code.haskell.org/~dolio/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/primitive-0.3[profile?]
-		<dev-haskell/primitive-0.6[profile?]
-		>=dev-haskell/vector-0.6[profile?]
-		<dev-haskell/vector-0.11[profile?]
-		>=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2.3"
-
-PATCHES=("${FILESDIR}/${PN}-0.5.4.1-ghc-7.4.patch")
diff --git a/dev-haskell/vector-algorithms/vector-algorithms-0.6.0.4.ebuild b/dev-haskell/vector-algorithms/vector-algorithms-0.6.0.4.ebuild
deleted file mode 100644
index 71ad325f4b94..000000000000
--- a/dev-haskell/vector-algorithms/vector-algorithms-0.6.0.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient algorithms for vector arrays"
-HOMEPAGE="http://code.haskell.org/~dolio/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bench +boundschecks internalchecks +properties unsafechecks"
-
-RESTRICT=test # hangs
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/mwc-random:=[profile?]
-	>=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
-	>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( properties? ( >=dev-haskell/quickcheck-2 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bench bench) \
-		$(cabal_flag boundschecks boundschecks) \
-		$(cabal_flag internalchecks internalchecks) \
-		$(cabal_flag properties properties) \
-		$(cabal_flag unsafechecks unsafechecks)
-}
diff --git a/dev-haskell/vector-algorithms/vector-algorithms-0.7.0.1.ebuild b/dev-haskell/vector-algorithms/vector-algorithms-0.7.0.1.ebuild
deleted file mode 100644
index 131da53ff676..000000000000
--- a/dev-haskell/vector-algorithms/vector-algorithms-0.7.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient algorithms for vector arrays"
-HOMEPAGE="http://code.haskell.org/~dolio/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bench +boundschecks internalchecks +properties unsafechecks"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/mwc-random:=[profile?]
-	>=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
-	>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( properties? ( >=dev-haskell/quickcheck-2 ) )
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-8.0.2_rc1.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bench bench) \
-		$(cabal_flag boundschecks boundschecks) \
-		$(cabal_flag internalchecks internalchecks) \
-		$(cabal_flag properties properties) \
-		$(cabal_flag unsafechecks unsafechecks)
-}
diff --git a/dev-haskell/vector-binary-instances-0.2.1.0 b/dev-haskell/vector-binary-instances-0.2.1.0
new file mode 100644
index 000000000000..af3928ecd175
--- /dev/null
+++ b/dev-haskell/vector-binary-instances-0.2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/binary:=[profile?] dev-haskell/cereal:=[profile?] >=dev-haskell/vector-0.6:=[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=Instances of Data.Binary and Data.Serialize for vector
+EAPI=5
+HOMEPAGE=https://github.com/bos/vector-binary-instances
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/binary:=[profile?] dev-haskell/cereal:=[profile?] >=dev-haskell/vector-0.6:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.2.1.0
+SRC_URI=mirror://hackage/packages/archive/vector-binary-instances/0.2.1.0/vector-binary-instances-0.2.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1802c34260a3f1346282901442077ce0
diff --git a/dev-haskell/vector-binary-instances-0.2.3.2 b/dev-haskell/vector-binary-instances-0.2.3.2
new file mode 100644
index 000000000000..82519b2778d1
--- /dev/null
+++ b/dev-haskell/vector-binary-instances-0.2.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/binary-0.7:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/tasty dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Instances of Data.Binary and Data.Serialize for vector
+EAPI=6
+HOMEPAGE=https://github.com/bos/vector-binary-instances
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/binary-0.7:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.3.2
+SRC_URI=mirror://hackage/packages/archive/vector-binary-instances/0.2.3.2/vector-binary-instances-0.2.3.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7424c65370c718c569eef842e0321759
diff --git a/dev-haskell/vector-binary-instances/Manifest b/dev-haskell/vector-binary-instances/Manifest
deleted file mode 100644
index 542809e235d2..000000000000
--- a/dev-haskell/vector-binary-instances/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST vector-binary-instances-0.2.1.0.tar.gz 3114 BLAKE2B 24982160160805717302f602ca7e7aa97487ea1af51ebab7577eb5a744c38dbeefc56fbe46538a492095e16db13df7aaa9978dd8d2ed2c0c082bebce6f584a34 SHA512 37955552fc7ea24f35760f8e791d115329591ac720f66bc94db172cf609c67b51d8f075cdcda96e3fcbf9f4fd566557ebdeb306d86e7512e8acf526d691b4ff7
-DIST vector-binary-instances-0.2.3.2.tar.gz 3989 BLAKE2B 69d25cdce13e999551ca0027171d252a5b2cf8868ef8f2415b1dfaa6df5f955bfdf257837ac67fb73a82526374b6d562afbf6705e6431659e234df186a16c0ba SHA512 ef3ef6a11dc5b35c2b24eb8b6487e6ad3ba73267107e8e8b4b172afbdd10d1d283d653025cfbd9089d4c2135d881e2b7efb5427a8dabcbef51de4ecadb332d62
-EBUILD vector-binary-instances-0.2.1.0.ebuild 677 BLAKE2B d0fedb8efd973a4ce5893271537577a33a97d2b17b52ef87423a764987d291e8e903b64f79f0b876c0868e3e791e6f80eb80b9c4c2fe06ca3e9cbe1c288dfe6d SHA512 2bfab9856778e63fe4d911cb09efb3d9cac5111defda91b24b8e34b4d9ad24d6e920d8cad4dd4ec3a016bfdd373d0f4fe5b775c1747d1476d877173a000d66a1
-EBUILD vector-binary-instances-0.2.3.2.ebuild 792 BLAKE2B 2f71d17b499d593f0908b7f782ef661fa0e94bd47bedc90aa43509e2d65d289c0c6f77a5e756126add678e771a0eaba3c4c86c390d93162fed7cc14888e33611 SHA512 1b71e596d173b2fb964314cd3a888bfe37c4bae78d6dcf6795e149b46a54b39e061b911f3288c7fa6824173ef7f7599576f8b2698e627267c115f6c23bcb4d6d
-MISC metadata.xml 1131 BLAKE2B 090c06d05a9f6f40d2cc444a964c0ae348e61bebeebf89646149f1d3561a1a3ebec42208fa8a7c49b8ca07ee20ecfa71d8516ecbc44e4f100adcd888e1ae787f SHA512 def290c09bd6f4055d0db8bb1778518cab35c08cd7b24e67bee00de4b9e0d1d096608cc486c98423c322c23712629cd093b5692e98c7b958b75fa6fe50a03bb9
diff --git a/dev-haskell/vector-binary-instances/metadata.xml b/dev-haskell/vector-binary-instances/metadata.xml
deleted file mode 100644
index db582d2c5586..000000000000
--- a/dev-haskell/vector-binary-instances/metadata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Instances for Binary for the types defined in the vector package,
-		making it easy to serialize vectors to and from disk. We use the
-		generic interface to vectors, so all vector types are supported.
-		Specific instances are provided for unboxed, boxed and storable
-		vectors.
-		
-		To serialize a vector:
-		
-		&gt; *Data.Vector.Binary&gt; let v = Data.Vector.fromList [1..10]
-		&gt; *Data.Vector.Binary&gt; v
-		&gt; fromList [1,2,3,4,5,6,7,8,9,10] :: Data.Vector.Vector
-		&gt; *Data.Vector.Binary&gt; encode v
-		&gt; Chunk "\NUL\NUL\NUL\NUL\NUL...\NUL\NUL\NUL\t\NUL\NUL\NUL\NUL\n" Empty
-		
-		Which you can in turn compress before writing to disk:
-		
-		&gt; compress . encode $ v
-		&gt; Chunk "\US\139\b\NUL\NUL\N...\229\240,\254:\NUL\NUL\NUL" Empty
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bos/vector-binary-instances</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.1.0.ebuild b/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.1.0.ebuild
deleted file mode 100644
index a72b6ef4100b..000000000000
--- a/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Instances of Data.Binary and Data.Serialize for vector"
-HOMEPAGE="https://github.com/bos/vector-binary-instances"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/binary:=[profile?]
-		dev-haskell/cereal:=[profile?]
-		>=dev-haskell/vector-0.6:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.3.2.ebuild b/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.3.2.ebuild
deleted file mode 100644
index 992b40cf2524..000000000000
--- a/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.3.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Instances of Data.Binary and Data.Serialize for vector"
-HOMEPAGE="https://github.com/bos/vector-binary-instances"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.7:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/vector-instances-3.3.1 b/dev-haskell/vector-instances-3.3.1
new file mode 100644
index 000000000000..cc5044ef46df
--- /dev/null
+++ b/dev-haskell/vector-instances-3.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-3:=[profile?] >=dev-haskell/keys-3:=[profile?] >=dev-haskell/pointed-3:=[profile?] >=dev-haskell/semigroupoids-3:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Orphan Instances for 'Data.Vector'
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/vector-instances
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/comonad-3:=[profile?] >=dev-haskell/keys-3:=[profile?] >=dev-haskell/pointed-3:=[profile?] >=dev-haskell/semigroupoids-3:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/3.3.1
+SRC_URI=mirror://hackage/packages/archive/vector-instances/3.3.1/vector-instances-3.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=40b42a980148869c435d0d3a35e14ac5
diff --git a/dev-haskell/vector-instances/Manifest b/dev-haskell/vector-instances/Manifest
deleted file mode 100644
index 0aa1651ba493..000000000000
--- a/dev-haskell/vector-instances/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST vector-instances-3.3.1.tar.gz 3726 BLAKE2B d7d592c0cac6745449aefabc87c6475bcd26012a6917e9a5d5d1167384f3901e75aeb53653ab9fe3644575a5601049d1b0a7b99e8425fd447eee9ac05c375c47 SHA512 0416532a83ee6f750e51296f1c8a3cf1f374a316bbc30638501e663199434fca28f85064660a9fc0bdbfb08ff5919c0ba1662dba704ff50bd8a7bd1ce09d56ae
-EBUILD vector-instances-3.3.1.ebuild 820 BLAKE2B d68c32e11010750925ec95af4eccbc70eaf4b05ca902398068cabe2526d9608ee4a9ecb0cbddd010e88fcffd34c29b085efb71cdd76dc4156ade455033526e3a SHA512 6115a900619e52de18bde14a513503b15bb55b062b3e6f6ca7c4aecd1ced7466e44c0a9e0b4f81e5af239f0172698c09cebe209e65c07a9c5fd4a2a53fb20563
-MISC metadata.xml 413 BLAKE2B eb2cc656e5d867653e1fdb992ccd564cf12deb64505b5d54aafbded25196a4375e56f77fce411db7d36665499957519b6a13d673fcdf1b7d94c44d76e748a35d SHA512 8263c43f75266b64d7908acbf2a5362f27d967a2da98c1392b84523bbbfb706339763b844679ed02cab847f6ac7d6e3f3769003bf4b1de27f12187f0f8707c75
diff --git a/dev-haskell/vector-instances/metadata.xml b/dev-haskell/vector-instances/metadata.xml
deleted file mode 100644
index bcf46045ad08..000000000000
--- a/dev-haskell/vector-instances/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Orphan Instances for 'Data.Vector'
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/vector-instances</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/vector-instances/vector-instances-3.3.1.ebuild b/dev-haskell/vector-instances/vector-instances-3.3.1.ebuild
deleted file mode 100644
index e234dd1d689c..000000000000
--- a/dev-haskell/vector-instances/vector-instances-3.3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Orphan Instances for 'Data.Vector'"
-HOMEPAGE="https://github.com/ekmett/vector-instances"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3:=[profile?]
-	>=dev-haskell/keys-3:=[profile?]
-	>=dev-haskell/pointed-3:=[profile?]
-	>=dev-haskell/semigroupoids-3:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/vector-space-0.10.4 b/dev-haskell/vector-space-0.10.4
new file mode 100644
index 000000000000..41322a3ae31c
--- /dev/null
+++ b/dev-haskell/vector-space-0.10.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/boolean-0.1.0:=[profile?] >=dev-haskell/memotrie-0.5:=[profile?] >=dev-haskell/numinstances-1.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Vector & affine spaces, linear maps, and derivatives
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/vector-space
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/boolean-0.1.0:=[profile?] >=dev-haskell/memotrie-0.5:=[profile?] >=dev-haskell/numinstances-1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.10.4
+SRC_URI=mirror://hackage/packages/archive/vector-space/0.10.4/vector-space-0.10.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7801de1e298f87c73c25427064634a18
diff --git a/dev-haskell/vector-space/Manifest b/dev-haskell/vector-space/Manifest
deleted file mode 100644
index 050c3608df14..000000000000
--- a/dev-haskell/vector-space/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST vector-space-0.10.4.tar.gz 14249 BLAKE2B 519f99dfec2bb4999939b2b3247822202ab93832597c2412a3ec97a8ddb7b74329b98fe296e7aa0dd96297c9ca802346cf9d6478755995a7e40e9e01c8584611 SHA512 c7218701fe837eab01cd65b3bc0ce2d85fb3a73c8aa034bb606b7bc0bbe87856dc5f375bd1515f65f77e08e12d84b63757d0ba755ae726771888ea7413bac183
-EBUILD vector-space-0.10.4.ebuild 694 BLAKE2B 4720609d9787e4d91923f5653a78adfe887c58beac6e0c3ed1b155eeb7c69abe13010cb73b16e76bb3cf01e6e48ec4b87bcd3f1606234ec8fcd9974bb957ca03 SHA512 330e2f4d7e463e92183cd761402d12d5702fb7299e736b667ae7757f6c5f3c22eba4d6fc609688f9144d43d6a49bb14793d5efc9b06bc1660c6e23ee48229e92
-MISC metadata.xml 854 BLAKE2B c5f0198f03e8c5d2c4c85653882b8f62f15f353811349b411ed41014157285dd1169e9f5368db5b2d6093de7d6b12ce032e68d51a3dc34285ba1255ee48e14dd SHA512 60ccfe4844f3c8f02c616458928712d60c0294bb3fb378a752cbe9be5111d576f6f2ee137cdd320a7ccd801ccdc3dbfd8b4d0e349987c687ab484f2eda2e96c8
diff --git a/dev-haskell/vector-space/metadata.xml b/dev-haskell/vector-space/metadata.xml
deleted file mode 100644
index 159853575fc3..000000000000
--- a/dev-haskell/vector-space/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		/vector-space/ provides classes and generic operations for vector
-		spaces and affine spaces.  It also defines a type of infinite towers
-		of generalized derivatives.  A generalized derivative is a linear
-		transformation rather than one of the common concrete representations
-		(scalars, vectors, matrices, ...).
-		
-		/Warning/: this package depends on type families working fairly well,
-		and requires ghc version at least 6.9.
-		
-		Project wiki page: &lt;http://haskell.org/haskellwiki/vector-space&gt;
-		
-		&amp;#169; 2008-2012 by Conal Elliott; BSD3 license.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/vector-space/vector-space-0.10.4.ebuild b/dev-haskell/vector-space/vector-space-0.10.4.ebuild
deleted file mode 100644
index d6944f035441..000000000000
--- a/dev-haskell/vector-space/vector-space-0.10.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Vector & affine spaces, linear maps, and derivatives"
-HOMEPAGE="http://hackage.haskell.org/package/vector-space"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/boolean-0.1.0:=[profile?]
-	>=dev-haskell/memotrie-0.5:=[profile?]
-	>=dev-haskell/numinstances-1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/vector-th-unbox-0.2.1.3 b/dev-haskell/vector-th-unbox-0.2.1.3
new file mode 100644
index 000000000000..bcc6b4cb74fb
--- /dev/null
+++ b/dev-haskell/vector-th-unbox-0.2.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/data-default ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Deriver for Data.Vector.Unboxed using Template Haskell
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/vector-th-unbox
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.1.3
+SRC_URI=mirror://hackage/packages/archive/vector-th-unbox/0.2.1.3/vector-th-unbox-0.2.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5b1e183b3bbdb1168e9e6b8e49c582fc
diff --git a/dev-haskell/vector-th-unbox-0.2.1.6 b/dev-haskell/vector-th-unbox-0.2.1.6
new file mode 100644
index 000000000000..7582e3983170
--- /dev/null
+++ b/dev-haskell/vector-th-unbox-0.2.1.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/data-default ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Deriver for Data.Vector.Unboxed using Template Haskell
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/vector-th-unbox
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.1.6
+SRC_URI=mirror://hackage/packages/archive/vector-th-unbox/0.2.1.6/vector-th-unbox-0.2.1.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1067d6af61edd98f9d62ef21a3722cc0
diff --git a/dev-haskell/vector-th-unbox/Manifest b/dev-haskell/vector-th-unbox/Manifest
deleted file mode 100644
index 7c772222891c..000000000000
--- a/dev-haskell/vector-th-unbox/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST vector-th-unbox-0.2.1.3.tar.gz 4585 BLAKE2B 507f1ee7228024e446e5f9d8d871cae67497301634e09ce2d4566fbf4f6da1bab3fea00207b5a7337075dcdb9a18d779b1d8df6784f9ec3c83815d076f726276 SHA512 187d23b84387c14a45aa97e196d51d1e171dea2a93b400023db552a8fdfb2d9c5ba4c3cb3589ee73abe612e63b4889851fac889d3b6cd0216dd2d853c24d57ba
-DIST vector-th-unbox-0.2.1.6.tar.gz 4717 BLAKE2B 89e1d2fed19e89fab2fc0c20cdcbb387c07f9a8aadb05a02482d3760c3a4b1d5e50c16929b9d5fb5d0b28f79360790884e80d4978f15be3b5f1e75217b31c517 SHA512 e25bbe44cbdf47ee4e89bac358cce4179c49ce00d676fec911a1ba6be5d81fc70072f55374442c8209cf2023d0a91b8fce3e2a266294aa04ed9b12acbd7dc955
-EBUILD vector-th-unbox-0.2.1.3.ebuild 662 BLAKE2B e8c44c3390912b3866c6a719bbb5dbd61e125a38d8274e3ceadb11baec3e8015895ccbab508fb8cc2d405182c87f8fba21d63dbedbc3a90118991751e0566376 SHA512 0f644831ea517bb9020a3de70fe0afb12395550b246406d4507975812a0ceefa32b567e31540baf15ed2ec9d41187d683970451e5a4b758d1cc5cc14a67e981d
-EBUILD vector-th-unbox-0.2.1.6.ebuild 662 BLAKE2B 38ae05ef7dea0f6febdc946afab3894ea51b090b12e394138aba4f78c372f1513fe8248fdac4bd921927f22196c48925669085095f01d0015389b03f0d61599e SHA512 e51d7ab4353522153a773deb8812b1dd15e6f594519bcb05699f17a12ac4c8bb3a87e3864c3ceafc7a58f9df5a185a599b216ed138156a384d43fc29301ffe45
-MISC metadata.xml 507 BLAKE2B b7d5ac975575519f663f97b6af10f1d30c01654181291b76005aebd9bf7a53093bd1fb89704412d00379577796ddae52a3cf6f536bd2dbb061e957b72b185880 SHA512 d26a922cea4556e110e803e2d4f51eb87969abc695f51cf85fd7057dc1a1fd09ec6758c5eb0cce2fbfad127f4731415deaffc33efc1f54e6d8c95d30ca7cbd9d
diff --git a/dev-haskell/vector-th-unbox/metadata.xml b/dev-haskell/vector-th-unbox/metadata.xml
deleted file mode 100644
index 4d584e01ce4b..000000000000
--- a/dev-haskell/vector-th-unbox/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A Template Haskell deriver for unboxed vectors, given a pair of coercion
-		functions to and from some existing type with an Unbox instance.
-		
-		Refer to "Data.Vector.Unboxed.Deriving" for documentation and examples.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.3.ebuild b/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.3.ebuild
deleted file mode 100644
index fe15c22bbd0f..000000000000
--- a/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Deriver for Data.Vector.Unboxed using Template Haskell"
-HOMEPAGE="http://hackage.haskell.org/package/vector-th-unbox"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/vector-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/data-default )
-"
diff --git a/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.6.ebuild b/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.6.ebuild
deleted file mode 100644
index cc73c3a45c5a..000000000000
--- a/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Deriver for Data.Vector.Unboxed using Template Haskell"
-HOMEPAGE="http://hackage.haskell.org/package/vector-th-unbox"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/vector-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/data-default )
-"
diff --git a/dev-haskell/vector/Manifest b/dev-haskell/vector/Manifest
deleted file mode 100644
index 033f0d127c9e..000000000000
--- a/dev-haskell/vector/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX vector-0.11.0.0-primitive-0.6.2.0.patch 753 BLAKE2B 1117ef087b476dc7a35bdf4286d980a9be438c71ab6d08f0219b03a714859ea30c444b983ec04b03e297a8100cca37c6f64f75167c55a002c8767899b0b47e72 SHA512 09cf5972b6d7ae61fe87246df675229c73c37c8d510b1e56e6ffce4d445fa75578efdbaba26c7cda23d588f68c75ea9f27a854f2d5e0cba00e6c8bdd515eeada
-DIST vector-0.10.12.3.tar.gz 103617 BLAKE2B cd4a4fda8a3da5b431c316d04b23eb82947f08cc930059beb3182c9c68d646c6a767168ae2fd82d06a782991b055421a0558dbf41a1e92f06d265c043cdb2048 SHA512 2b2c98f1fbaaf4f5e7243e18a08e373e85acb06dddf73a48d34b966bfd736efc72880babec9c47859bd8d6d6928a28ac9acd9134eb0ef61b2f88fa31bf18811b
-DIST vector-0.11.0.0.tar.gz 115558 BLAKE2B e2475a37593b92f896c48ff85f6e506fb5011d89173bb0fe12492ed8c6f9620f426c9db88cbc274b37aade52bf6ca3cbdc7cf03b013371b37f2d1b42c348a117 SHA512 4f31e45d08a08c09e5ce73cca4da70e954bf3921d05130b9458c7f2ba267602e0aafc96496595000fd7b82f80aa9147c880917dc64086dab7bf5b2cd426539e0
-EBUILD vector-0.10.12.3.ebuild 1592 BLAKE2B 418bc7d6570795fc008f735ae306cd6173255c19da9602030142f75fc803d75c1e36c4a075080593476bce55d223a89b31fc829800fbbde2807c537034267871 SHA512 6257d68861966ec6768d435239179b8cc9d35cea0023085392c87b6a0be620bc7577d74911ece596d1d2b0f19e6974cad8c08b7155056bef472a3deeffd614c3
-EBUILD vector-0.11.0.0.ebuild 1401 BLAKE2B c963221760f2ef6ecd59bd57307d1cfdd92b4d460262730894aa00b8226ed5c8c918ce656d987cf5469724fdff2b6c4e176d428c0d49778343ed2a273aa6bef7 SHA512 e23c6b4371a9f9c662192fae3e832c783c92fa40a64131cb6391946398df256bc308cfdccd88b55847bf23260c4052387ae7ba50fb794c9fa2fa6cc6f241e3a8
-MISC metadata.xml 2431 BLAKE2B ab4b371c0626e51fa792aa18b7a7622921ea12a7b76d8855441865f46372a3dfa11fd0d0acdafb11983b614b6733325a28711d149660d3e0d874fe24754cf7c4 SHA512 58c6d75396f364fa29acf4287a1411448c2a77f5589be30fc83bdde998773f15c5d5a4fd7e6e95b5454c33ad49aa367a6b557c445612f85f99924520825002ba
diff --git a/dev-haskell/vector/files/vector-0.11.0.0-primitive-0.6.2.0.patch b/dev-haskell/vector/files/vector-0.11.0.0-primitive-0.6.2.0.patch
deleted file mode 100644
index 3b78ad74efc3..000000000000
--- a/dev-haskell/vector/files/vector-0.11.0.0-primitive-0.6.2.0.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/Data/Vector.hs b/Data/Vector.hs
-index db6dfb7..f074bf0 100644
---- a/Data/Vector.hs
-+++ b/Data/Vector.hs
-@@ -152,3 +152,3 @@ module Data.Vector (
-   -- ** Lists
--  toList, fromList, fromListN,
-+  toList, Data.Vector.fromList, Data.Vector.fromListN,
- 
-@@ -222,4 +222,4 @@ instance Exts.IsList (Vector a) where
-   type Item (Vector a) = a
--  fromList = fromList
--  fromListN = fromListN
-+  fromList = Data.Vector.fromList
-+  fromListN = Data.Vector.fromListN
-   toList = toList
-@@ -343,3 +343,3 @@ instance Traversable.Traversable Vector where
-   {-# INLINE traverse #-}
--  traverse f xs = fromList Applicative.<$> Traversable.traverse f (toList xs)
-+  traverse f xs = Data.Vector.fromList Applicative.<$> Traversable.traverse f (toList xs)
- 
diff --git a/dev-haskell/vector/metadata.xml b/dev-haskell/vector/metadata.xml
deleted file mode 100644
index fac2f4dc8e54..000000000000
--- a/dev-haskell/vector/metadata.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		An efficient implementation of Int-indexed arrays (both mutable
-		and immutable), with a powerful loop optimisation framework .
-
-		It is structured as follows:
-
-		["Data.Vector"] Boxed vectors of arbitrary types.
-
-		["Data.Vector.Unboxed"] Unboxed vectors with an adaptive
-		representation based on data type families.
-
-		["Data.Vector.Storable"] Unboxed vectors of 'Storable' types.
-
-		["Data.Vector.Primitive"] Unboxed vectors of primitive types as
-		defined by the @primitive@ package. "Data.Vector.Unboxed" is more
-		flexible at no performance cost.
-
-		["Data.Vector.Generic"] Generic interface to the vector types.
-
-		Each module has a @Safe@ version with is marked as @Trustworthy@
-		(see &lt;http://hackage.haskell.org/trac/ghc/wiki/SafeHaskell&gt;).
-
-		There is also a (draft) tutorial on common uses of vector.
-
-		* &lt;http://haskell.org/haskellwiki/Numeric_Haskell:_A_Vector_Tutorial&gt;
-
-		Please use the project trac to submit bug reports and feature
-		requests.
-
-		* &lt;http://trac.haskell.org/vector&gt;
-
-		Changes in version 0.9
-
-		* 'MonadPlus' instance for boxed vectors
-
-		* Export more @construct@ and @constructN@ from @Safe@ modules
-
-		* Require @primitive-0.4.0.1@
-
-		Changes in version 0.8
-
-		* New functions: @constructN@, @constructrN@
-
-		* Support for GHC 7.2 array copying primitives
-
-		* New fixity for @(!)@
-
-		* Safe Haskell support (contributed by David Terei)
-
-		* 'Functor', 'Monad', 'Applicative', 'Alternative', 'Foldable' and
-		'Traversable' instances for boxed vectors
-		(/WARNING: they tend to be slow and are only provided for completeness/)
-
-		* 'Show' instances for immutable vectors follow containers conventions
-
-		* 'Read' instances for all immutable vector types
-
-		* Performance improvements
-	</longdescription>
-	<use>
-		<flag name="boundschecks">Enable bounds checking</flag>
-		<flag name="internalchecks">Enable internal consistency checks at the cost of a significant performance penalty</flag>
-		<flag name="unsafechecks">Enable bounds checking in unsafe operations at the cost of a significant performance penalty</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">haskell/vector</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/vector/vector-0.10.12.3.ebuild b/dev-haskell/vector/vector-0.10.12.3.ebuild
deleted file mode 100644
index 056efaa250b0..000000000000
--- a/dev-haskell/vector/vector-0.10.12.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient Arrays"
-HOMEPAGE="https://github.com/haskell/vector"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="+boundschecks internalchecks unsafechecks"
-
-RDEPEND=">=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9
-		dev-haskell/random
-		dev-haskell/test-framework
-		dev-haskell/test-framework-quickcheck2
-		>=dev-haskell/transformers-0.2.0.0 )
-"
-
-src_prepare() {
-	local can_spec_const="yes"
-
-	cabal_chdeps \
-		"QuickCheck >=  2.7  && < 2.8" "QuickCheck >=  2.7  && < 2.9"
-
-	ghc-supports-interpreter || can_spec_const="no"
-
-	# ghci-less GHC can't do ANN #482960
-	if [[ ${can_spec_const} == "no" ]]; then
-		einfo "Disabling 'ForceSpecConstr' due to bug #482960"
-		sed -e 's/{-# ANN type SPEC ForceSpecConstr #-}/{- # ANN type SPEC ForceSpecConstr #-}/' \
-			-i Data/Vector/Fusion/Stream/Monadic.hs || die
-	fi
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag boundschecks boundschecks) \
-		$(cabal_flag internalchecks internalchecks) \
-		$(cabal_flag unsafechecks unsafechecks)
-}
diff --git a/dev-haskell/vector/vector-0.11.0.0.ebuild b/dev-haskell/vector/vector-0.11.0.0.ebuild
deleted file mode 100644
index f27cf913c98b..000000000000
--- a/dev-haskell/vector/vector-0.11.0.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient Arrays"
-HOMEPAGE="https://github.com/haskell/vector"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="+boundschecks internalchecks unsafechecks"
-
-RESTRICT=test # -O2 -g makes tests build hang
-
-RDEPEND=">=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.7
-		dev-haskell/random
-		dev-haskell/test-framework
-		dev-haskell/test-framework-quickcheck2
-		>=dev-haskell/transformers-0.2.0.0 )
-"
-
-PATCHES=("${FILESDIR}"/${P}-primitive-0.6.2.0.patch)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		"QuickCheck >=  2.7  && < 2.8" "QuickCheck >=  2.7" \
-		'base >= 4.3 && < 4.9' 'base >= 4.3' \
-		'ghc-prim >= 0.2 && < 0.5' 'ghc-prim >= 0.2'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag boundschecks boundschecks) \
-		$(cabal_flag internalchecks internalchecks) \
-		$(cabal_flag unsafechecks unsafechecks)
-}
diff --git a/dev-haskell/void-0.6.1 b/dev-haskell/void-0.6.1
new file mode 100644
index 000000000000..85d445a467e0
--- /dev/null
+++ b/dev-haskell/void-0.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.1:=[profile?] >=dev-haskell/semigroups-0.8.2:=[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 Haskell 98 logically uninhabited data type
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/void
+IUSE=safe doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.1:=[profile?] >=dev-haskell/semigroups-0.8.2:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.6.1
+SRC_URI=mirror://hackage/packages/archive/void/0.6.1/void-0.6.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c2c851ee2ff03f569f8d8b9b3879f3f9
diff --git a/dev-haskell/void-0.7.1 b/dev-haskell/void-0.7.1
new file mode 100644
index 000000000000..4d68b936c020
--- /dev/null
+++ b/dev-haskell/void-0.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.1:=[profile?] >=dev-haskell/semigroups-0.8.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Haskell 98 logically uninhabited data type
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/void
+IUSE=safe doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.1:=[profile?] >=dev-haskell/semigroups-0.8.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.1
+SRC_URI=mirror://hackage/packages/archive/void/0.7.1/void-0.7.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0c967bef8f41359c3c29888932421139
diff --git a/dev-haskell/void/Manifest b/dev-haskell/void/Manifest
deleted file mode 100644
index 166f6de8efb3..000000000000
--- a/dev-haskell/void/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST void-0.6.1.tar.gz 3807 BLAKE2B 649b810bdb0d4ff1e670dee0d4f2feeb131eec09e10d4aeef1094b06dc0b2e4ed67ee3867c3a39d3efbd14ffea5479b54ea81e928a3bb345cc1b823eb35ef922 SHA512 9158e201547b43e97d13112d87ab27b7dddff90fff11727c880bbd03e50faf2755ff27c03710e7bd634325a2c31f07e70dae61e62d925fa1f31b0b66e3927c48
-DIST void-0.7.1.tar.gz 4103 BLAKE2B 194310d0aa555d7524fdda5e57be6e56026dbdf99a299cd03d20863027e3e67f86521d62cbfe56b5126513c0f6c06ef793fa537d190ca532bd965252f0d7bfce SHA512 15cffa3ad31f365ffd276d962ba6c401907d5f4d74deb0b2635a8dc9b516519961c7b5d44751a816cc3480d12bd84be4a81b05703e31d4e796a58c4205e4785c
-EBUILD void-0.6.1.ebuild 712 BLAKE2B 76678a4e3c4207f3c5671a964e95ddfbe3c3c54b8d4caab4ec6dcbdc84182242dc843c831e8c9e18b2830e2963bf5f08859e3bbddf900d1e3742c5362f1dfb94 SHA512 77a6a1a0491932f9a5997416adf3b601683bbb3b23d26e875815d101bb5fc15fcf9ac5826dabe329d9219eb7aac5d90f37dd5d78cc270ffd94104a39e22d1bcb
-EBUILD void-0.7.1.ebuild 711 BLAKE2B c95af54543e843926bbfdda093a390b48d52e2cfe2424378cb5af997b6e32d2e839181b98f33ef81b899999d42c135f4a634e8e270c98475153c5b0077a51c28 SHA512 ea269b40ae883665cc9e2971b289a68c698db8dc2de8cab0c10b09db50d474390f0766e1db0f33c6bb216af8ff6fb529e7800d528fb66f7f08ae02f368cde212
-MISC metadata.xml 547 BLAKE2B d9050b7cfcd668512098f65236813cd5b045b39306d4b872feab05a9ec160b8a2368e9db0b61d9ae9c0cc9fb2904129f4f597cccf4acf14e5574136986044f9c SHA512 e6fc6b0ec727f8c5aedf5f141719cd225d3799c47947e69b2c4b0b7b26052418bbe4f8198c737dccc823a919f03d3b337c468f7f8cd152cc0dc2f8c343f1f71e
diff --git a/dev-haskell/void/metadata.xml b/dev-haskell/void/metadata.xml
deleted file mode 100644
index 0c190a6bf351..000000000000
--- a/dev-haskell/void/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A Haskell 98 logically uninhabited data type. Used to indicate that a given term should not exist.
-	</longdescription>
-	<use>
-		<flag name="safe">dissable effective but unsafe coersions</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ekmett/void</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/void/void-0.6.1.ebuild b/dev-haskell/void/void-0.6.1.ebuild
deleted file mode 100644
index e56773218a5a..000000000000
--- a/dev-haskell/void/void-0.6.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Haskell 98 logically uninhabited data type"
-HOMEPAGE="https://github.com/ekmett/void"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="safe"
-
-RDEPEND=">=dev-haskell/hashable-1.1:=[profile?]
-		>=dev-haskell/semigroups-0.8.2:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag safe safe)
-}
diff --git a/dev-haskell/void/void-0.7.1.ebuild b/dev-haskell/void/void-0.7.1.ebuild
deleted file mode 100644
index 375b57b76ab4..000000000000
--- a/dev-haskell/void/void-0.7.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Haskell 98 logically uninhabited data type"
-HOMEPAGE="https://github.com/ekmett/void"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="safe"
-
-RDEPEND=">=dev-haskell/hashable-1.1:=[profile?]
-	>=dev-haskell/semigroups-0.8.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag safe safe)
-}
diff --git a/dev-haskell/wai-1.4.0.2 b/dev-haskell/wai-1.4.0.2
new file mode 100644
index 000000000000..4d498c046ce1
--- /dev/null
+++ b/dev-haskell/wai-1.4.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/vault-0.1:=[profile?] <dev-haskell/vault-0.4:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Web Application Interface
+EAPI=5
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/vault-0.1:=[profile?] <dev-haskell/vault-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.4.0.2
+SRC_URI=mirror://hackage/packages/archive/wai/1.4.0.2/wai-1.4.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=df43117deff3e52bbe8e97cc7894d75d
diff --git a/dev-haskell/wai-2.0.0 b/dev-haskell/wai-2.0.0
new file mode 100644
index 000000000000..a3bf02fc9e34
--- /dev/null
+++ b/dev-haskell/wai-2.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/conduit-1.0.8:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/vault-0.1:=[profile?] <dev-haskell/vault-0.4:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Web Application Interface
+EAPI=5
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/conduit-1.0.8:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/vault-0.1:=[profile?] <dev-haskell/vault-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/2.0.0
+SRC_URI=mirror://hackage/packages/archive/wai/2.0.0/wai-2.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=83818dc4265997e9159307445a28298e
diff --git a/dev-haskell/wai-2.1.0 b/dev-haskell/wai-2.1.0
new file mode 100644
index 000000000000..eab27cfab9ba
--- /dev/null
+++ b/dev-haskell/wai-2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/conduit-1.0.8:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Web Application Interface
+EAPI=5
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/conduit-1.0.8:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/2.1.0
+SRC_URI=mirror://hackage/packages/archive/wai/2.1.0/wai-2.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e7ef42168a5f3dad1c0a652add51acb3
diff --git a/dev-haskell/wai-3.0.3.0 b/dev-haskell/wai-3.0.3.0
new file mode 100644
index 000000000000..c0299cc0c0a1
--- /dev/null
+++ b/dev-haskell/wai-3.0.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Web Application Interface
+EAPI=5
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/3.0.3.0
+SRC_URI=mirror://hackage/packages/archive/wai/3.0.3.0/wai-3.0.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=afea6d8bb175702e7787a6f3dad41937
diff --git a/dev-haskell/wai-3.0.5.0 b/dev-haskell/wai-3.0.5.0
new file mode 100644
index 000000000000..206d8d4f5aa0
--- /dev/null
+++ b/dev-haskell/wai-3.0.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/bytestring-builder-0.10.4.0:=[profile?] <dev-haskell/bytestring-builder-0.10.7:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.0:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Web Application Interface
+EAPI=5
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/bytestring-builder-0.10.4.0:=[profile?] <dev-haskell/bytestring-builder-0.10.7:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.0:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/3.0.5.0
+SRC_URI=mirror://hackage/packages/archive/wai/3.0.5.0/wai-3.0.5.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f94ea8300a548d4c5ac3819822c1465f
diff --git a/dev-haskell/wai-3.2.1.1 b/dev-haskell/wai-3.2.1.1
new file mode 100644
index 000000000000..890cfe30edf8
--- /dev/null
+++ b/dev-haskell/wai-3.2.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/bytestring-builder-0.10.4.0:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.0:=[profile?] >=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Web Application Interface
+EAPI=6
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/bytestring-builder-0.10.4.0:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.0:=[profile?] >=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/3.2.1.1
+SRC_URI=mirror://hackage/packages/archive/wai/3.2.1.1/wai-3.2.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7f5708d9e01b9916ef9be12644d09713
diff --git a/dev-haskell/wai-app-static-1.3.2.1 b/dev-haskell/wai-app-static-1.3.2.1
new file mode 100644
index 000000000000..472746959b16
--- /dev/null
+++ b/dev-haskell/wai-app-static-1.3.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/cereal-0.3.5:=[profile?] >=dev-haskell/crypto-api-0.12.2:=[profile?] >=dev-haskell/crypto-conduit-0.4:=[profile?] >=dev-haskell/cryptohash-cryptoapi-0.1.0:=[profile?] >=dev-haskell/file-embed-0.0.3.1:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/network dev-haskell/wai-test ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=WAI application for static serving
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/web-application-interface
+IUSE=print doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/cereal-0.3.5:=[profile?] >=dev-haskell/crypto-api-0.12.2:=[profile?] >=dev-haskell/crypto-conduit-0.4:=[profile?] >=dev-haskell/cryptohash-cryptoapi-0.1.0:=[profile?] >=dev-haskell/file-embed-0.0.3.1:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.3.2.1
+SRC_URI=mirror://hackage/packages/archive/wai-app-static/1.3.2.1/wai-app-static-1.3.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7dd496ee876b0e5a3020356312a29d5f
diff --git a/dev-haskell/wai-app-static-2.0.0.3 b/dev-haskell/wai-app-static-2.0.0.3
new file mode 100644
index 000000000000..5a8399b7b56b
--- /dev/null
+++ b/dev-haskell/wai-app-static-2.0.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/cereal-0.3.5:=[profile?] >=dev-haskell/crypto-api-0.12.2:=[profile?] >=dev-haskell/crypto-conduit-0.4:=[profile?] >=dev-haskell/cryptohash-cryptoapi-0.1.0:=[profile?] >=dev-haskell/file-embed-0.0.3.1:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-2.0:=[profile?] <dev-haskell/wai-2.2:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/network dev-haskell/wai-test ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=WAI application for static serving
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/web-application-interface
+IUSE=print doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/cereal-0.3.5:=[profile?] >=dev-haskell/crypto-api-0.12.2:=[profile?] >=dev-haskell/crypto-conduit-0.4:=[profile?] >=dev-haskell/cryptohash-cryptoapi-0.1.0:=[profile?] >=dev-haskell/file-embed-0.0.3.1:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-2.0:=[profile?] <dev-haskell/wai-2.2:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.0.0.3
+SRC_URI=mirror://hackage/packages/archive/wai-app-static/2.0.0.3/wai-app-static-2.0.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=579b7304e79e9eceafeab2fa1ef03830
diff --git a/dev-haskell/wai-app-static-3.0.1 b/dev-haskell/wai-app-static-3.0.1
new file mode 100644
index 000000000000..12e3a7abfb86
--- /dev/null
+++ b/dev-haskell/wai-app-static-3.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] dev-haskell/cryptohash-conduit:=[profile?] >=dev-haskell/file-embed-0.0.3.1:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] >=dev-haskell/optparse-applicative-0.7:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.1:=[profile?] >=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.1:=[profile?] >=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.1:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/network ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=WAI application for static serving
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/web-application-interface
+IUSE=print doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] dev-haskell/cryptohash-conduit:=[profile?] >=dev-haskell/file-embed-0.0.3.1:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] >=dev-haskell/optparse-applicative-0.7:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.1:=[profile?] >=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.1:=[profile?] >=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.1:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/3.0.1
+SRC_URI=mirror://hackage/packages/archive/wai-app-static/3.0.1/wai-app-static-3.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ac3f65bf62a0c91cabb6c11ed6eb7f05
diff --git a/dev-haskell/wai-app-static-3.1.4.1 b/dev-haskell/wai-app-static-3.1.4.1
new file mode 100644
index 000000000000..89a4919f0f62
--- /dev/null
+++ b/dev-haskell/wai-app-static-3.1.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] dev-haskell/cryptohash-conduit:=[profile?] >=dev-haskell/file-embed-0.0.3.1:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] >=dev-haskell/optparse-applicative-0.7:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.1:=[profile?] >=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/network dev-haskell/temporary ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=WAI application for static serving
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/web-application-interface
+IUSE=print doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] dev-haskell/cryptohash-conduit:=[profile?] >=dev-haskell/file-embed-0.0.3.1:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] >=dev-haskell/optparse-applicative-0.7:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.1:=[profile?] >=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/3.1.4.1
+SRC_URI=mirror://hackage/packages/archive/wai-app-static/3.1.4.1/wai-app-static-3.1.4.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=76ab137546316409e0fefefd90478e2d
diff --git a/dev-haskell/wai-app-static-3.1.6.1 b/dev-haskell/wai-app-static-3.1.6.1
new file mode 100644
index 000000000000..2d4092355fd0
--- /dev/null
+++ b/dev-haskell/wai-app-static-3.1.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/cryptonite-0.6:=[profile?] >=dev-haskell/file-embed-0.0.3.1:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/memory-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] >=dev-haskell/optparse-applicative-0.7:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.1:=[profile?] >=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/mockery dev-haskell/network dev-haskell/temporary ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=WAI application for static serving
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/book/web-application-interface
+IUSE=print doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/cryptonite-0.6:=[profile?] >=dev-haskell/file-embed-0.0.3.1:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/memory-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] >=dev-haskell/optparse-applicative-0.7:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.1:=[profile?] >=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/3.1.6.1
+SRC_URI=mirror://hackage/packages/archive/wai-app-static/3.1.6.1/wai-app-static-3.1.6.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8ade8dca80e69717ba0cbce736b165e1
diff --git a/dev-haskell/wai-app-static/Manifest b/dev-haskell/wai-app-static/Manifest
deleted file mode 100644
index 968e7a4aab6f..000000000000
--- a/dev-haskell/wai-app-static/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST wai-app-static-1.3.2.1.tar.gz 19247 BLAKE2B 0082f01f36a4d5c9cbd26ddd48a647859000deea50140859d6e2bbc1641b782992f16d18a971ba0de7ff43d5fc41e264bcc5574d23fc77af091882bbb40f4fe4 SHA512 718d9f01169c087f9e90ed662258e54c2b8a5a46f0a6248503cb9447e078e680ec291876fdaabe71c17c110d8a9e0fec4378423ae6a778f8a0d02c71288e797c
-DIST wai-app-static-2.0.0.3.tar.gz 19337 BLAKE2B 0f6e079ba8ed171b046cdfa7cc07a56e4249f5379aece3f1e24db1938ff34da3b1cf53cd880b88895e100dface6a06fc568ce8abaf6cef777d354be00d8ba8b8 SHA512 b4b40719b300b2f7ad448f9a6f4acdc3258419c66a5ca39887466dfa689c4d80dac8bbefd2a57f521e0f66e1ff87c0710af55b5a0bbcaf1d4592c833c61d693d
-DIST wai-app-static-3.0.1.tar.gz 21502 BLAKE2B c19eba52bee7f6a2e6412c359438fcde28a7c4f50870631e788ef68a00702eddf525d709218e093448243f9f49e644acaac984ce93c6799ba2b5f02129ca4f04 SHA512 851c6c3d13d01dda0566c6c98364ddcc54b8aedb4775e9e491452ea672f3f8dfb05ee75d9c44e78a5c89944ab10f8b6646f3dc9d6bfe44e9f2abd910bb33f687
-DIST wai-app-static-3.1.4.1.tar.gz 22321 BLAKE2B afcea96f91e88c2abd3a186b9f9c5686719d2dfd0fb0e63fde728117547b9d0c15cd391f7c38711ab3bb4c46d02bf49cb3ff262d44e5a6c0b324c0d1fafc1cb7 SHA512 2a4925a48a09ca1d7e366a1b01961b0069c941f0987721e92cb0c257df8feefe78f0dc5f8c69680d155a3d1b1bdee95f4417fe734c14e02b0596475bead72b8f
-DIST wai-app-static-3.1.6.1.tar.gz 22686 BLAKE2B f6c41a0df5daf01d8a6cb9b440098b3e45c4ccaeb36624fd9bef2f9a0d99ab7cd0343c61a99d0cb8d22736272f5661b0c6daa5bbc64cf5eb6b1c554b65d7bc94 SHA512 a2a19a57f289ecec8b2cbae2d412783ebcc789c8518a357eed8bbeee01a6283f7e636c38065c815cba3af782e56363b644baa21b32f70dd851cb6fd0bff692c6
-EBUILD wai-app-static-1.3.2.1.ebuild 1686 BLAKE2B 2cc0e17bca369f6e333ded5358d1dd3d5708a4954c6b879000c236271bc882f6db6943f31708088813f8120ceae108a617a4f42a0398b2e0aa4625e045f0f6b0 SHA512 f6c748cf59226727f9b6b11bdc82458e83afc9374be68b0456e33946030c819d62244c89b1af3fdc663d76f697e1c83d03d530a3492e9eeb3dd10b000c6e04b0
-EBUILD wai-app-static-2.0.0.3.ebuild 1686 BLAKE2B 5a1441d034a17ec871012e22fefe14724c9633270be1c13ea380e3dfb6a2cafd7e97e9fe636e39b326c7a1366ac1d4537b2881e3b4f8fdc9e2fe6d98559a2ee5 SHA512 3ba8ba8b01528c0b01f136d9c761bf22aa6068edb84864746cdf055101066b31167f791f6aa4cdbc43155211c1a98e49f3f2a1b49e26783472a6fab2e79cfc67
-EBUILD wai-app-static-3.0.1.ebuild 1854 BLAKE2B 539f3eeea9357800fd3a7f0594a7c1cdcf39df482beece2ef0830d1b2fe3d942292b6860e4599835bc3766c54ded21277a6c4a313731edc4060168e32e6b75a5 SHA512 e9a51581f8767da9f7bbd7af34c09e8f43042b5b0aaeacc4cf1b4f05d011a6c483e048696056e2aabda494cecb562258722654c6d20b1fe6660c77df5b9a3608
-EBUILD wai-app-static-3.1.4.1.ebuild 1786 BLAKE2B 411b76523db0d18b36225c540617ebb0eeb1baefc804faa6927689cc4fd487e518be11861f93fee07b83a363d39a428e97a28e58149e2fa34685ac238f119497 SHA512 31cd99965b9effd03cfd595e925af8937430776b0c0c5e94efb230429db24f0b918c07f553d1cfc22b77ed435902b90c1712a2712500654565085bd614444348
-EBUILD wai-app-static-3.1.6.1.ebuild 1716 BLAKE2B 9d9ed966146ecb3785eb13c820e9b94b37b97d263a809b41a00e95f1a180b98a532e27fafff680bd256058d686b079ce17ed94af2986a87fa299c6560562bac2 SHA512 86eb0fb32c825ceaaa91ae49bec70d348c6f0dc064107374f14eb03b2e5535dcbbfa3f4b137f89baf2f04446a84d4c48d2f421980bcc1386e872cd04e033a85b
-MISC metadata.xml 425 BLAKE2B 1bbe316c73ef0e2954111cf9d401aab07f5e763f74ac542436128df25cbf28424c8e525e37016f46804f234098735668b713756a9a925922fcf307ada4ada014 SHA512 af56d5ef903a704a54270e5ead759bc4abfd1ab713ebb387184323baa1ee90e5f14007e03eea73b2469875dde733974d95dda48999ed26d66fad7b4f75b8292e
diff --git a/dev-haskell/wai-app-static/metadata.xml b/dev-haskell/wai-app-static/metadata.xml
deleted file mode 100644
index cb0dd1304272..000000000000
--- a/dev-haskell/wai-app-static/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Also provides some helper functions and datatypes for use outside of WAI.
-	</longdescription>
-	<use>
-		<flag name="print">print debug info.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/wai-app-static/wai-app-static-1.3.2.1.ebuild b/dev-haskell/wai-app-static/wai-app-static-1.3.2.1.ebuild
deleted file mode 100644
index fac1660cf64d..000000000000
--- a/dev-haskell/wai-app-static/wai-app-static-1.3.2.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="WAI application for static serving"
-HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="print"
-
-RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/cereal-0.3.5:=[profile?]
-	>=dev-haskell/crypto-api-0.12.2:=[profile?]
-	>=dev-haskell/crypto-conduit-0.4:=[profile?]
-	>=dev-haskell/cryptohash-cryptoapi-0.1.0:=[profile?]
-	>=dev-haskell/file-embed-0.0.3.1:=[profile?]
-	dev-haskell/http-date:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?]
-	>=dev-haskell/system-fileio-0.3:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/network
-		dev-haskell/wai-test )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag print print)
-}
diff --git a/dev-haskell/wai-app-static/wai-app-static-2.0.0.3.ebuild b/dev-haskell/wai-app-static/wai-app-static-2.0.0.3.ebuild
deleted file mode 100644
index 6b7dcfc70b72..000000000000
--- a/dev-haskell/wai-app-static/wai-app-static-2.0.0.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="WAI application for static serving"
-HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="print"
-
-RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/cereal-0.3.5:=[profile?]
-	>=dev-haskell/crypto-api-0.12.2:=[profile?]
-	>=dev-haskell/crypto-conduit-0.4:=[profile?]
-	>=dev-haskell/cryptohash-cryptoapi-0.1.0:=[profile?]
-	>=dev-haskell/file-embed-0.0.3.1:=[profile?]
-	dev-haskell/http-date:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?]
-	>=dev-haskell/system-fileio-0.3:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/wai-2.0:=[profile?] <dev-haskell/wai-2.2:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/network
-		dev-haskell/wai-test )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag print print)
-}
diff --git a/dev-haskell/wai-app-static/wai-app-static-3.0.1.ebuild b/dev-haskell/wai-app-static/wai-app-static-3.0.1.ebuild
deleted file mode 100644
index 8df2b47fcf8d..000000000000
--- a/dev-haskell/wai-app-static/wai-app-static-3.0.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="WAI application for static serving"
-HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="print"
-
-RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	>=dev-haskell/cryptohash-0.11:=[profile?]
-	dev-haskell/cryptohash-conduit:=[profile?]
-	>=dev-haskell/file-embed-0.0.3.1:=[profile?]
-	dev-haskell/http-date:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?]
-	>=dev-haskell/optparse-applicative-0.7:=[profile?]
-	>=dev-haskell/system-fileio-0.3:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.1:=[profile?]
-	>=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.1:=[profile?]
-	>=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.1:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/network )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag print print)
-}
diff --git a/dev-haskell/wai-app-static/wai-app-static-3.1.4.1.ebuild b/dev-haskell/wai-app-static/wai-app-static-3.1.4.1.ebuild
deleted file mode 100644
index 270c79366a3d..000000000000
--- a/dev-haskell/wai-app-static/wai-app-static-3.1.4.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="WAI application for static serving"
-HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="print"
-
-RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	>=dev-haskell/cryptohash-0.11:=[profile?]
-	dev-haskell/cryptohash-conduit:=[profile?]
-	>=dev-haskell/file-embed-0.0.3.1:=[profile?]
-	dev-haskell/http-date:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?]
-	>=dev-haskell/optparse-applicative-0.7:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
-	>=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.1:=[profile?]
-	>=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.3:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/network
-		dev-haskell/temporary )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag print print)
-}
diff --git a/dev-haskell/wai-app-static/wai-app-static-3.1.6.1.ebuild b/dev-haskell/wai-app-static/wai-app-static-3.1.6.1.ebuild
deleted file mode 100644
index 0a891f5c239a..000000000000
--- a/dev-haskell/wai-app-static/wai-app-static-3.1.6.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="WAI application for static serving"
-HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="print"
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/cryptonite-0.6:=[profile?]
-	>=dev-haskell/file-embed-0.0.3.1:=[profile?]
-	dev-haskell/http-date:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/memory-0.7:=[profile?]
-	>=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?]
-	>=dev-haskell/optparse-applicative-0.7:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
-	>=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.1:=[profile?]
-	>=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.3:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/mockery
-		dev-haskell/network
-		dev-haskell/temporary )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag print print)
-}
diff --git a/dev-haskell/wai-conduit-3.0.0.2 b/dev-haskell/wai-conduit-3.0.0.2
new file mode 100644
index 000000000000..aa07b2b3d47c
--- /dev/null
+++ b/dev-haskell/wai-conduit-3.0.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=conduit wrappers for WAI
+EAPI=5
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/3.0.0.2
+SRC_URI=mirror://hackage/packages/archive/wai-conduit/3.0.0.2/wai-conduit-3.0.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bad4f79e14ba85b9208e1bd36d1df1da
diff --git a/dev-haskell/wai-conduit-3.0.0.3 b/dev-haskell/wai-conduit-3.0.0.3
new file mode 100644
index 000000000000..f47abc8f4cec
--- /dev/null
+++ b/dev-haskell/wai-conduit-3.0.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=conduit wrappers for WAI
+EAPI=5
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/3.0.0.3
+SRC_URI=mirror://hackage/packages/archive/wai-conduit/3.0.0.3/wai-conduit-3.0.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=283cad9d80ecc47e51c106dfdccefcc8
diff --git a/dev-haskell/wai-conduit/Manifest b/dev-haskell/wai-conduit/Manifest
deleted file mode 100644
index b5152251e98e..000000000000
--- a/dev-haskell/wai-conduit/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST wai-conduit-3.0.0.2.tar.gz 2139 BLAKE2B be13ca69bb1c5eb8a69148a2b954b5725f3ce7530636d1e6fb2555e3a6095b3078db540f477a0cd6db131f27ffb0ead792c0a9bf6c20317b112772ed5d41cbb8 SHA512 2b24acf1148b157375dd9f70a15f07b1fb24e76b8cdaa0e67abc47bf8f181d41ae326beb05c769698bbaff0cedb3211f6c148c323f3ff0e35745a5f05198ae1b
-DIST wai-conduit-3.0.0.3.tar.gz 2129 BLAKE2B b85282eb13e4452e306eb0b1c08f63576fe1abd63458c3bba754275925d3c1c15621be8e5b4209113224ef5afc3ef0e4cae0afc4414715b27a9b9c27759d1904 SHA512 adf6c507f53dfd5eab33cc713528d27fd37d044262024626e89da1489d9315e2fbd47a1a3fb00384858a79101482cf056349e17a0614e6788613e67bad1ff976
-EBUILD wai-conduit-3.0.0.2.ebuild 740 BLAKE2B 3ee2866b49d015a47fdc4d28ed373bc07a1d005c6fadc46383a5e24b5649416736f12fb1a4901e7966f4aed4aac6228b1dac0eaa56b014cd0216885a24b3d66a SHA512 04afe2135ce19e4ed6f1dbdeee32f71eef8e0dba4179e2186f54caa3afe071027f3b8fd4b1c16f5d76e3dae725c628c3a5e77719988c7ae178f5e447beb6cf5b
-EBUILD wai-conduit-3.0.0.3.ebuild 742 BLAKE2B cb2ee2b6eb5eca4a79cdcc8356125344d7b4aa388104139849eaf7ff5f11bb0100f9cf21f84dc1a529f1c73447fb8dd52b5789a13f3dabb1e3929e9cba409d7a SHA512 601ffaa48a5448c6b76a3c486cff9da6576c56df8ea518977a0d2b3b8b0336e7c1b97847a9ef890f213ec0800b77e5bc722ef171574e8b631eec89ce62fc4b1c
-MISC metadata.xml 510 BLAKE2B bf53d664a32a9dbb1d6fac85569e78eb6b9ac663283e2c37a364e3e194a0845064637dcf3e97be83c66d0db5245549194f6193e49d4bb2393a3d0fe8082f6518 SHA512 c6100f6b2edf90ee715f63f290dd16baffacb5e40ee0683fd5e43c8fb260a9725200c0315024558e76bcdd3aed78f8e027d630b095ceaca03baf04b9fb2b3139
diff --git a/dev-haskell/wai-conduit/metadata.xml b/dev-haskell/wai-conduit/metadata.xml
deleted file mode 100644
index 1e1fa5cc48a2..000000000000
--- a/dev-haskell/wai-conduit/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Since version 3.0.0, WAI has no built-in streaming data abstraction.
-		This library provides similar functionality to what existed in WAI 2.x.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">yesodweb/wai</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/wai-conduit/wai-conduit-3.0.0.2.ebuild b/dev-haskell/wai-conduit/wai-conduit-3.0.0.2.ebuild
deleted file mode 100644
index 1ec7e7827578..000000000000
--- a/dev-haskell/wai-conduit/wai-conduit-3.0.0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="conduit wrappers for WAI"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/wai-conduit/wai-conduit-3.0.0.3.ebuild b/dev-haskell/wai-conduit/wai-conduit-3.0.0.3.ebuild
deleted file mode 100644
index 736759f9ba8f..000000000000
--- a/dev-haskell/wai-conduit/wai-conduit-3.0.0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="conduit wrappers for WAI"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/wai-extra-3.0.10 b/dev-haskell/wai-extra-3.0.10
new file mode 100644
index 000000000000..23f52a9fceff
--- /dev/null
+++ b/dev-haskell/wai-extra-3.0.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/ansi-terminal:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/fast-logger-2.1:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1.2:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/vault:=[profile?] >=dev-haskell/void-0.5:=[profile?] >=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.1:=[profile?] >=dev-haskell/wai-logger-2.0:=[profile?] <dev-haskell/wai-logger-2.3:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/zlib ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Provides some basic WAI handlers and middleware
+EAPI=5
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-haskell/ansi-terminal:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/fast-logger-2.1:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1.2:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/vault:=[profile?] >=dev-haskell/void-0.5:=[profile?] >=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.1:=[profile?] >=dev-haskell/wai-logger-2.0:=[profile?] <dev-haskell/wai-logger-2.3:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/3.0.10
+SRC_URI=mirror://hackage/packages/archive/wai-extra/3.0.10/wai-extra-3.0.10.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=610c538326aae29dbaa41a02160f8b2c
diff --git a/dev-haskell/wai-extra-3.0.14 b/dev-haskell/wai-extra-3.0.14
new file mode 100644
index 000000000000..7c80b30b5f9e
--- /dev/null
+++ b/dev-haskell/wai-extra-3.0.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/fast-logger-2.1:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/iproute:=[profile?] >=dev-haskell/lifted-base-0.1.2:=[profile?] >=dev-haskell/network-2.6.1.0:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/vault:=[profile?] >=dev-haskell/void-0.5:=[profile?] >=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-logger-2.0:=[profile?] <dev-haskell/wai-logger-2.3:=[profile?] dev-haskell/word8:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Provides some basic WAI handlers and middleware
+EAPI=5
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/fast-logger-2.1:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/iproute:=[profile?] >=dev-haskell/lifted-base-0.1.2:=[profile?] >=dev-haskell/network-2.6.1.0:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/vault:=[profile?] >=dev-haskell/void-0.5:=[profile?] >=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-logger-2.0:=[profile?] <dev-haskell/wai-logger-2.3:=[profile?] dev-haskell/word8:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/3.0.14
+SRC_URI=mirror://hackage/packages/archive/wai-extra/3.0.14/wai-extra-3.0.14.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a29d1953fd7f139cbc3eabdc89e71b00
diff --git a/dev-haskell/wai-extra-3.0.15.1 b/dev-haskell/wai-extra-3.0.15.1
new file mode 100644
index 000000000000..e8e567150967
--- /dev/null
+++ b/dev-haskell/wai-extra-3.0.15.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/fast-logger-2.4.5:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/iproute:=[profile?] >=dev-haskell/lifted-base-0.1.2:=[profile?] >=dev-haskell/network-2.6.1.0:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/vault:=[profile?] >=dev-haskell/void-0.5:=[profile?] >=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-logger-2.2.6:=[profile?] <dev-haskell/wai-logger-2.3:=[profile?] dev-haskell/word8:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Provides some basic WAI handlers and middleware
+EAPI=6
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/fast-logger-2.4.5:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/iproute:=[profile?] >=dev-haskell/lifted-base-0.1.2:=[profile?] >=dev-haskell/network-2.6.1.0:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/vault:=[profile?] >=dev-haskell/void-0.5:=[profile?] >=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-logger-2.2.6:=[profile?] <dev-haskell/wai-logger-2.3:=[profile?] dev-haskell/word8:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/3.0.15.1
+SRC_URI=mirror://hackage/packages/archive/wai-extra/3.0.15.1/wai-extra-3.0.15.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=414e993c1970b443f8f6c4c8df625e8f
diff --git a/dev-haskell/wai-extra-3.0.18 b/dev-haskell/wai-extra-3.0.18
new file mode 100644
index 000000000000..5f4bdbe9df81
--- /dev/null
+++ b/dev-haskell/wai-extra-3.0.18
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/fast-logger-2.4.5:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/iproute:=[profile?] >=dev-haskell/lifted-base-0.1.2:=[profile?] >=dev-haskell/network-2.6.1.0:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/vault:=[profile?] >=dev-haskell/void-0.5:=[profile?] >=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-logger-2.2.6:=[profile?] <dev-haskell/wai-logger-2.4:=[profile?] dev-haskell/word8:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Provides some basic WAI handlers and middleware
+EAPI=6
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/fast-logger-2.4.5:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/iproute:=[profile?] >=dev-haskell/lifted-base-0.1.2:=[profile?] >=dev-haskell/network-2.6.1.0:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/vault:=[profile?] >=dev-haskell/void-0.5:=[profile?] >=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-logger-2.2.6:=[profile?] <dev-haskell/wai-logger-2.4:=[profile?] dev-haskell/word8:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/3.0.18
+SRC_URI=mirror://hackage/packages/archive/wai-extra/3.0.18/wai-extra-3.0.18.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bee21da419764f0c1f136e33f40a2bf1
diff --git a/dev-haskell/wai-extra/Manifest b/dev-haskell/wai-extra/Manifest
deleted file mode 100644
index 53aa79bed023..000000000000
--- a/dev-haskell/wai-extra/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST wai-extra-3.0.10.tar.gz 49846 BLAKE2B 34c77322bf4c4f2db666f868ee8dc562a2d7a7be2acd24474e54824acec6c867202b01927fa23e028671167e05205b7742f59e5fcdbe3b474841ead716849a06 SHA512 c634c02d5c5b7774fede0b639be6cce7522e74cfb5eab4b5e5bcca3d00dd6304bb1d2a83a8bfa34e29c5dd3b72802bfc1306d323bd98629e530b0b630e0b00e3
-DIST wai-extra-3.0.14.tar.gz 52041 BLAKE2B 4ab0336b0f2ae87e1dc1fcb737b4d94a04d354079988b37d6a661514e7300e4a1317903429c4fd880e55c31b01a6e9106bc1b0830dc25f8e10315e793d8a15c5 SHA512 92c8456cc2959ddfd23bfae50936f237bfe903143d68ef211e2af8dbe1327a8ede63cadd74d3555349411a5046df9a2c87c7e983e06728759eafde80092a8aea
-DIST wai-extra-3.0.15.1.tar.gz 53546 BLAKE2B d6ece1ded9b2eb53a449ec8c3def2d4393ec4eb4d903e92c560628ff0baa4089da2893d9c0ab98b75c2b11d2615a15ad6fe3284f3db5e6796e6c659c21d47a52 SHA512 0a212b1f40fee357dbe452b71da9a5d793d1fc826e82b9b0df84c65e4fc06773fdf41ba637fe29bdc0627e01b4863076813d2cef4dd36e5e248400083a1248e8
-DIST wai-extra-3.0.18.tar.gz 59477 BLAKE2B b3f565c0f154b6341b618b23916c80c79edd972afb6f3d9b167f86787c6d1adf980c0a0f8ec726b0d1a5529881f5e93c80cb4a0f479f0a802c3919e9bdd0b6de SHA512 d17f7f31ca35b2d8ce9bb5b63579d720a5cc4b72907dcde8668038953ac99fd5798d84ec8ab533a5a2b7f5a411e945fd91c8e389190b9cf5ca47fcc2f666715b
-EBUILD wai-extra-3.0.10.ebuild 1813 BLAKE2B 6101cfc2ee5ac7e0ba833ee43750d9b30e6836d2129fee629786053180d482654d43ef207c3d761b115cd93d3362f70add48681eb4c457087ac09154c0bdf88d SHA512 cf1f294690ee5f9fb9e27cb17da15f45761968169d9a7344033b2f09cb9ec811811bd170353eb510dfc9eb69de60dae93a2e55bd4c495f9b1c8f217f903f0292
-EBUILD wai-extra-3.0.14.ebuild 1890 BLAKE2B 3e4896ca8e1eed3f0bb98e2f7812364be82d9fbb6e95487a0950b76f0cea63ef4de4a4e669b28c8ef40d4a631806e9b57e8e27791d3590041fcfa98244da28e9 SHA512 c4e12984375b450de93e9a9b12a20cef9ac64a830f752aa26a8e504a2b60a691fbeb5b632a8c6ccf1ca30b16dc6d2527064884fe596d575499111472bd1201dc
-EBUILD wai-extra-3.0.15.1.ebuild 1893 BLAKE2B 68c7861223de6a1912618ef6b4c45d8d7a3721c9c7893812b66410f1889b26878920b6e210eb5ffbad582996e0b25385457bc041b7e688f5e546c5ce564348ff SHA512 b5a60ed0d9efaac4bc945d0e4c4a4730d6e3891926725c91305e05917b9e8e69751fd2a6c06d067f0f06103ccc1575a4df986425f7cf35a950082f21fbbe623c
-EBUILD wai-extra-3.0.18.ebuild 1851 BLAKE2B 0c24abc296707b70385c05ad0bad53eed020ebdbc67b597011d6dc69d3c7404970e7a81115935ac1fffbb6d13e137e9c130df8f31ca86ce0b9b328fa5924100c SHA512 c00bbfc2835c6721a166a8a9a502264bc6058c3d1c9e0f668ae228e34d35aa871613a1f4a4cfda45d5ddd213ae558ef727f56fcb68bea5972ac148acf0499e23
-MISC metadata.xml 438 BLAKE2B 980987d3555b2921cb937bcc2c7e95f0ffeeb84d72b1c644483a30bfae1c574f9597a60c729c83535ddd743b06287c6f6e59001b1e450cef66ec42041e013c98 SHA512 44ef094f17e204930d66991292286aea16b740f62494a325b0dd405e94b9937114b573baef293f1c9e0ebb0918441f3fdf74b4efe1ae8ec24ba1979a13ca9360
diff --git a/dev-haskell/wai-extra/metadata.xml b/dev-haskell/wai-extra/metadata.xml
deleted file mode 100644
index 5fef2dac5332..000000000000
--- a/dev-haskell/wai-extra/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The goal here is to provide common features without many dependencies.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">yesodweb/wai</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/wai-extra/wai-extra-3.0.10.ebuild b/dev-haskell/wai-extra/wai-extra-3.0.10.ebuild
deleted file mode 100644
index d38d56d06d54..000000000000
--- a/dev-haskell/wai-extra/wai-extra-3.0.10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Provides some basic WAI handlers and middleware"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/ansi-terminal:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/fast-logger-2.1:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lifted-base-0.1.2:=[profile?]
-	>=dev-haskell/network-2.2.1.5:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	>=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	dev-haskell/vault:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?]
-	>=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.1:=[profile?]
-	>=dev-haskell/wai-logger-2.0:=[profile?] <dev-haskell/wai-logger-2.3:=[profile?]
-	dev-haskell/word8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/zlib )
-"
diff --git a/dev-haskell/wai-extra/wai-extra-3.0.14.ebuild b/dev-haskell/wai-extra/wai-extra-3.0.14.ebuild
deleted file mode 100644
index 5732f4282caf..000000000000
--- a/dev-haskell/wai-extra/wai-extra-3.0.14.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Provides some basic WAI handlers and middleware"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/ansi-terminal:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/fast-logger-2.1:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	dev-haskell/iproute:=[profile?]
-	>=dev-haskell/lifted-base-0.1.2:=[profile?]
-	>=dev-haskell/network-2.6.1.0:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	>=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	dev-haskell/vault:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?]
-	>=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
-	>=dev-haskell/wai-logger-2.0:=[profile?] <dev-haskell/wai-logger-2.3:=[profile?]
-	dev-haskell/word8:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/wai-extra/wai-extra-3.0.15.1.ebuild b/dev-haskell/wai-extra/wai-extra-3.0.15.1.ebuild
deleted file mode 100644
index 8ae11392256f..000000000000
--- a/dev-haskell/wai-extra/wai-extra-3.0.15.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Provides some basic WAI handlers and middleware"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/ansi-terminal:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/fast-logger-2.4.5:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	dev-haskell/iproute:=[profile?]
-	>=dev-haskell/lifted-base-0.1.2:=[profile?]
-	>=dev-haskell/network-2.6.1.0:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	>=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	dev-haskell/vault:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?]
-	>=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
-	>=dev-haskell/wai-logger-2.2.6:=[profile?] <dev-haskell/wai-logger-2.3:=[profile?]
-	dev-haskell/word8:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/wai-extra/wai-extra-3.0.18.ebuild b/dev-haskell/wai-extra/wai-extra-3.0.18.ebuild
deleted file mode 100644
index ae14d5519de4..000000000000
--- a/dev-haskell/wai-extra/wai-extra-3.0.18.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Provides some basic WAI handlers and middleware"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/ansi-terminal:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/fast-logger-2.4.5:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	dev-haskell/iproute:=[profile?]
-	>=dev-haskell/lifted-base-0.1.2:=[profile?]
-	>=dev-haskell/network-2.6.1.0:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	>=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	dev-haskell/vault:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?]
-	>=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
-	>=dev-haskell/wai-logger-2.2.6:=[profile?] <dev-haskell/wai-logger-2.4:=[profile?]
-	dev-haskell/word8:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/wai-logger-2.2.4.1 b/dev-haskell/wai-logger-2.2.4.1
new file mode 100644
index 000000000000..16f4cb595644
--- /dev/null
+++ b/dev-haskell/wai-logger-2.2.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/auto-update:=[profile?] dev-haskell/blaze-builder:=[profile?] dev-haskell/byteorder:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/easy-file-0.2:=[profile?] >=dev-haskell/fast-logger-2.2:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/unix-time-0.2.2:=[profile?] >=dev-haskell/wai-2.0.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/doctest ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A logging system for WAI
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/wai-logger
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/auto-update:=[profile?] dev-haskell/blaze-builder:=[profile?] dev-haskell/byteorder:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/easy-file-0.2:=[profile?] >=dev-haskell/fast-logger-2.2:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/unix-time-0.2.2:=[profile?] >=dev-haskell/wai-2.0.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/2.2.4.1
+SRC_URI=mirror://hackage/packages/archive/wai-logger/2.2.4.1/wai-logger-2.2.4.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5b68d995afcd0615fa5d43e0f40083d7
diff --git a/dev-haskell/wai-logger-2.2.7 b/dev-haskell/wai-logger-2.2.7
new file mode 100644
index 000000000000..7a5a7d47e975
--- /dev/null
+++ b/dev-haskell/wai-logger-2.2.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/byteorder:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/fast-logger-2.4.5:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/unix-time-0.2.2:=[profile?] >=dev-haskell/wai-2.0.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/doctest-0.10.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A logging system for WAI
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/wai-logger
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/byteorder:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/fast-logger-2.4.5:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/unix-time-0.2.2:=[profile?] >=dev-haskell/wai-2.0.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/2.2.7
+SRC_URI=mirror://hackage/packages/archive/wai-logger/2.2.7/wai-logger-2.2.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=56b681b064eaaad55e9576b9175fe7dc
diff --git a/dev-haskell/wai-logger/Manifest b/dev-haskell/wai-logger/Manifest
deleted file mode 100644
index f3cd3c391eca..000000000000
--- a/dev-haskell/wai-logger/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST wai-logger-2.2.4.1.tar.gz 6585 BLAKE2B 76915a9816b5f9f57914854014570e19dd8c6f31b8667d54f046ddf2efe549750211afe07d2804320cdb5d418e479bc3763039ec1c98e44e04569daa5f901416 SHA512 0900ecbcebed9433541ae4665c98037f1da832d6e6659be81328433f3ba9a5f258059736205e36517fdc22aefbd2d85e79bb5b50296c257b964c9256b2e828c5
-DIST wai-logger-2.2.7.tar.gz 5162 BLAKE2B a7cad6302151ed916c9dea4c42096e186269cdefab99d4edaf6d60e5b26bee7115686ae56b72296b7a6850d5ab9d097a882c75256df43cd6cdb22ed27149805b SHA512 09335971d30ef615c579df29214c7f9a1e7295c457d3d0aa6107d80a6ffce1399c13a101e7a4b64f0d869f66206fe28f8d0e0b01787421dd59f46046ebee382d
-EBUILD wai-logger-2.2.4.1.ebuild 1008 BLAKE2B e4f7bab8e80d5d9ce39c8ec657dc3455a86f98c262cb8939169cf61988b247435b80840ee840c959afa0ba2a560c9414c055808f2ba198a17f6c50a268fc0f98 SHA512 0736f0adcb42c2843551c1246ac8c3b94fc493b6328d4ac9c360dd46628458553bef28fa34021c02a9c1d359209db702ee496482d517ae5e47bff5d5238dad14
-EBUILD wai-logger-2.2.7.ebuild 932 BLAKE2B 153df9a461e53d481dd9b0942d76251afbd2936941fc95a327f6552feb4c21c653414c9f93c7c9c92f8b5117e4f35e17702f18f2143b992c0d73ebc9b5f05e59 SHA512 b535903beb67296be845bfe197b1ba0b955562707127aae8f86f46a405e91af389648baff8c6fbff4d194d38d10c8d2c7d78cf9cea789bed78e712a32b75e917
-MISC metadata.xml 315 BLAKE2B bb422720bbd618b0a9bca9d12aae63dfca71a7d3e06c337f7c665bac602e0800b9060af438574b6bf1c549c89043137ef7a2594c194e04e9dd796cbbb325cbe8 SHA512 4610c5b45b593dc780353c090d11c78c696fb39ef752f24684c3851b770285f6e5164cbef3d2770168d57b34f0bb22393d65e60b7aa38681da44db2edf8e1f8c
diff --git a/dev-haskell/wai-logger/metadata.xml b/dev-haskell/wai-logger/metadata.xml
deleted file mode 100644
index f2ec4ab58349..000000000000
--- a/dev-haskell/wai-logger/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A logging system for WAI
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/wai-logger/wai-logger-2.2.4.1.ebuild b/dev-haskell/wai-logger/wai-logger-2.2.4.1.ebuild
deleted file mode 100644
index a20eb7e91f26..000000000000
--- a/dev-haskell/wai-logger/wai-logger-2.2.4.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A logging system for WAI"
-HOMEPAGE="http://hackage.haskell.org/package/wai-logger"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RESTRICT=test # wai-test cyclic depend
-
-RDEPEND="dev-haskell/auto-update:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/byteorder:=[profile?]
-	dev-haskell/case-insensitive:=[profile?]
-	>=dev-haskell/easy-file-0.2:=[profile?]
-	>=dev-haskell/fast-logger-2.2:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-haskell/unix-time-0.2.2:=[profile?]
-	>=dev-haskell/wai-2.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/doctest )
-"
diff --git a/dev-haskell/wai-logger/wai-logger-2.2.7.ebuild b/dev-haskell/wai-logger/wai-logger-2.2.7.ebuild
deleted file mode 100644
index a1ff9017b01b..000000000000
--- a/dev-haskell/wai-logger/wai-logger-2.2.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A logging system for WAI"
-HOMEPAGE="http://hackage.haskell.org/package/wai-logger"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RESTRICT=test # missing file?
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/byteorder:=[profile?]
-	dev-haskell/case-insensitive:=[profile?]
-	>=dev-haskell/fast-logger-2.4.5:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-haskell/unix-time-0.2.2:=[profile?]
-	>=dev-haskell/wai-2.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/doctest-0.10.1 )
-"
diff --git a/dev-haskell/wai-test-1.3.1.1 b/dev-haskell/wai-test-1.3.1.1
new file mode 100644
index 000000000000..6b6a867155d6
--- /dev/null
+++ b/dev-haskell/wai-test-1.3.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-builder-conduit-0.5:=[profile?] <dev-haskell/blaze-builder-conduit-1.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/cookie-0.2:=[profile?] <dev-haskell/cookie-0.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] =dev-haskell/hunit-1.2*:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Unit test framework (built on HUnit) for WAI applications
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/web-application-interface
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-builder-conduit-0.5:=[profile?] <dev-haskell/blaze-builder-conduit-1.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/cookie-0.2:=[profile?] <dev-haskell/cookie-0.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] =dev-haskell/hunit-1.2*:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.3.1.1
+SRC_URI=mirror://hackage/packages/archive/wai-test/1.3.1.1/wai-test-1.3.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0bff80921d78f4dfd205fcdc982686d7
diff --git a/dev-haskell/wai-test-2.0.0.2 b/dev-haskell/wai-test-2.0.0.2
new file mode 100644
index 000000000000..73b37889f5cf
--- /dev/null
+++ b/dev-haskell/wai-test-2.0.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-builder-conduit-0.5:=[profile?] <dev-haskell/blaze-builder-conduit-1.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/cookie-0.2:=[profile?] <dev-haskell/cookie-0.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-1.3:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/wai-2.0:=[profile?] <dev-haskell/wai-2.2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Unit test framework (built on HUnit) for WAI applications
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/web-application-interface
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-builder-conduit-0.5:=[profile?] <dev-haskell/blaze-builder-conduit-1.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/cookie-0.2:=[profile?] <dev-haskell/cookie-0.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-1.3:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/wai-2.0:=[profile?] <dev-haskell/wai-2.2:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/2.0.0.2
+SRC_URI=mirror://hackage/packages/archive/wai-test/2.0.0.2/wai-test-2.0.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b8c3442e21779e1fca39f366eda44e47
diff --git a/dev-haskell/wai-test-3.0.0 b/dev-haskell/wai-test-3.0.0
new file mode 100644
index 000000000000..829933193d12
--- /dev/null
+++ b/dev-haskell/wai-test-3.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/wai-3.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8
+DESCRIPTION=Unit test framework (built on HUnit) for WAI applications. (deprecated)
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/book/web-application-interface
+IUSE=profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/wai-3.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/3.0.0
+SRC_URI=mirror://hackage/packages/archive/wai-test/3.0.0/wai-test-3.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f892ef66ff9dba81770330d8db82fe26
diff --git a/dev-haskell/wai-test/Manifest b/dev-haskell/wai-test/Manifest
deleted file mode 100644
index c77d2140de0a..000000000000
--- a/dev-haskell/wai-test/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST wai-test-1.3.1.1.tar.gz 3858 BLAKE2B fc16e086749bae7637e5aa11fac7ee5447aba0fe24fc665985101d8cf8a5933f0879555403b4e78d7eee289d2e6baedd0e6593807aba024a2bb80130694e9ada SHA512 fb9d216812d9e5d3bf18ece6ae397290444e9e843749869a688c7fecdb2d4cbb56d4c9d7527d6c8ecd597e055717cf6a5df9286950c38c94f862b7d578a6825d
-DIST wai-test-2.0.0.2.tar.gz 3645 BLAKE2B f63efd0030b23768aa6eefecf4bcf9b33445ba3dc7c2c63d4cdf2891a4d4ceb861d5d49e62d882b24340400ce9ef08b9e43e01732e2aa2dbbe30c4276dd3fb0f SHA512 d81fc332ebbcf071c9d62f1dea7b9cb2e7ad1bf160a2472ced347dd4dea0a0f36dbbfaa733ccd00958c904a9e4413f720d75e9c66efb7bed17c7e3bc067f5379
-DIST wai-test-3.0.0.tar.gz 1227 BLAKE2B 4a99ab99810cff2d3b2fbdc7c36acc239d1ab8d15ffe5d4d9d8c953c01de2daca63279a6f36f2850740f8f945f8e7edc6d756a6516acfc686c45a35d9af8c400 SHA512 2c7f8788f3a51f94b02a2d79b7ad40c0f92f3756163b1e4c0981e92c3364c822b6a1cbf2b7129fd6974a745774f2dbffe1a6097e362d183bc2e30dd62125666f
-EBUILD wai-test-1.3.1.1.ebuild 1391 BLAKE2B c5b92028d5738484d2bc894e7ce5097bc04b21a905197bd4e94095410cbc3ef5f5afd811b78441ba70231e85a17208f2c3ade60fe3aebe24956a54ea39b215ff SHA512 9481af7d5357e3f558b95783db9fd220d45f9c44e87ce80451a3b563c2e631e035524332aa569e6b178362064cfd105311dae316fe1a1f5311006b432858d98b
-EBUILD wai-test-2.0.0.2.ebuild 1364 BLAKE2B 27b111a56d1c1fc43c8189ad9c1559caed083a071c0185afa5e4d3dd3cd5a783904aa046804e9c8162ed5357ab6bf910caeb3babbedbd361c0c641264880d234 SHA512 db376762b6b5174bd022228164e5c4659020a0859e6bac2abbf9c3e43287e8ebe1dd86de9fe2153d78f4c7044e680a6ca3132aefb344d13590fa1987c929d8e8
-EBUILD wai-test-3.0.0.ebuild 609 BLAKE2B 82f1b5f5343b3f54e187541c7d31dd3966ee7dfd22ecbc63b4df4b5a1cfac0d9e3643e716e51dde4be87c2fc90348912cdd0fb42f407e7ecf2fa7fca02c335b4 SHA512 b978f6664b4cb7cbd8eec17d99f6d5d9c4acbbdcea0efaab4b86bf8914f7fb308572ff3c7b2b5de5ba1511b0cf26037a3c65670b2c3138b43d85b44da0b126ef
-MISC metadata.xml 349 BLAKE2B 3b565f50b8bee9e82f74aa9b38ae55ee062cca380c270c8065b0654485e1536d4b314c16b1e0231ffaa39d8d8811147fc1e1302d420e53e1ce14ee69bd464d47 SHA512 d2c643a662b2fa0b06c429cf611653967a42314218d03edab32bd9d7e5bc82cfef253f3ef89c318c75ae665e6e8143e76eca116be6746dbfd0215c8750058163
diff --git a/dev-haskell/wai-test/metadata.xml b/dev-haskell/wai-test/metadata.xml
deleted file mode 100644
index 79cdd05b83e0..000000000000
--- a/dev-haskell/wai-test/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Unit test framework (built on HUnit) for WAI applications.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/wai-test/wai-test-1.3.1.1.ebuild b/dev-haskell/wai-test/wai-test-1.3.1.1.ebuild
deleted file mode 100644
index 950d9fe46bc4..000000000000
--- a/dev-haskell/wai-test/wai-test-1.3.1.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Unit test framework (built on HUnit) for WAI applications"
-HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-		<dev-haskell/blaze-builder-0.4:=[profile?]
-		>=dev-haskell/blaze-builder-conduit-0.5:=[profile?]
-		<dev-haskell/blaze-builder-conduit-1.1:=[profile?]
-		>=dev-haskell/case-insensitive-0.2:=[profile?]
-		>=dev-haskell/conduit-0.5:=[profile?]
-		<dev-haskell/conduit-1.1:=[profile?]
-		>=dev-haskell/cookie-0.2:=[profile?]
-		<dev-haskell/cookie-0.5:=[profile?]
-		>=dev-haskell/http-types-0.7:=[profile?]
-		=dev-haskell/hunit-1.2*:=[profile?]
-		dev-haskell/network:=[profile?]
-		>=dev-haskell/text-0.7:=[profile?]
-		<dev-haskell/text-0.12:=[profile?]
-		>=dev-haskell/transformers-0.2.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-haskell/wai-1.3:=[profile?]
-		<dev-haskell/wai-1.5:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-		)"
diff --git a/dev-haskell/wai-test/wai-test-2.0.0.2.ebuild b/dev-haskell/wai-test/wai-test-2.0.0.2.ebuild
deleted file mode 100644
index 28fc047cbb17..000000000000
--- a/dev-haskell/wai-test/wai-test-2.0.0.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Unit test framework (built on HUnit) for WAI applications"
-HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/blaze-builder-conduit-0.5:=[profile?] <dev-haskell/blaze-builder-conduit-1.1:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	>=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/cookie-0.2:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-1.3:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-haskell/wai-2.0:=[profile?] <dev-haskell/wai-2.2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/wai-test/wai-test-3.0.0.ebuild b/dev-haskell/wai-test/wai-test-3.0.0.ebuild
deleted file mode 100644
index 37b1f3c28bc1..000000000000
--- a/dev-haskell/wai-test/wai-test-3.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Unit test framework (built on HUnit) for WAI applications. (deprecated)"
-HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/wai-3.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/wai/Manifest b/dev-haskell/wai/Manifest
deleted file mode 100644
index 87f7b2052699..000000000000
--- a/dev-haskell/wai/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-DIST wai-1.4.0.2.tar.gz 4659 BLAKE2B a74a5b7267788590e0cd2cbcc5b9dfc836b9d32ce59533464226be0b805f286b8f0f87ce9a8b30a1b3b3bf49609f936c604ff7c0ab38a900a9543d491ffce11c SHA512 2f0953e37a2f80044ba70d5bbbb4d9c964c6703702619710c959fd2dc9c49803ab470f689e4c0f13e6fe86612d6202ac822e1c5e8dc0c438027fac3dcd660202
-DIST wai-2.0.0.tar.gz 5971 BLAKE2B d7274842234860bca702118c068d266434ceffa2e2fd81f9e061dc21d9f5e6648193831def64ca5b0e3d0736279b2fff6563d4e2d37c880940aaf0b1442c8e94 SHA512 2c154cd3000fe6380d1584df0c27235b8d3574bf6b1ee54be8d2fbd2ccb025b4e263549c450f71c78c04b633bd4aa90ba957274643e196b7bb1bf9361d709a2b
-DIST wai-2.1.0.tar.gz 6249 BLAKE2B f65fa57e518f26bfeb10bd6a36faf1100322d82312a8fcef8722e2bd5e6c513f8d94446cd3682b26aecc6e7992a6287c0057ad22bfd3c856b7e6b9253e5d8359 SHA512 4df4cf10220c97439385990de9d8e5bce97a842fbdc131d8a90ff96c8c2aa958179851563750136043cbc7ebbe10542bafa81c7d9db20a8218380a064d76032b
-DIST wai-3.0.3.0.tar.gz 9532 BLAKE2B 0e65afe6127b96ba35c6a2e59d370ac0781039a0d92764308bb9e7d280f65ebc9aa057628d8b57c7372c1ce04d0c285f1cef98be37465f2dc93d76d5583aa879 SHA512 e1a3672db5ad367abdafe88b8366f29c8cc4dc5ef309b09193a2167d90466cdfed19fcb5ba4e179b31622c3df8ddb74a11c5338967fdae8696fb739cf62a7002
-DIST wai-3.0.5.0.tar.gz 14498 BLAKE2B 48e7ed33110cb5e6c21624392e65fa29832809f068f48ccc260998962ca442bf532154d1fa0c21f883a40773e668e1fbf3cc71be37852077a12fa46d1a429288 SHA512 076ebc3a651b5e93e608d42a9a64a591bfc742139dc6112ce574ef04b4e701d709bc3fed2ed7ce74ca46f9e99df45990a0b8bfe7da0b054c06f0bc7864b29fc7
-DIST wai-3.2.1.1.tar.gz 10039 BLAKE2B 017d5fd4555541263ce6c47a2d666215c155585cf08ce111a5d1c7e818b6bff11f785bf7bbb374c4fc18c98f806e118cd272e0b1f243a5b8c03d7ac00c77533c SHA512 5fadbc5e665002f9e1a5d962731309bac6cb91a0533ba8ce0ae8d69014322e2a2960bcd0e6c56e65e3a2a03be6832ba5e72dcca6ae33620f1cd1791ea725f6a3
-EBUILD wai-1.4.0.2.ebuild 938 BLAKE2B a57562f08b42f09d3f152ad385a71d4040c22b1d0f5fade8e30494ed31245ca80fb2ae5e4f8c24de814d1e516d6ff2588c26b3ee8ce77d718d9498bcbebcfd99 SHA512 48c72329d5fe5a8dbab2f4c143383e3a98bbfce2b943347c7c263c124caa45460187d44601b44a778aeeac474119c5bf5a09b9ddd28d00ea69cbb968c25df665
-EBUILD wai-2.0.0.ebuild 940 BLAKE2B b4aea14aef1f15968ad30e025de01590bd7b6086ccdeb270d7ca3b5a6d558c272189e05ad397aac3fdf8db98ce8c44ac6d60ebfe7a6ac011bb49835bf6a55390 SHA512 82f41887cc4a4f83c62eb3f629a1f8354d03710b6c7c7488f482b5ff10842a8dcfaaeabe71cdcf9569f54d727dcec7b1084cb3893fcc54f80ab17121aade3533
-EBUILD wai-2.1.0.ebuild 942 BLAKE2B 86ddfb97b9375836bcf9620b64bd70549b07562e0cce455da27847b413fd0c8f0451e5647040e2cb33798bc67b64b6ac101e51d3ec92ae7e23e622dd4ba11e40 SHA512 b8eaf95511b77e3c31f6aaf634adf75db2eec1010d606b130831c2ec6b9652a7d18a350966b7c07730039f3eb6c594d9249e35f833545ea24c1111a799f0c05f
-EBUILD wai-3.0.3.0.ebuild 851 BLAKE2B 3e3ac7fcfe3edf5eaf28abd7e94eece3b952930dea6ae3e77f89cdc5da43f05adc88cc0d9744bca4c36c7ca038e4be666fbb4fbe5e27581f65592a14f1a91926 SHA512 e7a3d5d7f0956ba88aceb37362302b9121f2ce23dbef26ebe8cf9c8dd1f60475d78e718b9eacf35236fbea62fa4e24cb85dbd771264de6448aee8576f0f66acd
-EBUILD wai-3.0.5.0.ebuild 1049 BLAKE2B b4e543c64b11fae5f59f1bd7a6877faa10a13c3ecbab21d97d035499e30a608c2d7a9b4844cfedb475264a5ed7343f2abcd83bc9c099f14e8cd2fbc710f1fcfd SHA512 3339e9edd7505cd860605fa8015aaa9b106510a9435b11805eab71b08a41a266bd89bb6d3755f78d93be07d46e9423970f2ee96eeabb9f9c2789f68431c2b23e
-EBUILD wai-3.2.1.1.ebuild 1002 BLAKE2B 94c54bc2d456999b890c9ac783de0c14ec3ed797ba6b5f020c6d32a3fedddeded960f0f082c4360d53a76bf96dad3bdc997563bc9ed3d9f9a95da6ae365733ad SHA512 41e163a4a8be3c03bcf368630e336a5ea56c4b159fe587dd7a31703caaf8afb0a0902107bafd31cbf667e27522f863235e42b4f00cbc621383f0df7412344252
-MISC metadata.xml 454 BLAKE2B 3ef1cbb158cda0dac602716c12e1bf50f55ad1ca0df83b6a7d8915882df9e93e0bc945bbf59d4fa5d0381c39af8fe7a48a7857063b90f9bcae963bb2ccd77eb8 SHA512 dc3917c971c63bdab8e9c1bdc8e00959de5372d42ac139acf86a9ee3b3b2abe2f437fddd0a421676c4411d58a076fd6cf125230d105be6848ac28c6006d005a5
diff --git a/dev-haskell/wai/metadata.xml b/dev-haskell/wai/metadata.xml
deleted file mode 100644
index 1f32097775f3..000000000000
--- a/dev-haskell/wai/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Provides a common protocol for communication between web applications and web servers.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">yesodweb/wai</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/wai/wai-1.4.0.2.ebuild b/dev-haskell/wai/wai-1.4.0.2.ebuild
deleted file mode 100644
index 5e1e51cb1080..000000000000
--- a/dev-haskell/wai/wai-1.4.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Web Application Interface"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/network-2.2.1.5:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/vault-0.1:=[profile?] <dev-haskell/vault-0.4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/wai/wai-2.0.0.ebuild b/dev-haskell/wai/wai-2.0.0.ebuild
deleted file mode 100644
index eca47223999f..000000000000
--- a/dev-haskell/wai/wai-2.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Web Application Interface"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/conduit-1.0.8:=[profile?] <dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/network-2.2.1.5:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/vault-0.1:=[profile?] <dev-haskell/vault-0.4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/wai/wai-2.1.0.ebuild b/dev-haskell/wai/wai-2.1.0.ebuild
deleted file mode 100644
index 20dca92ac6f4..000000000000
--- a/dev-haskell/wai/wai-2.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Web Application Interface"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/conduit-1.0.8:=[profile?] <dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/network-2.2.1.5:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/wai/wai-3.0.3.0.ebuild b/dev-haskell/wai/wai-3.0.3.0.ebuild
deleted file mode 100644
index afc1ad2858e2..000000000000
--- a/dev-haskell/wai/wai-3.0.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Web Application Interface"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/network-2.2.1.5:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/wai/wai-3.0.5.0.ebuild b/dev-haskell/wai/wai-3.0.5.0.ebuild
deleted file mode 100644
index a83bac1be0a2..000000000000
--- a/dev-haskell/wai/wai-3.0.5.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Web Application Interface"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/bytestring-builder-0.10.4.0:=[profile?] <dev-haskell/bytestring-builder-0.10.7:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/network-2.2.1.5:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.0:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/wai/wai-3.2.1.1.ebuild b/dev-haskell/wai/wai-3.2.1.1.ebuild
deleted file mode 100644
index 07a7e3257b7d..000000000000
--- a/dev-haskell/wai/wai-3.2.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Web Application Interface"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/bytestring-builder-0.10.4.0:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/network-2.2.1.5:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.0:=[profile?]
-	>=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/warp-3.0.13.1 b/dev-haskell/warp-3.0.13.1
new file mode 100644
index 000000000000..669294f3adb8
--- /dev/null
+++ b/dev-haskell/warp-3.0.13.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/auto-update-0.1.1:=[profile?] <dev-haskell/auto-update-0.2:=[profile?] >=dev-haskell/blaze-builder-0.3.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.8.5:=[profile?] >=dev-haskell/iproute-1.3.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?] >=dev-haskell/streaming-commons-0.1.10:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/vault-0.3:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.1:=[profile?] >=dev-lang/ghc-7.4.1:= allow-sendfilefd? ( dev-haskell/hashable:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/async >=dev-haskell/doctest-0.9.3 >=dev-haskell/hspec-1.3 dev-haskell/http dev-haskell/hunit >=dev-haskell/lifted-base-0.1 dev-haskell/old-locale dev-haskell/quickcheck >=dev-haskell/transformers-0.2.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A fast, light-weight web server for WAI applications
+EAPI=5
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=+allow-sendfilefd warp-debug doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/auto-update-0.1.1:=[profile?] <dev-haskell/auto-update-0.2:=[profile?] >=dev-haskell/blaze-builder-0.3.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.8.5:=[profile?] >=dev-haskell/iproute-1.3.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?] >=dev-haskell/streaming-commons-0.1.10:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/vault-0.3:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.1:=[profile?] >=dev-lang/ghc-7.4.1:= allow-sendfilefd? ( dev-haskell/hashable:=[profile?] )
+RESTRICT=test
+SLOT=0/3.0.13.1
+SRC_URI=mirror://hackage/packages/archive/warp/3.0.13.1/warp-3.0.13.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=be3ae9e4ff30c96fe7d279659a15d2cb
diff --git a/dev-haskell/warp-3.1.10 b/dev-haskell/warp-3.1.10
new file mode 100644
index 000000000000..ee1c46f1bb71
--- /dev/null
+++ b/dev-haskell/warp-3.1.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/auto-update-0.1.1:=[profile?] <dev-haskell/auto-update-0.2:=[profile?] >=dev-haskell/blaze-builder-0.4:=[profile?] dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.8.5:=[profile?] >=dev-haskell/http2-1.3:=[profile?] >=dev-haskell/iproute-1.3.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/streaming-commons-0.1.10:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/vault-0.3:=[profile?] >=dev-haskell/wai-3.0.4:=[profile?] <dev-haskell/wai-3.1:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/async >=dev-haskell/doctest-0.10.1 >=dev-haskell/hspec-1.3 dev-haskell/http dev-haskell/hunit >=dev-haskell/lifted-base-0.1 dev-haskell/quickcheck >=dev-haskell/transformers-0.2.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A fast, light-weight web server for WAI applications
+EAPI=5
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=+allow-sendfilefd warp-debug doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/auto-update-0.1.1:=[profile?] <dev-haskell/auto-update-0.2:=[profile?] >=dev-haskell/blaze-builder-0.4:=[profile?] dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.8.5:=[profile?] >=dev-haskell/http2-1.3:=[profile?] >=dev-haskell/iproute-1.3.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/streaming-commons-0.1.10:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/vault-0.3:=[profile?] >=dev-haskell/wai-3.0.4:=[profile?] <dev-haskell/wai-3.1:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/3.1.10
+SRC_URI=mirror://hackage/packages/archive/warp/3.1.10/warp-3.1.10.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=608544ec2549814d23c28cd9c8b3cff1
diff --git a/dev-haskell/warp-3.2.11 b/dev-haskell/warp-3.2.11
new file mode 100644
index 000000000000..85d9bf7109ae
--- /dev/null
+++ b/dev-haskell/warp-3.2.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/auto-update-0.1.3:=[profile?] <dev-haskell/auto-update-0.2:=[profile?] >=dev-haskell/blaze-builder-0.4:=[profile?] dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.8.5:=[profile?] >=dev-haskell/http2-1.6:=[profile?] <dev-haskell/http2-1.7:=[profile?] >=dev-haskell/iproute-1.3.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/streaming-commons-0.1.10:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/vault-0.3:=[profile?] >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/doctest-0.10.1 >=dev-haskell/hspec-1.3 dev-haskell/http dev-haskell/hunit >=dev-haskell/lifted-base-0.1 dev-haskell/quickcheck dev-haskell/silently >=dev-haskell/transformers-0.2.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A fast, light-weight web server for WAI applications
+EAPI=6
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=+allow-sendfilefd warp-debug doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/auto-update-0.1.3:=[profile?] <dev-haskell/auto-update-0.2:=[profile?] >=dev-haskell/blaze-builder-0.4:=[profile?] dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.8.5:=[profile?] >=dev-haskell/http2-1.6:=[profile?] <dev-haskell/http2-1.7:=[profile?] >=dev-haskell/iproute-1.3.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/streaming-commons-0.1.10:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/vault-0.3:=[profile?] >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/3.2.11
+SRC_URI=mirror://hackage/packages/archive/warp/3.2.11/warp-3.2.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f244cdaceb12264d0c9419d57050cfd9
diff --git a/dev-haskell/warp-tls-3.0.4.2 b/dev-haskell/warp-tls-3.0.4.2
new file mode 100644
index 000000000000..27217a987787
--- /dev/null
+++ b/dev-haskell/warp-tls-3.0.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cprng-aes-0.5.0:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] >=dev-haskell/network-2.2.1:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/tls-1.2.16:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.1:=[profile?] >=dev-haskell/warp-3.0.8:=[profile?] <dev-haskell/warp-3.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HTTP over SSL/TLS support for Warp via the TLS package
+EAPI=5
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/cprng-aes-0.5.0:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] >=dev-haskell/network-2.2.1:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/tls-1.2.16:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.1:=[profile?] >=dev-haskell/warp-3.0.8:=[profile?] <dev-haskell/warp-3.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/3.0.4.2
+SRC_URI=mirror://hackage/packages/archive/warp-tls/3.0.4.2/warp-tls-3.0.4.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e31100db2be93de3f430440726110a6b
diff --git a/dev-haskell/warp-tls-3.1.5 b/dev-haskell/warp-tls-3.1.5
new file mode 100644
index 000000000000..00c1d8ddc691
--- /dev/null
+++ b/dev-haskell/warp-tls-3.1.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cprng-aes-0.5.0:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] >=dev-haskell/network-2.2.1:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/tls-1.3.2:=[profile?] >=dev-haskell/wai-3.0.4:=[profile?] <dev-haskell/wai-3.1:=[profile?] >=dev-haskell/warp-3.1.7:=[profile?] <dev-haskell/warp-3.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HTTP over TLS support for Warp via the TLS package
+EAPI=5
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/cprng-aes-0.5.0:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] >=dev-haskell/network-2.2.1:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/tls-1.3.2:=[profile?] >=dev-haskell/wai-3.0.4:=[profile?] <dev-haskell/wai-3.1:=[profile?] >=dev-haskell/warp-3.1.7:=[profile?] <dev-haskell/warp-3.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/3.1.5
+SRC_URI=mirror://hackage/packages/archive/warp-tls/3.1.5/warp-tls-3.1.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=255bd6ed1546609ce880163fe014a452
diff --git a/dev-haskell/warp-tls-3.2.3 b/dev-haskell/warp-tls-3.2.3
new file mode 100644
index 000000000000..a74be0906500
--- /dev/null
+++ b/dev-haskell/warp-tls-3.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cryptonite-0.12:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] >=dev-haskell/network-2.2.1:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/tls-1.3.5:=[profile?] >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/warp-3.2.10:=[profile?] <dev-haskell/warp-3.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HTTP over TLS support for Warp via the TLS package
+EAPI=6
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/cryptonite-0.12:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] >=dev-haskell/network-2.2.1:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/tls-1.3.5:=[profile?] >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/warp-3.2.10:=[profile?] <dev-haskell/warp-3.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/3.2.3
+SRC_URI=mirror://hackage/packages/archive/warp-tls/3.2.3/warp-tls-3.2.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f69f61ea346fdd667ece33b993046352
diff --git a/dev-haskell/warp-tls/Manifest b/dev-haskell/warp-tls/Manifest
deleted file mode 100644
index 4c7d7aa05f3b..000000000000
--- a/dev-haskell/warp-tls/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST warp-tls-3.0.4.2.tar.gz 5870 BLAKE2B ea55807c1ed297befd351db83bfac773d22bb5de509d56870fc7695716a0144b55d99ea27a7e9b30a0042fbe075ab0ccd47c47d463a345ef4b30efa27b2a52e7 SHA512 3334d8923b720ed4b79f9489364824170df276bcf3ac530719d26999d0899e4ae46c2758856819b440ee937d8c411bbfff2a446984a3b7d5c61177582517e467
-DIST warp-tls-3.1.5.tar.gz 6967 BLAKE2B ca5a4bc7abc7a1ebf1348c85ce4ff2ccb329e55ff3a669b4714cdea225b8b5d25692bc1fa79b1952017f9c421fe4fb2f200014b1a3de0b2a66b8890b18eb68a2 SHA512 f34f706ed1a1a37a3d78b3b5f296bd8416b5524fcded5b1291ffc2b7e20069ab252fe5c1620bc6c79b8c2346a70b872654b88d0957a55a843a92ce6384fe3483
-DIST warp-tls-3.2.3.tar.gz 7159 BLAKE2B c54d4ffd52a2968e279fd8cef2acbbc22bdf1830fac4fad71319c85d8e7906c799b5a0385cd01ea59aa30a8304b0219be280a2ec774b60a9f5c43b628dd1ebd6 SHA512 d20baaf2d89007cef8f7beed1eb5dc9e3698376c0abfdfca65d06c3c55dc083fa1f68b0fdfb2f67e686e1d5bcc69e5d3f128d2807f72b95c49ef2400791f8b03
-EBUILD warp-tls-3.0.4.2.ebuild 1012 BLAKE2B 6a4d5539d439397e8fff0429a8691ccbf5d1b79c30cc35969a949207a015798e128bb214d3f6229f984025b04581e16361ab615b917298f721a539136aa1d62a SHA512 7692e8726a2291bff6dd0d63b3c1ebda55212f7beffb615f52c9c0eda6006f46cee91ecf4d28c8d12d2bb995137be81d1244a25906cb0332c9df42e0a1b6afbd
-EBUILD warp-tls-3.1.5.ebuild 1011 BLAKE2B 19c45db382569fda7919139bc937543626edc929fe052632a1805cc459af2c0fa0256d8df8dcd6e4a5d4841addbc4f9f595471befd1f0ad0b641f801799f0dd0 SHA512 5213857b87313b911774ca9145bd902dbe5d0e09a6e2b89e6841104d903ba5bdf8d6bf8683b63438aad9b31eb7ff3a1de3d1cfb41674b01da8ea08830ba17b30
-EBUILD warp-tls-3.2.3.ebuild 1010 BLAKE2B f9ac7a766765ce0a2afd4dff33f5ebfe32e62fce02e3ca678ae322472f6beaa4c9fb07983960e6ab02d2212976a161678bb9d7fc86b8796b92becb00ac7f5ca9 SHA512 f95cd0d1b931d76fd01f49b15944da28f0a5c1dff8fe0a88957fe037518b54b3833bd42ac239b97b22122586db8f592d1dd12263e695011bed8eed8fe7e99457
-MISC metadata.xml 423 BLAKE2B 5463c75d3b032343e0afea3366a8aaedc25a3f551740decca76238f7909231d56c7855b55e21ce279ed8b79f06bfbd84bfa946863318916bcbe68da0cef4388f SHA512 8e779cfe4315e42ff396408778ea3d421fa6607b4385ee0b6227d4c8c780996ffbe8a1f20d82f0c2442d04ae4ed2b0a04c890e19ab583c85aea8ed2e238c769c
diff --git a/dev-haskell/warp-tls/metadata.xml b/dev-haskell/warp-tls/metadata.xml
deleted file mode 100644
index e8a84ab12130..000000000000
--- a/dev-haskell/warp-tls/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		HTTP over SSL/TLS support for Warp via the TLS package.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">yesodweb/wai</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/warp-tls/warp-tls-3.0.4.2.ebuild b/dev-haskell/warp-tls/warp-tls-3.0.4.2.ebuild
deleted file mode 100644
index 8dcba53a58e4..000000000000
--- a/dev-haskell/warp-tls/warp-tls-3.0.4.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: +tls_1_1_3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP over SSL/TLS support for Warp via the TLS package"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cprng-aes-0.5.0:=[profile?]
-	>=dev-haskell/data-default-class-0.0.1:=[profile?]
-	>=dev-haskell/network-2.2.1:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	>=dev-haskell/tls-1.2.16:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.1:=[profile?]
-	>=dev-haskell/warp-3.0.8:=[profile?] <dev-haskell/warp-3.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=tls_1_1_3
-}
diff --git a/dev-haskell/warp-tls/warp-tls-3.1.5.ebuild b/dev-haskell/warp-tls/warp-tls-3.1.5.ebuild
deleted file mode 100644
index fba132c79907..000000000000
--- a/dev-haskell/warp-tls/warp-tls-3.1.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +tls_1_1_3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP over TLS support for Warp via the TLS package"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cprng-aes-0.5.0:=[profile?]
-	>=dev-haskell/data-default-class-0.0.1:=[profile?]
-	>=dev-haskell/network-2.2.1:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	>=dev-haskell/tls-1.3.2:=[profile?]
-	>=dev-haskell/wai-3.0.4:=[profile?] <dev-haskell/wai-3.1:=[profile?]
-	>=dev-haskell/warp-3.1.7:=[profile?] <dev-haskell/warp-3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=tls_1_1_3
-}
diff --git a/dev-haskell/warp-tls/warp-tls-3.2.3.ebuild b/dev-haskell/warp-tls/warp-tls-3.2.3.ebuild
deleted file mode 100644
index c0950962a8b4..000000000000
--- a/dev-haskell/warp-tls/warp-tls-3.2.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: +tls_1_1_3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP over TLS support for Warp via the TLS package"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cryptonite-0.12:=[profile?]
-	>=dev-haskell/data-default-class-0.0.1:=[profile?]
-	>=dev-haskell/network-2.2.1:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	>=dev-haskell/tls-1.3.5:=[profile?]
-	>=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?]
-	>=dev-haskell/warp-3.2.10:=[profile?] <dev-haskell/warp-3.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=tls_1_1_3
-}
diff --git a/dev-haskell/warp/Manifest b/dev-haskell/warp/Manifest
deleted file mode 100644
index 286ba0c304af..000000000000
--- a/dev-haskell/warp/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST warp-3.0.13.1.tar.gz 44894 BLAKE2B 1eafa5629ea5c4562d904da62c988b87f42d8f53a58214323414f94ff56fa0c363449ec703a57ca67f63e11c385018d07aac7b5b1db6cf6456a0b01e339842a9 SHA512 5da05c58e0a4223469ffa78877a7099c5ab9bdae1f4cc43db1f88fa109f0a5f44a9eb7a98f36f068ecd2b67a1c4b218e565fa8d4cb8cd39a944995569fe6feda
-DIST warp-3.1.10.tar.gz 72128 BLAKE2B fcb3c3a01a5d1d8943559aca2f66c62a19ae85db5f17a7978f99c414c1d60c845d46870add61296b3c4bf43b13bfb403fa62152145011f6c2d4498d253e8648c SHA512 ee5ea6a1bbf4b9773ce0e69d51989268ed610564bcbe06fd8b214ec1edf2a71c22b47c2970cd0a45573fa9bec734ff2b585747dfc86e1e788b16f12429aea645
-DIST warp-3.2.11.tar.gz 78007 BLAKE2B 5dc7b0e3a14d8dca141a7f537021d9cc721f8eb441f62e6ab10abaa2f41ba69049c352a6e311bf3de637ee83d452a618c221ff34fb657de59c0df4ca32fdb8b9 SHA512 971662d84c327b314822bf4f4a9c4f9c1950ef444d1965fab5139fe245dc5c0bb88302f1ff40cf32afa7085a80494dd377a5528586ad3395dc633f3ae782b04c
-EBUILD warp-3.0.13.1.ebuild 1982 BLAKE2B 3ae4a8d7c2975a18c578ac28d51a6092b5713f31d809357a4a836e70eb7015bfa8e77aa11edb9394d91f98605357e5acefe2bce8580e524a6ab69b7662250f25 SHA512 c82dc21119c50369e80487e122e6336ab44dd84ec0eb3bfafc751acf27097400492757a7ac5cd6d9c1a55cf5a0a5600f9af3059c280a72a0f003ccb2fb3c5d41
-EBUILD warp-3.1.10.ebuild 1946 BLAKE2B 9a32a2ca1f5d7ebe5384ec71baff263f69e84b42b95c447d6349044a299af99e13ce66f8f6e075ade497f5005f260158afa97be90e723abddb99db78ea84b7a6 SHA512 a07ba81f225ff4cbe56dd655031a3d054862759f943acdb1597604476d83776ac12969ea9e1285cc6b768d060885347110df28758d9cd599a97a7b504da47a6a
-EBUILD warp-3.2.11.ebuild 1934 BLAKE2B 0dcbf45db7f96000e72c27472f99ca3c8c1bf3dccd4fbd470a2b75c131aa1922aee38ed0fadc687f23769bd8c15dbabc7f52064c54915f783f222bf217e7b0d8 SHA512 d3691c5d806919f4d8f51fb7dd817725b5cf23f5a1c2a661e3987eaf9dec57f67c1bd80387c815c65c702c41961168edab5bacbab3897069b5d0088e6d2c4b2a
-MISC metadata.xml 675 BLAKE2B 74f9fc8f509c9ac875d37f7a99bd1fdc626a215a60f7c82e411f66b718b7979cb67807fa10da408e423beead085541a69978d22725bd0255baa29ef8c060ecde SHA512 641fc01699c9f39c032b4735ac30e218e32cfd1403d9eae03ac4a5d6ab55e7c91af1ef7ddee088c87df902cda43ed74f16f6cc7d83eba1f859b43121c0112d42
diff --git a/dev-haskell/warp/metadata.xml b/dev-haskell/warp/metadata.xml
deleted file mode 100644
index 686087ee568d..000000000000
--- a/dev-haskell/warp/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The premier WAI handler. For more information, see &lt;http://steve.vinoski.net/blog/2011/05/01/warp-a-haskell-web-server/&gt;.
-	</longdescription>
-	<use>
-		<flag name="allow-sendfilefd">Allow use of sendfileFd (not available on GNU/kFreeBSD).</flag>
-		<flag name="warp-debug">Add additional debuging information</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">yesodweb/wai</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/warp/warp-3.0.13.1.ebuild b/dev-haskell/warp/warp-3.0.13.1.ebuild
deleted file mode 100644
index 01cc94cee3f7..000000000000
--- a/dev-haskell/warp/warp-3.0.13.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -network-bytestring
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A fast, light-weight web server for WAI applications"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+allow-sendfilefd warp-debug"
-
-# Ambiguous module name ‘Data.IP’: it was found in multiple packages:
-# iproute-1.4.0@ network-data-0.5.3@
-RESTRICT=test
-
-RDEPEND="
-	>=dev-haskell/auto-update-0.1.1:=[profile?] <dev-haskell/auto-update-0.2:=[profile?]
-	>=dev-haskell/blaze-builder-0.3.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/http-date:=[profile?]
-	>=dev-haskell/http-types-0.8.5:=[profile?]
-	>=dev-haskell/iproute-1.3.1:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.10:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/vault-0.3:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	allow-sendfilefd? ( dev-haskell/hashable:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? (
-		dev-haskell/async
-		>=dev-haskell/doctest-0.9.3
-		>=dev-haskell/hspec-1.3
-		dev-haskell/http
-		dev-haskell/hunit
-		>=dev-haskell/lifted-base-0.1
-		dev-haskell/old-locale
-		dev-haskell/quickcheck
-		>=dev-haskell/transformers-0.2.2
-	)
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag allow-sendfilefd allow-sendfilefd) \
-		--flag=-network-bytestring \
-		$(cabal_flag warp-debug warp-debug)
-}
diff --git a/dev-haskell/warp/warp-3.1.10.ebuild b/dev-haskell/warp/warp-3.1.10.ebuild
deleted file mode 100644
index 6c9c26841d66..000000000000
--- a/dev-haskell/warp/warp-3.1.10.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -network-bytestring
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A fast, light-weight web server for WAI applications"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+allow-sendfilefd warp-debug"
-
-RESTRICT=test # module colision
-
-RDEPEND=">=dev-haskell/auto-update-0.1.1:=[profile?] <dev-haskell/auto-update-0.2:=[profile?]
-	>=dev-haskell/blaze-builder-0.4:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	dev-haskell/http-date:=[profile?]
-	>=dev-haskell/http-types-0.8.5:=[profile?]
-	>=dev-haskell/http2-1.3:=[profile?]
-	>=dev-haskell/iproute-1.3.1:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?]
-	>=dev-haskell/stm-2.3:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.10:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/vault-0.3:=[profile?]
-	>=dev-haskell/wai-3.0.4:=[profile?] <dev-haskell/wai-3.1:=[profile?]
-	dev-haskell/word8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/async
-		>=dev-haskell/doctest-0.10.1
-		>=dev-haskell/hspec-1.3
-		dev-haskell/http
-		dev-haskell/hunit
-		>=dev-haskell/lifted-base-0.1
-		dev-haskell/quickcheck
-		>=dev-haskell/transformers-0.2.2 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag allow-sendfilefd allow-sendfilefd) \
-		--flag=-network-bytestring \
-		$(cabal_flag warp-debug warp-debug)
-}
diff --git a/dev-haskell/warp/warp-3.2.11.ebuild b/dev-haskell/warp/warp-3.2.11.ebuild
deleted file mode 100644
index edabfef62204..000000000000
--- a/dev-haskell/warp/warp-3.2.11.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -network-bytestring
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A fast, light-weight web server for WAI applications"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+allow-sendfilefd warp-debug"
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/auto-update-0.1.3:=[profile?] <dev-haskell/auto-update-0.2:=[profile?]
-	>=dev-haskell/blaze-builder-0.4:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	dev-haskell/http-date:=[profile?]
-	>=dev-haskell/http-types-0.8.5:=[profile?]
-	>=dev-haskell/http2-1.6:=[profile?] <dev-haskell/http2-1.7:=[profile?]
-	>=dev-haskell/iproute-1.3.1:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?]
-	>=dev-haskell/stm-2.3:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.10:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/vault-0.3:=[profile?]
-	>=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?]
-	dev-haskell/word8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.10.1
-		>=dev-haskell/hspec-1.3
-		dev-haskell/http
-		dev-haskell/hunit
-		>=dev-haskell/lifted-base-0.1
-		dev-haskell/quickcheck
-		dev-haskell/silently
-		>=dev-haskell/transformers-0.2.2 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag allow-sendfilefd allow-sendfilefd) \
-		--flag=-network-bytestring \
-		$(cabal_flag warp-debug warp-debug)
-}
diff --git a/dev-haskell/wavy-0.1.0.0 b/dev-haskell/wavy-0.1.0.0
new file mode 100644
index 000000000000..be7370f8f941
--- /dev/null
+++ b/dev-haskell/wavy-0.1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/pretty-show:=[profile?] >=dev-haskell/riff-0.3:=[profile?] <dev-haskell/riff-0.4:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Process WAVE files in Haskell
+EAPI=6
+HOMEPAGE=https://bitbucket.org/robertmassaioli/wavy
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/pretty-show:=[profile?] >=dev-haskell/riff-0.3:=[profile?] <dev-haskell/riff-0.4:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.1.0.0
+SRC_URI=mirror://hackage/packages/archive/wavy/0.1.0.0/wavy-0.1.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=baa881ab221803b70dc9f16b2034a7c4
diff --git a/dev-haskell/wavy/Manifest b/dev-haskell/wavy/Manifest
deleted file mode 100644
index 79fc60be3412..000000000000
--- a/dev-haskell/wavy/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX wavy-0.1.0.0-binary-0.8.patch 454 BLAKE2B 8865e15588ef0a9fa603da3aefa793ad7b26c0f39aa93ca3fe3ffdd04a6d3e64fea28c647acd775df0a1a6c88042496cc92387f9f5de0250a885a61cc5ce7914 SHA512 01e86475fcb6b022bf5560b4338e2d7a574bbafbcaf8b71be32d54809ebffc76dd2a88a101f5fcc8333bd494fe02dc953895cec2b071668fe42f557918b3be79
-DIST wavy-0.1.0.0.tar.gz 25100 BLAKE2B 5c4926c22b0a874b84a02fdff9218aa78f78a97dd736ae1243e99bfe368c8d136dc463346c3905e794b70deaeba5dab7223a54fa43304d67234cb16f0bd489e2 SHA512 25103aeae5104f6525b75cae4aea1b70e3998a56e4c262462a8dd7b8edfee2749fbd099e81a2c2bde0bfb0211e2194d0e4df705bd8882e526516c85be0fdd94d
-EBUILD wavy-0.1.0.0.ebuild 1020 BLAKE2B 5de2be83b1c8d482cbc51174c8b0421dc44c132c8cdcbd3538c8780e284efd816dce4f094dabc695b0c5d948c51c2ab58a853a33991d0a27290c63b8c23ff783 SHA512 60bf7b0cb911c405f60fc1e1d53853f100d425860ee9b961f130ddce4cb43ab8fb52d39b688b6c2035bd4ce6d4acb510d8319c0a6fa692933e561e4c36018d54
-MISC metadata.xml 624 BLAKE2B c3a9f576830d189dc88e76910ea9857b6d77fb9bfb12ee8187512b81c41a4a42097efd24daf05b63da4c91029eb7044a4013772b6b5045c3638fa1852d9ababd SHA512 8442163e564335e43e3010df0183a5b6e15fcda2650ce97cc59c410bc978171b49a65b926229c7d02c8f7ffad4232b160a326fddca89e20822d4930e84c6ff8b
diff --git a/dev-haskell/wavy/files/wavy-0.1.0.0-binary-0.8.patch b/dev-haskell/wavy/files/wavy-0.1.0.0-binary-0.8.patch
deleted file mode 100644
index 88db75b995c2..000000000000
--- a/dev-haskell/wavy/files/wavy-0.1.0.0-binary-0.8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Sound/Wav/Binary.hs b/Sound/Wav/Binary.hs
-index d2c539c..11883a3 100644
---- a/Sound/Wav/Binary.hs
-+++ b/Sound/Wav/Binary.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE CPP #-}
- -- | This module provides helper binary functions to get integer values from binary streams and put
-@@ -8,2 +9,3 @@ import Data.Int
- 
-+#if ! MIN_VERSION_binary(0,8,0)
- getInt8 :: Get Int8
-@@ -31 +33,2 @@ putInt64le :: Int64 -> Put
- putInt64le = putWord64le . fromIntegral
-+#endif
diff --git a/dev-haskell/wavy/metadata.xml b/dev-haskell/wavy/metadata.xml
deleted file mode 100644
index 162d299f5c8f..000000000000
--- a/dev-haskell/wavy/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Wavy was designed to be a fast and efficient method of extracting and writing PCM
-		data to and from WAV files. It is here to help you make fast use of Audio
-		data in your Haskell programs and thus encourage many more audio projects in Haskell.
-	</longdescription>
-	<upstream>
-		<remote-id type="bitbucket">robertmassaioli/wavy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/wavy/wavy-0.1.0.0.ebuild b/dev-haskell/wavy/wavy-0.1.0.0.ebuild
deleted file mode 100644
index f9e4129db057..000000000000
--- a/dev-haskell/wavy/wavy-0.1.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Process WAVE files in Haskell"
-HOMEPAGE="https://bitbucket.org/robertmassaioli/wavy"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/pretty-show:=[profile?]
-	>=dev-haskell/riff-0.3:=[profile?] <dev-haskell/riff-0.4:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-PATCHES=("${FILESDIR}"/${P}-binary-0.8.patch)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'vector ==0.10.*' 'vector >= 0.10' \
-		'filepath ==1.3.*' 'filepath >= 1.3' \
-		'binary ==0.7.*' 'binary >= 0.7' \
-		'containers ==0.4.*' 'containers >= 0.4'
-}
diff --git a/dev-haskell/weigh-0.0.3 b/dev-haskell/weigh-0.0.3
new file mode 100644
index 000000000000..d184ef93baf0
--- /dev/null
+++ b/dev-haskell/weigh-0.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/split:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Measure allocations of a Haskell functions/values
+EAPI=6
+HOMEPAGE=https://github.com/fpco/weigh#readme
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/split:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.0.3
+SRC_URI=mirror://hackage/packages/archive/weigh/0.0.3/weigh-0.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dfac2c71d03b60da3b7a468e4848125b
diff --git a/dev-haskell/weigh/Manifest b/dev-haskell/weigh/Manifest
deleted file mode 100644
index bd966a6c11d8..000000000000
--- a/dev-haskell/weigh/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST weigh-0.0.3.tar.gz 7028 BLAKE2B bee320438a986d8a3fd21c8680f7263a4394e9eb713d8b503dc57bb823841ada5d6395e813685fd4e4c7f19f0b5153e70dae1fb2a7f9e4a81e9c674dba0be0d2 SHA512 26c33c4079b6461be3cd93c9ba07deec9f5e1945bf9a2baddd3608d19fb5a3c5e103415dd37f931a7f63e3d62c42cac5d7e156d59e9a1a2789d46c27c24b550e
-EBUILD weigh-0.0.3.ebuild 631 BLAKE2B 8371b4d4ca458a36e1ac728e7624c4651e069797b42d787733b4532ee5e35598c61814e306f863a71c767cc8d52bafff95c725395aecb550bda7e400e4a09aa4 SHA512 86e782ec1d8677b0d8735322012385d69be0ce4eec600bf7fc5a95277ed67752dec28b59d0d899d8f5e20da82275e283cfe9920b2a6a5e133d7affbbd698480d
-MISC metadata.xml 386 BLAKE2B e741d460c3040ed20bafc01159700aab1316a28ab2f1c96bf6103ae5d9a54108af3dff06553f2967a503f4a231e21ce0264183cb7c4f4a2a13677df366e25726 SHA512 f52750aab10226100de1d49e58567436c094054e0e08580af809da1c93dca14ed15fe536aebc8dde573ef754d0e371a760dc6906d5bbc8b67be6cef4a22a54d5
diff --git a/dev-haskell/weigh/metadata.xml b/dev-haskell/weigh/metadata.xml
deleted file mode 100644
index 202d5d721b7c..000000000000
--- a/dev-haskell/weigh/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Please see README.md
-	</longdescription>
-	<upstream>
-		<remote-id type="github">fpco/weigh</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/weigh/weigh-0.0.3.ebuild b/dev-haskell/weigh/weigh-0.0.3.ebuild
deleted file mode 100644
index dbb61c79adfb..000000000000
--- a/dev-haskell/weigh/weigh-0.0.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Measure allocations of a Haskell functions/values"
-HOMEPAGE="https://github.com/fpco/weigh#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/split:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/with-location-0.0.0 b/dev-haskell/with-location-0.0.0
new file mode 100644
index 000000000000..f8252e1b7018
--- /dev/null
+++ b/dev-haskell/with-location-0.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Use ImplicitParams-based source locations in a backward compatible way
+EAPI=5
+HOMEPAGE=https://github.com/sol/with-location#readme
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.0.0
+SRC_URI=mirror://hackage/packages/archive/with-location/0.0.0/with-location-0.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=41b2645bbc8759c01535357bc1ce53ba
diff --git a/dev-haskell/with-location-0.1.0 b/dev-haskell/with-location-0.1.0
new file mode 100644
index 000000000000..293bd4c5971d
--- /dev/null
+++ b/dev-haskell/with-location-0.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Use ImplicitParams-based source locations in a backward compatible way
+EAPI=5
+HOMEPAGE=https://github.com/sol/with-location#readme
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0
+SRC_URI=mirror://hackage/packages/archive/with-location/0.1.0/with-location-0.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2d52a41675cc7b55556948911f9159a1
diff --git a/dev-haskell/with-location/Manifest b/dev-haskell/with-location/Manifest
deleted file mode 100644
index a57d9244d511..000000000000
--- a/dev-haskell/with-location/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST with-location-0.0.0.tar.gz 1806 BLAKE2B 5a861687b8c0670c52f1e2a89fb29353466efc44a0cacaf76dca21e45323762629683b1f45955b5b238a93ce549c8be2e1e4062302efed7dfcd9347772e025e1 SHA512 c5be3a9478c0f9585daebe1b7ab73d81ed937740d7c5f5f3dac05289c58a508fca458e5c0727aed767e507c27a9007e878ee949228b8d25355ab8474ba7289c2
-DIST with-location-0.1.0.tar.gz 2029 BLAKE2B 0d76733cff25a2dc3603ddad7b0806d43e2007017f73ec8773f6d00db0f7830eb2a30e324a5044654b7537bb9a43d453dbe50fd1ee89668fbbc465a5a27f90ee SHA512 1b8bdecd02d4acaa8b21e2cd6acdee573ac29b909c9a6f0d88a56adcd7433d551db5c1fadbc3e72c78378d74a614594d8d2ad08899fd63ecc57c65d0c37b28b9
-EBUILD with-location-0.0.0.ebuild 586 BLAKE2B df0317baa0815dc2734a6b453172fc341faa9c50cfff1d491cb224932545648844a0e120ca641dea36f657b6be242aa59e94092bfceeb66a2f7eee02d8ff8ddf SHA512 e9576e161becbd844bac0ad8d3fe0d617011be4c3f5ea7527f3d71da19d715f87f423a98a67e3d17c90c578ae956c3e41983b18fbf303862ec4fe4b7c6af88e1
-EBUILD with-location-0.1.0.ebuild 624 BLAKE2B aef91f94850ceb5ac9e85804cc7a2410860e4cf933425a042e83af546a7259c278291e11e8ee4c0f334aec96dd3200852e94ecf9454dcaf6a9b900c10115ea95 SHA512 b3cf1ceb1427eb497de3592f827ec3f31aa7ba8e950658114ac809467de051ac9205b99d05c998dd3831f33fb77b2df958c2c8ea5961b1fb8a0d4a8921e896da
-MISC metadata.xml 443 BLAKE2B db1c3406be13f1d7a9856da4e478e1d604a09d8fb57f7ecc0bc3255a14ea1dc820e5d02ea2b6d3f44f44a5dec12fa9de65f71a90fd5e8357b346bf87e86e7fd0 SHA512 879001b58a566893653b9aadc60bbaf34e75d270cf879983628e3bc434b67aa046df70f0ed87db586baa6849948bd0cc1ff91ebca448daf98fc7d3cccd7c6b7f
diff --git a/dev-haskell/with-location/metadata.xml b/dev-haskell/with-location/metadata.xml
deleted file mode 100644
index 9c623ab5f924..000000000000
--- a/dev-haskell/with-location/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Use ImplicitParams-based source locations in a backward compatible way
-	</longdescription>
-	<upstream>
-		<remote-id type="github">sol/with-location</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/with-location/with-location-0.0.0.ebuild b/dev-haskell/with-location/with-location-0.0.0.ebuild
deleted file mode 100644
index fdf45e370556..000000000000
--- a/dev-haskell/with-location/with-location-0.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Use ImplicitParams-based source locations in a backward compatible way"
-HOMEPAGE="https://github.com/sol/with-location#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/with-location/with-location-0.1.0.ebuild b/dev-haskell/with-location/with-location-0.1.0.ebuild
deleted file mode 100644
index a16513d7836d..000000000000
--- a/dev-haskell/with-location/with-location-0.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Use ImplicitParams-based source locations in a backward compatible way"
-HOMEPAGE="https://github.com/sol/with-location#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/wl-pprint-1.2 b/dev-haskell/wl-pprint-1.2
new file mode 100644
index 000000000000..0e50b5d51e44
--- /dev/null
+++ b/dev-haskell/wl-pprint-1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=The Wadler/Leijen Pretty Printer
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/wl-pprint
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2
+SRC_URI=mirror://hackage/packages/archive/wl-pprint/1.2/wl-pprint-1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c1504d1552d90ca6b6a0218700e0f9d0
diff --git a/dev-haskell/wl-pprint-text-1.1.0.4 b/dev-haskell/wl-pprint-text-1.1.0.4
new file mode 100644
index 000000000000..d8d791566fb5
--- /dev/null
+++ b/dev-haskell/wl-pprint-text-1.1.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-0.11.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Wadler/Leijen Pretty Printer for Text values
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/wl-pprint-text
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-0.11.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.0.4
+SRC_URI=mirror://hackage/packages/archive/wl-pprint-text/1.1.0.4/wl-pprint-text-1.1.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a4263610412405c7ed21f6eb41e17f3d
diff --git a/dev-haskell/wl-pprint-text-1.1.1.0 b/dev-haskell/wl-pprint-text-1.1.1.0
new file mode 100644
index 000000000000..5e3da2e1bc7c
--- /dev/null
+++ b/dev-haskell/wl-pprint-text-1.1.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.10:=[profile?] >=dev-haskell/text-0.11.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Wadler/Leijen Pretty Printer for Text values
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/wl-pprint-text
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.10:=[profile?] >=dev-haskell/text-0.11.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.1.0
+SRC_URI=mirror://hackage/packages/archive/wl-pprint-text/1.1.1.0/wl-pprint-text-1.1.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bf63566179118ee9f662eee4d1c0c542
diff --git a/dev-haskell/wl-pprint-text/Manifest b/dev-haskell/wl-pprint-text/Manifest
deleted file mode 100644
index 7cb50d224599..000000000000
--- a/dev-haskell/wl-pprint-text/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST wl-pprint-text-1.1.0.4.tar.gz 15140 BLAKE2B c2c7739638098180394c6ef98e435ea52d2a414da4d629db2ebc0ae9f01414c4a33eeaacfe0c8b733e89914ce308885bc434a71797a3228d94ae5fed1a32bdc3 SHA512 17116393deea2b0ff9b34d6df411e1edc219803bc3986ef105e4bb6bf03f193c622e54be998712a777605bb931a322e828ffee7d150a8787d41480672ea178f5
-DIST wl-pprint-text-1.1.1.0.tar.gz 16575 BLAKE2B 9e90e0d58fa9bf099cdd03446e35ee933890428f2e523978e8addb55af6a8d31642da5989a8a1703b67e82d29fb93baf84a2471e493a4433dc2024a100799d7a SHA512 16a265846b6f116b8e53b691875afab2e40c6c75dabd6ed74d2bc23aab8241208236aba880cb1b45b15dc2d3b0e1654f0187d8492145147922ee6ff4a36009fd
-EBUILD wl-pprint-text-1.1.0.4.ebuild 644 BLAKE2B 0bf68ed579937157592628ebaab545009a90c78df92e17ec54bf387b51bff530a3bb09e88768a6609a335d1b7e3f0d94b1b30bd51f3959f2b30cf3f277fb9e77 SHA512 388aa15472e6089fb2a265ac9d59072edeb107b423374b7fc780076f477c4641666dcab6749f24d1b14e44e647da9c7238d0f7e2d707e9a474d3f788abeec74b
-EBUILD wl-pprint-text-1.1.1.0.ebuild 731 BLAKE2B a3344674613f21a639e6a965e54320d28436e559fb599fa175fd652909defe6ef5d67afde56a010b949407ea7f9b2ac1722b63faf7dd93989c1fba4c903d74db SHA512 4d74284126fcfbe4a661f158a59117a156e8cfaac92c3c9bdd84ba9f13b4c9a722a89cb554e0fed7e5855329f18421214d0bc7b56c3dc718a7e056b355f0a28e
-MISC metadata.xml 342 BLAKE2B 7d8903aa4189e9e42195c98c30e92cb25bc5e59bbcae5598441ee58fdd0893c9c367981c4f6cdca3a3735f39d6f955472484bf42cddae4ba0a78d998e7b111cd SHA512 be2a9a24047f85b40a42ed9db8784a5726949fb1c4049ed32d2403bb3a00b3cbcee8e0602842e681b75208374d1be142ae36cb2510d7d77450942549ba4eca2c
diff --git a/dev-haskell/wl-pprint-text/metadata.xml b/dev-haskell/wl-pprint-text/metadata.xml
deleted file mode 100644
index 55e03cdd691b..000000000000
--- a/dev-haskell/wl-pprint-text/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A clone of wl-pprint for use with the text library.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.0.4.ebuild b/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.0.4.ebuild
deleted file mode 100644
index b3f827bb97f9..000000000000
--- a/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.0.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Wadler/Leijen Pretty Printer for Text values"
-HOMEPAGE="http://hackage.haskell.org/package/wl-pprint-text"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.11.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.1.0.ebuild b/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.1.0.ebuild
deleted file mode 100644
index 969f634806df..000000000000
--- a/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Wadler/Leijen Pretty Printer for Text values"
-HOMEPAGE="http://hackage.haskell.org/package/wl-pprint-text"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.10:=[profile?]
-	>=dev-haskell/text-0.11.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/wl-pprint/Manifest b/dev-haskell/wl-pprint/Manifest
deleted file mode 100644
index 0ca59de38364..000000000000
--- a/dev-haskell/wl-pprint/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wl-pprint-1.2.tar.gz 9881 BLAKE2B 7025f41b0a5213b6c08b07d0a87deeb16526f102ec73c1196be72179bb76320a83ac5631bfd16d88845751a756d0f87db60afe9109106e8676f8953eb6095851 SHA512 b5e6a8be51f10f1e1dad225020ba769cac62c311d6c0cc13a4ff8623e9b906218826d6f829e9169396eef9fc44379ba32d642914f543bd2f4e7070d6886ee91b
-EBUILD wl-pprint-1.2.ebuild 548 BLAKE2B d1811987ce00d318aae57aa12ba54f3ece886cf1647b559e789850349e082bc42f440b31740716064ee20e711639753896d47ceea6451d6129d330be716cdc99 SHA512 ec963725213ac20031aa93e0b966b0a647ceabacf64f1e62b57a7c39b3bf7f9d3600f802511549d2a1a9ec32a1ca190eeabc78e40c3ea7868262d547a8012375
-MISC metadata.xml 501 BLAKE2B c0aae3d26b53e999389afe2ee7faef2dd6284403a2854200a3d2f76de9ffbedf21be4d1a1ec85b8812d66022a2cebe91e3ffdb4e61e2e6d44ef96a238ec02e3e SHA512 b4f191fd31e74205e3118692ad610bafa56754be9ea44b127f0ee1f79f9da60c5d168315b1cb6b6c0008573fad874191b53218b6436e450faebc0b140c6bd43d
diff --git a/dev-haskell/wl-pprint/metadata.xml b/dev-haskell/wl-pprint/metadata.xml
deleted file mode 100644
index ea057004cb79..000000000000
--- a/dev-haskell/wl-pprint/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This is a pretty printing library based on Wadler's paper "A Prettier
-		Printer".  See the haddocks for full info.  This version allows the
-		library user to declare overlapping instances of the 'Pretty' class.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/wl-pprint/wl-pprint-1.2.ebuild b/dev-haskell/wl-pprint/wl-pprint-1.2.ebuild
deleted file mode 100644
index a9d13ae89de3..000000000000
--- a/dev-haskell/wl-pprint/wl-pprint-1.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="The Wadler/Leijen Pretty Printer"
-HOMEPAGE="http://hackage.haskell.org/package/wl-pprint"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/word8-0.1.2 b/dev-haskell/word8-0.1.2
new file mode 100644
index 000000000000..54ee0a281b79
--- /dev/null
+++ b/dev-haskell/word8-0.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Word8 library
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/word8
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.2
+SRC_URI=mirror://hackage/packages/archive/word8/0.1.2/word8-0.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=42868d3fb09a47ee7fb36867f2edde5a
diff --git a/dev-haskell/word8/Manifest b/dev-haskell/word8/Manifest
deleted file mode 100644
index 8d37b406b3eb..000000000000
--- a/dev-haskell/word8/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST word8-0.1.2.tar.gz 6218 BLAKE2B 5001304392cb5e7be20f129f308df2d67ae0aca789e5d45b160e3477cd2f1f42c09d11133e127704f137f5ed63681b9062a7756614a85808238a23c5646d2972 SHA512 6eb6bbf5e0e06fe5846fcd9eae24d9716e11b56aa1d431a96a0c0092be621668a0350f6c8d4ca0bdd3e1d2e3d2453e600c1a5a0bcfc058005ed1e7ddbe12608c
-EBUILD word8-0.1.2.ebuild 564 BLAKE2B b497e578d24077837f67f05e94b5a0db9962f1e85229f3a8260f0add384e6390418da8993c8f1eea1800337ab3ae79e2989985a64e3098722b02f72b1103ccf0 SHA512 b3eae9debcb571db7775bb122ea4d3781d76d4d2f493475f4fd1bb9354e63c8c4be5487e49ed545f7b3d87dd5de8d768d7b987e0639d0a23b85b193e5375fe18
-MISC metadata.xml 336 BLAKE2B b8daa3ec5fb6b1d2d4ed3829e6d7a232e7c0ab142446682cb7589a766b6bb90c8f5574815a749a4cae5ad8be5dbb7549f55d435bf7fb730d87b3a517ccda5561 SHA512 94035095e35e81f290830333938b2959c98aaf97c03abeb940cd39e74526c25b0355363a37eb534f8213dd43f66489488c1088ecc6a3454041c871239ee56767
diff --git a/dev-haskell/word8/metadata.xml b/dev-haskell/word8/metadata.xml
deleted file mode 100644
index 3675ea513613..000000000000
--- a/dev-haskell/word8/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Word8 library to be used with Data.ByteString
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/word8/word8-0.1.2.ebuild b/dev-haskell/word8/word8-0.1.2.ebuild
deleted file mode 100644
index e242566ebf64..000000000000
--- a/dev-haskell/word8/word8-0.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Word8 library"
-HOMEPAGE="http://hackage.haskell.org/package/word8"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/wx-0.92.2.0 b/dev-haskell/wx-0.92.2.0
new file mode 100644
index 000000000000..e4a47a9998b1
--- /dev/null
+++ b/dev-haskell/wx-0.92.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/stm:=[profile?] >=dev-haskell/wxcore-0.92:3.0=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=wxHaskell
+EAPI=5
+HOMEPAGE=https://wiki.haskell.org/WxHaskell
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=wxWinLL-3.1
+RDEPEND=dev-haskell/stm:=[profile?] >=dev-haskell/wxcore-0.92:3.0=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=3.0/0.92.2.0
+SRC_URI=mirror://hackage/packages/archive/wx/0.92.2.0/wx-0.92.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ea80b45df1abdda46cd7db5d71d03cce
diff --git a/dev-haskell/wx/Manifest b/dev-haskell/wx/Manifest
deleted file mode 100644
index 76bd00f02c55..000000000000
--- a/dev-haskell/wx/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wx-0.92.2.0.tar.gz 50938 BLAKE2B 3a1b8c4391c73c78d8aa635e48ebd135671bbec4c5312de715966f6596e2201c50c8284c69fd8f873c65e72a654944374c757de4e8c4afe81939e9771a318d77 SHA512 f8bbb2598fc1555030ebe3084737d6f8c0691a3e2fddd9b979c4694442b458937a9bb6afe347b2a5661b7d70339194087ce083ad6efc01173bc0f62b72bf1134
-EBUILD wx-0.92.2.0.ebuild 965 BLAKE2B 2d3415e2b464ce8a373ff0cd31678ec557742c50ac87b130128b3e6452f69f525bf053dbd11d5345db9fb69606290b711fd312b6d67f029980e0b8fc6286011b SHA512 7a17efc64386b73494357ea5ccb84a08fa700b23ec61a216126d86ffa38a2ffd5a7633ca513825238243469972b18077f13e6103d3f746a285f33add9128d9f9
-MISC metadata.xml 549 BLAKE2B 7645a80403b4176584de8783c6bbf36df125a59aeb27867d88e048d35de11f8f69df2b80a88ceeefdc200156c81a5b3d0db8288a2afb0e2c7219efd5eced2fb9 SHA512 5914f30a0be778084cb801fc3521cf85490a67b9f5a0ee1c5cadb9bd44441c8d1a1840275944d8d1deee334289fd86b7b71bb4b4ab73700e25333f2658ce0d26
diff --git a/dev-haskell/wx/metadata.xml b/dev-haskell/wx/metadata.xml
deleted file mode 100644
index 89beeeef44de..000000000000
--- a/dev-haskell/wx/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		wxHaskell is a portable and native GUI library for Haskell.  It is built on top of wxWidgets - a comprehensive C++ library that is portable across all major GUI platforms; including GTK, Windows, X11, and MacOS X.  This version works with wxWidgets 2.8 only.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/wx/wx-0.92.2.0.ebuild b/dev-haskell/wx/wx-0.92.2.0.ebuild
deleted file mode 100644
index 817a3f70513e..000000000000
--- a/dev-haskell/wx/wx-0.92.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-WX_GTK_VER="3.0"
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="wxHaskell"
-HOMEPAGE="https://wiki.haskell.org/WxHaskell"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="wxWinLL-3.1"
-SLOT="${WX_GTK_VER}/${PV}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/stm:=[profile?]
-	>=dev-haskell/wxcore-0.92:${WX_GTK_VER}=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-src_configure() {
-	# ghc DCE bug: https://ghc.haskell.org/trac/ghc/ticket/9155
-	[[ $(ghc-version) == 7.8.2 ]] && replace-hcflags -O[2-9] -O1
-	# ghc DCE bug: https://ghc.haskell.org/trac/ghc/ticket/9303
-	[[ $(ghc-version) == 7.8.3 ]] && replace-hcflags -O[2-9] -O1
-
-	haskell-cabal_src_configure \
-		--flag=newbase
-}
diff --git a/dev-haskell/wxc-0.92.2.0 b/dev-haskell/wxc-0.92.2.0
new file mode 100644
index 000000000000..ba8c462d5bfc
--- /dev/null
+++ b/dev-haskell/wxc-0.92.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>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:= >=dev-haskell/cabal-1.16.0
+DESCRIPTION=wxHaskell C++ wrapper
+EAPI=5
+HOMEPAGE=https://wiki.haskell.org/WxHaskell
+IUSE=profile
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_md5_=e436999c2266650d38e90a6d10128831
diff --git a/dev-haskell/wxc/Manifest b/dev-haskell/wxc/Manifest
deleted file mode 100644
index a0d86e323b47..000000000000
--- a/dev-haskell/wxc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wxc-0.92.2.0.tar.gz 203065 BLAKE2B 3f873b3bbc50e5fa7690f2f05a25ab360260d90523dd0b9c016f5dfeea99e9a59fe4848de520d642d2cea52dbadfd69aa31671f521243240488d643d4554e880 SHA512 e6fba1be94978603965b8902fad9326772b5483d5df621d5245f1fae97d85bcb1aff4565f1e8396de23c854050151c5e009e34a1ea29c3037057599ac0412bcd
-EBUILD wxc-0.92.2.0.ebuild 1671 BLAKE2B 4f7a1e5a1e182fb00c7882bfba1ba44be7e0306c2aa1592b850d9141b56eea5014430eb2db97345564e1f56650df7e9b4dca52ae4b893cf6889eb520c6c8e9e6 SHA512 5aa427edcc824b7856a8926da4e131e9406b891fb2cf038c59ad9216fc054e84e970d86f7deb4d7f3907096bc6413b84b6ecc2e2f05b61979a1d1697af7db93e
-MISC metadata.xml 796 BLAKE2B 3cb8acb5020436e15b3310fb974d1707af624d9a01aa64d66550bd64d17906870aadd01ecaa90bfe04b02564db169688c2774bd62df48501544467461cb333b3 SHA512 47ffc15e1167354eebbbeecfe9557d01dc832a67c2b7d213528f8be73846dab272351670f5b45be9098713c4ec3106753d8fa1cffdbb2844d0a9d8cd3146cd94
diff --git a/dev-haskell/wxc/metadata.xml b/dev-haskell/wxc/metadata.xml
deleted file mode 100644
index 7960f5bec78c..000000000000
--- a/dev-haskell/wxc/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		wxHaskell is a portable and native GUI library for Haskell. It is
-		built on top of wxWidgets, a comprehensive C++ library that is
-		portable across all major GUI platforms, including GTK, Windows,
-		X11, and MacOS X. This version works with wxWidgets 2.9 only.
-		Distributed under the WXWINDOWS LIBRARY LICENSE. Please see
-		LICENSE file, but note that this is essentially LGPL with an
-		exception allowing binary distribution of proprietary software.
-		This is the same license as wxWidgets itself uses.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/wxc/wxc-0.92.2.0.ebuild b/dev-haskell/wxc/wxc-0.92.2.0.ebuild
deleted file mode 100644
index 5d2fefd68d98..000000000000
--- a/dev-haskell/wxc/wxc-0.92.2.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-WX_GTK_VER="3.0"
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal multilib versionator wxwidgets
-
-DESCRIPTION="wxHaskell C++ wrapper"
-HOMEPAGE="https://wiki.haskell.org/WxHaskell"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="wxWinLL-3.1"
-SLOT="${WX_GTK_VER}/${PV}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">dev-haskell/split-0:=[profile?]
-	>=dev-haskell/wxdirect-0.90.1.1:${WX_GTK_VER}=[profile?]
-	x11-libs/wxGTK:${WX_GTK_VER}=[X,gstreamer,opengl]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-src_prepare() {
-	sed -e "s@\"wx-config\"@\"${WX_CONFIG}\"@g" \
-		-i "${S}/Setup.hs" || die "Could not specify wx-config in Setup.hs"
-}
-
-src_configure() {
-	local cgcc=()
-	for i in ${CXXFLAGS}
-	do
-		cgcc+=( --gcc-option="${i}" )
-	done
-	# Trying to specify the LDFLAGS in --ld-option does not work, as ld does
-	# not understand ld options prefixed with -Wl,
-	# The linker that is used to link the libwxc.so shared library is hard coded
-	# in Setup.hs.  So the --with-ld would not change the linker used when
-	# linking libwxc.so.  --with-ld="gcc" does not help, as then cabal passes
-	# ld options like -x to gcc which then returns a non-zero exit status, then
-	# cabal ignores all the --ld-option parameters.
-	# So I place all the LDFLAGS in --gcc-option parameters. They are ignored
-	# when building .o files.
-	local cld=()
-	for i in ${LDFLAGS}
-	do
-		cld+=( --gcc-option="${i}" )
-	done
-	cabal_src_configure ${cgcc[*]} ${cld[*]} --verbose=3
-}
diff --git a/dev-haskell/wxcore-0.92.2.0 b/dev-haskell/wxcore-0.92.2.0
new file mode 100644
index 000000000000..b37a432885bc
--- /dev/null
+++ b/dev-haskell/wxcore-0.92.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=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] >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=wxHaskell core
+EAPI=5
+HOMEPAGE=https://wiki.haskell.org/WxHaskell
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_md5_=ef5b5d92da17c595dc4f1e4fe20b7a41
diff --git a/dev-haskell/wxcore/Manifest b/dev-haskell/wxcore/Manifest
deleted file mode 100644
index abf7218c6ed7..000000000000
--- a/dev-haskell/wxcore/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wxcore-0.92.2.0.tar.gz 400116 BLAKE2B c4d87792ad7a7fdf125ef68211f1efe89bff9d3114dc2dacb8f7b96a824fa359addb00c331e3d8fd6325cf90cf3c78448c500431ef18ac7d2989eedee952e17c SHA512 e1339ea30a699e22a9fc2f12b6ddcd773911e4d611f834886952bde4d76205c448e1702bab3148f4c370eec1cabeac06655b4cf3cbbfe24e2ea08a628906880a
-EBUILD wxcore-0.92.2.0.ebuild 1025 BLAKE2B 4873e2895be31eeed77431375b509594d8aea6f643605ade861545633b083ec7cd98414b28b13274241e2698930452e943891ca93e3eb8156fe433fadc768cb6 SHA512 e34e99a10f13b26ebae83b477c0af6c376ef08be3790b9dacf6324a8f89c4d17c4a39197510f748c630c249465d95c5f92b6a015f6a3ccc193b671cdf65bfd4f
-MISC metadata.xml 552 BLAKE2B ee833f6c1a6469ecb6e1ae439a4b049fbd30af28f7a671f64687da3fbc4ac3ec5c0cba933364fd7f00933940d2462e107a62978f65fe6379dd587dac68f5c2a7 SHA512 2fc1a19d4fece7df270b76dc9aec6003f67f1a2a2adc7beb8999f9938762487fbda660734eddcbed33ae8472f748ba5079108d3806c844283696711ecd288f18
diff --git a/dev-haskell/wxcore/metadata.xml b/dev-haskell/wxcore/metadata.xml
deleted file mode 100644
index 922fc18d17bb..000000000000
--- a/dev-haskell/wxcore/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		wxHaskell is a portable and native GUI library for Haskell. It is
-		built on top of wxWidgets, a comprehensive C++ library that is
-		portable across all major GUI platforms, including GTK, Windows,
-		X11, and MacOS X. This version works with wxWidgets 2.8 only.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/wxcore/wxcore-0.92.2.0.ebuild b/dev-haskell/wxcore/wxcore-0.92.2.0.ebuild
deleted file mode 100644
index 4d6dfce86822..000000000000
--- a/dev-haskell/wxcore/wxcore-0.92.2.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-WX_GTK_VER="3.0"
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal wxwidgets
-
-DESCRIPTION="wxHaskell core"
-HOMEPAGE="https://wiki.haskell.org/WxHaskell"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="wxWinLL-3.1"
-SLOT="${WX_GTK_VER}/${PV}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/parsec:=[profile?]
-	dev-haskell/stm:=[profile?]
-	>=dev-haskell/wxc-0.92:${WX_GTK_VER}=[profile?]
-	>=dev-haskell/wxdirect-0.91:${WX_GTK_VER}=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	x11-libs/wxGTK:${WX_GTK_VER}=[X,gstreamer,opengl]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-src_prepare() {
-	sed -e "s@wxdirect@wxdirect-${WX_GTK_VER}@g" \
-		-i "${S}/Setup.hs" \
-		|| die "Could not change Setup.hs for wxdirect slot ${WX_GTK_VER}"
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=splitbase
-}
diff --git a/dev-haskell/wxdirect-0.92.2.0 b/dev-haskell/wxdirect-0.92.2.0
new file mode 100644
index 000000000000..535167da4152
--- /dev/null
+++ b/dev-haskell/wxdirect-0.92.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/parsec-2.1.0:=[profile?] <dev-haskell/parsec-4:=[profile?] dev-haskell/strict:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=helper tool for building wxHaskell
+EAPI=5
+HOMEPAGE=https://wiki.haskell.org/WxHaskell
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/parsec-2.1.0:=[profile?] <dev-haskell/parsec-4:=[profile?] dev-haskell/strict:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=3.0/0.92.2.0
+SRC_URI=mirror://hackage/packages/archive/wxdirect/0.92.2.0/wxdirect-0.92.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c1aee7544cb71ffb8f91e956cd04d2d5
diff --git a/dev-haskell/wxdirect-0.92.2.0-r1 b/dev-haskell/wxdirect-0.92.2.0-r1
new file mode 100644
index 000000000000..b9b54a67a4c8
--- /dev/null
+++ b/dev-haskell/wxdirect-0.92.2.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/parsec-2.1.0:=[profile?] <dev-haskell/parsec-4:=[profile?] dev-haskell/strict:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=helper tool for building wxHaskell
+EAPI=5
+HOMEPAGE=https://wiki.haskell.org/WxHaskell
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/parsec-2.1.0:=[profile?] <dev-haskell/parsec-4:=[profile?] dev-haskell/strict:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=3.0/0.92.2.0
+SRC_URI=mirror://hackage/packages/archive/wxdirect/0.92.2.0/wxdirect-0.92.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=274d9a8ebaf6c64bafad81ceb4e7556f
diff --git a/dev-haskell/wxdirect/Manifest b/dev-haskell/wxdirect/Manifest
deleted file mode 100644
index cc98e4184ffe..000000000000
--- a/dev-haskell/wxdirect/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST wxdirect-0.92.2.0.tar.gz 30544 BLAKE2B 3d51252cc792f2d00be9ec53f139d961c19d6bf5e5aa792b1fe65ed258b2f98b9da30fda28d018b6d26dae72d80d8c394c17ba822e43c2ba89611881b7ba9b29 SHA512 f112fc0a62031bc9eb8e6caa2bd70f0b9fa66a81380785165a07bdffa6fa2b44652ffb9f1165c3b8ab7db8a31273650e36e98c8eb72f7cec5873ecb75f58dc21
-EBUILD wxdirect-0.92.2.0-r1.ebuild 948 BLAKE2B 76cbe6bc2668d9fdf324d6e2c7fe42eb5dd4af31b7de3afb339802d94eda3a5fddddc99cf30bbc5a329ae7eea52c08907af27b2614d26ae1ad67ff64b63a4a94 SHA512 4454d24bddb2a8b48ea6418cdfcf68779492e465c0aab671c7f9be99c215bb7dc60fbc48ec78cc6e4203377bf86bc210931bd09f14e432b93ececea9bba37de9
-EBUILD wxdirect-0.92.2.0.ebuild 878 BLAKE2B 73ef3a2c546f42ecffe2faf98a083d2982cb5db83d4b2f11aad2e975dd57ca3988d1c63f6037b6d3d78c5f24a8e494d1e904f2bd3f1ad6de01d5a2b81ece31f7 SHA512 06a0de82f62ba1b50d66c8793486f8b6630e2c7518f82caa6f44ff5edecbd80f650ba2e63acb570d5f7cd18648df9b1dead6259e169aae878834b33e6f7469c0
-MISC metadata.xml 552 BLAKE2B 5917920410ec46e81b2af4b10c160023658612e85a79b163c169dca57f7adeb65b5dae7b95f425297d7cb7f622d5b9868bffa2db66dee520768831848b2fbede SHA512 330e53423fa37d149fd7ba27e3e8895c5e2a234d62b5fd7afa60eafd1f482c44ef8ae64bccba670a8090e0899d796ddc01595abda056ce9e35368ac496fb353b
diff --git a/dev-haskell/wxdirect/metadata.xml b/dev-haskell/wxdirect/metadata.xml
deleted file mode 100644
index aeeb72f3259a..000000000000
--- a/dev-haskell/wxdirect/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		wxHaskell is a portable and native GUI library for Haskell. It is built on
-		top of wxWidgets, a comprehensive C++ library that is portable across all
-		major GUI platforms, including GTK, Windows, X11, and MacOS X. This version
-		works with wxWidgets 2.8 only.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/wxdirect/wxdirect-0.92.2.0-r1.ebuild b/dev-haskell/wxdirect/wxdirect-0.92.2.0-r1.ebuild
deleted file mode 100644
index d02ea7c5ffa6..000000000000
--- a/dev-haskell/wxdirect/wxdirect-0.92.2.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-WX_GTK_VER="3.0"
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="helper tool for building wxHaskell"
-HOMEPAGE="https://wiki.haskell.org/WxHaskell"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="${WX_GTK_VER}/${PV}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-2.1.0:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	dev-haskell/strict:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'process    >= 1.1   && < 1.3' 'process    >= 1.1'
-
-	sed -e "s@executable wxdirect@executable wxdirect-${WX_GTK_VER}@" \
-		-i "${S}/${PN}.cabal" \
-		|| die "Could not change ${PN}.cabal for wxdirect slot ${WX_GTK_VER}"
-}
diff --git a/dev-haskell/wxdirect/wxdirect-0.92.2.0.ebuild b/dev-haskell/wxdirect/wxdirect-0.92.2.0.ebuild
deleted file mode 100644
index 809afcd871ee..000000000000
--- a/dev-haskell/wxdirect/wxdirect-0.92.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-WX_GTK_VER="3.0"
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="helper tool for building wxHaskell"
-HOMEPAGE="https://wiki.haskell.org/WxHaskell"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="${WX_GTK_VER}/${PV}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-2.1.0:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	dev-haskell/strict:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-src_prepare() {
-	sed -e "s@executable wxdirect@executable wxdirect-${WX_GTK_VER}@" \
-		-i "${S}/${PN}.cabal" \
-		|| die "Could not change ${PN}.cabal for wxdirect slot ${WX_GTK_VER}"
-}
diff --git a/dev-haskell/x11-1.6.1.1 b/dev-haskell/x11-1.6.1.1
new file mode 100644
index 000000000000..a6c0b9f11915
--- /dev/null
+++ b/dev-haskell/x11-1.6.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/data-default:=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr screensaver? ( x11-libs/libXScrnSaver ) xinerama? ( x11-libs/libXinerama ) >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A binding to the X11 graphics library
+EAPI=5
+HOMEPAGE=https://github.com/haskell-pkg-janitors/X11
+IUSE=+screensaver +xinerama doc hscolour profile
+KEYWORDS=amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=dev-haskell/data-default:=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr screensaver? ( x11-libs/libXScrnSaver ) xinerama? ( x11-libs/libXinerama )
+SLOT=0/1.6.1.1
+SRC_URI=mirror://hackage/packages/archive/X11/1.6.1.1/X11-1.6.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7a50cc0b37e59b131088f9c21a344329
diff --git a/dev-haskell/x11-1.6.1.2 b/dev-haskell/x11-1.6.1.2
new file mode 100644
index 000000000000..91b8a7a4a64b
--- /dev/null
+++ b/dev-haskell/x11-1.6.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/data-default:=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr screensaver? ( x11-libs/libXScrnSaver ) xinerama? ( x11-libs/libXinerama ) >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A binding to the X11 graphics library
+EAPI=5
+HOMEPAGE=https://github.com/haskell-pkg-janitors/X11
+IUSE=+screensaver +xinerama doc hscolour profile
+KEYWORDS=~amd64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=dev-haskell/data-default:=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr screensaver? ( x11-libs/libXScrnSaver ) xinerama? ( x11-libs/libXinerama )
+SLOT=0/1.6.1.2
+SRC_URI=mirror://hackage/packages/archive/X11/1.6.1.2/X11-1.6.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=59bae3de3ced938f8d6c6fbbc3b07c18
diff --git a/dev-haskell/x11-1.8-r1 b/dev-haskell/x11-1.8-r1
new file mode 100644
index 000000000000..0fff2724217b
--- /dev/null
+++ b/dev-haskell/x11-1.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/data-default:=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr screensaver? ( x11-libs/libXScrnSaver ) xinerama? ( x11-libs/libXinerama ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A binding to the X11 graphics library
+EAPI=6
+HOMEPAGE=https://github.com/xmonad/X11
+IUSE=+screensaver +xinerama doc hscolour profile
+KEYWORDS=amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=dev-haskell/data-default:=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr screensaver? ( x11-libs/libXScrnSaver ) xinerama? ( x11-libs/libXinerama )
+SLOT=0/1.8
+SRC_URI=mirror://hackage/packages/archive/X11/1.8/X11-1.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e7520d2cb47051fa97bd635b3f5de290
diff --git a/dev-haskell/x11-xft-0.3.1 b/dev-haskell/x11-xft-0.3.1
new file mode 100644
index 000000000000..b236124bdcbd
--- /dev/null
+++ b/dev-haskell/x11-xft-0.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.6.1 >=dev-haskell/utf8-string-0.1[profile?] >=dev-haskell/x11-1.2.1[profile?] x11-libs/libXft dev-haskell/cabal doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) )
+DESCRIPTION=Bindings to the Xft, X Free Type interface library, and some Xrender parts
+EAPI=4
+HOMEPAGE=http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11-xft
+IUSE=doc profile
+KEYWORDS=amd64 ~ppc64 x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-lang/ghc-6.6.1 >=dev-haskell/utf8-string-0.1[profile?] >=dev-haskell/x11-1.2.1[profile?] x11-libs/libXft
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/X11-xft/0.3.1/X11-xft-0.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dcdd96b22c3f56bed815a45c2c768b28
diff --git a/dev-haskell/x11-xft-0.3.1-r1 b/dev-haskell/x11-xft-0.3.1-r1
new file mode 100644
index 000000000000..33de713c8c16
--- /dev/null
+++ b/dev-haskell/x11-xft-0.3.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/utf8-string-0.1:=[profile?] >=dev-haskell/x11-1.2.1:=[profile?] >=dev-lang/ghc-6.10.4:= x11-libs/libXft >=dev-haskell/cabal-0 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Bindings to the Xft, X Free Type interface library, and some Xrender parts
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/X11-xft
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/utf8-string-0.1:=[profile?] >=dev-haskell/x11-1.2.1:=[profile?] >=dev-lang/ghc-6.10.4:= x11-libs/libXft
+SLOT=0/0.3.1
+SRC_URI=mirror://hackage/packages/archive/X11-xft/0.3.1/X11-xft-0.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b2775c6d69c6cf3e0c00b908d8c81b2b
diff --git a/dev-haskell/x11-xft/Manifest b/dev-haskell/x11-xft/Manifest
deleted file mode 100644
index efcdba4dafa9..000000000000
--- a/dev-haskell/x11-xft/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST X11-xft-0.3.1.tar.gz 13621 BLAKE2B a8b7f1d042e4cc10707a8d38b570cf4af8041b978afb75eddd8ce65c7ad20a4b13de384aab51a46d298ffc4be73912381d9c8cc1d8d987069259e1dfb163f7d6 SHA512 8f40db25453227ef9ce53b05a0c6af869e3a2efdb1d9b9ad683baf52601f320c85b09f0e514bb6ffeb17516d9b75c6772aa49613bb96272d56f06788118b7cfe
-EBUILD x11-xft-0.3.1-r1.ebuild 787 BLAKE2B 5a22f5e3f43f2074f31c7a06382ffa36db58d830cafa4d7acc349ec8cbe8dc8626da18b0aef0c930e92a156a8510983a8b76d282697569f93798e5ef79cd3f8f SHA512 2618f89266f62e1ae92c568ffbfb86de3df2f346cb302ccd028f4f6b5b780fecd9fccdc2b5877ac6788aed69f1eac99eb74559d0ad7a03bfdbb44a3208bdd91f
-EBUILD x11-xft-0.3.1.ebuild 719 BLAKE2B fda67357c95829e4997123edbe24f9d3580514c9e39af52c127ca6872f04f3d72b799fc0b847e6cdd3e05f5aa9834b65971bb63c47f8679b59bcd7a4026c55ea SHA512 c5f375aceafd4222680ee7dace0bab0c49e08255d29575c0ec1ea454ffbd4197fa575a0905b4a8e2835e711ab0c4e9613d18956bd59eed131207d8b31833d68e
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/x11-xft/metadata.xml b/dev-haskell/x11-xft/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/x11-xft/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild b/dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild
deleted file mode 100644
index e101611a985d..000000000000
--- a/dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="X11-xft"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Bindings to the Xft, X Free Type interface library, and some Xrender parts"
-HOMEPAGE="http://hackage.haskell.org/package/X11-xft"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/utf8-string-0.1:=[profile?]
-		>=dev-haskell/x11-1.2.1:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		x11-libs/libXft"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-0
-		virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/x11-xft/x11-xft-0.3.1.ebuild b/dev-haskell/x11-xft/x11-xft-0.3.1.ebuild
deleted file mode 100644
index 7608506ce148..000000000000
--- a/dev-haskell/x11-xft/x11-xft-0.3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
-
-MY_PN="X11-xft"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Bindings to the Xft, X Free Type interface library, and some Xrender parts"
-HOMEPAGE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11-xft"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.6.1
-		 >=dev-haskell/utf8-string-0.1[profile?]
-		 >=dev-haskell/x11-1.2.1[profile?]
-		 x11-libs/libXft"
-
-DEPEND="${RDEPEND}
-		dev-haskell/cabal"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/x11/Manifest b/dev-haskell/x11/Manifest
deleted file mode 100644
index ab6493a56775..000000000000
--- a/dev-haskell/x11/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX x11-1.8-no-LDFLAGS.patch 375 BLAKE2B ffaed9994a08f5e69354235cdc08d3c7a4156a22c4528e82a2c12e92bcc8d3451d5f30a619066f553cd4a96ebfe22f75fca1284ceb37bf33b8726e72d92dad1e SHA512 10637a22e5a49cbc570d60861ad6912c886355e99033d3a31ff874681e5bd00907d929b8bbac24372766f2bab36b9ac75aee3bc1e1c72a49366be73e566273b9
-DIST X11-1.6.1.1.tar.gz 188628 BLAKE2B 8ce533c89812c1b1e5babd1025773919518f021396d67bda3cc87b0ec61b241ebe27ca40ff4ae9fca9562a73263b71b64ceda098ff809a9a688230d5a71efcde SHA512 d5f58a7ab2450e145e890187e8dc7b43e286d2a95414a605e549cbf48568ef0d89f662870b2010eecba3b8fdd2a3a57214d33fc8775426e7e23ffad727b4e144
-DIST X11-1.6.1.2.tar.gz 188612 BLAKE2B f75e16010000fc28f899a008c547d6c7b3275f17eafface70f42cc9ef0542514090fccc42b69835df48f261b70f598e8484e99f563a41156b7613b555351292e SHA512 f8d01c806f59a20ad6d6632367b80ca972ebc2df9ba65fe23338d5fa1b933049c08609d25be690d87ba6dbe9cd1ba0f5a95e491c8abaca9eaec078ca03e0e01b
-DIST X11-1.8.tar.gz 191331 BLAKE2B a539da2bb0231c4749a948574b99e7fa4d30e21b94d1eaa81f1d9f79885b16d5fa60578db868cceb842e27e6b84fa6e3c7a7d1cb757d4df26dfaf2786fc2f4e6 SHA512 bb647bcc7504b3e4267d6a8a6ec73766fe62d7f5b3966bfa037742849c4a1128ea22608dd8353a6035aedc2046c53fae65c8b54f2933a4b896297159f5c2e59c
-EBUILD x11-1.6.1.1.ebuild 1011 BLAKE2B 5827e64a72104a0dcb3bc20c5e0054e2280c2ebf795e78e5e222caabf9727ecc39b452f37f433e5592db40f047ec43962182a860da562830b375172b00e0b36c SHA512 7ec597be697c7719447be6491dccb6be333f4b84f3641d97eac1a8f49b488bc44c2899962946fb031bbca99e53f888b2b443129d166ffb3228576d6bce3c2bbc
-EBUILD x11-1.6.1.2.ebuild 1012 BLAKE2B 043062c25b2d26feb43d0bfba33e73d750f34a39730116769d93cba3c729e38ff5ff8bc29fa1092a96d0b99ff7067227954a2c5cf24e769e465a3aa353d0a9a5 SHA512 c3c419d3fd27a563bc158ead3e7f60ea65c34c1de437ca1f40c1f4da5936f2088715c13c010577e7222aabf1017bfa287c9816d773bef909142f1ced949bc8e5
-EBUILD x11-1.8-r1.ebuild 1043 BLAKE2B e80515d79130c9b1c18504d10f8bc554e08ce42db90305c4ac947ad3c9dd1eb21fd466ace30f28875adefb43de4f4409e6712f410dca6632263a432a8f0c4db5 SHA512 7a24931d7a8a3179f629d4f49b0de4f0fbeb6aedcebd1244fbed734f856dd2038096d2fabb920c5f2d8ce701215cc619efbfb919684138610ed23877dab2f1ec
-MISC metadata.xml 700 BLAKE2B 080b3aca0b33588e2b2f5b2f8d984564a6de2db86c97cf03b807a875089f30a33f246f4eac92cc91d7adea48cf63c7e07146682288a6df9d277738e999cbfe0d SHA512 73e5b575860e2f3540b0bda58b551a8688d4003451913326f4e55ec0adc35dbb42bef7da015ad00d12683be286b1b7ee611884479f618ffdfabccf3a9c0fb074
diff --git a/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch b/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch
deleted file mode 100644
index f1d5c179036e..000000000000
--- a/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Don't persist LDFLAGS into package database.
-
-https://bugs.gentoo.org/609624
-diff --git a/X11.buildinfo.in b/X11.buildinfo.in
-index 6925939..6a18b58 100644
---- a/X11.buildinfo.in
-+++ b/X11.buildinfo.in
-@@ -5,3 +5,3 @@ buildable: @BUILD_PACKAGE_BOOL@
- cc-options: @X_CFLAGS@ @CPPFLAGS@
--ld-options: @X_LIBS@ @LDFLAGS@
-+ld-options: @X_LIBS@
- extra-libraries: @EXTRA_LIBRARIES@
diff --git a/dev-haskell/x11/metadata.xml b/dev-haskell/x11/metadata.xml
deleted file mode 100644
index 4c6b85a81825..000000000000
--- a/dev-haskell/x11/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A Haskell binding to the X11 graphics library.
-		The binding is a direct translation of the C binding; for
-		documentation of these calls, refer to "The Xlib Programming
-		Manual", available online at &lt;http://tronche.com/gui/x/xlib/&gt;.
-	</longdescription>
-	<use>
-		<flag name="screensaver">whether to build XScreenSaver.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">haskell-pkg-janitors/X11</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/x11/x11-1.6.1.1.ebuild b/dev-haskell/x11/x11-1.6.1.1.ebuild
deleted file mode 100644
index d5af84e8874b..000000000000
--- a/dev-haskell/x11/x11-1.6.1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="X11"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the X11 graphics library"
-HOMEPAGE="https://github.com/haskell-pkg-janitors/X11"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+screensaver +xinerama"
-
-RDEPEND="dev-haskell/data-default:=[profile?]
-		>=dev-lang/ghc-7.4.1:=
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-		screensaver? ( x11-libs/libXScrnSaver )
-		xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--configure-option=$(use_with xinerama) \
-		--configure-option=$(use_with screensaver xscreensaver)
-}
diff --git a/dev-haskell/x11/x11-1.6.1.2.ebuild b/dev-haskell/x11/x11-1.6.1.2.ebuild
deleted file mode 100644
index 5f5e654e625d..000000000000
--- a/dev-haskell/x11/x11-1.6.1.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="X11"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the X11 graphics library"
-HOMEPAGE="https://github.com/haskell-pkg-janitors/X11"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+screensaver +xinerama"
-
-RDEPEND="dev-haskell/data-default:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-		screensaver? ( x11-libs/libXScrnSaver )
-		xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--configure-option=$(use_with xinerama) \
-		--configure-option=$(use_with screensaver xscreensaver)
-}
diff --git a/dev-haskell/x11/x11-1.8-r1.ebuild b/dev-haskell/x11/x11-1.8-r1.ebuild
deleted file mode 100644
index a5010fb8e286..000000000000
--- a/dev-haskell/x11/x11-1.8-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="X11"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the X11 graphics library"
-HOMEPAGE="https://github.com/xmonad/X11"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+screensaver +xinerama"
-
-RDEPEND="dev-haskell/data-default:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	screensaver? ( x11-libs/libXScrnSaver )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-PATCHES=("${FILESDIR}"/${P}-no-LDFLAGS.patch)
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--configure-option=$(use_with xinerama) \
-		--configure-option=$(use_with screensaver xscreensaver)
-}
diff --git a/dev-haskell/x509-1.4.11 b/dev-haskell/x509-1.4.11
new file mode 100644
index 000000000000..2c27939c3ed9
--- /dev/null
+++ b/dev-haskell/x509-1.4.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/asn1-encoding-0.8:=[profile?] <dev-haskell/asn1-encoding-0.9:=[profile?] >=dev-haskell/asn1-parse-0.8:=[profile?] <dev-haskell/asn1-parse-0.9:=[profile?] >=dev-haskell/asn1-types-0.2.3:=[profile?] <dev-haskell/asn1-types-0.3:=[profile?] >=dev-haskell/crypto-pubkey-types-0.4.2.1:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?] >=dev-haskell/cryptohash-0.9:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2 dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=X509 reader and writer
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-certificate
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/asn1-encoding-0.8:=[profile?] <dev-haskell/asn1-encoding-0.9:=[profile?] >=dev-haskell/asn1-parse-0.8:=[profile?] <dev-haskell/asn1-parse-0.9:=[profile?] >=dev-haskell/asn1-types-0.2.3:=[profile?] <dev-haskell/asn1-types-0.3:=[profile?] >=dev-haskell/crypto-pubkey-types-0.4.2.1:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?] >=dev-haskell/cryptohash-0.9:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/1.4.11
+SRC_URI=mirror://hackage/packages/archive/x509/1.4.11/x509-1.4.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1af194ef82bf6fbb68c1a2ebded0884d
diff --git a/dev-haskell/x509-1.5.1 b/dev-haskell/x509-1.5.1
new file mode 100644
index 000000000000..8ccb2a803977
--- /dev/null
+++ b/dev-haskell/x509-1.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-parse-0.9:=[profile?] <dev-haskell/asn1-parse-0.10:=[profile?] >=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-haskell/crypto-pubkey-types-0.4.2.1:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?] >=dev-haskell/cryptohash-0.9:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] dev-haskell/hourglass:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/tasty dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=X509 reader and writer
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-certificate
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-parse-0.9:=[profile?] <dev-haskell/asn1-parse-0.10:=[profile?] >=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-haskell/crypto-pubkey-types-0.4.2.1:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?] >=dev-haskell/cryptohash-0.9:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] dev-haskell/hourglass:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.5.1
+SRC_URI=mirror://hackage/packages/archive/x509/1.5.1/x509-1.5.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f68c9e74c54bd40759662759c5ae5ecb
diff --git a/dev-haskell/x509-1.6.3 b/dev-haskell/x509-1.6.3
new file mode 100644
index 000000000000..edf0998dd026
--- /dev/null
+++ b/dev-haskell/x509-1.6.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-parse-0.9.3:=[profile?] <dev-haskell/asn1-parse-0.10:=[profile?] >=dev-haskell/asn1-types-0.3.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/hourglass:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/tasty dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=X509 reader and writer
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-certificate
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-parse-0.9.3:=[profile?] <dev-haskell/asn1-parse-0.10:=[profile?] >=dev-haskell/asn1-types-0.3.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/hourglass:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.6.3
+SRC_URI=mirror://hackage/packages/archive/x509/1.6.3/x509-1.6.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d09dbb3abe8705b82a6a1970ac188a16
diff --git a/dev-haskell/x509-1.6.5 b/dev-haskell/x509-1.6.5
new file mode 100644
index 000000000000..f3c3b184845c
--- /dev/null
+++ b/dev-haskell/x509-1.6.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-parse-0.9.3:=[profile?] <dev-haskell/asn1-parse-0.10:=[profile?] >=dev-haskell/asn1-types-0.3.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/hourglass:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/tasty dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=X509 reader and writer
+EAPI=6
+HOMEPAGE=https://github.com/vincenthz/hs-certificate
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-parse-0.9.3:=[profile?] <dev-haskell/asn1-parse-0.10:=[profile?] >=dev-haskell/asn1-types-0.3.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/hourglass:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.6.5
+SRC_URI=mirror://hackage/packages/archive/x509/1.6.5/x509-1.6.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4bee8b6a95c87c2056684f5f72217484
diff --git a/dev-haskell/x509-store-1.4.4 b/dev-haskell/x509-store-1.4.4
new file mode 100644
index 000000000000..c697f076635c
--- /dev/null
+++ b/dev-haskell/x509-store-1.4.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/asn1-encoding-0.8:=[profile?] <dev-haskell/asn1-encoding-0.9:=[profile?] >=dev-haskell/asn1-types-0.2:=[profile?] <dev-haskell/asn1-types-0.3:=[profile?] >=dev-haskell/crypto-pubkey-types-0.3:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.4.3:=[profile?] <dev-haskell/x509-1.5:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=X.509 collection accessing and storing methods
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-certificate
+IUSE=executable test doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/asn1-encoding-0.8:=[profile?] <dev-haskell/asn1-encoding-0.9:=[profile?] >=dev-haskell/asn1-types-0.2:=[profile?] <dev-haskell/asn1-types-0.3:=[profile?] >=dev-haskell/crypto-pubkey-types-0.3:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.4.3:=[profile?] <dev-haskell/x509-1.5:=[profile?] >=dev-lang/ghc-6.12.1:=
+SLOT=0/1.4.4
+SRC_URI=mirror://hackage/packages/archive/x509-store/1.4.4/x509-store-1.4.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e791bb470021c3ce2fa02646b03e9f51
diff --git a/dev-haskell/x509-store-1.5.0 b/dev-haskell/x509-store-1.5.0
new file mode 100644
index 000000000000..f31ffa565807
--- /dev/null
+++ b/dev-haskell/x509-store-1.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-haskell/crypto-pubkey-types-0.3:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.5.0:=[profile?] <dev-haskell/x509-1.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=X.509 collection accessing and storing methods
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-certificate
+IUSE=executable test doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-haskell/crypto-pubkey-types-0.3:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.5.0:=[profile?] <dev-haskell/x509-1.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.5.0
+SRC_URI=mirror://hackage/packages/archive/x509-store/1.5.0/x509-store-1.5.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6d3965cae22954d278c6518b3bc5f742
diff --git a/dev-haskell/x509-store-1.6.1 b/dev-haskell/x509-store-1.6.1
new file mode 100644
index 000000000000..ef4b8f2d957c
--- /dev/null
+++ b/dev-haskell/x509-store-1.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.6:=[profile?] <dev-haskell/x509-1.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=X.509 collection accessing and storing methods
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-certificate
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.6:=[profile?] <dev-haskell/x509-1.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.6.1
+SRC_URI=mirror://hackage/packages/archive/x509-store/1.6.1/x509-store-1.6.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f75b552c7a835629e6bfeb8bdfcdbb6a
diff --git a/dev-haskell/x509-store-1.6.2 b/dev-haskell/x509-store-1.6.2
new file mode 100644
index 000000000000..8f20330f418d
--- /dev/null
+++ b/dev-haskell/x509-store-1.6.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.6:=[profile?] <dev-haskell/x509-1.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=X.509 collection accessing and storing methods
+EAPI=6
+HOMEPAGE=https://github.com/vincenthz/hs-certificate
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.6:=[profile?] <dev-haskell/x509-1.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.6.2
+SRC_URI=mirror://hackage/packages/archive/x509-store/1.6.2/x509-store-1.6.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1fcbcd45cf83286d0f234485351c6ea8
diff --git a/dev-haskell/x509-store/Manifest b/dev-haskell/x509-store/Manifest
deleted file mode 100644
index f8a4da96f02a..000000000000
--- a/dev-haskell/x509-store/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST x509-store-1.4.4.tar.gz 2992 BLAKE2B 9727c4a16f63003222c8794158ad96304f25579f0a43e46a7fa1c5db85d8d7ab99088096e03003622ac3d2afcb39fd5b985872e5d0edec6289f97f30493533a7 SHA512 b7a1ef5e25889ada9e654a52cf2606630c40b536359d7e1df01c96bf047816addfebdd2b0b3c7326a9b41a2b3034c641238f5fdee2f437eb29e0bc89a20e78c6
-DIST x509-store-1.5.0.tar.gz 2981 BLAKE2B 579eca067e0a2c8e65df57e2e1ebf8772959a4fd0d63bac752a3ffb7d1dd60ba57f73d0d638bc63e3194fa6343496eb8a343ca569abf4e632a822513c2bfbea4 SHA512 fdad44693615f832aafc0fc2b804bc7255d411241f669dc7396a5df958f128d6e94c1637a4b38860c4967a482915549aa94912821110477134d83095d27623d8
-DIST x509-store-1.6.1.tar.gz 3562 BLAKE2B cbbb3bd9cd280334f2dead12f156fa2b3b8ab5dbe2d72a5eb4cbb42023ee15df8823d89dd076c62638bb52a37537f6c1ada7906c3d1f374da3bcf54aecd0c0e5 SHA512 1417bfbb1f4863fe2e3e31f37253b2d96f145a790edb1f5f2439ddcadad67497d082222410f08ae9c2c2d1e87a1c994f09551f796b17ab757373a85fbb53e5da
-DIST x509-store-1.6.2.tar.gz 4326 BLAKE2B 1d79775d622cb6ba70069fdc61c5338447cb6e496b3ac621695ae4a172ff35c008cda4d036dd04d27c6f787d480ac5779d90c01c387eb83c080a5a01fc95c6b1 SHA512 41e511ea32095e96c71da17a1dfd34fa4e4d5e9a0d87d99586a5976602844f196aa0cca9ee97f66a092284a2c6120c0174a7f2d707a3e80c1d7020ee6168f847
-EBUILD x509-store-1.4.4.ebuild 1138 BLAKE2B a9a8823b925420fa3a2784c0927eb35c2ccba4fcba96eb3f1b87dcd5c97da759c14619cc9be09bbbabed96e4f0266157d5af5a98bee0856cafc7859aee61fd59 SHA512 8048851d4527eef2de3a48cdb776ae7fd1595244c65b275fc2005497735df58abc990eca58b7a81dec5b2fe030f433d4cd660508895e286f4c4e1941112b6265
-EBUILD x509-store-1.5.0.ebuild 1127 BLAKE2B 1d21eadcf2c32ff49e5a9e641ca186a671cc27455d951dfd6b9c86a95f9b2dad228785c3babcbcd1b0e6101b5f5683ee9ec9513232836daa4c733aef3bfdc715 SHA512 d890fb460c13a9986cc29ed39bbd403feadb2d2a9d4dd2908be6463ed18a975464751312178044f8e5f7858e62b961888be25fbc4a7e3f9785f9f0105f6143a7
-EBUILD x509-store-1.6.1.ebuild 935 BLAKE2B a3043072450094717e29adc988836f183e8e17b3ee2b733ddfb274a430de53c2040e46b799aad7c2dc6acff065527e97a01785e7fccfe39122a58f4ef15a1ba4 SHA512 a14e0c8f43b7c11923a9fb32ff96efffbae4a02e558070911de842d2418adf63f7f7f362198cfd4120009fad55ee09fcac11d21917463abece8b6f5ff5e56bf8
-EBUILD x509-store-1.6.2.ebuild 933 BLAKE2B 6b47b7d1a6bb1cd9a603fa6390a46011243a0ad06c064c424181ce2b30bc3cefccdab3c78493a2f72cb27e2f54054cd3e8de837ede49f64957f1511b18cf9819 SHA512 98fe608acbb3800dd434151df29e45b84771d8c856528219a9c3101f6a0ab93d8678c96803c21c86b0200369bf1342bcf439bd23aa46bac4213f8686161e0027
-MISC metadata.xml 532 BLAKE2B 0ae737c7d16f08e631f3d791580eb72ac16094e81f2fc8e2b9e2a84067c0deb4fb2bcae28e7df8fc65acb5abd27095fec9ebf6c733bdb2e55a84ddc4cd55c8cf SHA512 e40040999883c0b8506bf95e554d84f2edfa0bb36bb61c3edc44b8756c1b584c20470fd40c04599a9506d9775846b62744c40814163bfb44542fbb8a26c50bbc
diff --git a/dev-haskell/x509-store/metadata.xml b/dev-haskell/x509-store/metadata.xml
deleted file mode 100644
index 387cfc03b044..000000000000
--- a/dev-haskell/x509-store/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="executable">Build the executable</flag>
-	</use>
-	<longdescription>
-		X.509 collection accessing and storing methods for certificate, crl, exception list
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-certificate</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/x509-store/x509-store-1.4.4.ebuild b/dev-haskell/x509-store/x509-store-1.4.4.ebuild
deleted file mode 100644
index 30c065b8b3bf..000000000000
--- a/dev-haskell/x509-store/x509-store-1.4.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="X.509 collection accessing and storing methods"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable test"
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.8:=[profile?] <dev-haskell/asn1-encoding-0.9:=[profile?]
-	>=dev-haskell/asn1-types-0.2:=[profile?] <dev-haskell/asn1-types-0.3:=[profile?]
-	>=dev-haskell/crypto-pubkey-types-0.3:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/x509-1.4.3:=[profile?] <dev-haskell/x509-1.5:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag test test)
-}
diff --git a/dev-haskell/x509-store/x509-store-1.5.0.ebuild b/dev-haskell/x509-store/x509-store-1.5.0.ebuild
deleted file mode 100644
index fb7e29fd2ec0..000000000000
--- a/dev-haskell/x509-store/x509-store-1.5.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="X.509 collection accessing and storing methods"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="executable test"
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
-	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	>=dev-haskell/crypto-pubkey-types-0.3:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/x509-1.5.0:=[profile?] <dev-haskell/x509-1.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag test test)
-}
diff --git a/dev-haskell/x509-store/x509-store-1.6.1.ebuild b/dev-haskell/x509-store/x509-store-1.6.1.ebuild
deleted file mode 100644
index ea7926f6c3c0..000000000000
--- a/dev-haskell/x509-store/x509-store-1.6.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="X.509 collection accessing and storing methods"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
-	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	dev-haskell/cryptonite:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/x509-1.6:=[profile?] <dev-haskell/x509-1.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/x509-store/x509-store-1.6.2.ebuild b/dev-haskell/x509-store/x509-store-1.6.2.ebuild
deleted file mode 100644
index af5f590a1645..000000000000
--- a/dev-haskell/x509-store/x509-store-1.6.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="X.509 collection accessing and storing methods"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
-	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	dev-haskell/cryptonite:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/x509-1.6:=[profile?] <dev-haskell/x509-1.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/x509-system-1.4.5 b/dev-haskell/x509-system-1.4.5
new file mode 100644
index 000000000000..37979f2b2d6a
--- /dev/null
+++ b/dev-haskell/x509-system-1.4.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.4:=[profile?] <dev-haskell/x509-1.5:=[profile?] >=dev-haskell/x509-store-1.4:=[profile?] <dev-haskell/x509-store-1.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Handle per-operating-system X.509 accessors and storage
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-certificate
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.4:=[profile?] <dev-haskell/x509-1.5:=[profile?] >=dev-haskell/x509-store-1.4:=[profile?] <dev-haskell/x509-store-1.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.4.5
+SRC_URI=mirror://hackage/packages/archive/x509-system/1.4.5/x509-system-1.4.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=319b4c9fc71b5327accf64166dde1cec
diff --git a/dev-haskell/x509-system-1.5.0 b/dev-haskell/x509-system-1.5.0
new file mode 100644
index 000000000000..696016c32627
--- /dev/null
+++ b/dev-haskell/x509-system-1.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.5:=[profile?] <dev-haskell/x509-1.6:=[profile?] >=dev-haskell/x509-store-1.5:=[profile?] <dev-haskell/x509-store-1.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Handle per-operating-system X.509 accessors and storage
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-certificate
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.5:=[profile?] <dev-haskell/x509-1.6:=[profile?] >=dev-haskell/x509-store-1.5:=[profile?] <dev-haskell/x509-store-1.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.5.0
+SRC_URI=mirror://hackage/packages/archive/x509-system/1.5.0/x509-system-1.5.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1a6a8851e18f480c6bf71783a6e6af51
diff --git a/dev-haskell/x509-system-1.6.3 b/dev-haskell/x509-system-1.6.3
new file mode 100644
index 000000000000..f5fb4205da71
--- /dev/null
+++ b/dev-haskell/x509-system-1.6.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.6:=[profile?] <dev-haskell/x509-1.7:=[profile?] >=dev-haskell/x509-store-1.6:=[profile?] <dev-haskell/x509-store-1.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Handle per-operating-system X.509 accessors and storage
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-certificate
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.6:=[profile?] <dev-haskell/x509-1.7:=[profile?] >=dev-haskell/x509-store-1.6:=[profile?] <dev-haskell/x509-store-1.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.6.3
+SRC_URI=mirror://hackage/packages/archive/x509-system/1.6.3/x509-system-1.6.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fab31bb385434dc08c42f5ae292f4c8d
diff --git a/dev-haskell/x509-system-1.6.4 b/dev-haskell/x509-system-1.6.4
new file mode 100644
index 000000000000..0b5a97091d9a
--- /dev/null
+++ b/dev-haskell/x509-system-1.6.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.6:=[profile?] <dev-haskell/x509-1.7:=[profile?] >=dev-haskell/x509-store-1.6.2:=[profile?] <dev-haskell/x509-store-1.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Handle per-operating-system X.509 accessors and storage
+EAPI=6
+HOMEPAGE=https://github.com/vincenthz/hs-certificate
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.6:=[profile?] <dev-haskell/x509-1.7:=[profile?] >=dev-haskell/x509-store-1.6.2:=[profile?] <dev-haskell/x509-store-1.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.6.4
+SRC_URI=mirror://hackage/packages/archive/x509-system/1.6.4/x509-system-1.6.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0061bf893255d2f8dec6a496fa72f743
diff --git a/dev-haskell/x509-system/Manifest b/dev-haskell/x509-system/Manifest
deleted file mode 100644
index aec0e9a8f72b..000000000000
--- a/dev-haskell/x509-system/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST x509-system-1.4.5.tar.gz 3596 BLAKE2B 09c07e7391ebabd7ea2d52b784b54c6b6f39ee2ad6cd29c6ab0ba1b9b4be44cb2edce88b66e499f3ab1fbfbfb22ad1e1b60f907733bc6d3e45cd53085bafdfd9 SHA512 609dfd0a8095f9a9b9b869a871b9da463f50c2973a48d60dad8e6c8f652cdebc09675391f8193bf183b64dab9d81dab09e1561bc253534958d10d325e217c3a9
-DIST x509-system-1.5.0.tar.gz 3832 BLAKE2B 8912c9cd13add9113b204bc0626fa36ce91ec797743e655c978f56352f3d7ea77158168d887e85b4cf13e71cef73586fd82b987a8ba994f08587a891a6e59a71 SHA512 275423717680d62978fbe0703861c05ca2ebe2f0185bd479b5590c725380508d3aefcb229f62111647592f28bddef5285d1224cedab71349b28ee23d8a7d1ee4
-DIST x509-system-1.6.3.tar.gz 4035 BLAKE2B 639deab930f04f1faaa362cd475eb9ced191c7cc93eb83a35e8230b80723e2c607e0c1b9ac34e807afc22c628ad96773e3d83fbecb42aa819ef5a19de4356ae2 SHA512 4368254a6a1d96876372797bdb360c89fde4266a1fd73d028e7807ea342cc58090181c5fe81c0f19ec8620424be04ceefc48dbe4a682cb792dc6bd6726bc2e6e
-DIST x509-system-1.6.4.tar.gz 3443 BLAKE2B 95357c8cd5f5b6e18af9a380d13adfd4bd7eaa69dd67451ab74313046ccc20b16b96d8980818e0700be019d49f419f6fd447943b12c7ffe82690cf2f796b2265 SHA512 5b12e9d3509d0f131532f4a5857442cdb64c157b16fb71b181336b7ff1840222f6bbcccbd69609b74d5f387963eb4ece37bb9fd37bb5d1e6d9d2aa5162739bf7
-EBUILD x509-system-1.4.5.ebuild 817 BLAKE2B c1bd135d6f3ab6212399ddc73ec3938c6ab81577c77ad2c0d437c4f223d2f86825e1aa5715b9db96ed1d6529002c3c083f4e3272e728c98dd4e740e0272afd0e SHA512 a0af16c85679f2427981d497f710ee814dfb661b850357d5d0eb543e276f4ebfece9aabc772a61ee21f476dde2325d956bb9d5d2815ea522e40d1570a340c00e
-EBUILD x509-system-1.5.0.ebuild 812 BLAKE2B 21318d529a080a92b62ecab57b96a221754982f598b030d08b3fc70224b7fdc444174d13a52c8b112b6cb679aa64290352fd2302c89b4c17e4d9ea8e00255ae1 SHA512 72925e40bac9d379d4b6bd92ccec2f535046bcf50c3df512e5310e43864c4bfa8936cea4959e755691a3ba04a9a26f2ca2784f8ef39165a7a577dfda15867250
-EBUILD x509-system-1.6.3.ebuild 819 BLAKE2B 9e956b2e2a3e8f59a580cbe157cb411af9c89cc54858ff94f00c2ed9fd77690a178ebbcda14cccacef65d02eecccc2304e90bf899854c7a6875225467ad9bace SHA512 74fe2e84b5d5669b89ed0367d397f62c1f942158dd7eb92f044b47b603c7030affeac5619bf34239e51aed89994cd8f176fc9aa3f5cf2aaaf816136b45976a16
-EBUILD x509-system-1.6.4.ebuild 819 BLAKE2B c44d8dd7b5fd32f9e510ff022c29af3ddc2031589fe0526aff8166bc0f43a1fd04b6792e5b3f07f8089f44466c6022a6909f43d64267a66648f6f33639dbd9f9 SHA512 80b1626774c2b7de27c45c2173c8de615cfe91d7b6c13ad43475e5f5c64c4e80beed8a6cb9b2df7d3acb00dbd1dc4e2a384d928fa829fdb46f3d3a2ac615e85d
-MISC metadata.xml 401 BLAKE2B 328d96d11638b96887e11e8073a487ccd0a8590b5f520f9ec410a29cfd9e76f06d70a3b71eb5a3c7aa7f9afa61d5e6869dd80215dc774545c206eb72bcf3a2bb SHA512 5456194344e0624b6ab6860790a428f5cd29e5023780aa7e165405248e9cfc66b5b6ae8e8cef7ef46ac3241f89f330cf633e8374d77fde4b739a11513d91fe15
diff --git a/dev-haskell/x509-system/metadata.xml b/dev-haskell/x509-system/metadata.xml
deleted file mode 100644
index dea36bde9523..000000000000
--- a/dev-haskell/x509-system/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		System X.509 handling
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-certificate</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/x509-system/x509-system-1.4.5.ebuild b/dev-haskell/x509-system/x509-system-1.4.5.ebuild
deleted file mode 100644
index 9838879cc5d7..000000000000
--- a/dev-haskell/x509-system/x509-system-1.4.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Handle per-operating-system X.509 accessors and storage"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/x509-1.4:=[profile?] <dev-haskell/x509-1.5:=[profile?]
-	>=dev-haskell/x509-store-1.4:=[profile?] <dev-haskell/x509-store-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/x509-system/x509-system-1.5.0.ebuild b/dev-haskell/x509-system/x509-system-1.5.0.ebuild
deleted file mode 100644
index 8237c0ac7d3d..000000000000
--- a/dev-haskell/x509-system/x509-system-1.5.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Handle per-operating-system X.509 accessors and storage"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/x509-1.5:=[profile?] <dev-haskell/x509-1.6:=[profile?]
-	>=dev-haskell/x509-store-1.5:=[profile?] <dev-haskell/x509-store-1.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/x509-system/x509-system-1.6.3.ebuild b/dev-haskell/x509-system/x509-system-1.6.3.ebuild
deleted file mode 100644
index cdd868816863..000000000000
--- a/dev-haskell/x509-system/x509-system-1.6.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Handle per-operating-system X.509 accessors and storage"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/x509-1.6:=[profile?] <dev-haskell/x509-1.7:=[profile?]
-	>=dev-haskell/x509-store-1.6:=[profile?] <dev-haskell/x509-store-1.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/x509-system/x509-system-1.6.4.ebuild b/dev-haskell/x509-system/x509-system-1.6.4.ebuild
deleted file mode 100644
index 73074bfa58db..000000000000
--- a/dev-haskell/x509-system/x509-system-1.6.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Handle per-operating-system X.509 accessors and storage"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/x509-1.6:=[profile?] <dev-haskell/x509-1.7:=[profile?]
-	>=dev-haskell/x509-store-1.6.2:=[profile?] <dev-haskell/x509-store-1.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/x509-validation-1.5.2 b/dev-haskell/x509-validation-1.5.2
new file mode 100644
index 000000000000..c0378376d756
--- /dev/null
+++ b/dev-haskell/x509-validation-1.5.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-pubkey-0.1.4:=[profile?] <dev-haskell/crypto-pubkey-0.3:=[profile?] >=dev-haskell/crypto-pubkey-types-0.4:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?] >=dev-haskell/cryptohash-0.9:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/hourglass:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.5.0:=[profile?] <dev-haskell/x509-1.6:=[profile?] >=dev-haskell/x509-store-1.5:=[profile?] <dev-haskell/x509-store-1.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=X.509 Certificate and CRL validation
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-certificate
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-pubkey-0.1.4:=[profile?] <dev-haskell/crypto-pubkey-0.3:=[profile?] >=dev-haskell/crypto-pubkey-types-0.4:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?] >=dev-haskell/cryptohash-0.9:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/hourglass:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.5.0:=[profile?] <dev-haskell/x509-1.6:=[profile?] >=dev-haskell/x509-store-1.5:=[profile?] <dev-haskell/x509-store-1.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.5.2
+SRC_URI=mirror://hackage/packages/archive/x509-validation/1.5.2/x509-validation-1.5.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dcee5941f1875e34996eb35e623a719d
diff --git a/dev-haskell/x509-validation-1.6.3 b/dev-haskell/x509-validation-1.6.3
new file mode 100644
index 000000000000..64ba10847695
--- /dev/null
+++ b/dev-haskell/x509-validation-1.6.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] dev-haskell/byteable:=[profile?] >=dev-haskell/cryptonite-0.3:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/hourglass:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.6:=[profile?] <dev-haskell/x509-1.7:=[profile?] >=dev-haskell/x509-store-1.6:=[profile?] <dev-haskell/x509-store-1.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=X.509 Certificate and CRL validation
+EAPI=5
+HOMEPAGE=https://github.com/vincenthz/hs-certificate
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] dev-haskell/byteable:=[profile?] >=dev-haskell/cryptonite-0.3:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/hourglass:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.6:=[profile?] <dev-haskell/x509-1.7:=[profile?] >=dev-haskell/x509-store-1.6:=[profile?] <dev-haskell/x509-store-1.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.6.3
+SRC_URI=mirror://hackage/packages/archive/x509-validation/1.6.3/x509-validation-1.6.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=80b62e15f9d90886a4fabdaebef07c1b
diff --git a/dev-haskell/x509-validation-1.6.5 b/dev-haskell/x509-validation-1.6.5
new file mode 100644
index 000000000000..9815e8d2ac51
--- /dev/null
+++ b/dev-haskell/x509-validation-1.6.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] dev-haskell/byteable:=[profile?] >=dev-haskell/cryptonite-0.8:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/hourglass:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.6.2:=[profile?] <dev-haskell/x509-1.7:=[profile?] >=dev-haskell/x509-store-1.6:=[profile?] <dev-haskell/x509-store-1.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=X.509 Certificate and CRL validation
+EAPI=6
+HOMEPAGE=https://github.com/vincenthz/hs-certificate
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] dev-haskell/byteable:=[profile?] >=dev-haskell/cryptonite-0.8:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/hourglass:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.6.2:=[profile?] <dev-haskell/x509-1.7:=[profile?] >=dev-haskell/x509-store-1.6:=[profile?] <dev-haskell/x509-store-1.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.6.5
+SRC_URI=mirror://hackage/packages/archive/x509-validation/1.6.5/x509-validation-1.6.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=78baf7ede7f4f6ed134daeb4576b3474
diff --git a/dev-haskell/x509-validation/Manifest b/dev-haskell/x509-validation/Manifest
deleted file mode 100644
index c1846d8354a5..000000000000
--- a/dev-haskell/x509-validation/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST x509-validation-1.5.2.tar.gz 9658 BLAKE2B b0df27e594214e18130cad45d64b6bd14f21074d4fa3ce1090af80a432399ed77c99763fdbc089bdabafbe16d26b501e3fd221f5c55169efadbc09009cbb4463 SHA512 113cb7ebf6575e1902500a9b91dcf246d7a2d01fdccd25454660b4be667c92b60c8f18d797d69814a90ab941909370c96a24d1ed1a63b55bab5d75491f1cf603
-DIST x509-validation-1.6.3.tar.gz 10259 BLAKE2B f7ebb98c668a57399325fe9561d1d9fcea1f28e6079cdd29b3298a1a818a1fd0d318a81040bad4cd610aed0470d679ab7495b31ccf0a0f952d647e6b1381f887 SHA512 83aa4a403ee726cae8a901c64e997ce0ff9d94027c90f794ebd1eb0267cbf9f8846df7e3fd03cba5bd414e8dd7c89a46fc74d88bed8f42850e0c0e191aadabcf
-DIST x509-validation-1.6.5.tar.gz 10370 BLAKE2B 9fa399e63457c9d3d0e9bc52bfe739e38f1fa89a77a56384b7107b78b56f68f8a341ebd04a98db8b9a2dc096594893eeacc1b064e1cdfaabcc2899366685ae9f SHA512 170a01b748ebd082ed4b7c084ce2e4ee9614c8ff45ca28d4cfe32b0cae498c43bbb4ec0d9e0a6a25b480f57660fcab67222442c3df970a4242d0191e5c2015e6
-EBUILD x509-validation-1.5.2.ebuild 1390 BLAKE2B 2e4f01d26975105f216810d649cee38251fd3e1bad8fe4513734703578e092c2e7290ec70a0b6bc66321336c01a8582b1b78a0b7468c19f093e3597e06e71c2d SHA512 4733444237b5b44fe5f0a296cf6fc5813e69f832acf201d9e516bde1cd45810be3355433e4fceb2955ca2d79e39e224f756567c58faef885887d9b8cbef4074c
-EBUILD x509-validation-1.6.3.ebuild 1158 BLAKE2B 6a7e7806ccaba3b1ede902b743ec0e5950dac328d18d7c2fd5254f0bd08d5a48c3d486f6dd6b38600157fbd138d279a02b3c6076a66caa2810fd976f34053ace SHA512 ec735e158c0d348482a29069e8eb1a8d6a9ad3782860db984df225a20670b755dbfcfc2a44150f74f2330b8d52e762c4ec0afaa46f71a3fb78ce75ce9ff18b76
-EBUILD x509-validation-1.6.5.ebuild 1158 BLAKE2B b862b2f0ea54dbb8ab177ac7118c37d1f0df8d65f4d42328570ffa9ac6569cda7c7bb50e27d05a519494980c5d127be9db794242c4dd4438c08c58b9346e2ab8 SHA512 38362fd2b810300110b54f865f8f8abf90b51ad03ee15fe8edd958819cad1eeecf468ada36facaabb4a50f21e90e0a4990fc10a21c60ae2304153cb9389cb8fa
-MISC metadata.xml 416 BLAKE2B 71d99efd7f245b1ddca40bf75fbc79e586a15c7b7eeb12d53a3492cfa91139e268ec19c0d56a2d3a9f0b1b1881848fc763e36e5e89e7e19a100da56a37716185 SHA512 9572eec905c615a7d79bcc16c6d455fdee488d302c08fe5f18450806ef2b31893e1a86d900178418454e77fd3a0d6c69a85f09d67c4ccb7e3c95f6b0f521a7cf
diff --git a/dev-haskell/x509-validation/metadata.xml b/dev-haskell/x509-validation/metadata.xml
deleted file mode 100644
index 2fe4ec59d173..000000000000
--- a/dev-haskell/x509-validation/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		X.509 Certificate and CRL validation
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-certificate</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/x509-validation/x509-validation-1.5.2.ebuild b/dev-haskell/x509-validation/x509-validation-1.5.2.ebuild
deleted file mode 100644
index b0a69976ff25..000000000000
--- a/dev-haskell/x509-validation/x509-validation-1.5.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="X.509 Certificate and CRL validation"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
-	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	>=dev-haskell/crypto-pubkey-0.1.4:=[profile?] <dev-haskell/crypto-pubkey-0.3:=[profile?]
-	>=dev-haskell/crypto-pubkey-types-0.4:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?]
-	>=dev-haskell/cryptohash-0.9:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	dev-haskell/hourglass:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/x509-1.5.0:=[profile?] <dev-haskell/x509-1.6:=[profile?]
-	>=dev-haskell/x509-store-1.5:=[profile?] <dev-haskell/x509-store-1.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/x509-validation/x509-validation-1.6.3.ebuild b/dev-haskell/x509-validation/x509-validation-1.6.3.ebuild
deleted file mode 100644
index d1e3c724e1ca..000000000000
--- a/dev-haskell/x509-validation/x509-validation-1.6.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="X.509 Certificate and CRL validation"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
-	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	>=dev-haskell/cryptonite-0.3:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	dev-haskell/hourglass:=[profile?]
-	dev-haskell/memory:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/x509-1.6:=[profile?] <dev-haskell/x509-1.7:=[profile?]
-	>=dev-haskell/x509-store-1.6:=[profile?] <dev-haskell/x509-store-1.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/x509-validation/x509-validation-1.6.5.ebuild b/dev-haskell/x509-validation/x509-validation-1.6.5.ebuild
deleted file mode 100644
index 803341262b3e..000000000000
--- a/dev-haskell/x509-validation/x509-validation-1.6.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="X.509 Certificate and CRL validation"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
-	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	>=dev-haskell/cryptonite-0.8:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	dev-haskell/hourglass:=[profile?]
-	dev-haskell/memory:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/x509-1.6.2:=[profile?] <dev-haskell/x509-1.7:=[profile?]
-	>=dev-haskell/x509-store-1.6:=[profile?] <dev-haskell/x509-store-1.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/x509/Manifest b/dev-haskell/x509/Manifest
deleted file mode 100644
index 1302441d5aa6..000000000000
--- a/dev-haskell/x509/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST x509-1.4.11.tar.gz 13976 BLAKE2B ef161b6ac7bc28eed8736609487fc7f53eb9765d0a51677f917ee9e304c6ac9eda56dba2b775032eaff4bab408c7fafa7814f1ad023c5682f0d77fa79a608db6 SHA512 901e8d7623dfaae745d1748a302d2aba48e63fdf0f17eb932455f0dc0e348aa17f5b9bcc9ef4838c41ac5b9f9e0b03c6dac2805ba146584dcddf55069d29a2da
-DIST x509-1.5.1.tar.gz 14528 BLAKE2B d58463da78e3ba9204e7b93e69917bfa2c04ab8debf68c1fc27cc4e0c11fc5d15f304008ced232efae93a985843feab688b18a0a188882bbed1a23a11b9adcc2 SHA512 8255cd78c2602f2bda0eb6dc8b539c5f9c656e2b24b015031e1cc0439013b17e56e339ba497717c2aa38dc33b3e61632db2965e3a7859146a69ca6cb4e69e92d
-DIST x509-1.6.3.tar.gz 16134 BLAKE2B a1f8aec494f3a1614474c949da284909a848c637f3a358a71ded546d930973805352f4b7699eb372aac1d90941a1df5e815f059fb0b03053a72093aad83d9cd0 SHA512 6ee4198954bd66febdae4b2d223490085c5e49ca6cb416667061f879488f32cb51dbe9ba8c6c9dd6a79ee3a57706c0eba3cbf49603b80d613f692192bdb32221
-DIST x509-1.6.5.tar.gz 16711 BLAKE2B 0bc0997880dd74f97806a4a287e3dbdd8b1be0a28c52666b4a1057c2607c34d8b480d3af9d02d956ccb885ff6b8dac50ff74959dda2dd650899276b7f1240543 SHA512 bd63bcb1723777e379c50db55f32a2a7d10b051a7d5a586f1caa3ed298932626669adf8dc7e4becc54090741921b23a7e39879ac743ed90c2281634f8d18240c
-EBUILD x509-1.4.11.ebuild 1254 BLAKE2B 6cedfe132c4b9448a8fc3f9673c55c9004151950a25092b8e8fe073c26ac5aec58a378dd5c25dc7dbd983605973ffce7f422e499210501e1c1669ef4c2400717 SHA512 1792352c7e3d796f7c2a996e5f20c6548200ac1c9ea720d90bc6afaa2a161bc41a9f37c7240b4ea89f35844312f3b359a52e224c5315f57dca8afd46c53f9728
-EBUILD x509-1.5.1.ebuild 1181 BLAKE2B 27d58cb731412ce89c17a8fe166e75b4b3abeebb406089c2956b082ef1d9d3431c79befc634c8bae0de8bec14dcafda006a3f405bc1f295faa2414d43ea6caa7 SHA512 7171d573632af73320894cb7dc3646ea506f0e40415248773d6fd2dccd4f07026bd286f3d389b366f36bd3282c11517b09fe64c721b38353531d65cfa8f7cefd
-EBUILD x509-1.6.3.ebuild 1066 BLAKE2B 822e520d2fb638307548f29c22cdb7a715715e19b0af8affcbb589c67d6efb9876531bfb12356c31639c3e06065891cddcb839ccbb4e423dbb157e16d717d5d3 SHA512 7abe765984675d2286f929c5cf51b21c42831101bf1f6ee2ae0b467435106be678f54729b0e03f31d21a360c2b42b4b8b5962db9f0e2c9b3963fdc9ca6dc54bb
-EBUILD x509-1.6.5.ebuild 1066 BLAKE2B 3ba5996272fe4e1530f61218b26fcedbd37834655837a2fab2bd5ead8fe8760003fd2d55e5fb23563afe303103d58a0a8218ae2462684fb7c26b957af3862540 SHA512 4ec16773439988c0618d46e3c8856a233fbdd92b1c13755411aa451e6a19edbb14c0d2f679c1ef1f016a2c2992f2f8c199a4e021d447056cb9a4963ec945e0d9
-MISC metadata.xml 402 BLAKE2B 59bd72d1c5b6058ff84fdcaf16425640d696c2a684149e603238fa6edbfd3ea5159516208e71f120133332e2770cef79aeb3b2902cd29314d84e71869d252570 SHA512 f580c339830d91e8f5ffc91afedc049f10fa454477d81679668d16e2b8c7d1d0217476c487c39cd023c86cbbc43f72bfaecc5d0a6f7fd4cbd781184c2bad48e1
diff --git a/dev-haskell/x509/metadata.xml b/dev-haskell/x509/metadata.xml
deleted file mode 100644
index c2856848dc0e..000000000000
--- a/dev-haskell/x509/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		X509 reader and writer
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-certificate</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/x509/x509-1.4.11.ebuild b/dev-haskell/x509/x509-1.4.11.ebuild
deleted file mode 100644
index 34c242e67009..000000000000
--- a/dev-haskell/x509/x509-1.4.11.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="X509 reader and writer"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.8:=[profile?] <dev-haskell/asn1-encoding-0.9:=[profile?]
-	>=dev-haskell/asn1-parse-0.8:=[profile?] <dev-haskell/asn1-parse-0.9:=[profile?]
-	>=dev-haskell/asn1-types-0.2.3:=[profile?] <dev-haskell/asn1-types-0.3:=[profile?]
-	>=dev-haskell/crypto-pubkey-types-0.4.2.1:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?]
-	>=dev-haskell/cryptohash-0.9:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/x509/x509-1.5.1.ebuild b/dev-haskell/x509/x509-1.5.1.ebuild
deleted file mode 100644
index 06e66a4d5550..000000000000
--- a/dev-haskell/x509/x509-1.5.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="X509 reader and writer"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
-	>=dev-haskell/asn1-parse-0.9:=[profile?] <dev-haskell/asn1-parse-0.10:=[profile?]
-	>=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	>=dev-haskell/crypto-pubkey-types-0.4.2.1:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?]
-	>=dev-haskell/cryptohash-0.9:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
-	dev-haskell/hourglass:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/x509/x509-1.6.3.ebuild b/dev-haskell/x509/x509-1.6.3.ebuild
deleted file mode 100644
index 855812207fd1..000000000000
--- a/dev-haskell/x509/x509-1.6.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="X509 reader and writer"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
-	>=dev-haskell/asn1-parse-0.9.3:=[profile?] <dev-haskell/asn1-parse-0.10:=[profile?]
-	>=dev-haskell/asn1-types-0.3.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	dev-haskell/cryptonite:=[profile?]
-	dev-haskell/hourglass:=[profile?]
-	dev-haskell/memory:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/x509/x509-1.6.5.ebuild b/dev-haskell/x509/x509-1.6.5.ebuild
deleted file mode 100644
index 8efc4fa867a6..000000000000
--- a/dev-haskell/x509/x509-1.6.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="X509 reader and writer"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
-	>=dev-haskell/asn1-parse-0.9.3:=[profile?] <dev-haskell/asn1-parse-0.10:=[profile?]
-	>=dev-haskell/asn1-types-0.3.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	dev-haskell/cryptonite:=[profile?]
-	dev-haskell/hourglass:=[profile?]
-	dev-haskell/memory:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/xhtml-3000.2.1-r1 b/dev-haskell/xhtml-3000.2.1-r1
new file mode 100644
index 000000000000..aba6b96fa2ee
--- /dev/null
+++ b/dev-haskell/xhtml-3000.2.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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=An XHTML combinator library
+EAPI=5
+HOMEPAGE=https://github.com/haskell/xhtml
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/3000.2.1
+SRC_URI=mirror://hackage/packages/archive/xhtml/3000.2.1/xhtml-3000.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3405f7684e6c2b03976c2cbdacb549e5
diff --git a/dev-haskell/xhtml/Manifest b/dev-haskell/xhtml/Manifest
deleted file mode 100644
index 5f9bceea0c53..000000000000
--- a/dev-haskell/xhtml/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xhtml-3000.2.1.tar.gz 14555 BLAKE2B e6617914fbcf4ea56b7ffbf7790305fe6c89a27f2a24a50e54cf8a13d57c5bfe66731c47bf41c3163698ae6ce98a8566199c952bca9df22ead5e1a8d9d9a2cdd SHA512 a3e901f6173e3885717ee5e451f8ea8d2ee61cbb159335eb69b0a7e097dbad350b1919aedd7f9daf530147fea7982921fc324df41112e69ed362d143fe327342
-EBUILD xhtml-3000.2.1-r1.ebuild 820 BLAKE2B a7a76146c7aad0f3f75ae3c4f84870f2b6dbad47ec7e7c17f6b529abb689128ad91f6d44d78910004de87badf123ca3a99985843e70e2023f59f8a1fa4290324 SHA512 96734f7383ba56d020738d0f465ed719bd537f328d03d978e900c805f8ab22b42a81d281edc9c59efdbdeddc90e4d0cf9b4c0852beebb711c426e8790829af5c
-MISC metadata.xml 305 BLAKE2B e7048400b3dc0c789dbb2c34c23f18373deee9b55f53ae669b3d55f1aed654e486fc258fffe9f733fa688600069420adc0496627ced8d08084e7774e5dbe5b70 SHA512 0270a7ac1593d87c819597c6adf0c5658415e1338423c2c1cf254c8d2b9edb879b7776114600ae034b4b667ea42b53b1c372e8fc09c944a017303bbe04ea3453
diff --git a/dev-haskell/xhtml/metadata.xml b/dev-haskell/xhtml/metadata.xml
deleted file mode 100644
index b628ca84b8de..000000000000
--- a/dev-haskell/xhtml/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">haskell/xhtml</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild b/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
deleted file mode 100644
index 40e42ce9cfd2..000000000000
--- a/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="An XHTML combinator library"
-HOMEPAGE="https://github.com/haskell/xhtml"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6"
-
-CABAL_CORE_LIB_GHC_PV="7.8.3 7.8.3.20141119 7.8.4 7.10.0.20141222 7.10.0.20150123 PM:7.10.1_rc3 PM:7.10.1 PM:7.10.2_rc2 PM:7.10.2 PM:7.10.2-r1 PM:7.10.3_rc1 PM:7.10.3 PM:8.0.1_rc1 PM:8.0.1_rc2 PM:8.0.1_rc3 PM:8.0.1_rc4 PM:8.0.1 PM:8.0.2_rc1 PM:8.0.2_rc2 PM:8.0.2"
diff --git a/dev-haskell/xml-1.3.13 b/dev-haskell/xml-1.3.13
new file mode 100644
index 000000000000..ec85b022c3d0
--- /dev/null
+++ b/dev-haskell/xml-1.3.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/text:=[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 simple XML library
+EAPI=5
+HOMEPAGE=http://code.galois.com
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=956f1ab3392de684ad7fdb93812a343b
diff --git a/dev-haskell/xml-1.3.14 b/dev-haskell/xml-1.3.14
new file mode 100644
index 000000000000..1a7b1352c830
--- /dev/null
+++ b/dev-haskell/xml-1.3.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=082a9d1f7eecdac535e0654317b71570
diff --git a/dev-haskell/xml-conduit-1.1.0.9 b/dev-haskell/xml-conduit-1.1.0.9
new file mode 100644
index 000000000000..de7bb5bd9ad7
--- /dev/null
+++ b/dev-haskell/xml-conduit-1.1.0.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/attoparsec-conduit-1.0:=[profile?] >=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-builder-conduit-1.0:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.1:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/failure-0.1:=[profile?] <dev-haskell/failure-0.3:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pure-Haskell utilities for dealing with XML with the conduit package
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/xml
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/attoparsec-conduit-1.0:=[profile?] >=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-builder-conduit-1.0:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.1:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/failure-0.1:=[profile?] <dev-haskell/failure-0.3:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.0.9
+SRC_URI=mirror://hackage/packages/archive/xml-conduit/1.1.0.9/xml-conduit-1.1.0.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9a10fdd30f48ff938089f00c1f7da077
diff --git a/dev-haskell/xml-conduit-1.2.3.3 b/dev-haskell/xml-conduit-1.2.3.3
new file mode 100644
index 000000000000..c421677c9832
--- /dev/null
+++ b/dev-haskell/xml-conduit-1.2.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pure-Haskell utilities for dealing with XML with the conduit package
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/xml
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.3.3
+SRC_URI=mirror://hackage/packages/archive/xml-conduit/1.2.3.3/xml-conduit-1.2.3.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=36dfbf721908eea66c60b663b9fb47e4
diff --git a/dev-haskell/xml-conduit-1.3.1 b/dev-haskell/xml-conduit-1.3.1
new file mode 100644
index 000000000000..2cf406a8b6a0
--- /dev/null
+++ b/dev-haskell/xml-conduit-1.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pure-Haskell utilities for dealing with XML with the conduit package
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/xml
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.3.1
+SRC_URI=mirror://hackage/packages/archive/xml-conduit/1.3.1/xml-conduit-1.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0f3fa9667135e5425e51f1dc2f13c3c5
diff --git a/dev-haskell/xml-conduit-1.3.3 b/dev-haskell/xml-conduit-1.3.3
new file mode 100644
index 000000000000..67ee1990776b
--- /dev/null
+++ b/dev-haskell/xml-conduit-1.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pure-Haskell utilities for dealing with XML with the conduit package
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/xml
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.3.3
+SRC_URI=mirror://hackage/packages/archive/xml-conduit/1.3.3/xml-conduit-1.3.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=61ccc9a905efe616e7fc9555be2a239d
diff --git a/dev-haskell/xml-conduit-1.3.4.2 b/dev-haskell/xml-conduit-1.3.4.2
new file mode 100644
index 000000000000..c90bb5c33f7c
--- /dev/null
+++ b/dev-haskell/xml-conduit-1.3.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pure-Haskell utilities for dealing with XML with the conduit package
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/xml
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.3.4.2
+SRC_URI=mirror://hackage/packages/archive/xml-conduit/1.3.4.2/xml-conduit-1.3.4.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2ef3e4d8eb6b5e9033eb68bf49c114ae
diff --git a/dev-haskell/xml-conduit/Manifest b/dev-haskell/xml-conduit/Manifest
deleted file mode 100644
index 8eb9cf165779..000000000000
--- a/dev-haskell/xml-conduit/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST xml-conduit-1.1.0.9.tar.gz 29805 BLAKE2B c278d24aa5d028a56610539324044bc175cf50aa8fe8260aa9abba529db54d14653c12496ae1ceca0fa5407073a66454633eb98b39741dfcbda6cec5a111a804 SHA512 94c3f925e3ace90c1434b0becdf1a6fa73db786d71522ea413bcf40fab653f415c4e7b8653ed423ca9f24665e4b8af92661aa436824c4a1dfb7d249702bf079e
-DIST xml-conduit-1.2.3.3.tar.gz 31240 BLAKE2B a5ae1399be53d483a38ffe7570bd422a3eedfbfbcb3ee312252bade12144b43e5be0423b3521466fc2ee570a3384fa9d76827a6cb2c53862c258795356542d3c SHA512 1a72b890ad3501d8a80a4030a01da35ef913f9245db9c870f13b5d266e073f14d490d38666c639575e5cf9a28c19e27378ffda9d4fe551b2b187f9e98167bd69
-DIST xml-conduit-1.3.1.tar.gz 33304 BLAKE2B 3ee7e88de9ffc583dfb801e318304f17dbf79b0eb3c06d38fad748c8c8508aa05187f007b2aac1885fcab9211fdc1eed03518d50c1f5024beb453f4bb7478be4 SHA512 939a891304647a8643bbf186269edb3a59930bf825dfa9e5f96382259ecc1c0787fbeb826ba0e5ec2105b263c8a639fc6079e8e3918b271f0e6ab9640133d1a5
-DIST xml-conduit-1.3.3.tar.gz 33965 BLAKE2B e6bea7a2b7cec94758ffe6d624eae81eef1bcff7de6732f30a3c367367614a474768ac792f7aee5347358af0c86da6d9651257c0ce4696f49f39fd7bf6d2449d SHA512 1be43bafbdd3e0b0ca778741a42d81e95ee4f02f38dd61b06fd371f1314ff809223d0a6a269124191df8887ab82a85ff280d3a95d82c37038b04e86da12ee2b2
-DIST xml-conduit-1.3.4.2.tar.gz 34828 BLAKE2B 24514ea18adb396e66792631fb58949fa94a90980e0ab712e17175ee33152a2f68ac7b462cf92d1eeb5eac8b80ce4e7963d0dfe996fbcac4d1f64a0e908b3f90 SHA512 c4b505189edc39f80c1ae842516c2a2ca15f486465fab94864259b094f9f23dc1dfcab73f1754096fd323f0ab0bcd9a87f801d775295c99e208e9c7fa688b65a
-EBUILD xml-conduit-1.1.0.9.ebuild 1611 BLAKE2B 31831fe619493e09e532977f81d87e6d41e259a337365cd7f26f8799803a227f2a714d3d9d9bf1d6ad7a620ddc4697a07e67e59b7d81639c0230e6d02da2c6fd SHA512 eea640ba46b28b942e103aa9ef558139945358cccbf76695684553a93e6bafd539d87540d191ade42bc72190c0aa5fa87a247faf1ea8de10b7cd1cd7efb174e7
-EBUILD xml-conduit-1.2.3.3.ebuild 1477 BLAKE2B 9869279ba7b623c9d9a6f87ef4422a475106af532213bd176d715a3c1cccabc607ef52c7d90ee209d7cd18b2972f664bb188bbfa998a7e6d4988a29dc216111e SHA512 e08ea254a0ea83d0d674c822b9bb5be9bc52e76da1c1830a0d818a07272bf9296e208cbef430dad413a7c8e530d7a8dec442ba82883eef427d97aa71d408ba7b
-EBUILD xml-conduit-1.3.1.ebuild 1383 BLAKE2B b6c40ab2d44694748c906a0817f4efdc56d053926798b344e4020376c31cad790ed87ed449c0d8895a205a334c80628d029d160a2da6fafbdc994a11deddcdbf SHA512 fe87521e3b7750fb2ce74a6da7d6d6031b31efb6a8fca0db0f2d55a2d2383b76fd17201982ee2c13a26eaea7cfe2c30eeac6d540b4af79b2824129b947a1bd9a
-EBUILD xml-conduit-1.3.3.ebuild 1385 BLAKE2B d47f58b2d270fefbb25e679829780924fea4677c443dbd7ec4486ea8c5282722a23769b7a560635c8afe57ca413b4d0fb8bd4f5508ef176cce0ff5b92f023ff0 SHA512 bdae419d58e2788c0b4ee26025028aa6b1d0cfa51174570c10339df047b4e2c53ce05d265746dec397d62506f86027dc57841b885ad4dbf1e0d71d688eba123d
-EBUILD xml-conduit-1.3.4.2.ebuild 1383 BLAKE2B 291fd6c5b99b58cc8ef99ebe13d759becdbdf0a0ce86d7ce2451d62dd5ed3bf8a493b88337bf982c5bc494d2d2115af17f96c0ba9db5373e6476d36327b2ca3c SHA512 500b4c51191c1214e9acbeb283746d30b152db1460e77ed8b9373d78531dd811dc49b64f67a873dd29d2770c0396b39ffa89c7ad6fd802faf0ba6ff5f8305c62
-MISC metadata.xml 1536 BLAKE2B 45a099c2f789592d1b52f7d765de3e1e474dd2135f26795fe9f4c31319d2e58d1329f137eed0646570c7c819878fe96eb44c680e1d30e68f40108b8271aca537 SHA512 b165bc569011782102739b645d1d8c5e36ba248967732dd8faac80aeebf56122ffa5ebef474d9a43cd37cb725ef94fa6f57bf104224a5905eb6672e05cd891db
diff --git a/dev-haskell/xml-conduit/metadata.xml b/dev-haskell/xml-conduit/metadata.xml
deleted file mode 100644
index 9fafda76aad4..000000000000
--- a/dev-haskell/xml-conduit/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides parsing and rendering functions for XML. It is based on the datatypes found in the xml-types package. This package is broken up into the following modules:
-		
-		* Text.XML: DOM-based parsing and rendering. This is the most commonly used module.
-		
-		* Text.XML.Cursor: A wrapper around "Text.XML" which allows bidirectional traversing of the DOM, similar to XPath. (Note: Text.XML.Cursor.Generic is the same concept, but will work with any node representation.)
-		
-		* Text.XML.Unresolved: A slight modification to "Text.XML" which does not require all entities to be resolved at parsing. The datatypes are slightly more complicated here, and therefore this module is only recommended when you need to deal directly with raw entities.
-		
-		* Text.XML.Stream.Parse: Streaming parser, including some streaming parser combinators.
-		
-		* Text.XML.Stream.Render: Streaming renderer.
-		
-		Additionally, the xml-hamlet package &lt;http://hackage.haskell.org/package/xml-hamlet&gt; provides a more convenient syntax for creating XML documents. For a more thorough tutorial on this library, please see &lt;http://www.yesodweb.com/book/xml-enumerator&gt;.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/xml</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/xml-conduit/xml-conduit-1.1.0.9.ebuild b/dev-haskell/xml-conduit/xml-conduit-1.1.0.9.ebuild
deleted file mode 100644
index f07f4e60dfdd..000000000000
--- a/dev-haskell/xml-conduit/xml-conduit-1.1.0.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure-Haskell utilities for dealing with XML with the conduit package"
-HOMEPAGE="https://github.com/snoyberg/xml"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/attoparsec-conduit-1.0:=[profile?]
-	>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/blaze-builder-conduit-1.0:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.1:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/failure-0.1:=[profile?] <dev-haskell/failure-0.3:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-0.4:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/xml-conduit/xml-conduit-1.2.3.3.ebuild b/dev-haskell/xml-conduit/xml-conduit-1.2.3.3.ebuild
deleted file mode 100644
index 05dc9856ebb3..000000000000
--- a/dev-haskell/xml-conduit/xml-conduit-1.2.3.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure-Haskell utilities for dealing with XML with the conduit package"
-HOMEPAGE="https://github.com/snoyberg/xml"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/xml-conduit/xml-conduit-1.3.1.ebuild b/dev-haskell/xml-conduit/xml-conduit-1.3.1.ebuild
deleted file mode 100644
index 9ac098a62d10..000000000000
--- a/dev-haskell/xml-conduit/xml-conduit-1.3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure-Haskell utilities for dealing with XML with the conduit package"
-HOMEPAGE="https://github.com/snoyberg/xml"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/xml-conduit/xml-conduit-1.3.3.ebuild b/dev-haskell/xml-conduit/xml-conduit-1.3.3.ebuild
deleted file mode 100644
index 61d2974e36fa..000000000000
--- a/dev-haskell/xml-conduit/xml-conduit-1.3.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure-Haskell utilities for dealing with XML with the conduit package"
-HOMEPAGE="https://github.com/snoyberg/xml"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/xml-conduit/xml-conduit-1.3.4.2.ebuild b/dev-haskell/xml-conduit/xml-conduit-1.3.4.2.ebuild
deleted file mode 100644
index 93a03ed40743..000000000000
--- a/dev-haskell/xml-conduit/xml-conduit-1.3.4.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure-Haskell utilities for dealing with XML with the conduit package"
-HOMEPAGE="https://github.com/snoyberg/xml"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/xml-hamlet-0.4.0.11 b/dev-haskell/xml-hamlet-0.4.0.11
new file mode 100644
index 000000000000..150742c79ef3
--- /dev/null
+++ b/dev-haskell/xml-hamlet-0.4.0.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-2.2:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Hamlet-style quasiquoter for XML content
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-2.2:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.0.11
+SRC_URI=mirror://hackage/packages/archive/xml-hamlet/0.4.0.11/xml-hamlet-0.4.0.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=feaa0fbe81a6c83176f6382d92cc5248
diff --git a/dev-haskell/xml-hamlet-0.4.0.12 b/dev-haskell/xml-hamlet-0.4.0.12
new file mode 100644
index 000000000000..dfcb3a36da0e
--- /dev/null
+++ b/dev-haskell/xml-hamlet-0.4.0.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-2.2:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] <dev-haskell/xml-conduit-1.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Hamlet-style quasiquoter for XML content
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-2.2:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] <dev-haskell/xml-conduit-1.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.0.12
+SRC_URI=mirror://hackage/packages/archive/xml-hamlet/0.4.0.12/xml-hamlet-0.4.0.12.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e80833b40bd723c288ecddcf6313cf66
diff --git a/dev-haskell/xml-hamlet/Manifest b/dev-haskell/xml-hamlet/Manifest
deleted file mode 100644
index e96a87fc23b9..000000000000
--- a/dev-haskell/xml-hamlet/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST xml-hamlet-0.4.0.11.tar.gz 6080 BLAKE2B 282ec0afa37f65f45b6581f6323f3d3cc009cb47a4af8dbb846613699a620ec1be5918b340c4e898d65c32323919aad56df808ae84baba2a97f5e9fd7f2ec71e SHA512 a0deb9996948a2a87f63f58f18365cac4d9db2538b24f10f5e0a171fb597d10c567c926c89c1cdfb098f471acdbecc8ea58164c94a10f18eebb3f7779e9f999b
-DIST xml-hamlet-0.4.0.12.tar.gz 6078 BLAKE2B a476145a649181ef9116bcc0f1bfeb076a7967d16250bdfadf455f97615cf6c384801f1addc570e9b53fc0a834bf0e58059cd77fe1347b626cbb4ab28f39b11f SHA512 f503ffdefc0c8b3f8cce140bdf474086855a78d8be1ad729674f439e6a13e3f3b5313bdc5a4c88ac06756e85946b2b1e7f51e2a336ede6d4815bed4873dbe182
-EBUILD xml-hamlet-0.4.0.11.ebuild 882 BLAKE2B 64fba18f61279106b894f2234ff7501f410d5089e01bdad3e5c8502866fa3005549c4a185638aaf6f6a01bbb2aa6a5d90b3285502c1e76ca6c5b91e298e5fb57 SHA512 aee724a773a58100b172ae3e4060e9d16c0eb930e4b16638b348ee1922cb50043d99521a767e1ef51e4038d48425a7757aec777b30950db873edfd8d38936424
-EBUILD xml-hamlet-0.4.0.12.ebuild 880 BLAKE2B 7b7631a84e7114fd2837ae14831daeb3d042692f0fff8ed2e7d44a9b43b8712498f4f7dee9c7bc61ed9bcf92d44e8932c250ea76d1c58468b598b9dc96485b61 SHA512 ad5bf6f3883aa10a302debaf1128e53ecfccff39a9684c3d9e779fe63c05a78b0cab1a9b76ce30245806beac7cd5f3645a2e51e63849fc8b5438da97456d1869
-MISC metadata.xml 331 BLAKE2B 349adb7d16fdd4f8334c768f22c79fe2df189c05c5b058bc3429cead0fb17379bc865288648a631490ac975d3f22bde4ede06cea8c71a0d7e36b03a8f3269358 SHA512 bc41ef3118b9cfe18949270aa7f12a4568edc7f22580548557ddef1f879399a2a6bc61efbcb6188e15d4fadb8d925f8d8ecbc0846c1bb73a2899a20d37524403
diff --git a/dev-haskell/xml-hamlet/metadata.xml b/dev-haskell/xml-hamlet/metadata.xml
deleted file mode 100644
index e8e0075eaf33..000000000000
--- a/dev-haskell/xml-hamlet/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Hamlet-style quasiquoter for XML content
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/xml-hamlet/xml-hamlet-0.4.0.11.ebuild b/dev-haskell/xml-hamlet/xml-hamlet-0.4.0.11.ebuild
deleted file mode 100644
index 6724fd76eb4c..000000000000
--- a/dev-haskell/xml-hamlet/xml-hamlet-0.4.0.11.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hamlet-style quasiquoter for XML content"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-2.2:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/xml-hamlet/xml-hamlet-0.4.0.12.ebuild b/dev-haskell/xml-hamlet/xml-hamlet-0.4.0.12.ebuild
deleted file mode 100644
index e796eb621fb5..000000000000
--- a/dev-haskell/xml-hamlet/xml-hamlet-0.4.0.12.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hamlet-style quasiquoter for XML content"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-2.2:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?] <dev-haskell/xml-conduit-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/xml-types-0.3.4 b/dev-haskell/xml-types-0.3.4
new file mode 100644
index 000000000000..bd77475aac34
--- /dev/null
+++ b/dev-haskell/xml-types-0.3.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/text:=[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=Basic types for representing XML
+EAPI=5
+HOMEPAGE=https://john-millikin.com/software/haskell-xml/
+IUSE=doc hscolour profile
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
+LICENSE=MIT
+RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.3.4
+SRC_URI=mirror://hackage/packages/archive/xml-types/0.3.4/xml-types-0.3.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a1cbb283d8178f722e96b0a2311f3607
diff --git a/dev-haskell/xml-types-0.3.6 b/dev-haskell/xml-types-0.3.6
new file mode 100644
index 000000000000..b2506b9aded9
--- /dev/null
+++ b/dev-haskell/xml-types-0.3.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Basic types for representing XML
+EAPI=5
+HOMEPAGE=https://john-millikin.com/software/haskell-xml/
+IUSE=doc hscolour profile
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.6
+SRC_URI=mirror://hackage/packages/archive/xml-types/0.3.6/xml-types-0.3.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8f3981865f219409fe2b24b2b8f26d81
diff --git a/dev-haskell/xml-types/Manifest b/dev-haskell/xml-types/Manifest
deleted file mode 100644
index 0fa95ba69d62..000000000000
--- a/dev-haskell/xml-types/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST xml-types-0.3.4.tar.gz 3857 BLAKE2B 67395009679fc88baaece0732346016787909ea66cd09ecd6d7e948e1cbce22fb508bc1df006202f8b883ee4ec8e5ec1614fa08d84ab13d1bbaf7306381e7d97 SHA512 85f5de90d6494cb1e85b01f6da71335f4843336295df7b346870570fbc33ce3d760c1b92b74ca15f7fed1554a3f60025a4d51a5a9cb3079321a394f5a6842836
-DIST xml-types-0.3.6.tar.gz 4020 BLAKE2B 450e50ee20a7f758dc353fa0331e1a224dabf10e7658f489afd6755d332813564e025b2fc4f9c46a83d5c4ec7437aa3ee7dbd093d1502af5c4f1caf1d431a269 SHA512 552f2230e55bc8e45a62e06bbe8c0cb7844c5d73185303b3290632a816c5956b781fff1b0a679ce33b1759f1b9c815dab8063f6b9ced0c9e94ac314cf77b34ea
-EBUILD xml-types-0.3.4.ebuild 605 BLAKE2B 073d79f980a3e7fc758d0134d4986693fee8c38b6f16c0814858a23c5f8b04550602bed47199616c7f7689362c37932d47f0b3226afeb9b59c81500a212601fc SHA512 4ee0348ffeb5ae638ddd31982d3bd56e78d711e8aeaf55229c5d0e1b60f4ebff5376c5f3d8e2865545b60a174b28a1c0be9c7d1dbd69da336c0e9c56a23abe7d
-EBUILD xml-types-0.3.6.ebuild 613 BLAKE2B f651dd52fadbe2a8366616c028472b7192b04f1d01a554bb8782907bf315dbd7015ab59bc15890398835926d3a6401363ed129b52ad0185ccacde4e2108664cd SHA512 c21b1613cf2d66b6c7ca1671c46ed2b810987cb1ffd7e72347a1448284d9b648b9907b6e68643e41be328e59564a58c89126a8a3465497f4133596dc0366feac
-MISC metadata.xml 323 BLAKE2B 3d422445fb4bd6461affc4e8f9b3de2347662565e30eb22a30a6048b5de530413f8fe68353b09f4ff725c745c48d75bdef3ff6a1020b51067780f7f1f4096dca SHA512 4804601815b29028ec211563a5ad12908733568472a92b3b31c1a3f582930ba5e1ef305e22d5b7994c0d686094623a97c67405c75de1db574c8f00fba624a235
diff --git a/dev-haskell/xml-types/metadata.xml b/dev-haskell/xml-types/metadata.xml
deleted file mode 100644
index 3daaa927ccb7..000000000000
--- a/dev-haskell/xml-types/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Basic types for representing XML
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/xml-types/xml-types-0.3.4.ebuild b/dev-haskell/xml-types/xml-types-0.3.4.ebuild
deleted file mode 100644
index 98d995a9dabb..000000000000
--- a/dev-haskell/xml-types/xml-types-0.3.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Basic types for representing XML"
-HOMEPAGE="https://john-millikin.com/software/haskell-xml/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/xml-types/xml-types-0.3.6.ebuild b/dev-haskell/xml-types/xml-types-0.3.6.ebuild
deleted file mode 100644
index b0968f0f4f43..000000000000
--- a/dev-haskell/xml-types/xml-types-0.3.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Basic types for representing XML"
-HOMEPAGE="https://john-millikin.com/software/haskell-xml/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/xml/Manifest b/dev-haskell/xml/Manifest
deleted file mode 100644
index 0eceb2dcc268..000000000000
--- a/dev-haskell/xml/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST xml-1.3.13.tar.gz 12082 BLAKE2B a1e04ecfb4a94b8ff7e238a39cf708e7d22481e530dc247056913dc34ac874b18dbda0c33128bcaf1a872e22b0d36378d5d0f505bde918a4aae74eb6a159f986 SHA512 d38b74d2f57eb6b19b6b60407ac0832b391d85aa74a26aa325be0a6b79457e94333a07c7b986baca66d6135073c00fb9f6c0b7d6959e44a365397d7b9cc1644f
-DIST xml-1.3.14.tar.gz 12048 BLAKE2B bc30ff6dbc0da5554967b8ac2901cdb535ec0429d35c161f886a6172b3d5aad38e8f32dd2ec496b8acf3d21dbbd21880b148590623aaa305a15adac1c45541c2 SHA512 2ddaa6c837fe85a06c751a66ae2c185fb7190f51f24649a668032b048b3e1b15982b45c86dfee4131453f0bd1ed704e934090bbede252a2b6de30c5f4ad44137
-EBUILD xml-1.3.13.ebuild 580 BLAKE2B 63a778951fc40ed2c4cb44aecbd236a8daab95bd1e97e346e5c428b474a6c08160f106ef76604363346721135c111a84ae918c745a9ee5a85a5228ae37e5436b SHA512 34ec95efc1526582ad48e5e39d1e607dbea3d5c5e72045f5938348e5c2380bc3d176c65caaf1f8838ffd19e71cafddc6079ee29d0bf517e80cc23b0e0bb1161e
-EBUILD xml-1.3.14.ebuild 586 BLAKE2B e82613bb02ab8b130f675e3a88f6020139d8d1156ac82ef865aba2a087667401535068b7591a44a05e8867582a07c64262f464778532bf8a24c781a1dce959e1 SHA512 67075a7e2c2a2dde72eab326a0a29c23a99ceaf0cf161a727708522f0956b9f00132ec00cdfbce90b77e62615041435fd8e1ed5037c4272395b532d5b0803fea
-MISC metadata.xml 312 BLAKE2B ec1f520d6ade99c39fb76fae5b729b62258f622a6f595771cf3fe3c8b17f0e1aaeba0c48335cceb76430fd842f298dd5597bc3dfbbbf0cb8d761a28ee7e81a3c SHA512 0bccff409ed2f8b403f62ed2008c9b781673f9187d330dab8caa498b6085da2792d65bce5f2013bac933b74bcc5c947208178725680061fb6561d35ed4a3ce2b
diff --git a/dev-haskell/xml/metadata.xml b/dev-haskell/xml/metadata.xml
deleted file mode 100644
index dea69f9c52db..000000000000
--- a/dev-haskell/xml/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A simple XML library.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/xml/xml-1.3.13.ebuild b/dev-haskell/xml/xml-1.3.13.ebuild
deleted file mode 100644
index d8bad485f520..000000000000
--- a/dev-haskell/xml/xml-1.3.13.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A simple XML library"
-HOMEPAGE="http://code.galois.com"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/xml/xml-1.3.14.ebuild b/dev-haskell/xml/xml-1.3.14.ebuild
deleted file mode 100644
index 507a4f87a00e..000000000000
--- a/dev-haskell/xml/xml-1.3.14.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A simple XML library"
-HOMEPAGE="http://code.galois.com"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/xmlgen-0.6.2.1 b/dev-haskell/xmlgen-0.6.2.1
new file mode 100644
index 000000000000..1e1aa1909c2a
--- /dev/null
+++ b/dev-haskell/xmlgen-0.6.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hunit-1.2 >=dev-haskell/hxt-9.3 <dev-haskell/hxt-9.4 >=dev-haskell/quickcheck-2.5 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast XML generation library
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/xmlgen
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-lang/ghc-6.12.1:=
+RESTRICT=test
+SLOT=0/0.6.2.1
+SRC_URI=mirror://hackage/packages/archive/xmlgen/0.6.2.1/xmlgen-0.6.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5669635c95d41a31461f5e3f1152a1ea
diff --git a/dev-haskell/xmlgen/Manifest b/dev-haskell/xmlgen/Manifest
deleted file mode 100644
index 1adddd416657..000000000000
--- a/dev-haskell/xmlgen/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xmlgen-0.6.2.1.tar.gz 9452 BLAKE2B 724a2905a92ea95f02e71502d6f0025812e1cce52a6f6e8d3f04e4c82ac2022b7d47a04268461786cc3a45b1aa4ff3e3e6bcf2463d86a9ddb2c53b4e3c9cf6fa SHA512 c3c978859dd54cf5df970cb05f49b8b2a75a2096ef25e9a204fe665bdb3694139f69fd32f8eaef0ca047948b4c08dacae54eb67e64ac8da63cc0885022e09591
-EBUILD xmlgen-0.6.2.1.ebuild 905 BLAKE2B 94abafa36a4579f177077c721b79807ec56709f334ca420ef952209fdf002a5da753095df9d6193f4e1e4b50789695e8c08e5025be8ca5ef59d1875d8e184e90 SHA512 72c57dae516b3aee0336c6867aec0619f965e2b48e6b63804a60f6461e52e51d8786c015549af0890f4b004800a6f33fb2fa220114d383d5bfa55d424ebb7ba1
-MISC metadata.xml 335 BLAKE2B 29f4099fa59f213d3e2f2b15e059378d976e994e750cedc9494c8b7e7f13a21809483cee167915680cb11fde7806759a10b2c67b5bc3e175de5c2cd9708a9976 SHA512 f3b4690fac3229bf0f46e5630c11fc582e3985dda31303327d2f316bfe6dd70f989c06b6f98ef0fb73f523d05f3babaf0f84d178237ea86cf0a799438694e4d9
diff --git a/dev-haskell/xmlgen/metadata.xml b/dev-haskell/xmlgen/metadata.xml
deleted file mode 100644
index 268865abb51e..000000000000
--- a/dev-haskell/xmlgen/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Library for high-performance XML generation.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/xmlgen/xmlgen-0.6.2.1.ebuild b/dev-haskell/xmlgen/xmlgen-0.6.2.1.ebuild
deleted file mode 100644
index 61173ae80a41..000000000000
--- a/dev-haskell/xmlgen/xmlgen-0.6.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast XML generation library"
-HOMEPAGE="http://hackage.haskell.org/package/xmlgen"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # Cases: 8  Tried: 0  Errors: 0  Failures: 0test/1.xml: openFile: does not exist (No such file or directory)
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/hxt-9.3 <dev-haskell/hxt-9.4
-		>=dev-haskell/quickcheck-2.5 )
-"
diff --git a/dev-haskell/xss-sanitize-0.3.5.6 b/dev-haskell/xss-sanitize-0.3.5.6
new file mode 100644
index 000000000000..6a7bad614733
--- /dev/null
+++ b/dev-haskell/xss-sanitize-0.3.5.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10.0.3:=[profile?] <dev-haskell/attoparsec-1:=[profile?] >=dev-haskell/css-text-0.1.1:=[profile?] <dev-haskell/css-text-0.2:=[profile?] >=dev-haskell/tagsoup-0.12.2:=[profile?] <dev-haskell/tagsoup-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 >=dev-haskell/hunit-1.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=sanitize untrusted HTML to prevent XSS attacks
+EAPI=5
+HOMEPAGE=https://github.com/yesodweb/haskell-xss-sanitize
+IUSE=+network-uri doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.10.0.3:=[profile?] <dev-haskell/attoparsec-1:=[profile?] >=dev-haskell/css-text-0.1.1:=[profile?] <dev-haskell/css-text-0.2:=[profile?] >=dev-haskell/tagsoup-0.12.2:=[profile?] <dev-haskell/tagsoup-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/0.3.5.6
+SRC_URI=mirror://hackage/packages/archive/xss-sanitize/0.3.5.6/xss-sanitize-0.3.5.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=59993d8bafae49f2fe6df5d238e78cea
diff --git a/dev-haskell/xss-sanitize-0.3.5.7 b/dev-haskell/xss-sanitize-0.3.5.7
new file mode 100644
index 000000000000..e59918266ee0
--- /dev/null
+++ b/dev-haskell/xss-sanitize-0.3.5.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10.0.3:=[profile?] <dev-haskell/attoparsec-1:=[profile?] >=dev-haskell/css-text-0.1.1:=[profile?] <dev-haskell/css-text-0.2:=[profile?] >=dev-haskell/tagsoup-0.12.2:=[profile?] <dev-haskell/tagsoup-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 >=dev-haskell/hunit-1.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=sanitize untrusted HTML to prevent XSS attacks
+EAPI=6
+HOMEPAGE=https://github.com/yesodweb/haskell-xss-sanitize
+IUSE=+network-uri doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-haskell/attoparsec-0.10.0.3:=[profile?] <dev-haskell/attoparsec-1:=[profile?] >=dev-haskell/css-text-0.1.1:=[profile?] <dev-haskell/css-text-0.2:=[profile?] >=dev-haskell/tagsoup-0.12.2:=[profile?] <dev-haskell/tagsoup-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/0.3.5.7
+SRC_URI=mirror://hackage/packages/archive/xss-sanitize/0.3.5.7/xss-sanitize-0.3.5.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=04b7f141c756c64c4945e1a91f56b457
diff --git a/dev-haskell/xss-sanitize/Manifest b/dev-haskell/xss-sanitize/Manifest
deleted file mode 100644
index be5660ffe964..000000000000
--- a/dev-haskell/xss-sanitize/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST xss-sanitize-0.3.5.6.tar.gz 10874 BLAKE2B 60f0b7ac4507870bfdd645fd47c69ecc152865be83affeb3739c6c91e94a17fb93b16be536f74bf888db50b770f361629342fb1e868b686377173e5a2cc11d1b SHA512 9799979f2632b5a5d446913e1b465110a9f4ce6c25dddf27d4fd54a492293ab9f1937668213af762494fc44d4ec270beb0816a2afb3f2b3a5da22c180cb6707d
-DIST xss-sanitize-0.3.5.7.tar.gz 10878 BLAKE2B d6746b23ad149bd0fa37954caa52cda2e636b22c837f0f8701bd2a00cd610115d0db76c08deaf8d29265bc621cdba70597f18719e077e3a4a401c39d08c8d6f4 SHA512 8633a160ef9ad5408767eecf5279b009e01621a3ac2e3a5cfd6a6a480c5f1991497d1e4eb7b0195fbdc296830d5ef729e7893b836555f3fbc2c313032f4de040
-EBUILD xss-sanitize-0.3.5.6.ebuild 1253 BLAKE2B 4d59dfac5f8a3d177ee69ffdadaac37111e8f7434d2cfdf1dcb4abfafcaaac3ced14525f100aab3204869585af85b09b0dceebdc64c56e65fb65455ec5d04d32 SHA512 e89b0de322a6452dd290fd96441929813b3b45ae2a92873385f9626ce1e37a64e1c0fde96447f25466efee0ab984242f213bb14eff02c7711a980986714f2d6c
-EBUILD xss-sanitize-0.3.5.7.ebuild 1255 BLAKE2B 10ab97e4727db3c0deed0a65bb58b59b8e729ae00c147cace6308655535211635c455c597a76a891aa0ddd7630e878bd1868743bc205c6a815da49641e471256 SHA512 f0b048c0eb386f6ba07ca05bd38900a3f9e2807dcd2645fd5710fb75a5fef77c15cbd5bec38ebeb0e8a1930b3c5ad41aa3e04c05e5e22a0f6eba09dd229313bb
-MISC metadata.xml 652 BLAKE2B e217ab4fa0cb3ec8b691df94fe1913baffd459f186a31e7678808af0ff72645e999094c513dfd5be0fc64b1ffb875afb93fe755c386f0b9460a502acfe60c3e2 SHA512 426da46ff379aed8b7a5251fde63e79ef56513a88592ec3c9eaf3f796f75c83f7b490738b74a5d53198edd965b58c599a846d888a7e2e3d00564ff163df27e52
diff --git a/dev-haskell/xss-sanitize/metadata.xml b/dev-haskell/xss-sanitize/metadata.xml
deleted file mode 100644
index 7d68100b3327..000000000000
--- a/dev-haskell/xss-sanitize/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		run untrusted HTML through Text.HTML.SanitizeXSS.sanitizeXSS to prevent XSS attacks. see README.md &lt;https://github.com/yesodweb/haskell-xss-sanitize&gt; for more details
-	</longdescription>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">yesodweb/haskell-xss-sanitize</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/xss-sanitize/xss-sanitize-0.3.5.6.ebuild b/dev-haskell/xss-sanitize/xss-sanitize-0.3.5.6.ebuild
deleted file mode 100644
index 45d66f17877e..000000000000
--- a/dev-haskell/xss-sanitize/xss-sanitize-0.3.5.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="sanitize untrusted HTML to prevent XSS attacks"
-HOMEPAGE="https://github.com/yesodweb/haskell-xss-sanitize"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.0.3:=[profile?] <dev-haskell/attoparsec-1:=[profile?]
-	>=dev-haskell/css-text-0.1.1:=[profile?] <dev-haskell/css-text-0.2:=[profile?]
-	>=dev-haskell/tagsoup-0.12.2:=[profile?] <dev-haskell/tagsoup-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/hunit-1.2 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/xss-sanitize/xss-sanitize-0.3.5.7.ebuild b/dev-haskell/xss-sanitize/xss-sanitize-0.3.5.7.ebuild
deleted file mode 100644
index d00c924aeb64..000000000000
--- a/dev-haskell/xss-sanitize/xss-sanitize-0.3.5.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="sanitize untrusted HTML to prevent XSS attacks"
-HOMEPAGE="https://github.com/yesodweb/haskell-xss-sanitize"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.0.3:=[profile?] <dev-haskell/attoparsec-1:=[profile?]
-	>=dev-haskell/css-text-0.1.1:=[profile?] <dev-haskell/css-text-0.2:=[profile?]
-	>=dev-haskell/tagsoup-0.12.2:=[profile?] <dev-haskell/tagsoup-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/hunit-1.2 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/yaml-0.8.10.1 b/dev-haskell/yaml-0.8.10.1
new file mode 100644
index 000000000000..4d33a997d092
--- /dev/null
+++ b/dev-haskell/yaml-0.8.10.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec:=[profile?] >=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.1:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= system-libyaml? ( dev-libs/libyaml ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/aeson-qq >=dev-haskell/hspec-1.3 dev-haskell/hspec-expectations dev-haskell/hunit ) system-libyaml? ( virtual/pkgconfig ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Support for parsing and rendering YAML documents
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/yaml/
+IUSE=no-exe unicode system-libyaml doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec:=[profile?] >=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.1:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= system-libyaml? ( dev-libs/libyaml )
+SLOT=0/0.8.10.1
+SRC_URI=mirror://hackage/packages/archive/yaml/0.8.10.1/yaml-0.8.10.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c9b3c13c432e8b062ce751d944097c0a
diff --git a/dev-haskell/yaml-0.8.15.2 b/dev-haskell/yaml-0.8.15.2
new file mode 100644
index 000000000000..bb4e7f8f1e3f
--- /dev/null
+++ b/dev-haskell/yaml-0.8.15.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.11.3.0:=[profile?] >=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.1:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= system-libyaml? ( dev-libs/libyaml ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/aeson-qq dev-haskell/base-compat >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/mockery ) system-libyaml? ( virtual/pkgconfig ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Support for parsing and rendering YAML documents
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/yaml/
+IUSE=no-exe no-unicode system-libyaml doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.11.3.0:=[profile?] >=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.1:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= system-libyaml? ( dev-libs/libyaml )
+SLOT=0/0.8.15.2
+SRC_URI=mirror://hackage/packages/archive/yaml/0.8.15.2/yaml-0.8.15.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fba89230e3c5b5ab48db258cc09aca9a
diff --git a/dev-haskell/yaml-0.8.17.1 b/dev-haskell/yaml-0.8.17.1
new file mode 100644
index 000000000000..7f4dda246546
--- /dev/null
+++ b/dev-haskell/yaml-0.8.17.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.11.3.0:=[profile?] >=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.1:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= !no-examples? ( dev-haskell/raw-strings-qq:=[profile?] ) system-libyaml? ( dev-libs/libyaml ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/aeson-qq dev-haskell/base-compat >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/mockery ) system-libyaml? ( virtual/pkgconfig ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Support for parsing and rendering YAML documents
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/yaml/
+IUSE=+no-examples no-exe no-unicode system-libyaml doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.11.3.0:=[profile?] >=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.1:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= !no-examples? ( dev-haskell/raw-strings-qq:=[profile?] ) system-libyaml? ( dev-libs/libyaml )
+SLOT=0/0.8.17.1
+SRC_URI=mirror://hackage/packages/archive/yaml/0.8.17.1/yaml-0.8.17.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7c470808ebb9fb0eda131bfb77f09f9c
diff --git a/dev-haskell/yaml-0.8.20 b/dev-haskell/yaml-0.8.20
new file mode 100644
index 000000000000..e187dc109598
--- /dev/null
+++ b/dev-haskell/yaml-0.8.20
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.11.3.0:=[profile?] >=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:= !no-examples? ( dev-haskell/raw-strings-qq:=[profile?] ) system-libyaml? ( dev-libs/libyaml ) >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/aeson-qq dev-haskell/base-compat >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/mockery dev-haskell/temporary ) system-libyaml? ( virtual/pkgconfig ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Support for parsing and rendering YAML documents
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/yaml/
+IUSE=+no-examples no-exe no-unicode system-libyaml doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.11.3.0:=[profile?] >=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:= !no-examples? ( dev-haskell/raw-strings-qq:=[profile?] ) system-libyaml? ( dev-libs/libyaml )
+SLOT=0/0.8.20
+SRC_URI=mirror://hackage/packages/archive/yaml/0.8.20/yaml-0.8.20.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cdb3a826b2f88ad968b4cd2f52176084
diff --git a/dev-haskell/yaml-0.8.21.2 b/dev-haskell/yaml-0.8.21.2
new file mode 100644
index 000000000000..16ef02fa83d5
--- /dev/null
+++ b/dev-haskell/yaml-0.8.21.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.11.3.0:=[profile?] >=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:= !no-examples? ( dev-haskell/raw-strings-qq:=[profile?] ) system-libyaml? ( dev-libs/libyaml ) >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/aeson-qq dev-haskell/base-compat >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/mockery dev-haskell/temporary ) system-libyaml? ( virtual/pkgconfig ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Support for parsing and rendering YAML documents
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/yaml/
+IUSE=+no-examples no-exe no-unicode system-libyaml doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.11.3.0:=[profile?] >=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:= !no-examples? ( dev-haskell/raw-strings-qq:=[profile?] ) system-libyaml? ( dev-libs/libyaml )
+SLOT=0/0.8.21.2
+SRC_URI=mirror://hackage/packages/archive/yaml/0.8.21.2/yaml-0.8.21.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=50d4e5b0b0dff1367de40fead19d6f96
diff --git a/dev-haskell/yaml/Manifest b/dev-haskell/yaml/Manifest
deleted file mode 100644
index 09000207fe01..000000000000
--- a/dev-haskell/yaml/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST yaml-0.8.10.1.tar.gz 73448 BLAKE2B 1b4e8b50d8e4913dd772253a8a7481802afe3dbc91538da9ce06437a09d155d2711540a87d4592a9953f6f316915da20caaf85a49f3f1369b2d98a5d8d9004ca SHA512 59b26eaca99379ff84cda6b8972ec2ff1e777536a754b9bda248d350a0797ef6c24d9cb86590062f4e6c12a5453224619a656c306a0292fdd1fe46e459a286e7
-DIST yaml-0.8.15.2.tar.gz 75540 BLAKE2B fc7b03cdb582221c0d8611bee0f38189a4e55cc78a10c12906e09e1b4820de00298096d43289cd7d01ad23cd5fb9a221d9d976f90b0ec966f15975a97779312e SHA512 214a8203ca13350268b285d7049110ce91c03d6c8b0bc59187048b9efed15374c97a4b91e464e86f719d3190c0bc534f9ca4b7436fc33a4748d0fa84bb747bb4
-DIST yaml-0.8.17.1.tar.gz 78775 BLAKE2B 66ddd1bf1ccb1f7b1314cd5b56987cc6e29da23ccadbde0d62baa6a9f143167e619f83bdb2734b8d561be030ebffed62ae610c417c52a40375b395ba38fd9ee7 SHA512 7119651e209942d41a9f5a542d365b5fea77c56d9dab012e3bf77234e6c6d23e2cff65c9b6c16ca185ff33338fd75c6b3f7dacaf1ff56f96c5773fcea70687f3
-DIST yaml-0.8.20.tar.gz 80264 BLAKE2B dc1252c331e707b96f04a15026eb50862b457a0d1137c5a72f1e9269db3a1f2aac0425784c442417b04e1d08b21d52e10ba115f1170595229177f96c3545b779 SHA512 bed0bcc6758606663aa1ba315590b7f4e26043bd5fbf462219e4164c7d41144d093763f85015db2ad83fdeb51b464715d49c0ec882e43cba6b141d40d7a2226e
-DIST yaml-0.8.21.2.tar.gz 81350 BLAKE2B e2c1474625d1283eae811805127babf37e89f00a38fa889cf855a53defec7837b5c80a3e4f6cadb48855056430487cb21d380c8c4af5d54ba5e61b57820c0463 SHA512 94c612a6b54ea0844c092b2304f786dd974b7d36c365bc56a3d6f4705197a9aba85bd1c429d356bb6bb8ec1bf81ded38a859ed16a5846bfd86add6e598c7a4fa
-EBUILD yaml-0.8.10.1.ebuild 1440 BLAKE2B 6007b1e6d778e1bb4069e8f231363cd5e7b53176dee87b75fdae03a77ba5f09c2a1c0bd1f77258c1de516b5db1e44be1ca95a4c27b5f09466bd4f8442a32067d SHA512 d7daaf0a6f3bd62fe8b6cba86697ccdb4847c4278454e8ce71158657b05572c26533c8e155dcdbc4a4b38acd1748ef2cd1d78b1623c5f699b55b84e9ccd4f05d
-EBUILD yaml-0.8.15.2.ebuild 1448 BLAKE2B 75cf51d210a82e6ecf3c9cfaecfe21f1022bdb838c383f59dd77219ed7a146e94ff734dc290d380ca6e3bd6dec90457918c07828014e9d71827c74fee1871595 SHA512 8d3a6f229ee8320c6ff5682a9741fa95ba4adbb67ce72921e93d3e44334f47c1f88c423e401a56166b64247717fef2c946828a268258ce522ff0ea4917732b64
-EBUILD yaml-0.8.17.1.ebuild 1597 BLAKE2B 84aa395c2592d4b6f6e8b0b0f4f5650280acff81099c56ea37fbbf02048b06f6abacf1af12b6e3e839195a6dd7f68a565679b105696b00bc9e241035bed422d5 SHA512 716fc3990fa2027160262df2ecee6e71bcc0dd34dbf6f30f56d9380334c7df6cfe0e6eefeaa9586ac17b1650ed7337bfaf00eaffe6bc5f4ead05819a6ee20607
-EBUILD yaml-0.8.20.ebuild 1576 BLAKE2B e2d29e0a7f3d530acd097bc08fe42ccd019755bbb1ec3632a31f4ab4cd4dd4ce72f6b0224aaab5f11b852656fff808fda8b24ab9675882063100e5f66794e4e4 SHA512 b58c8df32ca6204cbafab25cf4b89fa74b584dacecf9a8a7e91a80ac1d42782e4df03ea7dd46a1895108714cdf184aace7f3926c5bb4ef51cf31114ad7b7a4df
-EBUILD yaml-0.8.21.2.ebuild 1578 BLAKE2B 2a2b22f418ac5805a42563e400e48bd249e5bb079f4258687946784f3fd539d7f4f6cff03f91b64434a0750c4a19a759433fd698b92e04596375cd8571c4fda4 SHA512 0a998179852c77ffb3e4ed5bddfd0bad7de54f7cca1fa2abadb7e1a4583638f678c3bdab5d5537f5f150f37f36e507bfcf0cc104682937c1450628fcf8ddce87
-MISC metadata.xml 964 BLAKE2B 379ad007b936b137d0353aaa89d3fe970d5bb96b69f11b1acfc2e5dfce75d7dc638efb6c358559cc694fef1b8695684f0e0ff4bb6200f0ecc1eb5fa8092bed0c SHA512 b24a56b9b405154c146d4a02424d443969e3b3df1fab7950486e64772f78d7fb6223e94763f867830135acca03ed1dc8f7e5d093fb76a50ca6ebca05bf890ef4
diff --git a/dev-haskell/yaml/metadata.xml b/dev-haskell/yaml/metadata.xml
deleted file mode 100644
index 2ea8f62867a3..000000000000
--- a/dev-haskell/yaml/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Provides support for parsing and emitting Yaml documents.
-		
-		This package includes the full libyaml C library version 0.1.12 by Kirill
-		Simonov (&lt;http://pyyaml.org/wiki/LibYAML&gt;) in the package so you
-		don't need to worry about any non-Haskell dependencies.
-	</longdescription>
-	<use>
-		<flag name="no-examples">don't build the examples</flag>
-		<flag name="no-exe">don't install the yaml2json executable</flag>
-		<flag name="no-unicode">Don't enable unicode output. Instead, unicode characters will be escaped.</flag>
-		<flag name="system-libyaml">Use system libyaml instead on generic one</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">snoyberg/yaml</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/yaml/yaml-0.8.10.1.ebuild b/dev-haskell/yaml/yaml-0.8.10.1.ebuild
deleted file mode 100644
index 622b61117a75..000000000000
--- a/dev-haskell/yaml/yaml-0.8.10.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support for parsing and rendering YAML documents"
-HOMEPAGE="https://github.com/snoyberg/yaml/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="no-exe unicode system-libyaml"
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	>=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.1:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	system-libyaml? ( dev-libs/libyaml )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/aeson-qq
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hspec-expectations
-		dev-haskell/hunit )
-	system-libyaml? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag no-exe no-exe) \
-		$(usex unicode "--flags=-no-unicode" "--flags=no-unicode") \
-		$(cabal_flag system-libyaml system-libyaml)
-}
diff --git a/dev-haskell/yaml/yaml-0.8.15.2.ebuild b/dev-haskell/yaml/yaml-0.8.15.2.ebuild
deleted file mode 100644
index 9cffac45f398..000000000000
--- a/dev-haskell/yaml/yaml-0.8.15.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support for parsing and rendering YAML documents"
-HOMEPAGE="https://github.com/snoyberg/yaml/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="no-exe no-unicode system-libyaml"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/attoparsec-0.11.3.0:=[profile?]
-	>=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.1:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	system-libyaml? ( dev-libs/libyaml )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/aeson-qq
-		dev-haskell/base-compat
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/mockery )
-	system-libyaml? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag no-exe no-exe) \
-		$(cabal_flag no-unicode no-unicode) \
-		$(cabal_flag system-libyaml system-libyaml)
-}
diff --git a/dev-haskell/yaml/yaml-0.8.17.1.ebuild b/dev-haskell/yaml/yaml-0.8.17.1.ebuild
deleted file mode 100644
index 1fac24fc45c1..000000000000
--- a/dev-haskell/yaml/yaml-0.8.17.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support for parsing and rendering YAML documents"
-HOMEPAGE="https://github.com/snoyberg/yaml/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+no-examples no-exe no-unicode system-libyaml"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/attoparsec-0.11.3.0:=[profile?]
-	>=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.1:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	!no-examples? ( dev-haskell/raw-strings-qq:=[profile?] )
-	system-libyaml? ( dev-libs/libyaml )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/aeson-qq
-		dev-haskell/base-compat
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/mockery )
-	system-libyaml? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag no-examples no-examples) \
-		$(cabal_flag no-exe no-exe) \
-		$(cabal_flag no-unicode no-unicode) \
-		$(cabal_flag system-libyaml system-libyaml)
-}
diff --git a/dev-haskell/yaml/yaml-0.8.20.ebuild b/dev-haskell/yaml/yaml-0.8.20.ebuild
deleted file mode 100644
index f68cc6a880e1..000000000000
--- a/dev-haskell/yaml/yaml-0.8.20.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support for parsing and rendering YAML documents"
-HOMEPAGE="https://github.com/snoyberg/yaml/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+no-examples no-exe no-unicode system-libyaml"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/attoparsec-0.11.3.0:=[profile?]
-	>=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	!no-examples? ( dev-haskell/raw-strings-qq:=[profile?] )
-	system-libyaml? ( dev-libs/libyaml )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/aeson-qq
-		dev-haskell/base-compat
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/mockery
-		dev-haskell/temporary )
-	system-libyaml? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag no-examples no-examples) \
-		$(cabal_flag no-exe no-exe) \
-		$(cabal_flag no-unicode no-unicode) \
-		$(cabal_flag system-libyaml system-libyaml)
-}
diff --git a/dev-haskell/yaml/yaml-0.8.21.2.ebuild b/dev-haskell/yaml/yaml-0.8.21.2.ebuild
deleted file mode 100644
index 769b51214263..000000000000
--- a/dev-haskell/yaml/yaml-0.8.21.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support for parsing and rendering YAML documents"
-HOMEPAGE="https://github.com/snoyberg/yaml/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+no-examples no-exe no-unicode system-libyaml"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/attoparsec-0.11.3.0:=[profile?]
-	>=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	!no-examples? ( dev-haskell/raw-strings-qq:=[profile?] )
-	system-libyaml? ( dev-libs/libyaml )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/aeson-qq
-		dev-haskell/base-compat
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/mockery
-		dev-haskell/temporary )
-	system-libyaml? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag no-examples no-examples) \
-		$(cabal_flag no-exe no-exe) \
-		$(cabal_flag no-unicode no-unicode) \
-		$(cabal_flag system-libyaml system-libyaml)
-}
diff --git a/dev-haskell/yesod-1.4.3 b/dev-haskell/yesod-1.4.3
new file mode 100644
index 000000000000..b9f25d7bc574
--- /dev/null
+++ b/dev-haskell/yesod-1.4.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/fast-logger:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] dev-haskell/monad-logger:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/shakespeare:=[profile?] dev-haskell/streaming-commons:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-extra-1.3:=[profile?] dev-haskell/wai-logger:=[profile?] >=dev-haskell/warp-1.3:=[profile?] >=dev-haskell/yaml-0.8.17:=[profile?] >=dev-haskell/yesod-auth-1.4:=[profile?] <dev-haskell/yesod-auth-1.5:=[profile?] >=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?] >=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Creation of type-safe, RESTful web applications
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/fast-logger:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] dev-haskell/monad-logger:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/shakespeare:=[profile?] dev-haskell/streaming-commons:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-extra-1.3:=[profile?] dev-haskell/wai-logger:=[profile?] >=dev-haskell/warp-1.3:=[profile?] >=dev-haskell/yaml-0.8.17:=[profile?] >=dev-haskell/yesod-auth-1.4:=[profile?] <dev-haskell/yesod-auth-1.5:=[profile?] >=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?] >=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.4.3
+SRC_URI=mirror://hackage/packages/archive/yesod/1.4.3/yesod-1.4.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d4d9abdfdcb3bdbbdcb323509bdd6bf1
diff --git a/dev-haskell/yesod-1.4.4 b/dev-haskell/yesod-1.4.4
new file mode 100644
index 000000000000..346597b1f0d7
--- /dev/null
+++ b/dev-haskell/yesod-1.4.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/conduit:=[profile?] >=dev-haskell/conduit-extra-1.1.14:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/fast-logger:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] dev-haskell/monad-logger:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/shakespeare:=[profile?] dev-haskell/streaming-commons:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-extra-1.3:=[profile?] dev-haskell/wai-logger:=[profile?] >=dev-haskell/warp-1.3:=[profile?] >=dev-haskell/yaml-0.8.17:=[profile?] >=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?] >=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Creation of type-safe, RESTful web applications
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/conduit:=[profile?] >=dev-haskell/conduit-extra-1.1.14:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/fast-logger:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] dev-haskell/monad-logger:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/shakespeare:=[profile?] dev-haskell/streaming-commons:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-extra-1.3:=[profile?] dev-haskell/wai-logger:=[profile?] >=dev-haskell/warp-1.3:=[profile?] >=dev-haskell/yaml-0.8.17:=[profile?] >=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?] >=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.4.4
+SRC_URI=mirror://hackage/packages/archive/yesod/1.4.4/yesod-1.4.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cb277114669fea5eb9703893e5b652ae
diff --git a/dev-haskell/yesod-auth-1.4.13.2 b/dev-haskell/yesod-auth-1.4.13.2
new file mode 100644
index 000000000000..394771490b4e
--- /dev/null
+++ b/dev-haskell/yesod-auth-1.4.13.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/authenticate-1.3:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/binary:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptohash:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/file-embed:=[profile?] dev-haskell/http-client:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] dev-haskell/http-types:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/mime-mail-0.3:=[profile?] >=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?] >=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.6:=[profile?] >=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.6:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/shakespeare:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.4:=[profile?] >=dev-haskell/yesod-core-1.4.20:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?] >=dev-haskell/yesod-persistent-1.4:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.6.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Authentication for Yesod
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=+network-uri doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/authenticate-1.3:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/binary:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptohash:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/file-embed:=[profile?] dev-haskell/http-client:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] dev-haskell/http-types:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/mime-mail-0.3:=[profile?] >=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?] >=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.6:=[profile?] >=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.6:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/shakespeare:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.4:=[profile?] >=dev-haskell/yesod-core-1.4.20:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?] >=dev-haskell/yesod-persistent-1.4:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/1.4.13.2
+SRC_URI=mirror://hackage/packages/archive/yesod-auth/1.4.13.2/yesod-auth-1.4.13.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=60a537bd1f9ce8da77c7bd241e1af556
diff --git a/dev-haskell/yesod-auth-1.4.13.5 b/dev-haskell/yesod-auth-1.4.13.5
new file mode 100644
index 000000000000..230851751b52
--- /dev/null
+++ b/dev-haskell/yesod-auth-1.4.13.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/authenticate-1.3:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/binary:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptohash:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/file-embed:=[profile?] dev-haskell/http-client:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] dev-haskell/http-types:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/mime-mail-0.3:=[profile?] >=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?] >=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.7:=[profile?] >=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.7:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/shakespeare:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.4:=[profile?] >=dev-haskell/yesod-core-1.4.20:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?] >=dev-haskell/yesod-persistent-1.4:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.6.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Authentication for Yesod
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=+network-uri doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/authenticate-1.3:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/binary:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptohash:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/file-embed:=[profile?] dev-haskell/http-client:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] dev-haskell/http-types:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/mime-mail-0.3:=[profile?] >=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?] >=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.7:=[profile?] >=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.7:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/shakespeare:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.4:=[profile?] >=dev-haskell/yesod-core-1.4.20:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?] >=dev-haskell/yesod-persistent-1.4:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/1.4.13.5
+SRC_URI=mirror://hackage/packages/archive/yesod-auth/1.4.13.5/yesod-auth-1.4.13.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a8473f7728bfe5e4b2fbe701afe0fc25
diff --git a/dev-haskell/yesod-auth-1.4.16 b/dev-haskell/yesod-auth-1.4.16
new file mode 100644
index 000000000000..f0a47edb803b
--- /dev/null
+++ b/dev-haskell/yesod-auth-1.4.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/authenticate-1.3:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptohash:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/file-embed:=[profile?] dev-haskell/http-client:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] dev-haskell/http-types:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/mime-mail-0.3:=[profile?] >=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?] >=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.7:=[profile?] >=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.7:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/shakespeare:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.4:=[profile?] >=dev-haskell/yesod-core-1.4.31:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?] >=dev-haskell/yesod-persistent-1.4:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Authentication for Yesod
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=+network-uri doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/authenticate-1.3:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptohash:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/file-embed:=[profile?] dev-haskell/http-client:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] dev-haskell/http-types:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/mime-mail-0.3:=[profile?] >=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?] >=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.7:=[profile?] >=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.7:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/shakespeare:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.4:=[profile?] >=dev-haskell/yesod-core-1.4.31:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?] >=dev-haskell/yesod-persistent-1.4:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/1.4.16
+SRC_URI=mirror://hackage/packages/archive/yesod-auth/1.4.16/yesod-auth-1.4.16.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6c77e34ef48e1c4d1dd1c282236c45c6
diff --git a/dev-haskell/yesod-auth-hashdb-1.5.1 b/dev-haskell/yesod-auth-hashdb-1.5.1
new file mode 100644
index 000000000000..850f85a13566
--- /dev/null
+++ b/dev-haskell/yesod-auth-hashdb-1.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cryptohash-0.8:=[profile?] >=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.6:=[profile?] >=dev-haskell/pwstore-fast-2.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/yesod-auth-1.4:=[profile?] <dev-haskell/yesod-auth-1.5:=[profile?] >=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?] >=dev-haskell/yesod-persistent-1.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8.0 test? ( dev-haskell/classy-prelude >=dev-haskell/hspec-2.0.0 dev-haskell/http-conduit dev-haskell/http-types dev-haskell/monad-logger dev-haskell/network-uri dev-haskell/persistent-sqlite dev-haskell/resourcet dev-haskell/wai-extra dev-haskell/yesod >=dev-haskell/yesod-test-1.4.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Authentication plugin for Yesod
+EAPI=6
+HOMEPAGE=https://github.com/paul-rouse/yesod-auth-hashdb
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/cryptohash-0.8:=[profile?] >=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.6:=[profile?] >=dev-haskell/pwstore-fast-2.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/yesod-auth-1.4:=[profile?] <dev-haskell/yesod-auth-1.5:=[profile?] >=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?] >=dev-haskell/yesod-persistent-1.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.5.1
+SRC_URI=mirror://hackage/packages/archive/yesod-auth-hashdb/1.5.1/yesod-auth-hashdb-1.5.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=985af6a811329cebc168676eb19c7ad7
diff --git a/dev-haskell/yesod-auth-hashdb-1.5.1.3 b/dev-haskell/yesod-auth-hashdb-1.5.1.3
new file mode 100644
index 000000000000..410468dc7941
--- /dev/null
+++ b/dev-haskell/yesod-auth-hashdb-1.5.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cryptohash-0.8:=[profile?] >=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.7:=[profile?] >=dev-haskell/pwstore-fast-2.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/yesod-auth-1.4:=[profile?] <dev-haskell/yesod-auth-1.5:=[profile?] >=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?] >=dev-haskell/yesod-persistent-1.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8.0 test? ( dev-haskell/basic-prelude >=dev-haskell/hspec-2.0.0 dev-haskell/http-conduit dev-haskell/http-types dev-haskell/monad-logger dev-haskell/network-uri dev-haskell/persistent-sqlite dev-haskell/resourcet dev-haskell/wai-extra dev-haskell/yesod >=dev-haskell/yesod-test-1.4.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Authentication plugin for Yesod
+EAPI=6
+HOMEPAGE=https://github.com/paul-rouse/yesod-auth-hashdb
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/cryptohash-0.8:=[profile?] >=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.7:=[profile?] >=dev-haskell/pwstore-fast-2.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/yesod-auth-1.4:=[profile?] <dev-haskell/yesod-auth-1.5:=[profile?] >=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?] >=dev-haskell/yesod-persistent-1.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.5.1.3
+SRC_URI=mirror://hackage/packages/archive/yesod-auth-hashdb/1.5.1.3/yesod-auth-hashdb-1.5.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=75ffe36a5d27990c0831c8df5d71a21f
diff --git a/dev-haskell/yesod-auth-hashdb/Manifest b/dev-haskell/yesod-auth-hashdb/Manifest
deleted file mode 100644
index ce4c0ed6a642..000000000000
--- a/dev-haskell/yesod-auth-hashdb/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST yesod-auth-hashdb-1.5.1.3.tar.gz 13367 BLAKE2B ee67116905ba799cb67e813e2096c63361ab9c4d7fdb3d64df44744e7df39b2a5754acf4f79a9b87f167a827449c6bfadc1a0bdb4df6f39f3b9110d8b7c3b0ae SHA512 2fd7de432307c2e4465b8eb9ca6af6e1ede0fb8a3e09f9a6d04cff63d03c2db57eba2282f3441b45c82774bb063fa1d5546b832ca521074304e03343010a1952
-DIST yesod-auth-hashdb-1.5.1.tar.gz 12987 BLAKE2B c0a715d26950de505e76900b309572b78ca28d8bcbd6c3c5935c91a6e614e46bb05089c442d154703ba230ab2e591bb16b1bb2fdaabac68bb51b1496030db956 SHA512 9fbbd5b3b8bdd56e0e35a7609408fff034ba320e8271655ae29d75b1a75dd7c4ef9cebc4f94ed991137940d8161ec8560af6bf3c397d86de78e447adaf741ccf
-EBUILD yesod-auth-hashdb-1.5.1.3.ebuild 1362 BLAKE2B b37a2d26d97febc87f3af120ebebe548cf8a9ce601012db10429e83a8e91a7df6166bcd223373a4cc55b076d36603279924322c6a2f872d679976bca4141ecfc SHA512 f88a2c451b8e50565d2d5cfff26a961087fb172b04f91111e057e75e764e5fb59468b9dc7c2e8005f88c7776bd90fab56b8eaae50e9a3ec7b8277ebf69494f73
-EBUILD yesod-auth-hashdb-1.5.1.ebuild 1363 BLAKE2B f9634e77a0a84aa2b9da8a308d398c8884002d4997a09fa9ec8be00ae86293f15bc1cbe7cb6587f3245fb0ac3f9c8768db84f8d7b6187e320e16f5ad1deadfc5 SHA512 6152f11340d15a8e269e60c9fe97c785dc2a85b0681e840984a9bad550304ccf9556b8fa81040d38b4ec194d4dfa26eeaa46856154b6412131da4a0aba386135
-MISC metadata.xml 533 BLAKE2B 1998dc0e033193c2d851920adb947655cc7f22b1cf78b0a734375e7d690df376a6deaba55f1a5ddc04fb398eea8bbec09c83fa333765beb9e0fddbb3d5802b8a SHA512 3989f0ef1df278ff8029a07467fb909c775af723078a5053f89fd86b0cb0cccde6d5ef29d8808c3290bfaedbd8b90e07f7f7b39045f1833b39886343649d3183
diff --git a/dev-haskell/yesod-auth-hashdb/metadata.xml b/dev-haskell/yesod-auth-hashdb/metadata.xml
deleted file mode 100644
index eb75132e3307..000000000000
--- a/dev-haskell/yesod-auth-hashdb/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package is the Yesod.Auth.HashDB plugin, originally included in yesod-auth, but now modified to be more secure and placed in a separate package.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">paul-rouse/yesod-auth-hashdb</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.5.1.3.ebuild b/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.5.1.3.ebuild
deleted file mode 100644
index 773a3efc6990..000000000000
--- a/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.5.1.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication plugin for Yesod"
-HOMEPAGE="https://github.com/paul-rouse/yesod-auth-hashdb"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cryptohash-0.8:=[profile?]
-	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.7:=[profile?]
-	>=dev-haskell/pwstore-fast-2.2:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/yesod-auth-1.4:=[profile?] <dev-haskell/yesod-auth-1.5:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0
-	test? ( dev-haskell/basic-prelude
-		>=dev-haskell/hspec-2.0.0
-		dev-haskell/http-conduit
-		dev-haskell/http-types
-		dev-haskell/monad-logger
-		dev-haskell/network-uri
-		dev-haskell/persistent-sqlite
-		dev-haskell/resourcet
-		dev-haskell/wai-extra
-		dev-haskell/yesod
-		>=dev-haskell/yesod-test-1.4.3 )
-"
diff --git a/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.5.1.ebuild b/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.5.1.ebuild
deleted file mode 100644
index 862308f919b1..000000000000
--- a/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.5.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication plugin for Yesod"
-HOMEPAGE="https://github.com/paul-rouse/yesod-auth-hashdb"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cryptohash-0.8:=[profile?]
-	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.6:=[profile?]
-	>=dev-haskell/pwstore-fast-2.2:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/yesod-auth-1.4:=[profile?] <dev-haskell/yesod-auth-1.5:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0
-	test? ( dev-haskell/classy-prelude
-		>=dev-haskell/hspec-2.0.0
-		dev-haskell/http-conduit
-		dev-haskell/http-types
-		dev-haskell/monad-logger
-		dev-haskell/network-uri
-		dev-haskell/persistent-sqlite
-		dev-haskell/resourcet
-		dev-haskell/wai-extra
-		dev-haskell/yesod
-		>=dev-haskell/yesod-test-1.4.3 )
-"
diff --git a/dev-haskell/yesod-auth/Manifest b/dev-haskell/yesod-auth/Manifest
deleted file mode 100644
index 4c3c4223677f..000000000000
--- a/dev-haskell/yesod-auth/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST yesod-auth-1.4.13.2.tar.gz 48670 BLAKE2B 1cae99e4ae777286de827fc86ad7fc0b81810bfe80f67e15b3de4358675151bcb66c58727b1a8e0c767f6dc2f29fecd0f0bac967ca69c30c5da684d127ff74bc SHA512 b22207d0ccf86345a50b87a66b4050727003edda7a54d86f81861471a694b2ccfb21d247bea972f21a2e8693cb79988028777f25791059ea3d2a47ddd8a47731
-DIST yesod-auth-1.4.13.5.tar.gz 49064 BLAKE2B c8120dd146266e8f5d31fa6149d6a5c30ca1d62cd9fdc9646afc125ad72a9253073f8d62a62b040f86bb8cc4afc58a5fa373af37552ed4d6b20710ec3c836cba SHA512 e401fc7b2d74c924108e59784f286704cbe44af05a8dabaacac027a3da45425592e0d85d0289c2601d5aec876fd19d2707b9a31a424f3997c8577a41dc49ed73
-DIST yesod-auth-1.4.16.tar.gz 50119 BLAKE2B 54f8a6b756e13c06597c989aa75bf6f16af2b16ac71f83d6c323853341fc9bfdc6c82be648aeef0ede89327ea9af0a41fa872d03819c0a03f59bd9e2cbf8a310 SHA512 cfa30040ce0c583a96af75ff1ff0c049a24239759814138d9891c05ceb8d47acbd39f96c3940713c5c3353627cba49504f29296a99c1fe8efcd3b033e19b677b
-EBUILD yesod-auth-1.4.13.2.ebuild 2308 BLAKE2B 3de2ce5b807f24efa2cad0189e22a57d2aed9be74944372422966100e546b9c27ab2b6d3af3d2e7d124d45eb2bf45424c1cab2d655f3406c01c38c99eff8a6db SHA512 3b968bcb69d8145226b566c5faff07a479f84a0b619b5b924c5b75a696c40c2ab31a8f3ab09d4d2196cf9c5b7104bac28472ead03ef921d4081c718db272c95d
-EBUILD yesod-auth-1.4.13.5.ebuild 2308 BLAKE2B 9bf84d0fedb6481b5b062235271d959c70a33845422ec6fcd7b34fe1dd3e154e6381c4a023ea61d1c1636883308bbec15d9cdd3a192adc80e364035a0b477465 SHA512 a0f1f5d86407c98be2bea9576a53706fc9868331a9cfa9395198f3d31a5d098076e6915adc9325ccf06adcea0381f6d5d729768ba94f79104441655461682044
-EBUILD yesod-auth-1.4.16.ebuild 2235 BLAKE2B 08eabcc0ed21ade0d7dd2fd8673221b0c36bafeca83142472910efad35a53a4eccc3f484e99c16f237beaef5e8d5db91489b5f3c9e31ebcce6db07dba99efabf SHA512 8de30304c58cf0da5290cff8883129a9b0bfda735b6a1ff624ee967058395b679a75b03d55d792f24e4a46839e2d4e0be57318a95405ad15491158c20c709546
-MISC metadata.xml 450 BLAKE2B f749c959e95168c1131d9132708794e191622fcbb2cc61ccf837d550a36bbf6edb970f8c326a04be54ba5dd8bac7ce52724ec28510e488f9fcace4ea58741ed3 SHA512 76e8601ea8bc0bcf9afb9cb3e2ed69689bd1f969da48c0993e507d2d6fce092d18d38e1417c7d25cb46e21f36de0bc2a035cbd958493cc98cf9a6f8e205ef572
diff --git a/dev-haskell/yesod-auth/metadata.xml b/dev-haskell/yesod-auth/metadata.xml
deleted file mode 100644
index a0139ad324bb..000000000000
--- a/dev-haskell/yesod-auth/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-        <maintainer type="project">
-  <email>haskell@gentoo.org</email>
-  <name>Gentoo Haskell</name>
-        </maintainer>
-        <longdescription>
-                Authentication for Yesod.
-        </longdescription>
-<use>
-  <flag name="network-uri">Get Network.URI from the network-uri package</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-haskell/yesod-auth/yesod-auth-1.4.13.2.ebuild b/dev-haskell/yesod-auth/yesod-auth-1.4.13.2.ebuild
deleted file mode 100644
index e58f44d542ed..000000000000
--- a/dev-haskell/yesod-auth/yesod-auth-1.4.13.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication for Yesod"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/authenticate-1.3:=[profile?]
-	dev-haskell/base16-bytestring:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	dev-haskell/binary:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/cryptohash:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/email-validate-1.0:=[profile?]
-	dev-haskell/file-embed:=[profile?]
-	dev-haskell/http-client:=[profile?]
-	>=dev-haskell/http-conduit-2.1:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/mime-mail-0.3:=[profile?]
-	>=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?]
-	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.6:=[profile?]
-	>=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.6:=[profile?]
-	>=dev-haskell/random-1.0.0.2:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/wai-1.4:=[profile?]
-	>=dev-haskell/yesod-core-1.4.20:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/yesod-auth/yesod-auth-1.4.13.5.ebuild b/dev-haskell/yesod-auth/yesod-auth-1.4.13.5.ebuild
deleted file mode 100644
index 48617daa4fd4..000000000000
--- a/dev-haskell/yesod-auth/yesod-auth-1.4.13.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication for Yesod"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/authenticate-1.3:=[profile?]
-	dev-haskell/base16-bytestring:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	dev-haskell/binary:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/cryptohash:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/email-validate-1.0:=[profile?]
-	dev-haskell/file-embed:=[profile?]
-	dev-haskell/http-client:=[profile?]
-	>=dev-haskell/http-conduit-2.1:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/mime-mail-0.3:=[profile?]
-	>=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?]
-	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.7:=[profile?]
-	>=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.7:=[profile?]
-	>=dev-haskell/random-1.0.0.2:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/wai-1.4:=[profile?]
-	>=dev-haskell/yesod-core-1.4.20:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/yesod-auth/yesod-auth-1.4.16.ebuild b/dev-haskell/yesod-auth/yesod-auth-1.4.16.ebuild
deleted file mode 100644
index cd202eb5e7d0..000000000000
--- a/dev-haskell/yesod-auth/yesod-auth-1.4.16.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication for Yesod"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/authenticate-1.3:=[profile?]
-	dev-haskell/base16-bytestring:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/cryptohash:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/email-validate-1.0:=[profile?]
-	dev-haskell/file-embed:=[profile?]
-	dev-haskell/http-client:=[profile?]
-	>=dev-haskell/http-conduit-2.1:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/mime-mail-0.3:=[profile?]
-	>=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?]
-	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.7:=[profile?]
-	>=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.7:=[profile?]
-	>=dev-haskell/random-1.0.0.2:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/wai-1.4:=[profile?]
-	>=dev-haskell/yesod-core-1.4.31:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/yesod-core-1.2.7 b/dev-haskell/yesod-core-1.2.7
new file mode 100644
index 000000000000..279e5eeae153
--- /dev/null
+++ b/dev-haskell/yesod-core-1.2.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec-conduit:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/clientsession-0.9:=[profile?] <dev-haskell/clientsession-0.10:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] >=dev-haskell/cookie-0.4:=[profile?] <dev-haskell/cookie-0.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/failure-0.2:=[profile?] <dev-haskell/failure-0.3:=[profile?] >=dev-haskell/fast-logger-0.2:=[profile?] >=dev-haskell/hamlet-1.1:=[profile?] <dev-haskell/hamlet-1.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1.2:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] >=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.2:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/resourcet-0.4.9:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] dev-haskell/safe:=[profile?] >=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/shakespeare-css-1.0:=[profile?] <dev-haskell/shakespeare-css-1.1:=[profile?] >=dev-haskell/shakespeare-i18n-1.0:=[profile?] <dev-haskell/shakespeare-i18n-1.1:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/wai-1.4:=[profile?] >=dev-haskell/wai-extra-1.3:=[profile?] >=dev-haskell/wai-logger-0.2:=[profile?] >=dev-haskell/warp-1.3.8:=[profile?] >=dev-haskell/yesod-routes-1.2:=[profile?] <dev-haskell/yesod-routes-1.3:=[profile?] >=dev-lang/ghc-7.0.1:= >=dev-haskell/cabal-1.10.0.0 test? ( dev-haskell/async >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/network dev-haskell/network-conduit >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 >=dev-haskell/wai-test-1.3.0.5 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Creation of type-safe, RESTful web applications
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec-conduit:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/clientsession-0.9:=[profile?] <dev-haskell/clientsession-0.10:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] >=dev-haskell/cookie-0.4:=[profile?] <dev-haskell/cookie-0.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/failure-0.2:=[profile?] <dev-haskell/failure-0.3:=[profile?] >=dev-haskell/fast-logger-0.2:=[profile?] >=dev-haskell/hamlet-1.1:=[profile?] <dev-haskell/hamlet-1.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1.2:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] >=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.2:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/resourcet-0.4.9:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] dev-haskell/safe:=[profile?] >=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/shakespeare-css-1.0:=[profile?] <dev-haskell/shakespeare-css-1.1:=[profile?] >=dev-haskell/shakespeare-i18n-1.0:=[profile?] <dev-haskell/shakespeare-i18n-1.1:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/wai-1.4:=[profile?] >=dev-haskell/wai-extra-1.3:=[profile?] >=dev-haskell/wai-logger-0.2:=[profile?] >=dev-haskell/warp-1.3.8:=[profile?] >=dev-haskell/yesod-routes-1.2:=[profile?] <dev-haskell/yesod-routes-1.3:=[profile?] >=dev-lang/ghc-7.0.1:=
+SLOT=0/1.2.7
+SRC_URI=mirror://hackage/packages/archive/yesod-core/1.2.7/yesod-core-1.2.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=631bfef6fea0d3bc1ced6d799eb237b5
diff --git a/dev-haskell/yesod-core-1.4.18.1 b/dev-haskell/yesod-core-1.4.18.1
new file mode 100644
index 000000000000..3cdc2577d5ae
--- /dev/null
+++ b/dev-haskell/yesod-core-1.4.18.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/auto-update:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?] >=dev-haskell/conduit-1.2:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/cookie-0.4.1:=[profile?] <dev-haskell/cookie-0.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/fast-logger-2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1.2:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/mwc-random:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/resourcet-0.4.9:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/shakespeare-2.0:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/wai-3.0:=[profile?] >=dev-haskell/wai-extra-3.0.7:=[profile?] >=dev-haskell/wai-logger-0.2:=[profile?] >=dev-haskell/warp-3.0.2:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/async >=dev-haskell/hspec-1.3 dev-haskell/hspec-expectations dev-haskell/hunit dev-haskell/network >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 dev-haskell/streaming-commons ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Creation of type-safe, RESTful web applications
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/auto-update:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?] >=dev-haskell/conduit-1.2:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/cookie-0.4.1:=[profile?] <dev-haskell/cookie-0.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/fast-logger-2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1.2:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/mwc-random:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/resourcet-0.4.9:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/shakespeare-2.0:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/wai-3.0:=[profile?] >=dev-haskell/wai-extra-3.0.7:=[profile?] >=dev-haskell/wai-logger-0.2:=[profile?] >=dev-haskell/warp-3.0.2:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.4.18.1
+SRC_URI=mirror://hackage/packages/archive/yesod-core/1.4.18.1/yesod-core-1.4.18.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e79d7042c5cdf683617efb2d5ac91fd8
diff --git a/dev-haskell/yesod-core-1.4.20.2 b/dev-haskell/yesod-core-1.4.20.2
new file mode 100644
index 000000000000..d45bc2b401e3
--- /dev/null
+++ b/dev-haskell/yesod-core-1.4.20.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/auto-update:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?] >=dev-haskell/conduit-1.2:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/cookie-0.4.1:=[profile?] <dev-haskell/cookie-0.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/fast-logger-2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1.2:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/mwc-random:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/resourcet-0.4.9:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/shakespeare-2.0:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/wai-3.0:=[profile?] >=dev-haskell/wai-extra-3.0.7:=[profile?] >=dev-haskell/wai-logger-0.2:=[profile?] >=dev-haskell/warp-3.0.2:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/async >=dev-haskell/hspec-1.3 dev-haskell/hspec-expectations dev-haskell/hunit dev-haskell/network >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 dev-haskell/streaming-commons ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Creation of type-safe, RESTful web applications
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/auto-update:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?] >=dev-haskell/conduit-1.2:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/cookie-0.4.1:=[profile?] <dev-haskell/cookie-0.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/fast-logger-2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1.2:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/mwc-random:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/resourcet-0.4.9:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/shakespeare-2.0:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/wai-3.0:=[profile?] >=dev-haskell/wai-extra-3.0.7:=[profile?] >=dev-haskell/wai-logger-0.2:=[profile?] >=dev-haskell/warp-3.0.2:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.4.20.2
+SRC_URI=mirror://hackage/packages/archive/yesod-core/1.4.20.2/yesod-core-1.4.20.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c3d02be3acbfcd6a833d4b80a3fd1d7a
diff --git a/dev-haskell/yesod-core-1.4.25 b/dev-haskell/yesod-core-1.4.25
new file mode 100644
index 000000000000..7c068845aee1
--- /dev/null
+++ b/dev-haskell/yesod-core-1.4.25
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/auto-update:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?] >=dev-haskell/conduit-1.2:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/cookie-0.4.2:=[profile?] <dev-haskell/cookie-0.5:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/deepseq-generics:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/fast-logger-2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1.2:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/mwc-random:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/resourcet-0.4.9:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/shakespeare-2.0:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/wai-3.0:=[profile?] >=dev-haskell/wai-extra-3.0.7:=[profile?] >=dev-haskell/wai-logger-0.2:=[profile?] >=dev-haskell/warp-3.0.2:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/async >=dev-haskell/hspec-1.3 dev-haskell/hspec-expectations dev-haskell/hunit dev-haskell/network >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 dev-haskell/streaming-commons ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Creation of type-safe, RESTful web applications
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/auto-update:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?] >=dev-haskell/conduit-1.2:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/cookie-0.4.2:=[profile?] <dev-haskell/cookie-0.5:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/deepseq-generics:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/fast-logger-2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1.2:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/mwc-random:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/resourcet-0.4.9:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/shakespeare-2.0:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/wai-3.0:=[profile?] >=dev-haskell/wai-extra-3.0.7:=[profile?] >=dev-haskell/wai-logger-0.2:=[profile?] >=dev-haskell/warp-3.0.2:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.4.25
+SRC_URI=mirror://hackage/packages/archive/yesod-core/1.4.25/yesod-core-1.4.25.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f94022e52a6071c291c112a969e0cca1
diff --git a/dev-haskell/yesod-core-1.4.31 b/dev-haskell/yesod-core-1.4.31
new file mode 100644
index 000000000000..090faaea4617
--- /dev/null
+++ b/dev-haskell/yesod-core-1.4.31
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/auto-update:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.7.1:=[profile?] dev-haskell/byteable:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?] >=dev-haskell/conduit-1.2:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/cookie-0.4.2:=[profile?] <dev-haskell/cookie-0.5:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/deepseq-generics:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/fast-logger-2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1.2:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/mwc-random:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/resourcet-0.4.9:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/shakespeare-2.0:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/wai-3.0:=[profile?] >=dev-haskell/wai-extra-3.0.7:=[profile?] >=dev-haskell/wai-logger-0.2:=[profile?] >=dev-haskell/warp-3.0.2:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/async >=dev-haskell/hspec-1.3 dev-haskell/hspec-expectations dev-haskell/hunit dev-haskell/network >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 dev-haskell/streaming-commons ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Creation of type-safe, RESTful web applications
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/auto-update:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.7.1:=[profile?] dev-haskell/byteable:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?] >=dev-haskell/conduit-1.2:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/cookie-0.4.2:=[profile?] <dev-haskell/cookie-0.5:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/deepseq-generics:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/fast-logger-2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1.2:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/mwc-random:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/resourcet-0.4.9:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/shakespeare-2.0:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/wai-3.0:=[profile?] >=dev-haskell/wai-extra-3.0.7:=[profile?] >=dev-haskell/wai-logger-0.2:=[profile?] >=dev-haskell/warp-3.0.2:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.4.31
+SRC_URI=mirror://hackage/packages/archive/yesod-core/1.4.31/yesod-core-1.4.31.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bd558592384aa841c280c6cba47c41a0
diff --git a/dev-haskell/yesod-core/Manifest b/dev-haskell/yesod-core/Manifest
deleted file mode 100644
index e25a1c8a2714..000000000000
--- a/dev-haskell/yesod-core/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST yesod-core-1.2.7.tar.gz 59361 BLAKE2B 03a929e123b854c8cda91f2c55f8c574436faff6299399e36567b29605ab68d38ea6bb6b1383458a652c8173dc7bc7dd39c85c1425dcc9314656710d91243bd6 SHA512 ca29b69db3e9ddcd93928fed78642a8740b8f73c21093cf2116caeceac597a5285f24882e2b5a40cc5ef66343e8c3d160e2d0e7b88459b649abd4b7148e6c400
-DIST yesod-core-1.4.18.1.tar.gz 85651 BLAKE2B d401ec6b53f05f0dcd6936c58fd9dea386586c9829dd1c17bb5f3835e193411be87c3e6a14c136daf98aebd7453d4b61c02717eec040df128fd5ed5376d30ac1 SHA512 9a97f00ed00f4f63be076dc586ca2305f6341816123758086265a0c939ce9e79a1f0b1399175f69a98ea0d40a5419848a81b95e64bda2010ad29b2810c515ed8
-DIST yesod-core-1.4.20.2.tar.gz 87502 BLAKE2B f689503fe45d202457f0f9bec290ecac360f116660ff3dde5b299d29cc301d45d8771d5a6eca0b2920d2787f962ea6b44df3a59d0e2fb059f0acd52ccb888272 SHA512 ad4be45ee06e3d29e2b936c2962a3d78abb398499f91019a9c3ab94d5a5e2ed9efe3d09c27c7fa078da4ec16e7d2d156765c73e8234b2e87a99c3cd46ad43c90
-DIST yesod-core-1.4.25.tar.gz 89777 BLAKE2B bdce9a3c821dadd5dd238f278230ea2fba2c509719bc6df8920f6461654f22f5062f03ede315bee2596e7241223270823155291e06c4854b61389e1ffe25dd17 SHA512 ede4120909247f5272064671df922c246736c62ddb3775657d10e865322926944de169a7e85c9fd4fe6011ccd45bc08003f872a55b17549058b93a889c080fd3
-DIST yesod-core-1.4.31.tar.gz 91273 BLAKE2B 036cb334ea56c0ed2af4263c073c942fcc9124259fba482bbe9d5a9d6e6707933b0e179d0b0c43bf92f0e5455a0d46fddc66bd05c092aecfe99cf2d99ca534dd SHA512 e701ab5bc56b7aaf0212443fd9057dfefd1709715cc69be0ab4c3a65764de123adf591e7600df243abda4a5232c79b73aecde1c853e0fb15311b30a4da53a574
-EBUILD yesod-core-1.2.7.ebuild 3055 BLAKE2B a24c87e038a2dfda960db8839687a7ba6247cbf7ee7d8d9c04f3d23626ab2863defdd210115614aa8b342bba4014a648ec8f8e0c373ebadc4780bae03bdf4201 SHA512 b1605c206bbd02003123028bdfc4b6cb598592065036dadf4116d33d48b7cea15cc6a2e468520ceb72a8fdc002ee2b199da43d8257a51356e92f1db4c4555309
-EBUILD yesod-core-1.4.18.1.ebuild 2874 BLAKE2B bcf256564fb52e4b74256bf6b4fc8645d5b38f5e4c81c8cf60e588ce3da11acf6520aa1f9164c003027f7fd3695e0b1aefb92aee467ee439d7bc44d5de69d9e1 SHA512 b2f34483cd73d7fcc04653ae3f540982bfc2ef39e48aafa8c3ac6a03a83012d3d79c08c600b1f30e702ce38440af3802b6e0a0bb6d0bea3cd6ccc5ae0abcef60
-EBUILD yesod-core-1.4.20.2.ebuild 2872 BLAKE2B 9a1e6ff8548bd906a08c51a9548afe2714435f0c4aeda3cd254d2bdb1c5ae3c3e991600b56f3b77049cd96c1e159828a822b891da6d4e8d73fbcc1876c4150d7 SHA512 be0bc7f80d1bb0170ab8b3d46cac8e8f6bd4a9b1fdf2ffdbd8cdd4373ddb902d3b3019ac0735664d817649a783a94366b70035de79217654cf500340699aee79
-EBUILD yesod-core-1.4.25.ebuild 2873 BLAKE2B d927bf3a8ea716515174e1b786ea0ae10f5d257342cd2265c117636f519d9d3edb9d0c417a88926d8df597efa41e9f1068a63cd076ff6ca2dba057b77079425f SHA512 ae519856bb9ba0bcd6f7e7406c2868d709bd75abdb6b8e005c620e22f8b81ccd06845e431fb2caeb9d8a241673e4cf09418984d2cda74e8f4adc1fbe734001b1
-EBUILD yesod-core-1.4.31.ebuild 2875 BLAKE2B ee6922a58d60f4762e6fe083193024fff95099b81e8b7d0315a96c78e571fe3e43a8dbe04b1c90a669a7cc28cce73f42e938698080ef4b320dd28ae9d95d2c88 SHA512 797e527540131d22c0c27123ed0993c3d44acd584d1edaea7b6dbc92455e3e4cfd85e627e0a977013cce896e6c1e1f12c8021f92fe1dbdbdbd42001191e56737
-MISC metadata.xml 722 BLAKE2B 8f4f6d4c278f92f847046b4c85c35c78e2a114b17766bdb24e7b7f2b48a48f9b7aca69c4eac626dd27b5b3eda92b18f0cd11f2fd39db2f8c348f030ce1d5da07 SHA512 a0a229d4867993c1256e99c804f503bdb9461a11003b9f616d2f8985d700aaa6821949316faf5e18a202a05f802f34a0c42ea237a86cbbde076c6279d7be5135
diff --git a/dev-haskell/yesod-core/metadata.xml b/dev-haskell/yesod-core/metadata.xml
deleted file mode 100644
index 3dcacd9d0c75..000000000000
--- a/dev-haskell/yesod-core/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Yesod is a framework designed to foster creation of RESTful web application that have strong compile-time guarantees of correctness. It also affords space efficient code and portability to many deployment backends, from CGI to stand-alone serving.
-		
-		The Yesod documentation site &lt;http://www.yesodweb.com/&gt; has much more information, tutorials and information on some of the supporting packages, like Hamlet and Persistent.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/yesod-core/yesod-core-1.2.7.ebuild b/dev-haskell/yesod-core/yesod-core-1.2.7.ebuild
deleted file mode 100644
index 1bee94895fa6..000000000000
--- a/dev-haskell/yesod-core/yesod-core-1.2.7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Creation of type-safe, RESTful web applications"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/attoparsec-conduit:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	>=dev-haskell/cereal-0.3:=[profile?]
-	>=dev-haskell/clientsession-0.9:=[profile?] <dev-haskell/clientsession-0.10:=[profile?]
-	>=dev-haskell/conduit-0.5:=[profile?]
-	>=dev-haskell/cookie-0.4:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/failure-0.2:=[profile?] <dev-haskell/failure-0.3:=[profile?]
-	>=dev-haskell/fast-logger-0.2:=[profile?]
-	>=dev-haskell/hamlet-1.1:=[profile?] <dev-haskell/hamlet-1.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lifted-base-0.1.2:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-0.4:=[profile?]
-	>=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.2:=[profile?]
-	>=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.1:=[profile?]
-	>=dev-haskell/resourcet-0.4.9:=[profile?] <dev-haskell/resourcet-0.5:=[profile?]
-	dev-haskell/safe:=[profile?]
-	>=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?]
-	>=dev-haskell/shakespeare-css-1.0:=[profile?] <dev-haskell/shakespeare-css-1.1:=[profile?]
-	>=dev-haskell/shakespeare-i18n-1.0:=[profile?] <dev-haskell/shakespeare-i18n-1.1:=[profile?]
-	>=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.3:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/wai-1.4:=[profile?]
-	>=dev-haskell/wai-extra-1.3:=[profile?]
-	>=dev-haskell/wai-logger-0.2:=[profile?]
-	>=dev-haskell/warp-1.3.8:=[profile?]
-	>=dev-haskell/yesod-routes-1.2:=[profile?] <dev-haskell/yesod-routes-1.3:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-	test? ( dev-haskell/async
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/network
-		dev-haskell/network-conduit
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		>=dev-haskell/wai-test-1.3.0.5 )
-"
diff --git a/dev-haskell/yesod-core/yesod-core-1.4.18.1.ebuild b/dev-haskell/yesod-core/yesod-core-1.4.18.1.ebuild
deleted file mode 100644
index 0781ee4384d4..000000000000
--- a/dev-haskell/yesod-core/yesod-core-1.4.18.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Creation of type-safe, RESTful web applications"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/auto-update:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	>=dev-haskell/cereal-0.3:=[profile?]
-	>=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?]
-	>=dev-haskell/conduit-1.2:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	>=dev-haskell/cookie-0.4.1:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/fast-logger-2.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lifted-base-0.1.2:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/mwc-random:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	>=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/resourcet-0.4.9:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?]
-	>=dev-haskell/wai-extra-3.0.7:=[profile?]
-	>=dev-haskell/wai-logger-0.2:=[profile?]
-	>=dev-haskell/warp-3.0.2:=[profile?]
-	dev-haskell/word8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/async
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hspec-expectations
-		dev-haskell/hunit
-		dev-haskell/network
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		dev-haskell/streaming-commons )
-"
diff --git a/dev-haskell/yesod-core/yesod-core-1.4.20.2.ebuild b/dev-haskell/yesod-core/yesod-core-1.4.20.2.ebuild
deleted file mode 100644
index f2f557cd59e0..000000000000
--- a/dev-haskell/yesod-core/yesod-core-1.4.20.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Creation of type-safe, RESTful web applications"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/auto-update:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	>=dev-haskell/cereal-0.3:=[profile?]
-	>=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?]
-	>=dev-haskell/conduit-1.2:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	>=dev-haskell/cookie-0.4.1:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/fast-logger-2.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lifted-base-0.1.2:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/mwc-random:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	>=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/resourcet-0.4.9:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?]
-	>=dev-haskell/wai-extra-3.0.7:=[profile?]
-	>=dev-haskell/wai-logger-0.2:=[profile?]
-	>=dev-haskell/warp-3.0.2:=[profile?]
-	dev-haskell/word8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/async
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hspec-expectations
-		dev-haskell/hunit
-		dev-haskell/network
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		dev-haskell/streaming-commons )
-"
diff --git a/dev-haskell/yesod-core/yesod-core-1.4.25.ebuild b/dev-haskell/yesod-core/yesod-core-1.4.25.ebuild
deleted file mode 100644
index b27ecea9c27f..000000000000
--- a/dev-haskell/yesod-core/yesod-core-1.4.25.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Creation of type-safe, RESTful web applications"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/auto-update:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	>=dev-haskell/cereal-0.3:=[profile?]
-	>=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?]
-	>=dev-haskell/conduit-1.2:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	>=dev-haskell/cookie-0.4.2:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	dev-haskell/deepseq-generics:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/fast-logger-2.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lifted-base-0.1.2:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/mwc-random:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	>=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/resourcet-0.4.9:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?]
-	>=dev-haskell/wai-extra-3.0.7:=[profile?]
-	>=dev-haskell/wai-logger-0.2:=[profile?]
-	>=dev-haskell/warp-3.0.2:=[profile?]
-	dev-haskell/word8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/async
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hspec-expectations
-		dev-haskell/hunit
-		dev-haskell/network
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		dev-haskell/streaming-commons )
-"
diff --git a/dev-haskell/yesod-core/yesod-core-1.4.31.ebuild b/dev-haskell/yesod-core/yesod-core-1.4.31.ebuild
deleted file mode 100644
index b9488828aba0..000000000000
--- a/dev-haskell/yesod-core/yesod-core-1.4.31.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Creation of type-safe, RESTful web applications"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/auto-update:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.7.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	>=dev-haskell/cereal-0.3:=[profile?]
-	>=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?]
-	>=dev-haskell/conduit-1.2:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	>=dev-haskell/cookie-0.4.2:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	dev-haskell/deepseq-generics:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/fast-logger-2.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lifted-base-0.1.2:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/mwc-random:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	>=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/resourcet-0.4.9:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?]
-	>=dev-haskell/wai-extra-3.0.7:=[profile?]
-	>=dev-haskell/wai-logger-0.2:=[profile?]
-	>=dev-haskell/warp-3.0.2:=[profile?]
-	dev-haskell/word8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/async
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hspec-expectations
-		dev-haskell/hunit
-		dev-haskell/network
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		dev-haskell/streaming-commons )
-"
diff --git a/dev-haskell/yesod-default-1.2.0 b/dev-haskell/yesod-default-1.2.0
new file mode 100644
index 000000000000..366b00ecc34e
--- /dev/null
+++ b/dev-haskell/yesod-default-1.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/yesod-core-1.2:=[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=Default config and main functions for your yesod application (deprecated)
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/yesod-core-1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.2.0
+SRC_URI=mirror://hackage/packages/archive/yesod-default/1.2.0/yesod-default-1.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8a8e8198a537050641d17851c3a26c24
diff --git a/dev-haskell/yesod-default/Manifest b/dev-haskell/yesod-default/Manifest
deleted file mode 100644
index ab95b92d0e6e..000000000000
--- a/dev-haskell/yesod-default/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST yesod-default-1.2.0.tar.gz 1397 BLAKE2B 9ec72760a47bc5ad36da19ae2e1f42bbf758d0ddb45c5c1e9450600296c26d402ca91719cadbac5ac0a82ec912f8d54b695964dd86e19b9151c380350a3290ab SHA512 35952255a12d7f661bca1312c31a2516fcce64046018e58f10811dd2c7439c2f4faaac622946e6ec64153972fd33d0c00f575f3cba196d99658c4d46c0d1e18d
-EBUILD yesod-default-1.2.0.ebuild 613 BLAKE2B 889385caf6eb5378aa8053f32b97fe23d3c078104772db7b77295c94bf210dd6e95391f466ee8b1c7550e45606c07c2c4573f8e7349339e746049cf587e40b8f SHA512 778d03b72d2bd60440c2d8e7de668170015215b224f1c4d88d4443530acb09e98eb136e5529cda6af1f3d82fef23841a6516f02b1b5902b7973746bc510d6541
-MISC metadata.xml 379 BLAKE2B cb7b624b5b3feb7ee96eebc4d12209c12048e9c2360be8b42aec58a33d805e1dd9edd710938ffc13785ce0d275f5bdd2c9f526807b1e56d45795c69f9c12ee1a SHA512 ecf119cad14dc831350eb95b371704ac3cd8813a8301a7a286c3daedf16b908f88ba2a16275e121c2bc7fe516c903fed4bf06f4dc54efdbdefc84edc38569c9c
diff --git a/dev-haskell/yesod-default/metadata.xml b/dev-haskell/yesod-default/metadata.xml
deleted file mode 100644
index 121cf62fce42..000000000000
--- a/dev-haskell/yesod-default/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Convenient wrappers for your the configuration and
-		execution of your yesod application
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/yesod-default/yesod-default-1.2.0.ebuild b/dev-haskell/yesod-default/yesod-default-1.2.0.ebuild
deleted file mode 100644
index 50b2e68c1d21..000000000000
--- a/dev-haskell/yesod-default/yesod-default-1.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Default config and main functions for your yesod application (deprecated)"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/yesod-core-1.2:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/yesod-form-1.4.10 b/dev-haskell/yesod-form-1.4.10
new file mode 100644
index 000000000000..d817dd0085df
--- /dev/null
+++ b/dev-haskell/yesod-form-1.4.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/persistent:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/shakespeare-2.0:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/xss-sanitize-0.3.0.1:=[profile?] >=dev-haskell/yesod-core-1.4.14:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Form handling support for Yesod Web Framework
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=+network-uri doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/persistent:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/shakespeare-2.0:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/xss-sanitize-0.3.0.1:=[profile?] >=dev-haskell/yesod-core-1.4.14:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/1.4.10
+SRC_URI=mirror://hackage/packages/archive/yesod-form/1.4.10/yesod-form-1.4.10.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cd989407c36e4063006bd4f823842809
diff --git a/dev-haskell/yesod-form-1.4.7.1 b/dev-haskell/yesod-form-1.4.7.1
new file mode 100644
index 000000000000..0297a003e18f
--- /dev/null
+++ b/dev-haskell/yesod-form-1.4.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/persistent:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/shakespeare-2.0:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/xss-sanitize-0.3.0.1:=[profile?] >=dev-haskell/yesod-core-1.4.14:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Form handling support for Yesod Web Framework
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=+network-uri doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/persistent:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/shakespeare-2.0:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/xss-sanitize-0.3.0.1:=[profile?] >=dev-haskell/yesod-core-1.4.14:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/1.4.7.1
+SRC_URI=mirror://hackage/packages/archive/yesod-form/1.4.7.1/yesod-form-1.4.7.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=129e63acf08d7c416ca5c24bbdcaa57f
diff --git a/dev-haskell/yesod-form-1.4.8 b/dev-haskell/yesod-form-1.4.8
new file mode 100644
index 000000000000..14dddad11ca3
--- /dev/null
+++ b/dev-haskell/yesod-form-1.4.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/persistent:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/shakespeare-2.0:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/xss-sanitize-0.3.0.1:=[profile?] >=dev-haskell/yesod-core-1.4.14:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Form handling support for Yesod Web Framework
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=+network-uri doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/persistent:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/shakespeare-2.0:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/xss-sanitize-0.3.0.1:=[profile?] >=dev-haskell/yesod-core-1.4.14:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/1.4.8
+SRC_URI=mirror://hackage/packages/archive/yesod-form/1.4.8/yesod-form-1.4.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=076f2954d93d5a22900a87ed3656b1a0
diff --git a/dev-haskell/yesod-form/Manifest b/dev-haskell/yesod-form/Manifest
deleted file mode 100644
index b5d6f5803dad..000000000000
--- a/dev-haskell/yesod-form/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST yesod-form-1.4.10.tar.gz 31028 BLAKE2B 745d2b872eb79e0c5d4504e783ac5f6797b258071009e1ba9874d1297698a01800876f8b28e96a09ddc81de10c41f8710142637fb9cf19a46b8b2598f7a28086 SHA512 a8736407147c2d0158ee4c6d9805450fdc692cb307e87bac753c380f78e1c6a2b36fc482bf6fab7e64403ea82df0af95a7afbeba0f4fdd93c42b9ab75503c8c4
-DIST yesod-form-1.4.7.1.tar.gz 30581 BLAKE2B 27d7c0bbdb835838704a52dce5ab59e77df3813e234b76d3131d121734496f0fe35443f1d96f765c437b63d00618c83a5ef0aeb0ebb42380dcc07a080eeda90a SHA512 71d5eacfb959320f2120304e36ad067c480002fddc2f6f6b1d9fb0b97864ead335eb66e813ebb554a8d312859a60cbd820edaa7541745f847c18aef8130598d7
-DIST yesod-form-1.4.8.tar.gz 30739 BLAKE2B 7a9a2348e537d077225b83d5e2588eac78dc1cd27229a22d34406b4ef8b3536950c43914c4ed4c1b6167dc2e235b4688be7fd8c971257c4aa6cdc793af182647 SHA512 d413f41c820c5428ceac0815d68d7518f8a5e45104a64a92d03381f1ccfcfb7e0c99b176c4440adf463b6ed2a4cf52aaebec6deb422c27ae0e6bd143434e4838
-EBUILD yesod-form-1.4.10.ebuild 1584 BLAKE2B 5e4d09c1807dc799908529d08c730282a77fa4ba779416591c2db070b4b534e327e3fc54dcc6d1effc74cd99d655ad6624cc571087bb769337a609d79a7312cc SHA512 b5514e35fef6811c7e97790de2fb01db104563d40c655d25b47310c9b75f13d0451c8d56bc5073bf3e831089e9b7feb3176cf3469e3541c6a58f6054951d4ad5
-EBUILD yesod-form-1.4.7.1.ebuild 1623 BLAKE2B 535687ecedf56accd42cbdc20cec7cc3cd961b5f66b8efe84a48124a83650f13e5894bd94bc3bff6e787f72e4da4de9bcb97a3984839db64fdadde2dc93ed45e SHA512 d0a1f7d55081014c424ace2e5a6bf7d2b7d0baa2057019677e51e5132082528de596ba72d692bd7600ddc9483b8cdd2c1e4aeb37e977312a63dcf5a71f7a4842
-EBUILD yesod-form-1.4.8.ebuild 1582 BLAKE2B 152e9765514b0c5f798767640753eca436622ca8893f4cbe46c15b81c6ae62e7ef0a575b2f9bc0cd4eb921ad8772eb3611d3d6c062e53a8e6ccfee5c449e4d3f SHA512 69067d60f19bfc3749566b2f5aa1636d4fecd2a96b1b5f660c2930d3cad36b7cf5c8a952ec544b25e4d08b9de4d6b2cdef2376abd11f403a52a66ef7d5abca5a
-MISC metadata.xml 470 BLAKE2B 79f2aeb5212a5ba3e420617484d5ad17a57d2940ce73f630a386e694383bec296cb80eb63debe67ac96094a38426b9ee2f74b936091a61bbe4f863acbda08733 SHA512 327d7c5ee97af05acdff99cb9a4300f97ab84b915ab3f132c2bf91d5e097dd792f31b9c07153d294cf03ef69432a7aaa6cc6ff2c54600e3b26b1a222550a8264
diff --git a/dev-haskell/yesod-form/metadata.xml b/dev-haskell/yesod-form/metadata.xml
deleted file mode 100644
index fb12836282c7..000000000000
--- a/dev-haskell/yesod-form/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-        <maintainer type="project">
-  <email>haskell@gentoo.org</email>
-  <name>Gentoo Haskell</name>
-        </maintainer>
-        <longdescription>
-                Form handling support for Yesod Web Framework
-        </longdescription>
-<use>
-  <flag name="network-uri">Get Network.URI from the network-uri package</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-haskell/yesod-form/yesod-form-1.4.10.ebuild b/dev-haskell/yesod-form/yesod-form-1.4.10.ebuild
deleted file mode 100644
index 77befa04b1fa..000000000000
--- a/dev-haskell/yesod-form/yesod-form-1.4.10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Form handling support for Yesod Web Framework"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/email-validate-1.0:=[profile?]
-	dev-haskell/persistent:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/xss-sanitize-0.3.0.1:=[profile?]
-	>=dev-haskell/yesod-core-1.4.14:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/yesod-form/yesod-form-1.4.7.1.ebuild b/dev-haskell/yesod-form/yesod-form-1.4.7.1.ebuild
deleted file mode 100644
index 6e40a10264ca..000000000000
--- a/dev-haskell/yesod-form/yesod-form-1.4.7.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Form handling support for Yesod Web Framework"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/email-validate-1.0:=[profile?]
-	dev-haskell/persistent:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/xss-sanitize-0.3.0.1:=[profile?]
-	>=dev-haskell/yesod-core-1.4.14:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/yesod-form/yesod-form-1.4.8.ebuild b/dev-haskell/yesod-form/yesod-form-1.4.8.ebuild
deleted file mode 100644
index 687c0f91c1d0..000000000000
--- a/dev-haskell/yesod-form/yesod-form-1.4.8.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Form handling support for Yesod Web Framework"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/email-validate-1.0:=[profile?]
-	dev-haskell/persistent:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/xss-sanitize-0.3.0.1:=[profile?]
-	>=dev-haskell/yesod-core-1.4.14:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/yesod-json-1.1.2.2 b/dev-haskell/yesod-json-1.1.2.2
new file mode 100644
index 000000000000..ec2898988ffe
--- /dev/null
+++ b/dev-haskell/yesod-json-1.1.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.5:=[profile?] >=dev-haskell/attoparsec-conduit-0.5:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] >=dev-haskell/safe-0.2:=[profile?] >=dev-haskell/shakespeare-js-1.0:=[profile?] >=dev-haskell/text-0.8:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-extra-1.3:=[profile?] >=dev-haskell/yesod-core-1.1:=[profile?] >=dev-haskell/yesod-routes-1.1:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hspec dev-haskell/wai-test ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generate content for Yesod using the aeson package
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] >=dev-haskell/attoparsec-conduit-0.5:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] >=dev-haskell/safe-0.2:=[profile?] >=dev-haskell/shakespeare-js-1.0:=[profile?] >=dev-haskell/text-0.8:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-extra-1.3:=[profile?] >=dev-haskell/yesod-core-1.1:=[profile?] >=dev-haskell/yesod-routes-1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.1.2.2
+SRC_URI=mirror://hackage/packages/archive/yesod-json/1.1.2.2/yesod-json-1.1.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d2dd32d1a269f29419fe7e8ae5860f44
diff --git a/dev-haskell/yesod-json-1.2.0 b/dev-haskell/yesod-json-1.2.0
new file mode 100644
index 000000000000..35584944429c
--- /dev/null
+++ b/dev-haskell/yesod-json-1.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/yesod-core-1.2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generate content for Yesod using the aeson package. (deprecated)
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/yesod-core-1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.2.0
+SRC_URI=mirror://hackage/packages/archive/yesod-json/1.2.0/yesod-json-1.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2f5d5f7294a003fe2111c2ff2e16ee1e
diff --git a/dev-haskell/yesod-json/Manifest b/dev-haskell/yesod-json/Manifest
deleted file mode 100644
index 10e22be9ed2f..000000000000
--- a/dev-haskell/yesod-json/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST yesod-json-1.1.2.2.tar.gz 3752 BLAKE2B fadd8b8b25d7e9e3de74ae8b7da7192065a68e015b5bf5bab8e476bbf45513b7cf59df7a60d6ea8e03e7398f83afead3ab4178cccb3c570d2cbc5512935076f9 SHA512 ab577311763850d3bdac8281761e43384bbc552e2caa7285797f7a9c8163de5b43f4d84495f2f716577a1848fa84a892789a5223752b6395bcdac7a46deb6763
-DIST yesod-json-1.2.0.tar.gz 1373 BLAKE2B d1e7d69aa98685fd6a77274a52302b9aa9b7614a1363f272209620ebd4f267062c4c7d5964c4f48a4d5a87571f02616a0b3bdbd834916f4821d271fa6257bd68 SHA512 9fa3eb964e5a543d4f38293245a8ef7f585c5ead94dd0fbc028fca5c954401eafb11e3d18a60a12baa82d3cedce871271b8320d65996f0b00021804c00da0dbb
-EBUILD yesod-json-1.1.2.2.ebuild 1156 BLAKE2B 639e2227a9b5cdbffb85c4f0fbd6747a859c7d472ef4b79a12deec4de25f69d7c019e9f2bfc366214a89b8545de848fd794e49d43418428de9d19ec09d0b85ab SHA512 28e09ec439316656796fcb99ed027ff4262a0fc1719fffdba361618fad57bd6b62c898f834d88debe5d98b81e1003d0b41c188ccbd737645df587532b33acd54
-EBUILD yesod-json-1.2.0.ebuild 604 BLAKE2B efa6a139ac0f6f014acba1baa690cdd7a7f11e8d6f5f9dfd2e378bfeb492956eed04514a8ea96e98cf89cd7fd4988d8d25b420ca79c291a8942e3ade07130dc7 SHA512 ceed0ab4ab592d40942df0bd3554ebee432375feb6d9396a85fc940df4cd29d29e326cf98dc8e20f98ccbeac59c89f5da2b78b230735a52c2f60c28bca6317ca
-MISC metadata.xml 342 BLAKE2B e6d0b6288199ce5fb8c449a477bd86464721b50606f0cb1e126930b6285df9fd7771ae1b84463fa1867e8e91fd218037d1fa57981df9579d6ef7346292488d79 SHA512 9ce57dd7b85d81330b4c2e6583530853cf8f2e7982309af25e39887c65f4567f516cb94976dd1a565ff54a7c5f2728e1dd0c7a020a6211559a0f4b2559bdcfc5
diff --git a/dev-haskell/yesod-json/metadata.xml b/dev-haskell/yesod-json/metadata.xml
deleted file mode 100644
index ee87ffcd4335..000000000000
--- a/dev-haskell/yesod-json/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Generate content for Yesod using the aeson package.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/yesod-json/yesod-json-1.1.2.2.ebuild b/dev-haskell/yesod-json/yesod-json-1.1.2.2.ebuild
deleted file mode 100644
index 5a50b662d84d..000000000000
--- a/dev-haskell/yesod-json/yesod-json-1.1.2.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Generate content for Yesod using the aeson package"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-		>=dev-haskell/attoparsec-conduit-0.5:=[profile?]
-		dev-haskell/blaze-builder:=[profile?]
-		>=dev-haskell/conduit-0.5:=[profile?]
-		>=dev-haskell/safe-0.2:=[profile?]
-		>=dev-haskell/shakespeare-js-1.0:=[profile?]
-		>=dev-haskell/text-0.8:=[profile?]
-		>=dev-haskell/transformers-0.2.2:=[profile?]
-		>=dev-haskell/vector-0.9:=[profile?]
-		>=dev-haskell/wai-1.3:=[profile?]
-		>=dev-haskell/wai-extra-1.3:=[profile?]
-		>=dev-haskell/yesod-core-1.1:=[profile?]
-		>=dev-haskell/yesod-routes-1.1:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/hspec
-			dev-haskell/wai-test
-		)"
diff --git a/dev-haskell/yesod-json/yesod-json-1.2.0.ebuild b/dev-haskell/yesod-json/yesod-json-1.2.0.ebuild
deleted file mode 100644
index bb2deda0286e..000000000000
--- a/dev-haskell/yesod-json/yesod-json-1.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate content for Yesod using the aeson package. (deprecated)"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/yesod-core-1.2:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/yesod-persistent-1.4.0.5 b/dev-haskell/yesod-persistent-1.4.0.5
new file mode 100644
index 000000000000..8499b71774a9
--- /dev/null
+++ b/dev-haskell/yesod-persistent-1.4.0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/conduit:=[profile?] >=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.6:=[profile?] >=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.6:=[profile?] dev-haskell/resource-pool:=[profile?] >=dev-haskell/resourcet-0.4.5:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/yesod-core-1.4.0:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hspec dev-haskell/persistent-sqlite dev-haskell/text dev-haskell/wai-extra ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Some helpers for using Persistent from Yesod
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/conduit:=[profile?] >=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.6:=[profile?] >=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.6:=[profile?] dev-haskell/resource-pool:=[profile?] >=dev-haskell/resourcet-0.4.5:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/yesod-core-1.4.0:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.4.0.5
+SRC_URI=mirror://hackage/packages/archive/yesod-persistent/1.4.0.5/yesod-persistent-1.4.0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=235ff40569996590c9e9406e3476f85e
diff --git a/dev-haskell/yesod-persistent-1.4.0.6 b/dev-haskell/yesod-persistent-1.4.0.6
new file mode 100644
index 000000000000..08a8ccd94bd1
--- /dev/null
+++ b/dev-haskell/yesod-persistent-1.4.0.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/conduit:=[profile?] >=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.7:=[profile?] >=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.7:=[profile?] dev-haskell/resource-pool:=[profile?] >=dev-haskell/resourcet-0.4.5:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/yesod-core-1.4.0:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hspec dev-haskell/persistent-sqlite dev-haskell/text dev-haskell/wai-extra ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Some helpers for using Persistent from Yesod
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/conduit:=[profile?] >=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.7:=[profile?] >=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.7:=[profile?] dev-haskell/resource-pool:=[profile?] >=dev-haskell/resourcet-0.4.5:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/yesod-core-1.4.0:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.4.0.6
+SRC_URI=mirror://hackage/packages/archive/yesod-persistent/1.4.0.6/yesod-persistent-1.4.0.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d81f64c6a566d7146ca2680790d6ef67
diff --git a/dev-haskell/yesod-persistent-1.4.1.1 b/dev-haskell/yesod-persistent-1.4.1.1
new file mode 100644
index 000000000000..5148a52346fe
--- /dev/null
+++ b/dev-haskell/yesod-persistent-1.4.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/conduit:=[profile?] >=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.7:=[profile?] >=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.7:=[profile?] dev-haskell/resource-pool:=[profile?] >=dev-haskell/resourcet-0.4.5:=[profile?] >=dev-haskell/yesod-core-1.4.0:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec dev-haskell/persistent-sqlite dev-haskell/text dev-haskell/wai-extra ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Some helpers for using Persistent from Yesod
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/conduit:=[profile?] >=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.7:=[profile?] >=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.7:=[profile?] dev-haskell/resource-pool:=[profile?] >=dev-haskell/resourcet-0.4.5:=[profile?] >=dev-haskell/yesod-core-1.4.0:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.4.1.1
+SRC_URI=mirror://hackage/packages/archive/yesod-persistent/1.4.1.1/yesod-persistent-1.4.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=93f7ec42e72399bb6deb9352d12dfcf7
diff --git a/dev-haskell/yesod-persistent/Manifest b/dev-haskell/yesod-persistent/Manifest
deleted file mode 100644
index e1ffef4994ce..000000000000
--- a/dev-haskell/yesod-persistent/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST yesod-persistent-1.4.0.5.tar.gz 4375 BLAKE2B 805d7a92af3183a7dbe47f836162bfc6c39c9fe65e40681cac949fe89b0a54dcbf9a41582f4f077d32570b4b5978073330c72087a62f9a3337e528aa12f96cd8 SHA512 867e252e7c511da5b4adaaebb22f53fcf657a588c43be456d8415157e49caa8e51b40fb875bf93834cf93c353c5d9f8455eff911636a13245c0725617ad52eb1
-DIST yesod-persistent-1.4.0.6.tar.gz 4401 BLAKE2B 7fe7900bee5ee3925b9a9c0d557e46a482c9fe40ac1a4669767ee52921ebf0c5d76a5b4e7957ccf9baf1938cf3955ce72ede4d822c056c86f5717d9e3eece858 SHA512 36f949ad6e2740ee3f9e3d198e4e8641b8349f41d1ebb4a958892df638a966b98cffb2579d3d08dae30baffd385aaba93364864736db973ce74174eb2062f64e
-DIST yesod-persistent-1.4.1.1.tar.gz 4893 BLAKE2B 5760256a7dcba44df192e47df3dfc0f4cd8691dd4a48def527e21c29e9111e644aef7a2be089cab44227248167c382b07b4217c8a3ba16bb470830e16c00d120 SHA512 e808d9266299d5d91c8d7766af62693791654213a1c51368e4259c9fcbd16e476d17403870d1ce5dd1c8761fa09932b4e91f713af715ca8e0de63a13f48bda04
-EBUILD yesod-persistent-1.4.0.5.ebuild 1120 BLAKE2B ecfdbe5d6264da7432d43fc68d0ab2d4ec7fe69b756380965955fa9114c420d209e81f9acb09eb19768b115e6a530510fe375ea1bb6941c900e72d1344dc039f SHA512 69425a1587d0fa649c555c19b9183f26bf324fad7a7c8fbc425ca87e91404967899bb8a671d44c9140a1f8fc22ed2c909b6e15fd4ce827eac08f7d63bd204981
-EBUILD yesod-persistent-1.4.0.6.ebuild 1120 BLAKE2B 6ac5f9daadc4ba357186418046ecff7d9993932931b994239bfcd92d5246188bea3f8dbdbef6149804b5a0ab9247e595e186ccc19a9a289ac508686b966e9afe SHA512 36d850612f9b4f2cfc4dd615199d499aed7342a84a2a12cb57a0c0d1834007831ca0abb9e39d842b998f807a31859c0d138813a8d89d84d97d4c94bbedf8a38f
-EBUILD yesod-persistent-1.4.1.1.ebuild 1081 BLAKE2B c5b81762d8d753cbce6a1cbe3dc1efcf197565d70bf948bd78af33aa9211ed3fd484dcb140c182e4a63de5639f704ca7783f6155534988679a5f753bd75d52ca SHA512 18f47d3308be93774790d73a31bea6c9247f8ccd79e72507c87fd507b854cf6f082ea92ab50e28fb41718a5767cc89627d479ea25fd1df48d21772d67aafdb56
-MISC metadata.xml 336 BLAKE2B cf7088ea5c8be53cf5697864cdc076a550bc1dcb8fb4535d79111ebeb50458857b3545913cdda201432d7674568a85b2cd0d664a0cadbc7b82253ab4461e599a SHA512 f8aa6254ff93489376ed82468a74bafaba158d2f90e0ba2dac473324d9a222ac71bb5e3ff9128f283310fb6834625b5a17dbb11c8439bd1f2168f6f9f2b9ee61
diff --git a/dev-haskell/yesod-persistent/metadata.xml b/dev-haskell/yesod-persistent/metadata.xml
deleted file mode 100644
index dbc5c9243bbe..000000000000
--- a/dev-haskell/yesod-persistent/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Some helpers for using Persistent from Yesod.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/yesod-persistent/yesod-persistent-1.4.0.5.ebuild b/dev-haskell/yesod-persistent/yesod-persistent-1.4.0.5.ebuild
deleted file mode 100644
index d11c416515f2..000000000000
--- a/dev-haskell/yesod-persistent/yesod-persistent-1.4.0.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Some helpers for using Persistent from Yesod"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.6:=[profile?]
-	>=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.6:=[profile?]
-	dev-haskell/resource-pool:=[profile?]
-	>=dev-haskell/resourcet-0.4.5:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/yesod-core-1.4.0:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec
-		dev-haskell/persistent-sqlite
-		dev-haskell/text
-		dev-haskell/wai-extra )
-"
diff --git a/dev-haskell/yesod-persistent/yesod-persistent-1.4.0.6.ebuild b/dev-haskell/yesod-persistent/yesod-persistent-1.4.0.6.ebuild
deleted file mode 100644
index 39c1615b6885..000000000000
--- a/dev-haskell/yesod-persistent/yesod-persistent-1.4.0.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Some helpers for using Persistent from Yesod"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.7:=[profile?]
-	>=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.7:=[profile?]
-	dev-haskell/resource-pool:=[profile?]
-	>=dev-haskell/resourcet-0.4.5:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/yesod-core-1.4.0:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec
-		dev-haskell/persistent-sqlite
-		dev-haskell/text
-		dev-haskell/wai-extra )
-"
diff --git a/dev-haskell/yesod-persistent/yesod-persistent-1.4.1.1.ebuild b/dev-haskell/yesod-persistent/yesod-persistent-1.4.1.1.ebuild
deleted file mode 100644
index d2d1d73c6511..000000000000
--- a/dev-haskell/yesod-persistent/yesod-persistent-1.4.1.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Some helpers for using Persistent from Yesod"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.7:=[profile?]
-	>=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.7:=[profile?]
-	dev-haskell/resource-pool:=[profile?]
-	>=dev-haskell/resourcet-0.4.5:=[profile?]
-	>=dev-haskell/yesod-core-1.4.0:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec
-		dev-haskell/persistent-sqlite
-		dev-haskell/text
-		dev-haskell/wai-extra )
-"
diff --git a/dev-haskell/yesod-platform-1.2.13.3 b/dev-haskell/yesod-platform-1.2.13.3
new file mode 100644
index 000000000000..81b35f7dfc64
--- /dev/null
+++ b/dev-haskell/yesod-platform-1.2.13.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.6.1.1:=[profile?] >=dev-haskell/ansi-wl-pprint-0.6.7.1:=[profile?] >=dev-haskell/asn1-encoding-0.8.1.3:=[profile?] >=dev-haskell/asn1-parse-0.8.1:=[profile?] >=dev-haskell/asn1-types-0.2.3:=[profile?] >=dev-haskell/attoparsec-conduit-1.1.0:=[profile?] >=dev-haskell/authenticate-1.3.2.10:=[profile?] >=dev-haskell/auto-update-0.1.0.0:=[profile?] >=dev-haskell/base16-bytestring-0.1.1.6:=[profile?] >=dev-haskell/base64-bytestring-1.0.0.1:=[profile?] >=dev-haskell/blaze-builder-0.3.3.2:=[profile?] >=dev-haskell/blaze-builder-conduit-1.1.0:=[profile?] >=dev-haskell/blaze-html-0.7.0.2:=[profile?] >=dev-haskell/blaze-markup-0.6.1.0:=[profile?] >=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/byteorder-1.0.4:=[profile?] >=dev-haskell/cereal-0.4.0.1:=[profile?] >=dev-haskell/cipher-aes-0.2.8:=[profile?] >=dev-haskell/cipher-des-0.0.6:=[profile?] >=dev-haskell/cipher-rc4-0.1.4:=[profile?] >=dev-haskell/clientsession-0.9.0.3:=[profile?] >=dev-haskell/conduit-1.1.7:=[profile?] >=dev-haskell/conduit-extra-1.1.3:=[profile?] >=dev-haskell/connection-0.2.3:=[profile?] >=dev-haskell/cookie-0.4.1.2:=[profile?] >=dev-haskell/cprng-aes-0.5.2:=[profile?] >=dev-haskell/crypto-api-0.13:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.9:=[profile?] >=dev-haskell/crypto-numbers-0.2.3:=[profile?] >=dev-haskell/crypto-pubkey-0.2.4:=[profile?] >=dev-haskell/crypto-pubkey-types-0.4.2.2:=[profile?] >=dev-haskell/crypto-random-0.0.7:=[profile?] >=dev-haskell/cryptohash-0.11.6:=[profile?] >=dev-haskell/cryptohash-conduit-0.1.1:=[profile?] >=dev-haskell/css-text-0.1.2.1:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] >=dev-haskell/data-default-instances-base-0.0.1:=[profile?] >=dev-haskell/data-default-instances-containers-0.0.1:=[profile?] >=dev-haskell/data-default-instances-dlist-0.0.1:=[profile?] >=dev-haskell/data-default-instances-old-locale-0.0.1:=[profile?] >=dev-haskell/dlist-0.7.1:=[profile?] >=dev-haskell/email-validate-2.0.1:=[profile?] >=dev-haskell/entropy-0.3.2:=[profile?] >=dev-haskell/esqueleto-1.4.4:=[profile?] >=dev-haskell/exceptions-0.6.1:=[profile?] >=dev-haskell/fast-logger-2.2.0:=[profile?] >=dev-haskell/file-embed-0.0.7:=[profile?] >=dev-haskell/hamlet-1.2.0:=[profile?] >=dev-haskell/hjsmin-0.1.4.7:=[profile?] >=dev-haskell/hspec-1.11.0:=[profile?] >=dev-haskell/hspec-expectations-0.6.0.1:=[profile?] >=dev-haskell/html-conduit-1.1.0.5:=[profile?] >=dev-haskell/http-client-0.3.7.1:=[profile?] >=dev-haskell/http-client-tls-0.2.2:=[profile?] >=dev-haskell/http-conduit-2.1.4:=[profile?] >=dev-haskell/http-date-0.0.4:=[profile?] >=dev-haskell/http-reverse-proxy-0.4.0.1:=[profile?] >=dev-haskell/http-types-0.8.5:=[profile?] >=dev-haskell/language-javascript-0.5.13:=[profile?] >=dev-haskell/lifted-base-0.2.3.0:=[profile?] >=dev-haskell/mime-mail-0.4.5.2:=[profile?] >=dev-haskell/mime-types-0.1.0.4:=[profile?] >=dev-haskell/mmorph-1.0.3:=[profile?] >=dev-haskell/monad-control-0.3.3.0:=[profile?] >=dev-haskell/monad-logger-0.3.7.1:=[profile?] >=dev-haskell/monad-loops-0.4.2.1:=[profile?] >=dev-haskell/nats-0.2:=[profile?] >=dev-haskell/network-conduit-1.1.0:=[profile?] >=dev-haskell/optparse-applicative-0.9.1.1:=[profile?] >=dev-haskell/path-pieces-0.1.4:=[profile?] >=dev-haskell/pem-0.2.2:=[profile?] >=dev-haskell/persistent-1.3.3:=[profile?] >=dev-haskell/persistent-template-1.3.2.2:=[profile?] >=dev-haskell/publicsuffixlist-0.1:=[profile?] >=dev-haskell/pwstore-fast-2.4.1:=[profile?] >=dev-haskell/quickcheck-io-0.1.1:=[profile?] >=dev-haskell/resource-pool-0.2.3.0:=[profile?] >=dev-haskell/resourcet-1.1.2.3:=[profile?] >=dev-haskell/safe-0.3.7:=[profile?] >=dev-haskell/securemem-0.1.3:=[profile?] >=dev-haskell/semigroups-0.15.2:=[profile?] >=dev-haskell/setenv-0.1.1.1:=[profile?] >=dev-haskell/sha-1.6.4.1:=[profile?] >=dev-haskell/shakespeare-2.0.1.1:=[profile?] >=dev-haskell/shakespeare-css-1.1.0:=[profile?] >=dev-haskell/shakespeare-i18n-1.1.0:=[profile?] >=dev-haskell/shakespeare-js-1.3.0:=[profile?] >=dev-haskell/shakespeare-text-1.1.0:=[profile?] >=dev-haskell/silently-1.2.4.1:=[profile?] >=dev-haskell/simple-sendfile-0.2.15:=[profile?] >=dev-haskell/skein-1.0.9:=[profile?] >=dev-haskell/socks-0.5.4:=[profile?] >=dev-haskell/stm-chans-3.0.0.2:=[profile?] >=dev-haskell/streaming-commons-0.1.4.1:=[profile?] >=dev-haskell/stringsearch-0.3.6.5:=[profile?] >=dev-haskell/system-fileio-0.3.14:=[profile?] >=dev-haskell/system-filepath-0.4.12:=[profile?] >=dev-haskell/tagged-0.7.2:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] >=dev-haskell/tagstream-conduit-0.5.5.1:=[profile?] >=dev-haskell/tf-random-0.5:=[profile?] >=dev-haskell/tls-1.2.8:=[profile?] >=dev-haskell/transformers-base-0.4.2:=[profile?] >=dev-haskell/utf8-string-0.3.8:=[profile?] >=dev-haskell/void-0.6.1:=[profile?] >=dev-haskell/wai-3.0.1.1:=[profile?] >=dev-haskell/wai-app-static-3.0.0:=[profile?] >=dev-haskell/wai-extra-3.0.1.2:=[profile?] >=dev-haskell/wai-logger-2.2.0:=[profile?] >=dev-haskell/wai-test-3.0.0:=[profile?] >=dev-haskell/warp-3.0.0.5:=[profile?] >=dev-haskell/warp-tls-3.0.0:=[profile?] >=dev-haskell/word8-0.1.1:=[profile?] >=dev-haskell/x509-1.4.11:=[profile?] >=dev-haskell/x509-store-1.4.4:=[profile?] >=dev-haskell/x509-system-1.4.5:=[profile?] >=dev-haskell/x509-validation-1.5.0:=[profile?] >=dev-haskell/xml-conduit-1.2.1:=[profile?] >=dev-haskell/xml-types-0.3.4:=[profile?] >=dev-haskell/xss-sanitize-0.3.5.3:=[profile?] >=dev-haskell/yaml-0.8.8.4:=[profile?] >=dev-haskell/yesod-1.2.6.1:=[profile?] >=dev-haskell/yesod-auth-1.3.4.1:=[profile?] >=dev-haskell/yesod-auth-hashdb-1.3.0.1:=[profile?] >=dev-haskell/yesod-core-1.2.19:=[profile?] >=dev-haskell/yesod-form-1.3.15.1:=[profile?] >=dev-haskell/yesod-persistent-1.2.3:=[profile?] >=dev-haskell/yesod-routes-1.2.0.7:=[profile?] >=dev-haskell/yesod-static-1.2.4:=[profile?] >=dev-haskell/yesod-test-1.2.3.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Meta package for Yesod (deprecated)
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/ansi-terminal-0.6.1.1:=[profile?] >=dev-haskell/ansi-wl-pprint-0.6.7.1:=[profile?] >=dev-haskell/asn1-encoding-0.8.1.3:=[profile?] >=dev-haskell/asn1-parse-0.8.1:=[profile?] >=dev-haskell/asn1-types-0.2.3:=[profile?] >=dev-haskell/attoparsec-conduit-1.1.0:=[profile?] >=dev-haskell/authenticate-1.3.2.10:=[profile?] >=dev-haskell/auto-update-0.1.0.0:=[profile?] >=dev-haskell/base16-bytestring-0.1.1.6:=[profile?] >=dev-haskell/base64-bytestring-1.0.0.1:=[profile?] >=dev-haskell/blaze-builder-0.3.3.2:=[profile?] >=dev-haskell/blaze-builder-conduit-1.1.0:=[profile?] >=dev-haskell/blaze-html-0.7.0.2:=[profile?] >=dev-haskell/blaze-markup-0.6.1.0:=[profile?] >=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/byteorder-1.0.4:=[profile?] >=dev-haskell/cereal-0.4.0.1:=[profile?] >=dev-haskell/cipher-aes-0.2.8:=[profile?] >=dev-haskell/cipher-des-0.0.6:=[profile?] >=dev-haskell/cipher-rc4-0.1.4:=[profile?] >=dev-haskell/clientsession-0.9.0.3:=[profile?] >=dev-haskell/conduit-1.1.7:=[profile?] >=dev-haskell/conduit-extra-1.1.3:=[profile?] >=dev-haskell/connection-0.2.3:=[profile?] >=dev-haskell/cookie-0.4.1.2:=[profile?] >=dev-haskell/cprng-aes-0.5.2:=[profile?] >=dev-haskell/crypto-api-0.13:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.9:=[profile?] >=dev-haskell/crypto-numbers-0.2.3:=[profile?] >=dev-haskell/crypto-pubkey-0.2.4:=[profile?] >=dev-haskell/crypto-pubkey-types-0.4.2.2:=[profile?] >=dev-haskell/crypto-random-0.0.7:=[profile?] >=dev-haskell/cryptohash-0.11.6:=[profile?] >=dev-haskell/cryptohash-conduit-0.1.1:=[profile?] >=dev-haskell/css-text-0.1.2.1:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] >=dev-haskell/data-default-instances-base-0.0.1:=[profile?] >=dev-haskell/data-default-instances-containers-0.0.1:=[profile?] >=dev-haskell/data-default-instances-dlist-0.0.1:=[profile?] >=dev-haskell/data-default-instances-old-locale-0.0.1:=[profile?] >=dev-haskell/dlist-0.7.1:=[profile?] >=dev-haskell/email-validate-2.0.1:=[profile?] >=dev-haskell/entropy-0.3.2:=[profile?] >=dev-haskell/esqueleto-1.4.4:=[profile?] >=dev-haskell/exceptions-0.6.1:=[profile?] >=dev-haskell/fast-logger-2.2.0:=[profile?] >=dev-haskell/file-embed-0.0.7:=[profile?] >=dev-haskell/hamlet-1.2.0:=[profile?] >=dev-haskell/hjsmin-0.1.4.7:=[profile?] >=dev-haskell/hspec-1.11.0:=[profile?] >=dev-haskell/hspec-expectations-0.6.0.1:=[profile?] >=dev-haskell/html-conduit-1.1.0.5:=[profile?] >=dev-haskell/http-client-0.3.7.1:=[profile?] >=dev-haskell/http-client-tls-0.2.2:=[profile?] >=dev-haskell/http-conduit-2.1.4:=[profile?] >=dev-haskell/http-date-0.0.4:=[profile?] >=dev-haskell/http-reverse-proxy-0.4.0.1:=[profile?] >=dev-haskell/http-types-0.8.5:=[profile?] >=dev-haskell/language-javascript-0.5.13:=[profile?] >=dev-haskell/lifted-base-0.2.3.0:=[profile?] >=dev-haskell/mime-mail-0.4.5.2:=[profile?] >=dev-haskell/mime-types-0.1.0.4:=[profile?] >=dev-haskell/mmorph-1.0.3:=[profile?] >=dev-haskell/monad-control-0.3.3.0:=[profile?] >=dev-haskell/monad-logger-0.3.7.1:=[profile?] >=dev-haskell/monad-loops-0.4.2.1:=[profile?] >=dev-haskell/nats-0.2:=[profile?] >=dev-haskell/network-conduit-1.1.0:=[profile?] >=dev-haskell/optparse-applicative-0.9.1.1:=[profile?] >=dev-haskell/path-pieces-0.1.4:=[profile?] >=dev-haskell/pem-0.2.2:=[profile?] >=dev-haskell/persistent-1.3.3:=[profile?] >=dev-haskell/persistent-template-1.3.2.2:=[profile?] >=dev-haskell/publicsuffixlist-0.1:=[profile?] >=dev-haskell/pwstore-fast-2.4.1:=[profile?] >=dev-haskell/quickcheck-io-0.1.1:=[profile?] >=dev-haskell/resource-pool-0.2.3.0:=[profile?] >=dev-haskell/resourcet-1.1.2.3:=[profile?] >=dev-haskell/safe-0.3.7:=[profile?] >=dev-haskell/securemem-0.1.3:=[profile?] >=dev-haskell/semigroups-0.15.2:=[profile?] >=dev-haskell/setenv-0.1.1.1:=[profile?] >=dev-haskell/sha-1.6.4.1:=[profile?] >=dev-haskell/shakespeare-2.0.1.1:=[profile?] >=dev-haskell/shakespeare-css-1.1.0:=[profile?] >=dev-haskell/shakespeare-i18n-1.1.0:=[profile?] >=dev-haskell/shakespeare-js-1.3.0:=[profile?] >=dev-haskell/shakespeare-text-1.1.0:=[profile?] >=dev-haskell/silently-1.2.4.1:=[profile?] >=dev-haskell/simple-sendfile-0.2.15:=[profile?] >=dev-haskell/skein-1.0.9:=[profile?] >=dev-haskell/socks-0.5.4:=[profile?] >=dev-haskell/stm-chans-3.0.0.2:=[profile?] >=dev-haskell/streaming-commons-0.1.4.1:=[profile?] >=dev-haskell/stringsearch-0.3.6.5:=[profile?] >=dev-haskell/system-fileio-0.3.14:=[profile?] >=dev-haskell/system-filepath-0.4.12:=[profile?] >=dev-haskell/tagged-0.7.2:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] >=dev-haskell/tagstream-conduit-0.5.5.1:=[profile?] >=dev-haskell/tf-random-0.5:=[profile?] >=dev-haskell/tls-1.2.8:=[profile?] >=dev-haskell/transformers-base-0.4.2:=[profile?] >=dev-haskell/utf8-string-0.3.8:=[profile?] >=dev-haskell/void-0.6.1:=[profile?] >=dev-haskell/wai-3.0.1.1:=[profile?] >=dev-haskell/wai-app-static-3.0.0:=[profile?] >=dev-haskell/wai-extra-3.0.1.2:=[profile?] >=dev-haskell/wai-logger-2.2.0:=[profile?] >=dev-haskell/wai-test-3.0.0:=[profile?] >=dev-haskell/warp-3.0.0.5:=[profile?] >=dev-haskell/warp-tls-3.0.0:=[profile?] >=dev-haskell/word8-0.1.1:=[profile?] >=dev-haskell/x509-1.4.11:=[profile?] >=dev-haskell/x509-store-1.4.4:=[profile?] >=dev-haskell/x509-system-1.4.5:=[profile?] >=dev-haskell/x509-validation-1.5.0:=[profile?] >=dev-haskell/xml-conduit-1.2.1:=[profile?] >=dev-haskell/xml-types-0.3.4:=[profile?] >=dev-haskell/xss-sanitize-0.3.5.3:=[profile?] >=dev-haskell/yaml-0.8.8.4:=[profile?] >=dev-haskell/yesod-1.2.6.1:=[profile?] >=dev-haskell/yesod-auth-1.3.4.1:=[profile?] >=dev-haskell/yesod-auth-hashdb-1.3.0.1:=[profile?] >=dev-haskell/yesod-core-1.2.19:=[profile?] >=dev-haskell/yesod-form-1.3.15.1:=[profile?] >=dev-haskell/yesod-persistent-1.2.3:=[profile?] >=dev-haskell/yesod-routes-1.2.0.7:=[profile?] >=dev-haskell/yesod-static-1.2.4:=[profile?] >=dev-haskell/yesod-test-1.2.3.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.13.3
+SRC_URI=mirror://hackage/packages/archive/yesod-platform/1.2.13.3/yesod-platform-1.2.13.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dae100cdc81c95d7807e373ea102eb0f
diff --git a/dev-haskell/yesod-platform/Manifest b/dev-haskell/yesod-platform/Manifest
deleted file mode 100644
index 4cb4f4b58f64..000000000000
--- a/dev-haskell/yesod-platform/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST yesod-platform-1.2.13.3.tar.gz 2730 BLAKE2B 77dc083346d1223593d870cbcf978fb33ef7ff6479cb6b53b139b32a3aa270207215b0c6a2b6d4885169a373fe0198b3374e31d0a0dd45c0a19842d22991eafa SHA512 4049d39eb781d909cab7933e0eea0cf6108ebcb1e964fdc1b168fbaa7bf5da557b34d8e7e662ee91fa3f00de650b12bf19d27546981c2718b2c9c09d3221699a
-EBUILD yesod-platform-1.2.13.3.ebuild 6657 BLAKE2B 943cf63ba8c08f088ce2689a9578d1b98555389aaaec8ce7ec6db738b3d3081e510feea2fb84b6697b4edaa59dd19e1c79ef193ea16b50de25fc26feb320d243 SHA512 6b34a9a54d765af196c3895fdcee420b1f975faa6bc0a1d5f99cd4e84891fea6861d26020009d969c28a069c35db6364b79d194d7d789a25012ac29af2ebe131
-MISC metadata.xml 407 BLAKE2B af8f6391b6f8dd550839a875e385e11db6c5cdc49c2c94c0e7cb3cc03ed28fe24b9eaeff4d5f2d3f4d5c5d63071b8eab4bfa35c8170653f89febd595937ba6b1 SHA512 df8978f0a56ca22ec70b2b45d18eb87df8734ecadc02ac39ddea812eec6f9cbe3d94604f6bebb35caf2443180253dc130756f13c9c488a969bffb193c0e330a1
diff --git a/dev-haskell/yesod-platform/metadata.xml b/dev-haskell/yesod-platform/metadata.xml
deleted file mode 100644
index 9d35a301e8dc..000000000000
--- a/dev-haskell/yesod-platform/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Instead of allowing version ranges of dependencies, this package requires specific versions to avoid dependency hell
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/yesod-platform/yesod-platform-1.2.13.3.ebuild b/dev-haskell/yesod-platform/yesod-platform-1.2.13.3.ebuild
deleted file mode 100644
index b178a9d32520..000000000000
--- a/dev-haskell/yesod-platform/yesod-platform-1.2.13.3.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Meta package for Yesod (deprecated)"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6.1.1:=[profile?]
-	>=dev-haskell/ansi-wl-pprint-0.6.7.1:=[profile?]
-	>=dev-haskell/asn1-encoding-0.8.1.3:=[profile?]
-	>=dev-haskell/asn1-parse-0.8.1:=[profile?]
-	>=dev-haskell/asn1-types-0.2.3:=[profile?]
-	>=dev-haskell/attoparsec-conduit-1.1.0:=[profile?]
-	>=dev-haskell/authenticate-1.3.2.10:=[profile?]
-	>=dev-haskell/auto-update-0.1.0.0:=[profile?]
-	>=dev-haskell/base16-bytestring-0.1.1.6:=[profile?]
-	>=dev-haskell/base64-bytestring-1.0.0.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.3.3.2:=[profile?]
-	>=dev-haskell/blaze-builder-conduit-1.1.0:=[profile?]
-	>=dev-haskell/blaze-html-0.7.0.2:=[profile?]
-	>=dev-haskell/blaze-markup-0.6.1.0:=[profile?]
-	>=dev-haskell/byteable-0.1.1:=[profile?]
-	>=dev-haskell/byteorder-1.0.4:=[profile?]
-	>=dev-haskell/cereal-0.4.0.1:=[profile?]
-	>=dev-haskell/cipher-aes-0.2.8:=[profile?]
-	>=dev-haskell/cipher-des-0.0.6:=[profile?]
-	>=dev-haskell/cipher-rc4-0.1.4:=[profile?]
-	>=dev-haskell/clientsession-0.9.0.3:=[profile?]
-	>=dev-haskell/conduit-1.1.7:=[profile?]
-	>=dev-haskell/conduit-extra-1.1.3:=[profile?]
-	>=dev-haskell/connection-0.2.3:=[profile?]
-	>=dev-haskell/cookie-0.4.1.2:=[profile?]
-	>=dev-haskell/cprng-aes-0.5.2:=[profile?]
-	>=dev-haskell/crypto-api-0.13:=[profile?]
-	>=dev-haskell/crypto-cipher-types-0.0.9:=[profile?]
-	>=dev-haskell/crypto-numbers-0.2.3:=[profile?]
-	>=dev-haskell/crypto-pubkey-0.2.4:=[profile?]
-	>=dev-haskell/crypto-pubkey-types-0.4.2.2:=[profile?]
-	>=dev-haskell/crypto-random-0.0.7:=[profile?]
-	>=dev-haskell/cryptohash-0.11.6:=[profile?]
-	>=dev-haskell/cryptohash-conduit-0.1.1:=[profile?]
-	>=dev-haskell/css-text-0.1.2.1:=[profile?]
-	>=dev-haskell/data-default-0.5.3:=[profile?]
-	>=dev-haskell/data-default-class-0.0.1:=[profile?]
-	>=dev-haskell/data-default-instances-base-0.0.1:=[profile?]
-	>=dev-haskell/data-default-instances-containers-0.0.1:=[profile?]
-	>=dev-haskell/data-default-instances-dlist-0.0.1:=[profile?]
-	>=dev-haskell/data-default-instances-old-locale-0.0.1:=[profile?]
-	>=dev-haskell/dlist-0.7.1:=[profile?]
-	>=dev-haskell/email-validate-2.0.1:=[profile?]
-	>=dev-haskell/entropy-0.3.2:=[profile?]
-	>=dev-haskell/esqueleto-1.4.4:=[profile?]
-	>=dev-haskell/exceptions-0.6.1:=[profile?]
-	>=dev-haskell/fast-logger-2.2.0:=[profile?]
-	>=dev-haskell/file-embed-0.0.7:=[profile?]
-	>=dev-haskell/hamlet-1.2.0:=[profile?]
-	>=dev-haskell/hjsmin-0.1.4.7:=[profile?]
-	>=dev-haskell/hspec-1.11.0:=[profile?]
-	>=dev-haskell/hspec-expectations-0.6.0.1:=[profile?]
-	>=dev-haskell/html-conduit-1.1.0.5:=[profile?]
-	>=dev-haskell/http-client-0.3.7.1:=[profile?]
-	>=dev-haskell/http-client-tls-0.2.2:=[profile?]
-	>=dev-haskell/http-conduit-2.1.4:=[profile?]
-	>=dev-haskell/http-date-0.0.4:=[profile?]
-	>=dev-haskell/http-reverse-proxy-0.4.0.1:=[profile?]
-	>=dev-haskell/http-types-0.8.5:=[profile?]
-	>=dev-haskell/language-javascript-0.5.13:=[profile?]
-	>=dev-haskell/lifted-base-0.2.3.0:=[profile?]
-	>=dev-haskell/mime-mail-0.4.5.2:=[profile?]
-	>=dev-haskell/mime-types-0.1.0.4:=[profile?]
-	>=dev-haskell/mmorph-1.0.3:=[profile?]
-	>=dev-haskell/monad-control-0.3.3.0:=[profile?]
-	>=dev-haskell/monad-logger-0.3.7.1:=[profile?]
-	>=dev-haskell/monad-loops-0.4.2.1:=[profile?]
-	>=dev-haskell/nats-0.2:=[profile?]
-	>=dev-haskell/network-conduit-1.1.0:=[profile?]
-	>=dev-haskell/optparse-applicative-0.9.1.1:=[profile?]
-	>=dev-haskell/path-pieces-0.1.4:=[profile?]
-	>=dev-haskell/pem-0.2.2:=[profile?]
-	>=dev-haskell/persistent-1.3.3:=[profile?]
-	>=dev-haskell/persistent-template-1.3.2.2:=[profile?]
-	>=dev-haskell/publicsuffixlist-0.1:=[profile?]
-	>=dev-haskell/pwstore-fast-2.4.1:=[profile?]
-	>=dev-haskell/quickcheck-io-0.1.1:=[profile?]
-	>=dev-haskell/resource-pool-0.2.3.0:=[profile?]
-	>=dev-haskell/resourcet-1.1.2.3:=[profile?]
-	>=dev-haskell/safe-0.3.7:=[profile?]
-	>=dev-haskell/securemem-0.1.3:=[profile?]
-	>=dev-haskell/semigroups-0.15.2:=[profile?]
-	>=dev-haskell/setenv-0.1.1.1:=[profile?]
-	>=dev-haskell/sha-1.6.4.1:=[profile?]
-	>=dev-haskell/shakespeare-2.0.1.1:=[profile?]
-	>=dev-haskell/shakespeare-css-1.1.0:=[profile?]
-	>=dev-haskell/shakespeare-i18n-1.1.0:=[profile?]
-	>=dev-haskell/shakespeare-js-1.3.0:=[profile?]
-	>=dev-haskell/shakespeare-text-1.1.0:=[profile?]
-	>=dev-haskell/silently-1.2.4.1:=[profile?]
-	>=dev-haskell/simple-sendfile-0.2.15:=[profile?]
-	>=dev-haskell/skein-1.0.9:=[profile?]
-	>=dev-haskell/socks-0.5.4:=[profile?]
-	>=dev-haskell/stm-chans-3.0.0.2:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.4.1:=[profile?]
-	>=dev-haskell/stringsearch-0.3.6.5:=[profile?]
-	>=dev-haskell/system-fileio-0.3.14:=[profile?]
-	>=dev-haskell/system-filepath-0.4.12:=[profile?]
-	>=dev-haskell/tagged-0.7.2:=[profile?]
-	>=dev-haskell/tagsoup-0.13.1:=[profile?]
-	>=dev-haskell/tagstream-conduit-0.5.5.1:=[profile?]
-	>=dev-haskell/tf-random-0.5:=[profile?]
-	>=dev-haskell/tls-1.2.8:=[profile?]
-	>=dev-haskell/transformers-base-0.4.2:=[profile?]
-	>=dev-haskell/utf8-string-0.3.8:=[profile?]
-	>=dev-haskell/void-0.6.1:=[profile?]
-	>=dev-haskell/wai-3.0.1.1:=[profile?]
-	>=dev-haskell/wai-app-static-3.0.0:=[profile?]
-	>=dev-haskell/wai-extra-3.0.1.2:=[profile?]
-	>=dev-haskell/wai-logger-2.2.0:=[profile?]
-	>=dev-haskell/wai-test-3.0.0:=[profile?]
-	>=dev-haskell/warp-3.0.0.5:=[profile?]
-	>=dev-haskell/warp-tls-3.0.0:=[profile?]
-	>=dev-haskell/word8-0.1.1:=[profile?]
-	>=dev-haskell/x509-1.4.11:=[profile?]
-	>=dev-haskell/x509-store-1.4.4:=[profile?]
-	>=dev-haskell/x509-system-1.4.5:=[profile?]
-	>=dev-haskell/x509-validation-1.5.0:=[profile?]
-	>=dev-haskell/xml-conduit-1.2.1:=[profile?]
-	>=dev-haskell/xml-types-0.3.4:=[profile?]
-	>=dev-haskell/xss-sanitize-0.3.5.3:=[profile?]
-	>=dev-haskell/yaml-0.8.8.4:=[profile?]
-	>=dev-haskell/yesod-1.2.6.1:=[profile?]
-	>=dev-haskell/yesod-auth-1.3.4.1:=[profile?]
-	>=dev-haskell/yesod-auth-hashdb-1.3.0.1:=[profile?]
-	>=dev-haskell/yesod-core-1.2.19:=[profile?]
-	>=dev-haskell/yesod-form-1.3.15.1:=[profile?]
-	>=dev-haskell/yesod-persistent-1.2.3:=[profile?]
-	>=dev-haskell/yesod-routes-1.2.0.7:=[profile?]
-	>=dev-haskell/yesod-static-1.2.4:=[profile?]
-	>=dev-haskell/yesod-test-1.2.3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		' == ' ' >= '
-}
diff --git a/dev-haskell/yesod-routes-1.1.2 b/dev-haskell/yesod-routes-1.1.2
new file mode 100644
index 000000000000..ac06cc29c2df
--- /dev/null
+++ b/dev-haskell/yesod-routes-1.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND==dev-haskell/path-pieces-0.1*:=[profile?] >=dev-haskell/text-0.5:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-lang/ghc-6.10.4:= <dev-lang/ghc-8 test? ( >=dev-haskell/hspec-1.3 =dev-haskell/hunit-1.2* ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient routing for Yesod
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND==dev-haskell/path-pieces-0.1*:=[profile?] >=dev-haskell/text-0.5:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-lang/ghc-6.10.4:= <dev-lang/ghc-8
+SLOT=0/1.1.2
+SRC_URI=mirror://hackage/packages/archive/yesod-routes/1.1.2/yesod-routes-1.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f4722834ab95cd390cdeb323330effab
diff --git a/dev-haskell/yesod-routes-1.2.0.7-r2 b/dev-haskell/yesod-routes-1.2.0.7-r2
new file mode 100644
index 000000000000..65bff295cd4d
--- /dev/null
+++ b/dev-haskell/yesod-routes-1.2.0.7-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/path-pieces-0.1:=[profile?] >=dev-haskell/text-0.5:=[profile?] >=dev-haskell/vector-0.8:=[profile?] >=dev-lang/ghc-7.4.1:= <dev-lang/ghc-8 >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 >=dev-haskell/hunit-1.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient routing for Yesod
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/path-pieces-0.1:=[profile?] >=dev-haskell/text-0.5:=[profile?] >=dev-haskell/vector-0.8:=[profile?] >=dev-lang/ghc-7.4.1:= <dev-lang/ghc-8
+SLOT=0/1.2.0.7
+SRC_URI=mirror://hackage/packages/archive/yesod-routes/1.2.0.7/yesod-routes-1.2.0.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ca01fd2913842a3fd967164102b3a0ac
diff --git a/dev-haskell/yesod-routes/Manifest b/dev-haskell/yesod-routes/Manifest
deleted file mode 100644
index 5ef416d73a35..000000000000
--- a/dev-haskell/yesod-routes/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST yesod-routes-1.1.2.tar.gz 17709 BLAKE2B 5fd3982d16529b4b79fcb802245c7aa295528d75c97d9aa0900b6d94a3b1523364b08db04c8a9c9ba687751d7683d9a94bbdda707e7602c8e4ea3119639c7222 SHA512 236dc8d53bce88b77bb832d57844a5379d0f9a1f0077c69f1e9fa24756ce411cff06eef5d66ac5bf50aa44f2211ffcbaf387bf336215df2029a982e0afdf608a
-DIST yesod-routes-1.2.0.7.tar.gz 21387 BLAKE2B 2cc3f1dd06473499df6fb12e30211a21c1a845b89c0823455aabc9f333823cf52ba438b85570286bf6c63d36620a62223f14e71ed75963e0d4b930f06bca1554 SHA512 966ba0a66b503ef8f4def2dd3b9c5b2f5a32eea3775e7daee0f58405703cd29b7b84f629490e772ddd84958c8ed0ce127abf8775af55637d670da622fb6755eb
-EBUILD yesod-routes-1.1.2.ebuild 812 BLAKE2B 1248b02699aa1f8267e45db2561f6e3493c116b49a2997572f64dd3db2b7fddbc00a46c4e2f55c237011e1cf514233150868058b2ccf68df7f7b2ecf313f2d91 SHA512 9572388e8125c96716f32f5dec5296a8853e585573788e83948787bac5c32e76372bfc20d98169453d9497c6277a2886e449fb867166cc4c26326725be9ce2c4
-EBUILD yesod-routes-1.2.0.7-r2.ebuild 1027 BLAKE2B e592407261e306d0b3b8f3748b2cc34233a6bd662226cd70329fca23d6f0e61430dd0939d5f7f2b8fafc00f5568322c040a7fd894a0f60a1117088dccd42d3c9 SHA512 9eab716982ef52614b0e858f830852cfad94828f6c3f2572f1f24eafe154aff084b168bfa81e2410c484166508ae33e6fa8dc00b1c6f727b17361617bb5c5870
-MISC metadata.xml 361 BLAKE2B b80c7da1cdbec02bfdb824ecadb69a1c22685999fd00b9d257c9ebd48baa35cbc3c4d5f38605f0bedded33a1659897b5c62aeb47a85bd4af5280aa6309c93a80 SHA512 57559fe7d6241e1f43bfb0066fa1bf93311955fa17f6e2306b69bece5d12607bb19c13ffccb9c34e519a1f5323dcc4a64475c5db4869950de44aa6d602f40e8d
diff --git a/dev-haskell/yesod-routes/metadata.xml b/dev-haskell/yesod-routes/metadata.xml
deleted file mode 100644
index 5418de0dcc8c..000000000000
--- a/dev-haskell/yesod-routes/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Provides an efficient routing system, a parser and TH code generation.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/yesod-routes/yesod-routes-1.1.2.ebuild b/dev-haskell/yesod-routes/yesod-routes-1.1.2.ebuild
deleted file mode 100644
index 655435211c2d..000000000000
--- a/dev-haskell/yesod-routes/yesod-routes-1.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient routing for Yesod"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/path-pieces-0.1*:=[profile?]
-		>=dev-haskell/text-0.5:=[profile?]
-		<dev-haskell/text-0.12:=[profile?]
-		>=dev-haskell/vector-0.8:=[profile?]
-		<dev-haskell/vector-0.11:=[profile?]
-		>=dev-lang/ghc-6.10.4:= <dev-lang/ghc-8"
-DEPEND="${RDEPEND}
-		test? ( >=dev-haskell/hspec-1.3
-			=dev-haskell/hunit-1.2*
-		)
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/yesod-routes/yesod-routes-1.2.0.7-r2.ebuild b/dev-haskell/yesod-routes/yesod-routes-1.2.0.7-r2.ebuild
deleted file mode 100644
index 20dfae0160a1..000000000000
--- a/dev-haskell/yesod-routes/yesod-routes-1.2.0.7-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient routing for Yesod"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/path-pieces-0.1:=[profile?]
-	>=dev-haskell/text-0.5:=[profile?]
-	>=dev-haskell/vector-0.8:=[profile?]
-	>=dev-lang/ghc-7.4.1:= <dev-lang/ghc-8
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/hunit-1.2 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'path-pieces               >= 0.1      && < 0.2' 'path-pieces               >= 0.1' \
-		'HUnit                     >= 1.2      && < 1.3' 'HUnit                     >= 1.2' \
-		'vector                    >= 0.8      && < 0.11' 'vector                    >= 0.8'
-}
diff --git a/dev-haskell/yesod-static-1.2.4 b/dev-haskell/yesod-static-1.2.4
new file mode 100644
index 000000000000..b9d67341f1aa
--- /dev/null
+++ b/dev-haskell/yesod-static-1.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/base64-bytestring-0.1.0.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] >=dev-haskell/cryptohash-conduit-0.1:=[profile?] >=dev-haskell/css-text-0.1.2:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] dev-haskell/hjsmin:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] >=dev-haskell/resourcet-0.4:=[profile?] >=dev-haskell/shakespeare-css-1.0.3:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4.6:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-app-static-1.3.2:=[profile?] >=dev-haskell/yesod-core-1.2:=[profile?] <dev-haskell/yesod-core-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/wai-extra dev-haskell/wai-test >=dev-haskell/yesod-test-1.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Static file serving subsite for Yesod Web Framework
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/base64-bytestring-0.1.0.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] >=dev-haskell/cryptohash-conduit-0.1:=[profile?] >=dev-haskell/css-text-0.1.2:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] dev-haskell/hjsmin:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] >=dev-haskell/resourcet-0.4:=[profile?] >=dev-haskell/shakespeare-css-1.0.3:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4.6:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-app-static-1.3.2:=[profile?] >=dev-haskell/yesod-core-1.2:=[profile?] <dev-haskell/yesod-core-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.4
+SRC_URI=mirror://hackage/packages/archive/yesod-static/1.2.4/yesod-static-1.2.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7afcbb78747a3cc0f25763e9e5b56517
diff --git a/dev-haskell/yesod-static-1.4.0.4 b/dev-haskell/yesod-static-1.4.0.4
new file mode 100644
index 000000000000..2dc5904e4753
--- /dev/null
+++ b/dev-haskell/yesod-static-1.4.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/base64-bytestring-0.1.0.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] >=dev-haskell/cryptohash-conduit-0.1:=[profile?] >=dev-haskell/css-text-0.1.2:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] dev-haskell/hjsmin:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] >=dev-haskell/resourcet-0.4:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4.6:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-app-static-1.3.2:=[profile?] >=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/wai-extra >=dev-haskell/yesod-test-1.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Static file serving subsite for Yesod Web Framework
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/base64-bytestring-0.1.0.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] >=dev-haskell/cryptohash-conduit-0.1:=[profile?] >=dev-haskell/css-text-0.1.2:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] dev-haskell/hjsmin:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] >=dev-haskell/resourcet-0.4:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4.6:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-app-static-1.3.2:=[profile?] >=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.4.0.4
+SRC_URI=mirror://hackage/packages/archive/yesod-static/1.4.0.4/yesod-static-1.4.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=aa7f3c6baaee58337d6398a067ca0987
diff --git a/dev-haskell/yesod-static-1.5.0.3 b/dev-haskell/yesod-static-1.5.0.3
new file mode 100644
index 000000000000..0c3fd76f6a33
--- /dev/null
+++ b/dev-haskell/yesod-static-1.5.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/base64-bytestring-0.1.0.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] >=dev-haskell/cryptohash-conduit-0.1:=[profile?] >=dev-haskell/css-text-0.1.2:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] dev-haskell/hjsmin:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] >=dev-haskell/old-time-1.0:=[profile?] >=dev-haskell/resourcet-0.4:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-app-static-3.1:=[profile?] >=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/wai-extra >=dev-haskell/yesod-test-1.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Static file serving subsite for Yesod Web Framework
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/base64-bytestring-0.1.0.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] >=dev-haskell/cryptohash-conduit-0.1:=[profile?] >=dev-haskell/css-text-0.1.2:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] dev-haskell/hjsmin:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] >=dev-haskell/old-time-1.0:=[profile?] >=dev-haskell/resourcet-0.4:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-app-static-3.1:=[profile?] >=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.5.0.3
+SRC_URI=mirror://hackage/packages/archive/yesod-static/1.5.0.3/yesod-static-1.5.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5ee0394c1d51c1ebcc19a74cdbfdf27d
diff --git a/dev-haskell/yesod-static-1.5.0.5 b/dev-haskell/yesod-static-1.5.0.5
new file mode 100644
index 000000000000..d58ae2179f72
--- /dev/null
+++ b/dev-haskell/yesod-static-1.5.0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/base64-bytestring-0.1.0.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] >=dev-haskell/cryptohash-conduit-0.1:=[profile?] >=dev-haskell/css-text-0.1.2:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] dev-haskell/hjsmin:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] >=dev-haskell/old-time-1.0:=[profile?] >=dev-haskell/resourcet-0.4:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-app-static-3.1:=[profile?] >=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/wai-extra >=dev-haskell/yesod-test-1.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Static file serving subsite for Yesod Web Framework
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/base64-bytestring-0.1.0.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] >=dev-haskell/cryptohash-conduit-0.1:=[profile?] >=dev-haskell/css-text-0.1.2:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] dev-haskell/hjsmin:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] >=dev-haskell/old-time-1.0:=[profile?] >=dev-haskell/resourcet-0.4:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-app-static-3.1:=[profile?] >=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.5.0.5
+SRC_URI=mirror://hackage/packages/archive/yesod-static/1.5.0.5/yesod-static-1.5.0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=aa4fd2eb15472f3943f250828abcf313
diff --git a/dev-haskell/yesod-static-1.5.1.1 b/dev-haskell/yesod-static-1.5.1.1
new file mode 100644
index 000000000000..096541106a18
--- /dev/null
+++ b/dev-haskell/yesod-static-1.5.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/base64-bytestring-0.1.0.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] >=dev-haskell/cryptohash-conduit-0.1:=[profile?] >=dev-haskell/css-text-0.1.2:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] dev-haskell/hjsmin:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] >=dev-haskell/old-time-1.0:=[profile?] >=dev-haskell/resourcet-0.4:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-app-static-3.1:=[profile?] >=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/wai-extra >=dev-haskell/yesod-test-1.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Static file serving subsite for Yesod Web Framework
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/base64-bytestring-0.1.0.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] >=dev-haskell/cryptohash-conduit-0.1:=[profile?] >=dev-haskell/css-text-0.1.2:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] dev-haskell/hjsmin:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] >=dev-haskell/old-time-1.0:=[profile?] >=dev-haskell/resourcet-0.4:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-app-static-3.1:=[profile?] >=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.5.1.1
+SRC_URI=mirror://hackage/packages/archive/yesod-static/1.5.1.1/yesod-static-1.5.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=86587b6ac9558d9fbe88dc04b9939d84
diff --git a/dev-haskell/yesod-static/Manifest b/dev-haskell/yesod-static/Manifest
deleted file mode 100644
index 854b559e7199..000000000000
--- a/dev-haskell/yesod-static/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST yesod-static-1.2.4.tar.gz 25099 BLAKE2B c50fb5e52991221473a42d760e5ead5e0bf31a042c32403bb83b251a6af00def8a72d1962b956deba69d876e752b989556fb0c38dc4c98c0fe130801f1439ae8 SHA512 8879f50028f45194071d588d7ffb29f20b860983546a07a12975b4b8e5279e962060f4c7a794475ea34d35bb061f63a342383f45a20441f34f95e4e553b335a7
-DIST yesod-static-1.4.0.4.tar.gz 25101 BLAKE2B dba561ed7f0dee38f29a42e95befdd2f24dc5d0b5ea544f9fa807797e42ec01533c0e28066fbd24d422bfc40b356ebd9b7b8d033ffe11b187545b175e687dbe6 SHA512 598e1ba668f73c639afb786ed6b210ff9c62c9e12fabc87d6682c9876b08e96b43b7dbb4d53ac8bbe7c1c11b709d1a6e8c231f46598b74c271909d26fb26edb3
-DIST yesod-static-1.5.0.3.tar.gz 25036 BLAKE2B 710018d59b605cf28097ea93b009d52e0a4ac5504a0e8b94bfccdc522496538979838c7a75ad7312d8b3b8b359df3b4434a7f4d217e1ba3bbff089d494dc4b55 SHA512 5fd0de8c034063b637ff90382fb5fb31e810eff196327becd6b217df39b9bf8612deb56ffc8996395c7a46223983333c45f14020952422260aea3629d6429122
-DIST yesod-static-1.5.0.5.tar.gz 25028 BLAKE2B 5ad12523d3e09e23a5a62eec2c7cd27a7c04cb42190429627e398fe6c4d8663cd737abb1cb0f696270e6ebd489bb3dd84bd4c8d9c8fe789b42d7696d1073a9d5 SHA512 51c522e51389843da5fb7a3d90d5b18a0e216451bd9322d55f815c393a6f2a5cd3e0f195fe924db15f18d14f1c0ecac521a6e74b975b2cdbc9c1d3a5da85e9ba
-DIST yesod-static-1.5.1.1.tar.gz 25211 BLAKE2B 4691472d183e9350182654b3cba6262143f388e50b9e0b311146b047d47ae2587ea6c663ee8b4fa1fda8110667ed031b6a613d0ed4138b2473db32d6d55fe3ae SHA512 cdca4f3d2df8324ebf26aa39eba0d9f8bef75ea4fa6eaaa25b65e3a223af2229a4ea14130b8a30a6336b8676c34f448e6adede8023e218d7d8b80703813268a0
-EBUILD yesod-static-1.2.4.ebuild 1968 BLAKE2B c70a581b72412541d983b64ee615ea268a5d26d4ce7dd2ab1c1f903fc32bbe1e58c8f7b7fefe051b4571b7b9213b5fca04cf0759a4de611b9d99b954be9c8af8 SHA512 b5b4c5febfa1e5737977d583056d427cde66be1ff63cccc47bdbd4307745d54c4fea4f08dbcb78587e59592cef17b533e4a174fbb8f8b420ed25e2b6348cf840
-EBUILD yesod-static-1.4.0.4.ebuild 1896 BLAKE2B 200f93c6752c14f3cfe7fc50bc733132b0f02843fded36eb90d056a9341e1feb64a37e2a2eb2784d5ccc6287137ca718b9bd24d160a4f6cd0320fd6e2cb1124a SHA512 c0984e7349d2f5b6988becfcc80d7a47a2041a381152387bdc73e53059dcf844cab329ca65fb753f8a16145d8dd40da3ae1e6d239715f4addd65eacc8e558bff
-EBUILD yesod-static-1.5.0.3.ebuild 1795 BLAKE2B e90ddd30d77fbff47debeb9dabfed0cae4741c8e422529e654f15f2bdacb6c3e50661da5bc98b1d11a7e457e02f5c79d0144ef4649571f1f5281a7378e4712be SHA512 f71a6718784b54e3113e39b70972574cc6454743b6afa794433558c122c1d3ccc3aff1adaf45817317dd7ac873ca55b27ccf37e9683729b3b66c41a6dc6b7558
-EBUILD yesod-static-1.5.0.5.ebuild 1752 BLAKE2B c8c8f0b86fc91051be39d52ebda094c0d978c81b13a320ac2f51ca7461abf06a362851a51ef3dc26f4a58e30e9ce978bfb9a6c86b7700fde9a0d42fd11ade0f0 SHA512 ee0d3f2aaa4e9c0cd312aaaf409d687a098ffbd4aad442b28decf9cdcfb0ac6da85af6a09d59f05c0a42cab38473e030947a2aa115876e5d7a24273914d7e315
-EBUILD yesod-static-1.5.1.1.ebuild 1788 BLAKE2B 1aa8c493538e2244b7d278c6542a9eb00f7297343baa383ac4089ab6809096403867cda97db2233cabb5873b57ee22c031aa1ca55e9a452b5ec1516706dacf1b SHA512 2562ed5cbf7b1afd6a09d3fc1e5ef8b8a6bc5c8908d65b16f8d6cd6bdfdbfa28fc139e33b69639583049bf6caca98769ab2bbe533d1fd8eb1b338abf102387ca
-MISC metadata.xml 343 BLAKE2B 866801ef740982c4e793193aee4aba1d561e999ad7a958bb46a82c807a86e0cd8f513ebfa89d00259d05247bc44635af39597224149a7eeaddc5179db8115291 SHA512 6d2282bf289e33b310f9e03c31f97003206964bef85ec09b847e530ee39537d27558ec478e301c4397f1db39d3768514f0c33d5407fd93d4d560c7543f37fd81
diff --git a/dev-haskell/yesod-static/metadata.xml b/dev-haskell/yesod-static/metadata.xml
deleted file mode 100644
index 272aa95e80ba..000000000000
--- a/dev-haskell/yesod-static/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Static file serving subsite for Yesod Web Framework.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/yesod-static/yesod-static-1.2.4.ebuild b/dev-haskell/yesod-static/yesod-static-1.2.4.ebuild
deleted file mode 100644
index dbe797818af1..000000000000
--- a/dev-haskell/yesod-static/yesod-static-1.2.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Static file serving subsite for Yesod Web Framework"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1.0.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/byteable-0.1:=[profile?]
-	>=dev-haskell/conduit-0.5:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	>=dev-haskell/cryptohash-0.11:=[profile?]
-	>=dev-haskell/cryptohash-conduit-0.1:=[profile?]
-	>=dev-haskell/css-text-0.1.2:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?]
-	>=dev-haskell/hashable-1.1:=[profile?]
-	dev-haskell/hjsmin:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/mime-types-0.1:=[profile?]
-	>=dev-haskell/resourcet-0.4:=[profile?]
-	>=dev-haskell/shakespeare-css-1.0.3:=[profile?]
-	>=dev-haskell/system-fileio-0.3:=[profile?]
-	>=dev-haskell/system-filepath-0.4.6:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	>=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/wai-app-static-1.3.2:=[profile?]
-	>=dev-haskell/yesod-core-1.2:=[profile?] <dev-haskell/yesod-core-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/wai-extra
-		dev-haskell/wai-test
-		>=dev-haskell/yesod-test-1.2 )
-"
diff --git a/dev-haskell/yesod-static/yesod-static-1.4.0.4.ebuild b/dev-haskell/yesod-static/yesod-static-1.4.0.4.ebuild
deleted file mode 100644
index 07752bb11344..000000000000
--- a/dev-haskell/yesod-static/yesod-static-1.4.0.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Static file serving subsite for Yesod Web Framework"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1.0.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/byteable-0.1:=[profile?]
-	>=dev-haskell/conduit-0.5:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	>=dev-haskell/cryptohash-0.11:=[profile?]
-	>=dev-haskell/cryptohash-conduit-0.1:=[profile?]
-	>=dev-haskell/css-text-0.1.2:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?]
-	>=dev-haskell/hashable-1.1:=[profile?]
-	dev-haskell/hjsmin:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/mime-types-0.1:=[profile?]
-	>=dev-haskell/resourcet-0.4:=[profile?]
-	>=dev-haskell/system-fileio-0.3:=[profile?]
-	>=dev-haskell/system-filepath-0.4.6:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	>=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/wai-app-static-1.3.2:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/wai-extra
-		>=dev-haskell/yesod-test-1.4 )
-"
diff --git a/dev-haskell/yesod-static/yesod-static-1.5.0.3.ebuild b/dev-haskell/yesod-static/yesod-static-1.5.0.3.ebuild
deleted file mode 100644
index 4d907168f617..000000000000
--- a/dev-haskell/yesod-static/yesod-static-1.5.0.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Static file serving subsite for Yesod Web Framework"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1.0.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/byteable-0.1:=[profile?]
-	>=dev-haskell/conduit-0.5:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	>=dev-haskell/cryptohash-0.11:=[profile?]
-	>=dev-haskell/cryptohash-conduit-0.1:=[profile?]
-	>=dev-haskell/css-text-0.1.2:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?]
-	>=dev-haskell/hashable-1.1:=[profile?]
-	dev-haskell/hjsmin:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/mime-types-0.1:=[profile?]
-	>=dev-haskell/old-time-1.0:=[profile?]
-	>=dev-haskell/resourcet-0.4:=[profile?]
-	>=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/wai-app-static-3.1:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/wai-extra
-		>=dev-haskell/yesod-test-1.4 )
-"
diff --git a/dev-haskell/yesod-static/yesod-static-1.5.0.5.ebuild b/dev-haskell/yesod-static/yesod-static-1.5.0.5.ebuild
deleted file mode 100644
index 3f507cb3180f..000000000000
--- a/dev-haskell/yesod-static/yesod-static-1.5.0.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Static file serving subsite for Yesod Web Framework"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1.0.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/byteable-0.1:=[profile?]
-	>=dev-haskell/conduit-0.5:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	>=dev-haskell/cryptohash-0.11:=[profile?]
-	>=dev-haskell/cryptohash-conduit-0.1:=[profile?]
-	>=dev-haskell/css-text-0.1.2:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?]
-	>=dev-haskell/hashable-1.1:=[profile?]
-	dev-haskell/hjsmin:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/mime-types-0.1:=[profile?]
-	>=dev-haskell/old-time-1.0:=[profile?]
-	>=dev-haskell/resourcet-0.4:=[profile?]
-	>=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/wai-app-static-3.1:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/wai-extra
-		>=dev-haskell/yesod-test-1.4 )
-"
diff --git a/dev-haskell/yesod-static/yesod-static-1.5.1.1.ebuild b/dev-haskell/yesod-static/yesod-static-1.5.1.1.ebuild
deleted file mode 100644
index 8e8c189aabb2..000000000000
--- a/dev-haskell/yesod-static/yesod-static-1.5.1.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Static file serving subsite for Yesod Web Framework"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1.0.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/byteable-0.1:=[profile?]
-	>=dev-haskell/conduit-0.5:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	>=dev-haskell/cryptohash-0.11:=[profile?]
-	>=dev-haskell/cryptohash-conduit-0.1:=[profile?]
-	>=dev-haskell/css-text-0.1.2:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	>=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?]
-	>=dev-haskell/hashable-1.1:=[profile?]
-	dev-haskell/hjsmin:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/mime-types-0.1:=[profile?]
-	>=dev-haskell/old-time-1.0:=[profile?]
-	>=dev-haskell/resourcet-0.4:=[profile?]
-	>=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/wai-app-static-3.1:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/wai-extra
-		>=dev-haskell/yesod-test-1.4 )
-"
diff --git a/dev-haskell/yesod-test-1.2.3.1 b/dev-haskell/yesod-test-1.2.3.1
new file mode 100644
index 000000000000..c00150f1e1e9
--- /dev/null
+++ b/dev-haskell/yesod-test-1.2.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/hspec-1.4:=[profile?] >=dev-haskell/html-conduit-0.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/persistent-1.0:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] dev-haskell/wai-extra:=[profile?] >=dev-haskell/wai-test-1.3:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] >=dev-haskell/yesod-core-1.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/yesod-form ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=integration testing for WAI/Yesod Applications
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/hspec-1.4:=[profile?] >=dev-haskell/html-conduit-0.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/persistent-1.0:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] dev-haskell/wai-extra:=[profile?] >=dev-haskell/wai-test-1.3:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] >=dev-haskell/yesod-core-1.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.3.1
+SRC_URI=mirror://hackage/packages/archive/yesod-test/1.2.3.1/yesod-test-1.2.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1c9d5c593cf6037e018a246a846a3b2e
diff --git a/dev-haskell/yesod-test-1.4.3.1 b/dev-haskell/yesod-test-1.4.3.1
new file mode 100644
index 000000000000..eafb26e2fa07
--- /dev/null
+++ b/dev-haskell/yesod-test-1.4.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?] >=dev-haskell/html-conduit-0.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/persistent-1.0:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/wai-3.0:=[profile?] dev-haskell/wai-extra:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] >=dev-haskell/yesod-core-1.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hspec dev-haskell/yesod-form ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=integration testing for WAI/Yesod Applications
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?] >=dev-haskell/html-conduit-0.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/persistent-1.0:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/wai-3.0:=[profile?] dev-haskell/wai-extra:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] >=dev-haskell/yesod-core-1.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.4.3.1
+SRC_URI=mirror://hackage/packages/archive/yesod-test/1.4.3.1/yesod-test-1.4.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b9e72516af361dd713c7e361f864f210
diff --git a/dev-haskell/yesod-test-1.5.0.1 b/dev-haskell/yesod-test-1.5.0.1
new file mode 100644
index 000000000000..f3b6659e6bd4
--- /dev/null
+++ b/dev-haskell/yesod-test-1.5.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?] >=dev-haskell/html-conduit-0.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/persistent-1.0:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/wai-3.0:=[profile?] dev-haskell/wai-extra:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] >=dev-haskell/yesod-core-1.4.14:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hspec dev-haskell/yesod-form ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=integration testing for WAI/Yesod Applications
+EAPI=5
+HOMEPAGE=https://www.yesodweb.com
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?] >=dev-haskell/html-conduit-0.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/persistent-1.0:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/wai-3.0:=[profile?] dev-haskell/wai-extra:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] >=dev-haskell/yesod-core-1.4.14:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.5.0.1
+SRC_URI=mirror://hackage/packages/archive/yesod-test/1.5.0.1/yesod-test-1.5.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5e06326bc820bf9aaa959b60f316ff2b
diff --git a/dev-haskell/yesod-test-1.5.1.1 b/dev-haskell/yesod-test-1.5.1.1
new file mode 100644
index 000000000000..52e9d07977be
--- /dev/null
+++ b/dev-haskell/yesod-test-1.5.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?] >=dev-haskell/html-conduit-0.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/persistent-1.0:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/wai-3.0:=[profile?] dev-haskell/wai-extra:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] >=dev-haskell/yesod-core-1.4.14:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hspec dev-haskell/lifted-base dev-haskell/yesod-form ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=integration testing for WAI/Yesod Applications
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?] >=dev-haskell/html-conduit-0.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/persistent-1.0:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/wai-3.0:=[profile?] dev-haskell/wai-extra:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] >=dev-haskell/yesod-core-1.4.14:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.5.1.1
+SRC_URI=mirror://hackage/packages/archive/yesod-test/1.5.1.1/yesod-test-1.5.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=71a36d2c62188d0c31abab59117934b1
diff --git a/dev-haskell/yesod-test-1.5.3 b/dev-haskell/yesod-test-1.5.3
new file mode 100644
index 000000000000..b37682358657
--- /dev/null
+++ b/dev-haskell/yesod-test-1.5.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?] >=dev-haskell/html-conduit-0.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/persistent-1.0:=[profile?] >=dev-haskell/pretty-show-1.6:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/wai-3.0:=[profile?] dev-haskell/wai-extra:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] >=dev-haskell/yesod-core-1.4.14:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hspec dev-haskell/lifted-base dev-haskell/yesod-form ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=integration testing for WAI/Yesod Applications
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?] >=dev-haskell/html-conduit-0.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/persistent-1.0:=[profile?] >=dev-haskell/pretty-show-1.6:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/wai-3.0:=[profile?] dev-haskell/wai-extra:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] >=dev-haskell/yesod-core-1.4.14:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.5.3
+SRC_URI=mirror://hackage/packages/archive/yesod-test/1.5.3/yesod-test-1.5.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1c05566f27647ea92554a4e8189f0cc2
diff --git a/dev-haskell/yesod-test-1.5.4.1 b/dev-haskell/yesod-test-1.5.4.1
new file mode 100644
index 000000000000..efa2220e778c
--- /dev/null
+++ b/dev-haskell/yesod-test-1.5.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?] >=dev-haskell/html-conduit-0.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/persistent-1.0:=[profile?] >=dev-haskell/pretty-show-1.6:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/wai-3.0:=[profile?] dev-haskell/wai-extra:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] >=dev-haskell/yesod-core-1.4.14:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec dev-haskell/lifted-base dev-haskell/yesod-form ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=integration testing for WAI/Yesod Applications
+EAPI=6
+HOMEPAGE=https://www.yesodweb.com
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?] >=dev-haskell/html-conduit-0.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/persistent-1.0:=[profile?] >=dev-haskell/pretty-show-1.6:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/wai-3.0:=[profile?] dev-haskell/wai-extra:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] >=dev-haskell/yesod-core-1.4.14:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.5.4.1
+SRC_URI=mirror://hackage/packages/archive/yesod-test/1.5.4.1/yesod-test-1.5.4.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fc009b6b058ae5107daf9463b99fbaa5
diff --git a/dev-haskell/yesod-test/Manifest b/dev-haskell/yesod-test/Manifest
deleted file mode 100644
index 3e7b3783e6a9..000000000000
--- a/dev-haskell/yesod-test/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-DIST yesod-test-1.2.3.1.tar.gz 13265 BLAKE2B c428c0db2d53918eeb744d109da733d5d5080488587f541f866e0ae5182248350c1097d4a38d82c2e91a0b62758961ef3d892543114415beb2c44028f294d57f SHA512 fbf9856392c5e7efcc6b95fc01eb08b234d55800fd1bc80a8ff290fe695b809a086918771d33bd79267d4d9825b05339222662fb4b128c21bc9e2e91401f1b02
-DIST yesod-test-1.4.3.1.tar.gz 15284 BLAKE2B 742abdbd17fe7a0c353f4077c892c517ff8ce009091cdbddd390761d3e0160b246dc2b5238f8c8108491430255c0c5b4dc4211ddd5440c4b36facc0ba57868fe SHA512 c423c10a10264a301418cf044aff1d8d8aab483039575e255c6bb29bffe91494a8e8f85e9c12b31aee6c394384b97356a4b64377f25d0781e516946d352aab13
-DIST yesod-test-1.5.0.1.tar.gz 17388 BLAKE2B c975819e793beeb7b551d2406b2ccd3939d551221de98c1201973381977d913bfa0a40e165d5175f7e6bf1499e713a55083015344c6fc320d7b654290ea8167b SHA512 f5798198d762415e8f0b97b63202393e2c4a41c8021cfda2db0b4f9144830d73be1ec5397da3a3de25b056798683955a1ff856eba93c64c172642c8cca6ada2d
-DIST yesod-test-1.5.1.1.tar.gz 18187 BLAKE2B cfcac2eef52beb79e0ce1cdb52c1bc7929c9632496bf2ae7cbda092959225dc1e7b47e9d898b3b986e554cce95578a829f05b7b2ab119c0a72be9781220c0d71 SHA512 a93db0b6ff7ea4d41c3783c35c3df0ae5bc86ee5797a7b200745db98f3404a4a1eb921b396b1cd23269ec89f092ddc9d572058844190a223b3a3b7d8afe3efbf
-DIST yesod-test-1.5.3.tar.gz 18076 BLAKE2B c89336800790c164156fdaf3ee7b3be440c71a53a67ded18d676d077444a83549122af32bfdc2dc9b077e5c8ea19ab78ffb154560e32b7b51d155155e9ffd7fa SHA512 56454230dcc3fa96eb06a2b77e3dbeebdbc0648bad57b18817d2b07d95d43483c8e618254d449dc5cafa0efce536952a0db95c638ead5bb19bb9818dd67fbdb0
-DIST yesod-test-1.5.4.1.tar.gz 18606 BLAKE2B 0676245dd796dcb333970f43a6dd664ae0f78bcd9fab12cb3e7558d91005ef55ea1a7344c1e411c51f05fab61f892687b306289b3639fddf19cdb3dfebfd476b SHA512 8c21e832b976d1e27f0a7a001c8e54e0ad40e24619047a767c8e74902afa19c29481309ff240f18636242cd543334bcac63fc9a460950c53de406ca047b98631
-EBUILD yesod-test-1.2.3.1.ebuild 1429 BLAKE2B 7d8366b4e213815f435484886d231e5eb8a30b37964250d0a45d632c1e07801806c87f66a8729fcbbc9f67482eaf541138f8e05e873105fcf7ffc5829483e739 SHA512 d98f53de9d9cbc440e1abf74ae35eddf9189639befba4595b8f191ff587db30a52c8f207ea4657a58a499d1362d0b04566d08d65e6c5e969532b753e5e6a8741
-EBUILD yesod-test-1.4.3.1.ebuild 1445 BLAKE2B 6438ca1dc82157262ee0aedeb3b86dad3b3fda838bf8c0554d8a730cd73f892457f367d376c60b9cf91a08d79fbab65c6f2aaabe22a411d019bad7f19f3afd50 SHA512 fec7fb4ba7f45678b5fe5745165276a64ff46fa192cba0f765a1540312d583c6b9aaffff25b3956d989694684393720c03676e8f22b362d0a329b5f855d1e8f6
-EBUILD yesod-test-1.5.0.1.ebuild 1453 BLAKE2B 82b6d66fd24255b96fcc26d840323f7d7e3d56d40e53173638d5c71dff7bd2d31af7ff3dde6a895f4d56938b9f77e3c54566ce427adeecaf0232803fa1953ce6 SHA512 e3c461f8816f9f6117306ccf9b90a947f98d89c5436b2f8ac6f944a8f95f79ba6959de79ee4024b9a6905a210c1b9ddbf6b61e0b07f2c5858204a1336e055c56
-EBUILD yesod-test-1.5.1.1.ebuild 1477 BLAKE2B 4a30f37ce478fd8c6736678093fd13f6dec9b24ad9dc3fc4c49c3ba71d90c1b7d27e64dc851c765083ae045d879ade78660ece57bbd11b3b58ccec01cdd94f22 SHA512 ad3a128c3bdcd668acd7e11c00430479aa1769885b7d2f039e708ee9013927819aedd1fe2b9073d0f8dab8dafee41eaed9ed17c958d273c95608f18d767a0db4
-EBUILD yesod-test-1.5.3.ebuild 1520 BLAKE2B d827cda64f865c70e0f3aa91069cefccf142f6a7c2444d41b48bf341d248fb27137632c855748494013d7c7bea3593c37b797a69816f0146c0a8123c8200fe7f SHA512 a2e599276e820810172010392041880254ddeb0667b1682a2d444252b8a57471752d828a24622b73a621f076ce4ab2ca092c83b6b13176c027309b719cdd1ee9
-EBUILD yesod-test-1.5.4.1.ebuild 1481 BLAKE2B 8d6b6f9e4766ba32f1a615252671c1fcffa1aa69c8c78c555c0192462fa3aa84e3447edc965bce002d4a4e5933b5028c601d785b3e87766d991324c47f3daf1f SHA512 f253a7404f2b77ebb84eb73c3250b41e5505ad819cc763678503b4fe62931d7e0375577672570e8ddf821d7819d076d8c64141825de12166317a17bcb0c9f720
-MISC metadata.xml 352 BLAKE2B 360c20956049bb17cc79da469b905b2bcb4fe95f1fb98babd9a002924fa0d04ddaa420eff139ada965e4532d5b9fb23829d49ea989aa4b8a689ae6e8a924b956 SHA512 8a4041f29de427e03644bd7b0939346925dbac83b7592ccdf775aaf6f57c8d48955930ed2ee30502f8c843091daaae886263a60c01b939315c6f7d797ad16105
diff --git a/dev-haskell/yesod-test/metadata.xml b/dev-haskell/yesod-test/metadata.xml
deleted file mode 100644
index 194abf9c4657..000000000000
--- a/dev-haskell/yesod-test/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Behaviour Oriented integration Testing for Yesod Applications
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/yesod-test/yesod-test-1.2.3.1.ebuild b/dev-haskell/yesod-test/yesod-test-1.2.3.1.ebuild
deleted file mode 100644
index fd9fd69f78bb..000000000000
--- a/dev-haskell/yesod-test/yesod-test-1.2.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="integration testing for WAI/Yesod Applications"
-HOMEPAGE="https://www.yesodweb.com"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	>=dev-haskell/hspec-1.4:=[profile?]
-	>=dev-haskell/html-conduit-0.1:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	>=dev-haskell/network-2.2:=[profile?]
-	>=dev-haskell/persistent-1.0:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	dev-haskell/wai-extra:=[profile?]
-	>=dev-haskell/wai-test-1.3:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?]
-	>=dev-haskell/yesod-core-1.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/yesod-form )
-"
diff --git a/dev-haskell/yesod-test/yesod-test-1.4.3.1.ebuild b/dev-haskell/yesod-test/yesod-test-1.4.3.1.ebuild
deleted file mode 100644
index cfe7ce71b0b4..000000000000
--- a/dev-haskell/yesod-test/yesod-test-1.4.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="integration testing for WAI/Yesod Applications"
-HOMEPAGE="https://www.yesodweb.com"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	>=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?]
-	>=dev-haskell/html-conduit-0.1:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	>=dev-haskell/network-2.2:=[profile?]
-	>=dev-haskell/persistent-1.0:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?]
-	dev-haskell/wai-extra:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec
-		dev-haskell/yesod-form )
-"
diff --git a/dev-haskell/yesod-test/yesod-test-1.5.0.1.ebuild b/dev-haskell/yesod-test/yesod-test-1.5.0.1.ebuild
deleted file mode 100644
index 055470b6a337..000000000000
--- a/dev-haskell/yesod-test/yesod-test-1.5.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="integration testing for WAI/Yesod Applications"
-HOMEPAGE="https://www.yesodweb.com"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	>=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?]
-	>=dev-haskell/html-conduit-0.1:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	>=dev-haskell/network-2.2:=[profile?]
-	>=dev-haskell/persistent-1.0:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?]
-	dev-haskell/wai-extra:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?]
-	>=dev-haskell/yesod-core-1.4.14:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec
-		dev-haskell/yesod-form )
-"
diff --git a/dev-haskell/yesod-test/yesod-test-1.5.1.1.ebuild b/dev-haskell/yesod-test/yesod-test-1.5.1.1.ebuild
deleted file mode 100644
index 03fe40aaa986..000000000000
--- a/dev-haskell/yesod-test/yesod-test-1.5.1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="integration testing for WAI/Yesod Applications"
-HOMEPAGE="https://www.yesodweb.com"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	>=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?]
-	>=dev-haskell/html-conduit-0.1:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	>=dev-haskell/network-2.2:=[profile?]
-	>=dev-haskell/persistent-1.0:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?]
-	dev-haskell/wai-extra:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?]
-	>=dev-haskell/yesod-core-1.4.14:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec
-		dev-haskell/lifted-base
-		dev-haskell/yesod-form )
-"
diff --git a/dev-haskell/yesod-test/yesod-test-1.5.3.ebuild b/dev-haskell/yesod-test/yesod-test-1.5.3.ebuild
deleted file mode 100644
index 1204acdcc03f..000000000000
--- a/dev-haskell/yesod-test/yesod-test-1.5.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="integration testing for WAI/Yesod Applications"
-HOMEPAGE="https://www.yesodweb.com"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	>=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?]
-	>=dev-haskell/html-conduit-0.1:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	>=dev-haskell/network-2.2:=[profile?]
-	>=dev-haskell/persistent-1.0:=[profile?]
-	>=dev-haskell/pretty-show-1.6:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?]
-	dev-haskell/wai-extra:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?]
-	>=dev-haskell/yesod-core-1.4.14:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec
-		dev-haskell/lifted-base
-		dev-haskell/yesod-form )
-"
diff --git a/dev-haskell/yesod-test/yesod-test-1.5.4.1.ebuild b/dev-haskell/yesod-test/yesod-test-1.5.4.1.ebuild
deleted file mode 100644
index 169c2d47b51e..000000000000
--- a/dev-haskell/yesod-test/yesod-test-1.5.4.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="integration testing for WAI/Yesod Applications"
-HOMEPAGE="https://www.yesodweb.com"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	>=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?]
-	>=dev-haskell/html-conduit-0.1:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	>=dev-haskell/network-2.2:=[profile?]
-	>=dev-haskell/persistent-1.0:=[profile?]
-	>=dev-haskell/pretty-show-1.6:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?]
-	dev-haskell/wai-extra:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?]
-	>=dev-haskell/yesod-core-1.4.14:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec
-		dev-haskell/lifted-base
-		dev-haskell/yesod-form )
-"
diff --git a/dev-haskell/yesod/Manifest b/dev-haskell/yesod/Manifest
deleted file mode 100644
index 51be741979d8..000000000000
--- a/dev-haskell/yesod/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST yesod-1.4.3.tar.gz 9023 BLAKE2B ef7db3731a4f2c828dcba4cb6f5982141897de553ce096460a9514a97ba1ba2074270e25c6519c6ade14a597c50d4bfaf475f16d5308c936cab328285db416c1 SHA512 2964e290307fde99ea0b3ad27af61a5c2d4577fcf24eeb18d7ddd2d7210db8801d4d3a824ae6331e4d79a23155f9943b7b0f705c347bcec4a947fbe7c83b9278
-DIST yesod-1.4.4.tar.gz 9146 BLAKE2B b49d699ac0f5fec33b194f71dba35eb913e6d9b5b50113ccf9602c3bc14adaf7c66d8fb64ef5a1fd268c20196099204d20af75649f965deb2475c07db5279254 SHA512 ff58454e31efa47a50f04905c555a684d2a7415c726f60a206332f96ecb152eb566e285679d97cc1233baae9cc5cd42702365358ec2a55559a8b898540803f7c
-EBUILD yesod-1.4.3.ebuild 1698 BLAKE2B dc1655d4631c3ee11343af075ed914422d936c6715adc6e42f983404f1cbea1c88b81c0b9247b1c1e08c8f21f361ba486998d09699d5c23f98ee5f690aa99d3d SHA512 1752de801566637fe5a7e7d4f42ed2740e85bc95bfe9bd92b74b817ed8df7be4a8f3ebca2e3fe2d6afa176d624d4cf4e20e5802402f16ed6d9927b8f21a97b6d
-EBUILD yesod-1.4.4.ebuild 1628 BLAKE2B 76e9fcc787aef2b09342135db7e5b60d59cbc47ae1c8ef79ccca9d9b1ca06194ed42617829832480e1b9873ddcfb3e34b17efc6dea02f1e411f7fb7687cb13bd SHA512 7c582921a14459e7a94a12d8f87271b0a811be744ab574e6b28f6435122e847ad203c972551362952ac5379d042895377af2ba737cca1e557275e74d48498eac
-MISC metadata.xml 838 BLAKE2B 229a6fd86e08c1bc3599a352211185621421c313d5facb16d5801e75b665897b9e4ff1ffe61a6712e1b92ab997bb08ddadd4e2058a812c4d769d69cf50a52b57 SHA512 965f516cfca88189b5e2e6f69a7e939c3c21c308604ff7c67b63176a3cd07a4bbc920c366989b01344b2ced3d8a783ba7f6f69bc1ec20288a73635c206c25211
diff --git a/dev-haskell/yesod/metadata.xml b/dev-haskell/yesod/metadata.xml
deleted file mode 100644
index 7360e5a64339..000000000000
--- a/dev-haskell/yesod/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A RESTful web framework with strong compile-time guarantees of correctness. It also affords space efficient code, highly concurrent loads, and portability to many deployment backends (via the wai package), from CGI to stand-alone serving.
-		
-		Yesod also focuses on developer productivity. Yesod integrates well with tools for all your basic web development (wai, persistent, and shakespeare/hamlet)
-		
-		The Yesod documentation site &lt;http://www.yesodweb.com/&gt; has much more information, including on the supporting packages mentioned above.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/yesod/yesod-1.4.3.ebuild b/dev-haskell/yesod/yesod-1.4.3.ebuild
deleted file mode 100644
index 857ab36861b1..000000000000
--- a/dev-haskell/yesod/yesod-1.4.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Creation of type-safe, RESTful web applications"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	dev-haskell/fast-logger:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/wai-extra-1.3:=[profile?]
-	dev-haskell/wai-logger:=[profile?]
-	>=dev-haskell/warp-1.3:=[profile?]
-	>=dev-haskell/yaml-0.8.17:=[profile?]
-	>=dev-haskell/yesod-auth-1.4:=[profile?] <dev-haskell/yesod-auth-1.5:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/yesod/yesod-1.4.4.ebuild b/dev-haskell/yesod/yesod-1.4.4.ebuild
deleted file mode 100644
index 5f70f88f6a3b..000000000000
--- a/dev-haskell/yesod/yesod-1.4.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Creation of type-safe, RESTful web applications"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	>=dev-haskell/conduit-extra-1.1.14:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	dev-haskell/fast-logger:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/wai-extra-1.3:=[profile?]
-	dev-haskell/wai-logger:=[profile?]
-	>=dev-haskell/warp-1.3:=[profile?]
-	>=dev-haskell/yaml-0.8.17:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/zip-archive-0.1.3.4 b/dev-haskell/zip-archive-0.1.3.4
new file mode 100644
index 000000000000..ecb9f5fbc6a5
--- /dev/null
+++ b/dev-haskell/zip-archive-0.1.3.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hunit app-arch/zip ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=98f54e3aecc387521656d1826780806a
diff --git a/dev-haskell/zip-archive-0.2.3.7 b/dev-haskell/zip-archive-0.2.3.7
new file mode 100644
index 000000000000..a30facb9358c
--- /dev/null
+++ b/dev-haskell/zip-archive-0.2.3.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=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:= >=dev-haskell/cabal-1.10 test? ( app-arch/zip dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b8535c6fa4023995a2370e9cd725c4c6
diff --git a/dev-haskell/zip-archive/Manifest b/dev-haskell/zip-archive/Manifest
deleted file mode 100644
index 2fd138c1620d..000000000000
--- a/dev-haskell/zip-archive/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST zip-archive-0.1.3.4.tar.gz 11250 BLAKE2B 830cce7d1600b66833e53584da68b07bfbb0417e9a752bedeca02b436e287ce187477851660d426104f392b6e508409a79abb70b0c781523100d7d547a155e4a SHA512 8476041bd3674a42c3777c54243037162d3fdf6f8e0c0bcb9577a4cd76a41d6d9dbdddc482845256858b284bd2bb6ad06cce8208c5584e60553ae659386f8165
-DIST zip-archive-0.2.3.7.tar.gz 12902 BLAKE2B a9b5563034cebb36c604752691950577996bf04e33bafd449019b08532f99635959502b4147ecf8e282d5a9379e6f09d2d2fe730579595e4d2991c152dcbe836 SHA512 3849a9ac806d69b496bfd2973ba8908b981cd72f900565fc9aea8a2b4080ec7c6fe8c579158c22da0ddc398faecf77a7ae1793eecf4d3054d0bdc06fde2aa7cc
-EBUILD zip-archive-0.1.3.4.ebuild 940 BLAKE2B 4b14c4be3762f89da61e6b613a3bbeeaa86734caabf5defb592e536d40156d586be89d58da1dcf3254025407e2f3e62643aa405ac8de16d406f119aaa03d29eb SHA512 e2207e5097df551220c3c23fc333aa6bd0ff7d0f2eb9f74aad7bf19757dfdc3b8aa5fdfbd5a61a442412fcd7c78ad4f9761ade5b9c76083f38decc86592db497
-EBUILD zip-archive-0.2.3.7.ebuild 963 BLAKE2B ba2ad5b538786e6dc7d08ca984ac0cba51ee05965607695412e1a58f34175b2a9957db9f85d5721461279bbcc8e7c5589edde0c3d59d705d0a6228d305d11a19 SHA512 93d51a4aca842cfed74abf13386a22ab19904f9c6486477c343912bbc2be13d5581ba1df999bf44448e5fd9ecdfc7f4496da2a09fd2ea4c3db5e2e38399a190a
-MISC metadata.xml 554 BLAKE2B c174354f44b6718bb8fe11bd45e5ab1474362828356539197f38160104c2589fcfddd691d120294d65f14a1a7659c5777f018e96b1cbddb9aa952e688c3c119d SHA512 0dd9cdbf572293e8e8aef46bc393c2cdb672b09170e383bc1a18100275061369abb875d38a8d00a7da5a7babe45ea827d551e19e49053649daad9fdd4201e5cb
diff --git a/dev-haskell/zip-archive/metadata.xml b/dev-haskell/zip-archive/metadata.xml
deleted file mode 100644
index 3f1368b5d4f1..000000000000
--- a/dev-haskell/zip-archive/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The zip-archive library provides functions for creating, modifying,
-		and extracting files from zip archives.
-	</longdescription>
-	<use>
-		<flag name="executable">Build the Zip executable.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">jgm/zip-archive</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/zip-archive/zip-archive-0.1.3.4.ebuild b/dev-haskell/zip-archive/zip-archive-0.1.3.4.ebuild
deleted file mode 100644
index eb02969ae28c..000000000000
--- a/dev-haskell/zip-archive/zip-archive-0.1.3.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Library for creating and modifying zip archives"
-HOMEPAGE="https://github.com/jgm/zip-archive"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="executable"
-
-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:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10
-		test? ( dev-haskell/hunit
-			app-arch/zip
-		)"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable)
-}
diff --git a/dev-haskell/zip-archive/zip-archive-0.2.3.7.ebuild b/dev-haskell/zip-archive/zip-archive-0.2.3.7.ebuild
deleted file mode 100644
index 8b1de9acd6b8..000000000000
--- a/dev-haskell/zip-archive/zip-archive-0.2.3.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Library for creating and modifying zip archives"
-HOMEPAGE="https://github.com/jgm/zip-archive"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="executable"
-
-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:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( app-arch/zip
-		dev-haskell/hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable)
-}
diff --git a/dev-haskell/zlib-0.5.4.1 b/dev-haskell/zlib-0.5.4.1
new file mode 100644
index 000000000000..26522be79f20
--- /dev/null
+++ b/dev-haskell/zlib-0.5.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= sys-libs/zlib >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6a1d434435a90ac5e219498b72e8d63b
diff --git a/dev-haskell/zlib-0.5.4.2 b/dev-haskell/zlib-0.5.4.2
new file mode 100644
index 000000000000..368d6d43a9b0
--- /dev/null
+++ b/dev-haskell/zlib-0.5.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f3f3aeb3e8926c5482eb8a44e5400618
diff --git a/dev-haskell/zlib-0.6.1.1 b/dev-haskell/zlib-0.6.1.1
new file mode 100644
index 000000000000..94213ea3c65d
--- /dev/null
+++ b/dev-haskell/zlib-0.6.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hunit-1.2 >=dev-haskell/quickcheck-2 >=dev-haskell/tasty-0.8 >=dev-haskell/tasty-hunit-0.8 >=dev-haskell/tasty-quickcheck-0.8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fbd9ca4fec1ed6b041cb38a88da72fce
diff --git a/dev-haskell/zlib-0.6.1.2 b/dev-haskell/zlib-0.6.1.2
new file mode 100644
index 000000000000..586a7da6a545
--- /dev/null
+++ b/dev-haskell/zlib-0.6.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 >=dev-haskell/tasty-0.8 <dev-haskell/tasty-0.12 >=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.10 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Compression and decompression in the gzip and zlib formats
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/zlib
+IUSE=non-blocking-ffi doc hscolour profile test
+KEYWORDS=~amd64 ~x86 ~ppc-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib
+SLOT=0/0.6.1.2
+SRC_URI=mirror://hackage/packages/archive/zlib/0.6.1.2/zlib-0.6.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=207ce34b620001d462779962332300d4
diff --git a/dev-haskell/zlib-bindings-0.1.1.5 b/dev-haskell/zlib-bindings-0.1.1.5
new file mode 100644
index 000000000000..133980fdc118
--- /dev/null
+++ b/dev-haskell/zlib-bindings-0.1.1.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/zlib-0.5.2.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 >=dev-haskell/quickcheck-2.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Low-level bindings to the zlib package. (deprecated)
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/zlib-bindings
+IUSE=doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/zlib-0.5.2.0:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.1.1.5
+SRC_URI=mirror://hackage/packages/archive/zlib-bindings/0.1.1.5/zlib-bindings-0.1.1.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9c0215860d4a983c7a7bfcb2188614ba
diff --git a/dev-haskell/zlib-bindings/Manifest b/dev-haskell/zlib-bindings/Manifest
deleted file mode 100644
index d9973e4b01cf..000000000000
--- a/dev-haskell/zlib-bindings/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST zlib-bindings-0.1.1.5.tar.gz 54770 BLAKE2B df5ed0474ed29c47720b4d94bd8dee49afeec36e9ecafe6639324bbd0ff2c0ef8d52996c54b3ad09aaf3a1b84ee8898bdcddc91705e33847e3e9e1d6cbb4af42 SHA512 1ce7a21f462ce5fb1c6ae0ccd40b6f59eb95772b46fa8f5cb3b94f76d55189b7c020dfd97cb18afe21cd826d1a511d9d02909c4376b165c2f574ec881f7de299
-EBUILD zlib-bindings-0.1.1.5.ebuild 681 BLAKE2B 9e09bfb17bdb9cb924084e4d3dcb8e9ea4fd6a2ea49a6037180733a04b554c9d5b74480d82e1efb2609a2c396ee5224275206b4c6fec39670d785d124111d6bd SHA512 050888ea63926cbb6c66f05efaed4dacb6ab42038f324f5b71d78405db45eb3b147e6da32fabea09ca38ff35b5b76e5f9976071a372e1f178fb2342d6f536601
-MISC metadata.xml 417 BLAKE2B f6248a94b8fd3708b184260d27911a261608ed30936403fdd43d0893080ee0206804f548018765b550a01ede3250370d830fa45a92f4b94cc708b40813b5ddd5 SHA512 4874cc6774401f7c45413458c44e70d40e207a2b5aaf65407eb350728c7f94e5d22945aab728d1147733d179670ff9d9e30796d375c2f09a964bd44c6c7f0a2d
diff --git a/dev-haskell/zlib-bindings/metadata.xml b/dev-haskell/zlib-bindings/metadata.xml
deleted file mode 100644
index 903a0cc68dc6..000000000000
--- a/dev-haskell/zlib-bindings/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Low-level bindings to the zlib package.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/zlib-bindings</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild b/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild
deleted file mode 100644
index 33fae44e0645..000000000000
--- a/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level bindings to the zlib package. (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/zlib-bindings"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/zlib-0.5.2.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/quickcheck-2.3 )
-"
diff --git a/dev-haskell/zlib-conduit-1.0.0 b/dev-haskell/zlib-conduit-1.0.0
new file mode 100644
index 000000000000..59217b2d7017
--- /dev/null
+++ b/dev-haskell/zlib-conduit-1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND==dev-haskell/conduit-1.0*:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] dev-haskell/void:=[profile?] =dev-haskell/zlib-bindings-0.1*:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck dev-haskell/resourcet ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Streaming compression/decompression via conduits
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=+debug doc hscolour profile test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND==dev-haskell/conduit-1.0*:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] dev-haskell/void:=[profile?] =dev-haskell/zlib-bindings-0.1*:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.0.0
+SRC_URI=mirror://hackage/packages/archive/zlib-conduit/1.0.0/zlib-conduit-1.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d30ab788e39545f38a0a3bb5d788f6dd
diff --git a/dev-haskell/zlib-conduit-1.1.0 b/dev-haskell/zlib-conduit-1.1.0
new file mode 100644
index 000000000000..7977d4ccaa62
--- /dev/null
+++ b/dev-haskell/zlib-conduit-1.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8
+DESCRIPTION=Streaming compression/decompression via conduits. (deprecated)
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=profile
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/1.1.0
+SRC_URI=mirror://hackage/packages/archive/zlib-conduit/1.1.0/zlib-conduit-1.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0388bd13ec78127e003c24c699ff5e2a
diff --git a/dev-haskell/zlib-conduit/Manifest b/dev-haskell/zlib-conduit/Manifest
deleted file mode 100644
index 4a88291ebfc6..000000000000
--- a/dev-haskell/zlib-conduit/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST zlib-conduit-1.0.0.tar.gz 3461 BLAKE2B 8605775bb5e801879c8017b8bd88379f200242bc021c34bf74322a578142444f013da227a9f9e7565b3f1afe27b9ab04a43666e16d9f4be81f3223b12ed07b52 SHA512 3f62701b687ab0220c2f5f18ebc2b9ba33010ed4471832523400cea4a808d02f59173c2de4ee3055f09ec6271a771745df35768612f8035d98c9dcd32be9b007
-DIST zlib-conduit-1.1.0.tar.gz 2024 BLAKE2B e7b8bcf5515cb25b2152c29db4a4f04d2050db8c999386428eaa913e296d34f6c07c136d2ff16962462b699fed20b35160ad51f079659d27b87a61bbb31c640a SHA512 5d19fa0e144b8e124486465c00b984f2e16f51e8ef0bc246fafd64b173e7dcef5b12f8cb431bb6071e4dab4a8c8f62606d47feb2cac2e36c1894216a9c8a32d9
-EBUILD zlib-conduit-1.0.0.ebuild 947 BLAKE2B 66b54eeec1352a80e2f7c36f6468022945cc81f6abeefe0ac71c46917bc428ed45d82ed920d29d5eb072b886322b92d639f9872f0a50e56c3285a5eb5528fa2c SHA512 16d43e76854ff60b4951bd9f8084eedf7d46b8bfe318bf9f67ade9f1590baec070442f3ef19362dba6608d629a86093cae385d13032bbe8307bcce17a86311b8
-EBUILD zlib-conduit-1.1.0.ebuild 583 BLAKE2B 9faa4ab27a50ed85d3aec7148b05b2f4c6ec2ecadd993c977e373014cb1540396ef91624bc93156b28c2d7ede9bfde78455b4382a5462589c37b4b409b2ca8bd SHA512 b2068fca59904a1822edff6c6690070f48306349eba8c97ac4d7d738b2008bdbd10d2d861482b85b5910a92af21c666e3bf4c6f05d65b937f6a823861cd3b310
-MISC metadata.xml 421 BLAKE2B a9003dc463b6c470053d6c36f16bdcc6eea6dae13fe7358ba5c8b5e67fdcafa60f149a72df3691e223c4a756c3facc957e813b04c0bfe82f1ac087983aa90c3d SHA512 5b01280934ed698382fb2a9ff0d8f21638ecbcd5c929824fa64a3f3520afe6b06c5fc52ef63931eb160d1dedaf1a5fe4799852ba8d006561e78098731f1e1e65
diff --git a/dev-haskell/zlib-conduit/metadata.xml b/dev-haskell/zlib-conduit/metadata.xml
deleted file mode 100644
index 33070e5f5f8e..000000000000
--- a/dev-haskell/zlib-conduit/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Streaming compression/decompression via conduits.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/conduit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/zlib-conduit/zlib-conduit-1.0.0.ebuild b/dev-haskell/zlib-conduit/zlib-conduit-1.0.0.ebuild
deleted file mode 100644
index 8203dd0c6841..000000000000
--- a/dev-haskell/zlib-conduit/zlib-conduit-1.0.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Streaming compression/decompression via conduits"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+debug"
-
-RDEPEND="=dev-haskell/conduit-1.0*:=[profile?]
-		>=dev-haskell/transformers-0.2.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		dev-haskell/void:=[profile?]
-		=dev-haskell/zlib-bindings-0.1*:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/quickcheck
-			dev-haskell/resourcet
-		)"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug)
-}
diff --git a/dev-haskell/zlib-conduit/zlib-conduit-1.1.0.ebuild b/dev-haskell/zlib-conduit/zlib-conduit-1.1.0.ebuild
deleted file mode 100644
index 0e84f5633ed8..000000000000
--- a/dev-haskell/zlib-conduit/zlib-conduit-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Streaming compression/decompression via conduits. (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/zlib-enum-0.2.3.1 b/dev-haskell/zlib-enum-0.2.3.1
new file mode 100644
index 000000000000..5b3c2122ef3f
--- /dev/null
+++ b/dev-haskell/zlib-enum-0.2.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Enumerator interface for zlib compression
+EAPI=5
+HOMEPAGE=https://github.com/maltem/zlib-enum
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.3.1
+SRC_URI=mirror://hackage/packages/archive/zlib-enum/0.2.3.1/zlib-enum-0.2.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7e3dd54832bbf331af4cb25762a16367
diff --git a/dev-haskell/zlib-enum-0.2.3.1-r1 b/dev-haskell/zlib-enum-0.2.3.1-r1
new file mode 100644
index 000000000000..037552fefd10
--- /dev/null
+++ b/dev-haskell/zlib-enum-0.2.3.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Enumerator interface for zlib compression
+EAPI=5
+HOMEPAGE=https://github.com/maltem/zlib-enum
+IUSE=doc hscolour profile
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.3.1
+SRC_URI=mirror://hackage/packages/archive/zlib-enum/0.2.3.1/zlib-enum-0.2.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=90e23d0f45f8bf291cc4a7f0f9d541ef
diff --git a/dev-haskell/zlib-enum/Manifest b/dev-haskell/zlib-enum/Manifest
deleted file mode 100644
index af2fa9245604..000000000000
--- a/dev-haskell/zlib-enum/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST zlib-enum-0.2.3.1.tar.gz 4652 BLAKE2B a0148de59f5beac8dac5239228f8d2855249b613af2bebd6fae52f194fc17f4b0d517567267bfb6d5973e67b56e947a18e4f4904f504e33f0803bb66619fad50 SHA512 e68c72ab44922fa2df3b2bc718f65ce313be24742e2edfcbb97cb12f7963e9448aa68ba2e64ef08369b07f641773f4688a787615f76dd183982089ef7fe68a8c
-EBUILD zlib-enum-0.2.3.1-r1.ebuild 1053 BLAKE2B f2ff51eccbf9c6e605a25dece0373219c2137e57eb070553afac8850297dc8ed336209a3a61d6faefd7178420aeaa9e5574b3dd0b04deac2a4a99268ab2a0988 SHA512 b0ca0283ebb73322157782b787ebc58023205aff86d8cbda2179b702fdb7d3c4ed55445a88084b45772daca597984c9a63a7f67b81072c040cf6fb7c09300c2a
-EBUILD zlib-enum-0.2.3.1.ebuild 895 BLAKE2B 515523e4f4b72a864746fa3022f117f241d2f7a350ceaf8870efc90beba4441d04335043840fa068aee74c4a22ae51f623fef2c8a1b2cd7a5c22a4a0ee7ccfd5 SHA512 dc19ddb67204277253a8b4b3b88c6a567ef4829d5cc69248a1f4053259b9833bd22f36467fa06133c92342f24a40ed723ff6a9016e47ea82c1f488f8b777fd8b
-MISC metadata.xml 464 BLAKE2B 927620fbbf3de61c35fdbf814c2753ce797acfaabc459775d1ddb67674eb19b27a2417254d3aad9ca2ac405bb304a69f397f94870c913f88c29c51c2e71d9736 SHA512 b2d72309b5a16cd457e2ca7ae4d0290639c8d1ec6d257faeddda471f35da0300a943188c82e65bd46fdcbb779fb42c17281ac6e981f8fab8ec472b7a5158e5d1
diff --git a/dev-haskell/zlib-enum/metadata.xml b/dev-haskell/zlib-enum/metadata.xml
deleted file mode 100644
index dcfe8b5f7e36..000000000000
--- a/dev-haskell/zlib-enum/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		zlib-enum is a stop-gap package to provide enumeratees for
-		zlib compression/decompression.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">maltem/zlib-enum</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/zlib-enum/zlib-enum-0.2.3.1-r1.ebuild b/dev-haskell/zlib-enum/zlib-enum-0.2.3.1-r1.ebuild
deleted file mode 100644
index 0e225f17e3ef..000000000000
--- a/dev-haskell/zlib-enum/zlib-enum-0.2.3.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-#hackport: flags: -test
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Enumerator interface for zlib compression"
-HOMEPAGE="https://github.com/maltem/zlib-enum"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'transformers          >= 0.2 && < 0.5' 'transformers          >= 0.2' \
-		'transformers               >= 0.2      &&   < 0.5' 'transformers               >= 0.2'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-test
-}
diff --git a/dev-haskell/zlib-enum/zlib-enum-0.2.3.1.ebuild b/dev-haskell/zlib-enum/zlib-enum-0.2.3.1.ebuild
deleted file mode 100644
index 586db20e6777..000000000000
--- a/dev-haskell/zlib-enum/zlib-enum-0.2.3.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-#hackport: flags: -test
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Enumerator interface for zlib compression"
-HOMEPAGE="https://github.com/maltem/zlib-enum"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-test
-}
diff --git a/dev-haskell/zlib/Manifest b/dev-haskell/zlib/Manifest
deleted file mode 100644
index dd3623e5d89a..000000000000
--- a/dev-haskell/zlib/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX zlib-0.6.1.2-fix-w8-tests.patch 1138 BLAKE2B 4a819faaca83aea0a6d338924907c8a02fe7d8b04a5ad57bc983e1a93cde3183c080883b97e49355a022e80dfa2f289b4cf11cc5e3e625d25b25ff7c0b6426bf SHA512 bd2f510dc6516668c130edd969d7002d178331a0d09e1e0cca9d899ff8164810f9875c652ab25cd331322ac5d369162a9c45a106b0ad9173f844bbc8f1e96bdc
-DIST zlib-0.5.4.1.tar.gz 127760 BLAKE2B 3e0ade0091a9d9e50fd4d0b9e65eba9a1fa7037fa4cfaa46d2d8b777d0d3338ddbc09c96ca12b5de8b2d7337c1a213d17b789cba971bb30b84ba1c3b34493c20 SHA512 aa3522a5704978badcf634e1d99282144f01ddee4600bd146631a3ee8b98080914eb2887869a5fa404dc9d1e438a5df87cf7d44548c2f3e1ec13ba19004ef985
-DIST zlib-0.5.4.2.tar.gz 127818 BLAKE2B 899a0edf39b9830d5223c05dce0d6e4a7884ac12b918bc54bdd820fb77c3701acde768179a1f1b1a88330c9c5ab46433eab0420744994013e9adbbe72fe451ff SHA512 9ee75d04bea192967dcc9f59f500a199c605ed6b18b7883e2876e1b3116929ef62ccff9cb7174a2d72b567241c3fc2eb794b3532831b929bd5f5a6236bc03410
-DIST zlib-0.6.1.1.tar.gz 142902 BLAKE2B 30cc774ca73fd657a9fbb00bda520855cf33932dbeae91c60f900b7c34a57014f14853535d6bd2bf0affbcda3545b896a2bbc1ebe5e289f78140244dd9ea8fb1 SHA512 b9f665308fe7887db376625d6001b5d4c511b6b0f392e366903e84f262cc7c81ed9746d9a5f0b84e9a0ec9dfdc91ed41809528dd50e067008a91ef5168cad12e
-DIST zlib-0.6.1.2.tar.gz 142413 BLAKE2B 3dac7acfc11b9e8dd00e7e9b35daa420a34f9cf58d06e7d82fb00f33025b9eb2769b966fdb9772937e8be182b16d502c14e4c6018fbdd72d942b6fca95f7d974 SHA512 0034eb1297eaf20ab64e5cbfc835cee1985d34bc248325bf57f7bf5cdf2918ab72f339fe5b8b3f5f16dee862f190e0c71612960b9021cf2ca70c951788b73fc1
-EBUILD zlib-0.5.4.1.ebuild 642 BLAKE2B 3bf6476fa848fe2f94121fa756f7e6f378b1ba1979018dfe8371ff7dd4f6bddbdfd02c4cbfbc6b60cb8898d054f3324b8db3e29545ad24fa06ad13459ab549e2 SHA512 a678ee02dd6c7f8df8b5676f3183b2a4f6d890d22d8b5308f716df6e4f8770111669e84a5486ca01c4ae3c705cf92c066eb75a1a0d7920bf921cb67c3940094b
-EBUILD zlib-0.5.4.2.ebuild 646 BLAKE2B 65880f2421138767fafc5a26a2c6bf59508ebb1a46ace3bbdcd52b88261dd450d71006482ea3721ef4adcaccbfb66e2b5121c7b97839b731ad81327c28daab4e SHA512 6add183c13a576819362ad63cde8607c77e426b3bab7c85845c5233e8538f3a6940346e1a8a224e79331ddb0ba566d6c741c07e3dff73418f7ae5a3617097d26
-EBUILD zlib-0.6.1.1.ebuild 836 BLAKE2B 180ce9439859841de82fd54bf633e3d25e3a20b05bb6263ebb501f6982e6a18e9dd3345f650135c3e59b81bce3a39b3e2299a2d554b7894bda2e6160a5dc5bb8 SHA512 79d014a5314aa97918a3a907624ea911be608a9b67d7b9590c5a33c6cab4b2099d55cc3be31457a9e25acbb7b7c8f22b46873436aee97c26f753f80e0b20ad23
-EBUILD zlib-0.6.1.2.ebuild 1030 BLAKE2B ae3dcfd2bb31d38e03507f1d3f84d84a00451c999a1d1d1ea0329e5303602883891c9cf417ff91b220400c0a490866e2e5703f0b565e29f5da930800cf0d3a96 SHA512 aae054c5f08ba245e7ceba341e810edb8023f18841270f36dce97cd61374dcd7f64aaabc660c3923e2abd3ee42cdadefcee4edda06d4aa12445b9b8f9fb5a5de
-MISC metadata.xml 824 BLAKE2B ea99ec3ad9a549c70455e91a59f38b6937da780e406c2bc18d039f93ef3cfdd08f600fb8854173c54ccbf029125204693f0da1592d30eb4554d479357299a7bb SHA512 c291a8088ad2d586390dad8cc2bb80a606fe7e558f4fdbba5c5168024693ea400f6d3a2795144f2c5af6cea51b90fe9097759027377ee8ead929296a4b4f26de
diff --git a/dev-haskell/zlib/files/zlib-0.6.1.2-fix-w8-tests.patch b/dev-haskell/zlib/files/zlib-0.6.1.2-fix-w8-tests.patch
deleted file mode 100644
index 5b4cb5a6eca2..000000000000
--- a/dev-haskell/zlib/files/zlib-0.6.1.2-fix-w8-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-zlib does not really support windows size of 8 bits:
-
-Reported by eroen
-
-https://github.com/haskell/zlib/issues/11
-https://bugs.gentoo.org/show_bug.cgi?id=613532
-diff --git a/test/Test.hs b/test/Test.hs
-index bbd8b94..81bd260 100644
---- a/test/Test.hs
-+++ b/test/Test.hs
-@@ -66,2 +66,3 @@ prop_decompress_after_compress w cp dp =
-    -- of the zlib source code.
-+   compressWindowBits cp /= WindowBits 8 &&
-    (decompressWindowBits dp > compressWindowBits cp || decompressWindowBits dp > WindowBits 8) &&
-@@ -76,2 +77,3 @@ prop_gziporzlib1 cp dp =
-    decompressWindowBits dp > compressWindowBits cp &&
-+   compressWindowBits cp /= WindowBits 8 &&
-    decompressBufferSize dp > 0 && compressBufferSize cp > 0 ==>
-@@ -85,2 +87,3 @@ prop_gziporzlib2 cp dp =
-    decompressWindowBits dp >= compressWindowBits cp &&
-+   compressWindowBits cp /= WindowBits 8 &&
-    decompressBufferSize dp > 0 && compressBufferSize cp > 0 ==>
-@@ -94,2 +97,3 @@ prop_gzip_concat cp dp input =
-    decompressWindowBits dp >= compressWindowBits cp &&
-+   compressWindowBits cp /= WindowBits 8 &&
-    decompressBufferSize dp > 0 && compressBufferSize cp > 0 ==>
diff --git a/dev-haskell/zlib/metadata.xml b/dev-haskell/zlib/metadata.xml
deleted file mode 100644
index d3253b28407a..000000000000
--- a/dev-haskell/zlib/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name='non-blocking-ffi'>Execute FFI calls in the context of haskell thread.</flag>
-	</use>
-	<longdescription>
-		This package provides a pure interface for compressing and
-		decompressing streams of data represented as lazy
-		'ByteString's. It uses the zlib C library so it has high
-		performance. It supports the \"zlib\", \"gzip\" and \"raw\"
-		compression formats.
-		
-		It provides a convenient high level API suitable for most
-		tasks and for the few cases where more control is needed it
-		provides access to the full zlib feature set.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/zlib/zlib-0.5.4.1.ebuild b/dev-haskell/zlib/zlib-0.5.4.1.ebuild
deleted file mode 100644
index d90af2e4805a..000000000000
--- a/dev-haskell/zlib/zlib-0.5.4.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Compression and decompression in the gzip and zlib formats"
-HOMEPAGE="http://hackage.haskell.org/package/zlib"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-		sys-libs/zlib"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/zlib/zlib-0.5.4.2.ebuild b/dev-haskell/zlib/zlib-0.5.4.2.ebuild
deleted file mode 100644
index 9ba0e7d79637..000000000000
--- a/dev-haskell/zlib/zlib-0.5.4.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Compression and decompression in the gzip and zlib formats"
-HOMEPAGE="http://hackage.haskell.org/package/zlib"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/zlib/zlib-0.6.1.1.ebuild b/dev-haskell/zlib/zlib-0.6.1.1.ebuild
deleted file mode 100644
index ffac01f1ec30..000000000000
--- a/dev-haskell/zlib/zlib-0.6.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Compression and decompression in the gzip and zlib formats"
-HOMEPAGE="http://hackage.haskell.org/package/zlib"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE=""
-
-RESTRICT=test # needs porting to new test tools
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/quickcheck-2
-		>=dev-haskell/tasty-0.8
-		>=dev-haskell/tasty-hunit-0.8
-		>=dev-haskell/tasty-quickcheck-0.8 )
-"
diff --git a/dev-haskell/zlib/zlib-0.6.1.2.ebuild b/dev-haskell/zlib/zlib-0.6.1.2.ebuild
deleted file mode 100644
index 4187ff78db05..000000000000
--- a/dev-haskell/zlib/zlib-0.6.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Compression and decompression in the gzip and zlib formats"
-HOMEPAGE="http://hackage.haskell.org/package/zlib"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE="non-blocking-ffi"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		>=dev-haskell/tasty-0.8 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 )
-"
-
-PATCHES=("${FILESDIR}"/${P}-fix-w8-tests.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag non-blocking-ffi non-blocking-ffi)
-}