gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-haskell
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
393 files changed, 7488 insertions, 405 deletions
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 6f72c78aaa2b..d8426e5573dc 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/aeson-pretty/Manifest b/dev-haskell/aeson-pretty/Manifest
index 2099c95bb9eb..e60f1864a5d7 100644
--- a/dev-haskell/aeson-pretty/Manifest
+++ b/dev-haskell/aeson-pretty/Manifest
@@ -1,7 +1,9 @@
 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
+DIST aeson-pretty-0.8.8.tar.gz 5600 BLAKE2B cac5605b17405868ea373806021e9ba2b3bd3bcb864e97067d4086289a53c2118922e318fb966172a0c0cf0df900e577698afdcea1291464151fc0a01f359dde SHA512 5867343c5d51d632bb299fcbc00cdb29b0feb1931f0ff9c3cf89c5752f1a103c68c9e6fa65e8538ac19212853c39f6d1d6e0c2d9f0bf49fe001c1bfd792db779
 EBUILD aeson-pretty-0.7.1.ebuild 921 BLAKE2B 54a7e8ef77d067e9ab0f248df33352eef8e2df9c5228e667248b2d33894ea34bfc1ce58991d17c674c3b666de03d73ec39d41e5711c55177944dba4e8b22444c SHA512 ce7639f7a188cc8c9ccd95c67c43a404eb29f7caec0887da9b373b25023b172835de2c0f0ca535fbafabb5ca039465b84c53e3dda4728b22697caed567c85399
 EBUILD aeson-pretty-0.7.2.ebuild 922 BLAKE2B b7031f855ec318a90f2059de54f2938c51d32265062ede0bea5f67a52272122bd136a685158b597023939872fea7f76df36b06d74a128456112dd4e728ea434c SHA512 07070f86f490a42d0be7ad546fae0f830134f08d999484aae1def4a19c88e8770558494aa0114722a975cba4c8a4b8f0234196f00402b9ca51754ae58bf91e26
 EBUILD aeson-pretty-0.8.2.ebuild 1041 BLAKE2B 025b664ded0bec1117a2a7800d43d3f63529444a8b4b4d6f84c8d0761c04f60209216cbe6dbca5542171e313f12fb3100fa5ad543281ace6f2133f87aeef301c SHA512 9f46572498fb87c45004977008a1ded4634ebcfacbd5dfbb5140c65e2c9a4f69885a51c5dc7cd644211f4deaeca301f02ec4b56c99b0f74b026822ccb6f16c23
+EBUILD aeson-pretty-0.8.8.ebuild 1043 BLAKE2B ff9d846bc59cbeda139f635137b92a0dc7bc6cbbf35b38fdb24dec95462b72d18dec95fee84be9e16193b53c212c8aa91026d51cde3a1fc738051756790f6772 SHA512 01bea313caafeb4aba9c9d7267362ccd8c17b41b80f041ae958ac80143e1236c7f3d6b5e5479de7d19c97bed211f7af01579aa97e55a88b31f40e153be4bf878
 MISC metadata.xml 1084 BLAKE2B f7a8caf4e37967a6615328a96b204cccaf8229576767137cdbe65184ead5c2ea543c6f4c69927c603e2f71d96e4c2887b725f18011a7fd25c91d7f6127d64d0e SHA512 9561989967c30ea725461606c5e3200220cc5d32d71b726a4aff0e7e88b4638c02bcb4459e2ffe460e2f0a673d1ec35fe08506e526534be06627b22af23b9713
diff --git a/dev-haskell/aeson-pretty/aeson-pretty-0.8.8.ebuild b/dev-haskell/aeson-pretty/aeson-pretty-0.8.8.ebuild
new file mode 100644
index 000000000000..9e23eefb7e8d
--- /dev/null
+++ b/dev-haskell/aeson-pretty/aeson-pretty-0.8.8.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+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="https://hackage.haskell.org/package/${P}/${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/scientific-0.3:=[profile?]
+	>=dev-haskell/semigroups-0.18.2:=[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-qq/Manifest b/dev-haskell/aeson-qq/Manifest
index 85502c5b476f..e40075e9eb93 100644
--- a/dev-haskell/aeson-qq/Manifest
+++ b/dev-haskell/aeson-qq/Manifest
@@ -1,5 +1,7 @@
 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
+DIST aeson-qq-0.8.3.tar.gz 4751 BLAKE2B 538c51c52470ad628326f67d4822812b352e7141c94ec2e385fc889d869c512705ee4ee58951c31e8422ccdd2ab855cfe4262a874864bd19b60e0ad67132798a SHA512 f7ef90529b4c9661ffc54ab8ebfc73c9966e6338591b871678be2a6e63ecf30089fd33279a074bd8d1905d71c8198ea5cc24c828d6e940e7af7585ba826a0c29
 EBUILD aeson-qq-0.7.4.ebuild 745 BLAKE2B 86b6b3fdae6443d28fd3362d7600f52417c6240fa5fb90be049cbfc5c903d75ec09b71d8b45e28c8a4cbb47831732795e44b6e287d6d45db979ca07ccce6be8d SHA512 31a18548bfc900a21b7b998dbb9951fa61cf2b9ab6a1cea1bc9d79f2dc67090d49007507dc705301dc7b7e09ae9ac2e25e916d70a952cac33e2785e10177db7f
 EBUILD aeson-qq-0.8.1.ebuild 856 BLAKE2B 85e278490e2a495ce51578b30558a562137eb44694f40f215e258f67eb9b85449a7e6ca57f0c81e46bdddebf23d2715d3fc338854909abdf0d4f0dd77610d3ac SHA512 2cbf6eff6e8ef47ab422dcaa134e894f1fc1de8f5addd098a1d40c5e1c005d2eefdf9437983915f16b07c45c7563e1b006b76ffeb64867415b77aaff80188f7e
+EBUILD aeson-qq-0.8.3.ebuild 856 BLAKE2B 92541cf9b61c472c5a21df44fba12a6f46ab58ed92c500c20d9a7db4e2bc2c7643ed22a0297b3898b7ebf9b74a305d51e62e571a08c2c4d66671149b91e8e0a2 SHA512 308c7b6945069003320fec9ea5cf778bce9bbdaf0ddf8c1072a5de312d3453ce543507ba15c00a750496bd2673a023da929e9bf57f75b008e07d19e7f646a2de
 MISC metadata.xml 727 BLAKE2B fb4fc94b0cc95d9e0a31529f45dfaab83c09c0d81ae64f0334e40054c12cfcacb93fbf8293eb2b99722c32b63bf66ebde6119af30af45b4a40212a462c42b935 SHA512 a8ad3155394526f744fa3a5aac2940a93817d5c8237d57ccb393afb3077a5c135bffb8ebee3f2208e20968e47c6f861deb24c9d46e6f75f887ec94dd311ba0f5
diff --git a/dev-haskell/aeson-qq/aeson-qq-0.8.3.ebuild b/dev-haskell/aeson-qq/aeson-qq-0.8.3.ebuild
new file mode 100644
index 000000000000..229b7a3ccb24
--- /dev/null
+++ b/dev-haskell/aeson-qq/aeson-qq-0.8.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="JSON quasiquoter for Haskell"
+HOMEPAGE="https://github.com/sol/aeson-qq#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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.12
+	test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/alex/Manifest b/dev-haskell/alex/Manifest
index 8ec8d7dcfe71..c7da888dac5a 100644
--- a/dev-haskell/alex/Manifest
+++ b/dev-haskell/alex/Manifest
@@ -1,7 +1,9 @@
 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
+DIST alex-3.2.4.tar.gz 110688 BLAKE2B 182f58317bcca6c72f54f63792e04a9108d9311e7f1dd8b7247f847fe577e0ba1297f442a4f533f5b55ee1f7963167d9818149807b46fb400818d163cc18a939 SHA512 e9e99caef4bc985aa37bd42488121f9b83c4f3026c9745ad12f50b5896e9f7c07f48a753c647c30ff16be804529d2478f8d90fa38e352f1d8861e610651c871a
 EBUILD alex-3.1.3.ebuild 1395 BLAKE2B 7faa32e02de14d493ea000a393f3c5e657b703c78385560810b4ea5bb1c0d4c1bd540f9fd70367962ae3ebd9ba9e9192799b2e65d45a895e7042aad56ed93039 SHA512 3911d252dbe638f92fa1d0bf39dd9fdc17b21b75b51ec6c2bf024c574ff40eccd210704d96a9a15b867b78cff848a987db5cefa0524186a897b97aec39b2c00e
-EBUILD alex-3.1.7.ebuild 1568 BLAKE2B 68507181cbf21628a116513860b10b673971a43f62b698bb68ede4839bc62ab7840030eb98d22ed17687ca03093a1c7f113be420546eb58550ae7b151db3cc9c SHA512 4cdb51d64bb7636e18079fcf1444862fa35515db403ed208abc7a6dd4d8211c048f20d29298329c4e1889910d765e1f4ac086cd8d3d2ffe5d0d0c7c41e6450da
-EBUILD alex-3.2.1.ebuild 1598 BLAKE2B 9237101b1bfd634920eaa11aa99b8cb222d5e0598a0946ac94813935c0a073a096ee6d84851ee793971d354e679f4fab8e02ddb9c62b0f0cf9621a5ba558fdb3 SHA512 daa800f62a36ddecad2df713d63460903534519a11ef11c0225a3f168aa80781ad2a4b122f36d4356f7c1119f7ede81ef7b75f6e3e47983cdf904e17768f6516
+EBUILD alex-3.1.7.ebuild 1561 BLAKE2B 0d7ee7d66d44610856dc86744b0aae9bff83fa4c277e486d0f88c6a56c616a43f773211e6de3bed22aace4507c1a2b3ed9fda2c1012b5406dd6973f3b02d1758 SHA512 e23c059f452a34df7effb43c9077100c054091b64132cc6401131f0b4a2debf3dc01bc05ab1b2ce098881259279f334d5a0ccaf9ad36dde17ada6a6f7a853a6a
+EBUILD alex-3.2.1.ebuild 1591 BLAKE2B a047ea6f07bb005082575fe065e92e83972946a0cf13e7283abba7ec23f0eed592bafeb29bd752f22bd2224d765143bb8ae302b8801fd1cafae3da5589bef8b9 SHA512 0da96d5d3bd2256967d99ef6c551631ac01d87c1feeefabf9a69cd26c374421e222eb28651efa6973f7e73b63cb9618c3ce59f09927479df28332f0682a353b8
+EBUILD alex-3.2.4.ebuild 1327 BLAKE2B ef970ae84c0a0b43fc9244053cb54eab7ac18f0fc072ad1a5a02efa225ff74b07a3a9492d409b0a8825ba32ee7c890614965c1790dd79a482b5df81c98857555 SHA512 fc07c8b3b2602c61c0bdaa8f5f777cc25539353d73f1917ddffe71de30c59021dc3587419e5172b8baf8b66674f98286599da0107356b673c9ffb3221a1ddbe9
 MISC metadata.xml 349 BLAKE2B 0e0922a706cc99af24707269cbe80a8969df912d02317294a007d43a81263b232a3f2b199b4f981a023143a765427851335493a10235feb627ff8adf85497c62 SHA512 9c41217241498cd036d00fce456cea108f675c71c12bab05305dcfbdbd5d55d5c7db8163e5315eef12f9ca8467276b6fad9038d47da729f448338655691a9ff8
diff --git a/dev-haskell/alex/alex-3.1.7.ebuild b/dev-haskell/alex/alex-3.1.7.ebuild
index 2ded8cc77471..8d4d94c9bf9e 100644
--- a/dev-haskell/alex/alex-3.1.7.ebuild
+++ b/dev-haskell/alex/alex-3.1.7.ebuild
@@ -66,7 +66,7 @@ src_compile() {
 
 src_test() {
 	# workaround https://github.com/haskell/cabal/issues/2398
-	emake -k -C tests all || die
+	emake -k -C tests all
 }
 
 src_install() {
diff --git a/dev-haskell/alex/alex-3.2.1.ebuild b/dev-haskell/alex/alex-3.2.1.ebuild
index e56cee1d07ba..1460cbdca36f 100644
--- a/dev-haskell/alex/alex-3.2.1.ebuild
+++ b/dev-haskell/alex/alex-3.2.1.ebuild
@@ -70,7 +70,7 @@ src_compile() {
 
 src_test() {
 	# workaround https://github.com/haskell/cabal/issues/2398
-	emake -k -C tests all || die
+	emake -k -C tests all
 }
 
 src_install() {
diff --git a/dev-haskell/alex/alex-3.2.4.ebuild b/dev-haskell/alex/alex-3.2.4.ebuild
new file mode 100644
index 000000000000..0adfe9957174
--- /dev/null
+++ b/dev-haskell/alex/alex-3.2.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND=">=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() {
+	default
+
+	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
+}
+
+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/alut/Manifest b/dev-haskell/alut/Manifest
index bc41c021260e..8167855e9a71 100644
--- a/dev-haskell/alut/Manifest
+++ b/dev-haskell/alut/Manifest
@@ -1,3 +1,5 @@
 DIST ALUT-2.4.0.2.tar.gz 26231 BLAKE2B 0af581e97d58ca4358e5675ecbe17891b45f229fb2a1fa6316f3a060001ab36604bb627d6d1b8ae78ace3e382860d65df5a9aea20c82e0bf8bbd5450bb31b32b SHA512 b2ede23635f73660db008e402567c376ef77c081312b76767a2c6d5a4f30bac7e3e8c6533da371828470865218cdb076be4dac07c11bdda0feb7889552d024f1
+DIST ALUT-2.4.0.3.tar.gz 25587 BLAKE2B acdc2878748c322acb630e05a2712f73aecee2ab1d789fe338e15b86b758cf708b962a5268ae159a5ace12f8749e772c8b654cbe97a13ae90fc65b2ad51e193d SHA512 3ca21f4846618c197e4d7fec49f20e9964ffe9ef320fd0880a307743f9b2240b1fa4004da630e000bb2255cad42ed081ca47d84bf8dd1fca72d0cfbf818ecda1
 EBUILD alut-2.4.0.2.ebuild 1077 BLAKE2B 02a3666b323a78ac499a80c830195daad8515862cfc7fffb92a31a066ba5cddfa47d6b1001c9e001a1f223a09ef90a1137490d2ee0d659ba0795ce8ab7cd702c SHA512 1ba276466b1724c7675822e33569c7a841be4604402be94a8ac7845b7ee47b2d62784ccac281041075dccbc09da3368b0883641414903b1440de58b19d6508bc
+EBUILD alut-2.4.0.3.ebuild 989 BLAKE2B 1ae56295db4b59753b37300ae61caa04d942cf293013fbb45fc4cd95a1f9439925d8a23220a3ff808ded26440b4cfb41faaac52045f8d0667a16e68c79dad900 SHA512 9049334e12d9c5417d635e71a269b090c38f65a911e39ea636eb173ad0618cc0c532f1919ce151befdf46edf89c238a61b654aacb941a89569604523c7395f51
 MISC metadata.xml 311 BLAKE2B d1edbd170f8774a220b1750e05390e0f6693a81de85b49b6d54df3ca8502adb7faf0aa99b66bd0374209433d91c1697216780b9de70d3a173b16256a72b6fba7 SHA512 41a19ed33057a3d03f99c30fe71898900cf0d5a15fa90c23de4bac7313872ceef0aa0f0d59f50d24ecb58bac144b46264812fa107137c187b67f084d3a307ee4
diff --git a/dev-haskell/alut/alut-2.4.0.3.ebuild b/dev-haskell/alut/alut-2.4.0.3.ebuild
new file mode 100644
index 000000000000..28bf060d07a5
--- /dev/null
+++ b/dev-haskell/alut/alut-2.4.0.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: -usenativewindowslibraries,buildexamples:examples
+
+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="https://hackage.haskell.org/package/${MY_P}/${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.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	media-libs/freealut
+"
+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/ansi-terminal/Manifest b/dev-haskell/ansi-terminal/Manifest
index 09754d4db785..5851c3f9ff62 100644
--- a/dev-haskell/ansi-terminal/Manifest
+++ b/dev-haskell/ansi-terminal/Manifest
@@ -1,7 +1,5 @@
-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 583 BLAKE2B faf9fec4f908807f9f3b0cac187e5c4922c6fe31a615e63da7e2b238b09d67bc40e2d9d5d5ed8eed073a932b470b9b4bd8beafea0ffb48dc843ce3b8a61b445c SHA512 67edb6f3261a831c80720afb056f76f5b7f45eb12ed3c3a2fe9526ca456c2dc8ba9d23ea69a8930252d5ae1e65bdd12d8b0ec533548169315f60b0532b4ee8fb
 EBUILD ansi-terminal-0.6.2.1.ebuild 677 BLAKE2B 0a03540a393de34ff920938287306a6c21315addcb5175016ee14123a14499889dca3566c2e8c0a62cecc9a8e140eb12405a31b0e9ceb328406c2095b98b538d SHA512 f92e29cc4c2881bb7fcdc8e89a7e47543fcf198d5d941d909d0c46744381015ee959ec4c4980fb4afa8518c122c4685734b403b0894bdbb5b168857bd74b4d21
 EBUILD ansi-terminal-0.6.2.3.ebuild 689 BLAKE2B 02c9b2303173b365471cd1a7b72b73a3c6173d1ceb64d71a02efcb59faf0feb365e8ef559173deee6f1216642c1ccb0c3a66646d9c13f7ccb85d6f184c844319 SHA512 2c466adf6e75a47b39290801f88513dd30678873f6db8b6d79a90e3b5e58c971c0d384d8fb37a4b63450e361497af4d8c329805c8411cf53a2bf1f60498c95a0
 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 b996d2379a4b..000000000000
--- a/dev-haskell/ansi-terminal/ansi-terminal-0.5.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="https://hackage.haskell.org/package/${P}/${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/ansi-wl-pprint/Manifest b/dev-haskell/ansi-wl-pprint/Manifest
index 314a4915fd1f..5506fc0b50c3 100644
--- a/dev-haskell/ansi-wl-pprint/Manifest
+++ b/dev-haskell/ansi-wl-pprint/Manifest
@@ -1,5 +1,7 @@
 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
+DIST ansi-wl-pprint-0.6.8.2.tar.gz 16491 BLAKE2B dd0619b5ee9f043b225dcafdc7dc4f8b095ccd24644f03cd46c3596765ecb3c2eba7955f5cf4032664b9da9473ee508c59c4b18e7b30725ab81c00fa96e5f2ad SHA512 00c39dcdd90071011d2db6e196c472fddc61bf3ee4baed0414de1a1ef1e13801fceb647a718018e1a644d2276845af7bc58d5bf72dcb35d193ef6391ba2f8ac3
 EBUILD ansi-wl-pprint-0.6.7.1.ebuild 787 BLAKE2B 52485b1dfc4e2bc2f6a290c2c8065fd52ad2acb1c45cd6e37bb3d44cf1deaf5d1a711717f933aa03f6a234ba97e7fde0dde58217e0833f77b6d92bb54edc38cb SHA512 bf69006f87b6c64cf53f3b46151c5c15c9e73d8e48fc7afc8b37fa90a3fac55fda004ae2564a1898b3f2d2732f12eeb1bb28940fda3fe4878ab888cb599da600
 EBUILD ansi-wl-pprint-0.6.7.3.ebuild 784 BLAKE2B 9f3509ac380590f45f267d16f04e44a111601f3e48abcd240ba97bb03ce476479623feb52fdc03bebb29b4cd87f329b07fa0c0cac4f19af65e4c7e96de2c950d SHA512 7e39eb20f595adc166aebcce5d5e58572667b3ab0c36dced93f9888edc7d207d4c65199b37a413a9ab353c3b55260f6e3c35b71d4d4492c6c8824666b0e49fe3
+EBUILD ansi-wl-pprint-0.6.8.2-r1.ebuild 897 BLAKE2B 120f71f59e12a5cf292c7248dd4ec16c46a0ebf556e124fe203a4f83fefb2735d913c4357bcfe22ff9fde8fb35fdf09bd90f35301c428b9a907b64f2e66bb823 SHA512 8b2d6cd45881af4dfd831c2606379d481e521be70178ace9d988c37c9216680cd03b50f4efda5c72aabcb70ae322d3a48a3881b1ec83d28aedb84192a4067e14
 MISC metadata.xml 640 BLAKE2B bbc4f8f5621d458eab0c1ea200b6a70201cc3825033302b57d235c76e3aba1f80dd07b8e204a1546a43b92782d93ca6c0c776d8fba1f6e35cf36901b19038da3 SHA512 7999a66b49fce8bdd94736eeb4eb47858b06daae8928053531df4892f34e46f5135c92c9b7659446573b144e6e8d37d27306b608759eb30d2e71addb81a7ffd1
diff --git a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.8.2-r1.ebuild b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.8.2-r1.ebuild
new file mode 100644
index 000000000000..ca01de330e4b
--- /dev/null
+++ b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.8.2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.4.9999
+
+CABAL_FEATURES="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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="example"
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?]
+	>=dev-haskell/semigroups-0.1:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag example example)
+}
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'ansi-terminal >= 0.4.0 && < 0.9' 'ansi-terminal >= 0.4.0'
+}
diff --git a/dev-haskell/appar/Manifest b/dev-haskell/appar/Manifest
index ff227d1f4e27..6cbe4c973e29 100644
--- a/dev-haskell/appar/Manifest
+++ b/dev-haskell/appar/Manifest
@@ -1,3 +1,5 @@
 DIST appar-0.1.4.tar.gz 3904 BLAKE2B bf9be10c63f5cf33b034f771fe38496daf178c251c8f0c1d2d923b524b6de6bfd2583ab2e41dc5319238a7d7e902836684f1363a1c8dbd6aeb9b0114f69b2d6f SHA512 cc4d7a0c910e20ae32f787db894fec29374aed19c208a79012f78e048bdc8383262f124187242654ca7df981647644b9cabb6fd3a4af8d02d7c4e90b46e726ac
+DIST appar-0.1.8.tar.gz 4037 BLAKE2B 1f8bfdaadbbbb6c950aabdcefe13df9b4325eb7e78a3c0f3f26285196f23c8427e867db79472aa08dfaa932b0cdc02303f02288c9f158d5158e2327da44c8577 SHA512 6954f4e966685fc47d91b34c527c524bdea29d2c8eba14f4c4ed1d268ee812926d23d2daf1b63c92b72d99be83b536f7ebc498f5981f8f4cd5c3c1e7769f0290
 EBUILD appar-0.1.4.ebuild 524 BLAKE2B 05fe4f6ef8c1639cfddf3c6caf328f6e5a7a3cb88069ce367a43a26fbed5cff6000e00e4a3b8eb88b64ed9e08a3fb41ed27b8cfb2cea3a116f99b8b9769d7112 SHA512 37a87345f6baddb81ec5d5411c186c9ed9f9356e0d7fb3d0a6ab8372e0424fa2f16ed706e1d01b1cbb463fac5992f50a84ddb0a3f1208638a3bf3517c57ef234
+EBUILD appar-0.1.8.ebuild 602 BLAKE2B 23191833b3b07a406b0bd7bfcb396ab7058fa3ffa1746552f66f1b246bfc6578d1b37c72170d513bda342d19eaa9601d90743ad9c7b19b5e0db07def3fe0b458 SHA512 695c1ffa102b8fc58e44ccafea79dd33b5e08646459b0a059102acf0b258ec69d81e2420a1c37ae912231238826eacbbf7a6bb1a6c59675c8d8ce09aa88652ff
 MISC metadata.xml 334 BLAKE2B 649d766c62419c76762f4a81a59edce2e0a3042ec63fc7afb39443e06498cda82f32b4ae7205f0f7e6987e20e7f92e015a629ed081d0b168b7542a0b49a269e4 SHA512 64ad67668d136f50969c171f09b143c906b071dc617f8d8812d165397434f3d4317e63335f8d6abe6022548ce93aa33433188098226b6a453e4ab84bf874d796
diff --git a/dev-haskell/appar/appar-0.1.8.ebuild b/dev-haskell/appar/appar-0.1.8.ebuild
new file mode 100644
index 000000000000..e4636de9f59f
--- /dev/null
+++ b/dev-haskell/appar/appar-0.1.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A simple applicative parser"
+HOMEPAGE="http://hackage.haskell.org/package/appar"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/arrows/Manifest b/dev-haskell/arrows/Manifest
index 7f7e9401e9f1..3e1e25b5f30c 100644
--- a/dev-haskell/arrows/Manifest
+++ b/dev-haskell/arrows/Manifest
@@ -1,3 +1,5 @@
 DIST arrows-0.4.4.1.tar.gz 12261 BLAKE2B b5272da27d18c11b91ccbf7bd27cbfebfed0ffeab6ea36fcb10f932c73a05a4ac9410e46f363ae54231e73c5221420192a28bd50e0ed879241b127b0235b1cf3 SHA512 642bc893ba5a01d139498fdd8d97531daf76c583eee3317ee7b0cb15bdd5304022a0c7d9280d1eef58bba40de9782cea01325c8fed45232c15261c49b060d352
+DIST arrows-0.4.4.2.tar.gz 12701 BLAKE2B b8654f3a4a2b86dba64ccd307d6344522d9622989b5d0c0394dc534a994dcd11867aa15702d16ea330c5772931e0fd8dbcb140124ddee8a7713fd208004edcb3 SHA512 596d5433c49bd20960533f6d773af7d07ae71f90dd2badc426ba1fba473bf28e29308861f1f7b7c3fc775e968cbd02bb421342258f77028ac41185d41970f64a
 EBUILD arrows-0.4.4.1-r1.ebuild 544 BLAKE2B a8182fea228dbc80a045d594984c71bb6bf87a5137230727d7c84f25816ffe0e86d8fb32b65f0d111c7b2c4cba2b19d08b28225cbef3f513324c162f2f2c78c1 SHA512 bf237a79b0ad0a126c07bd7484120bfe9e97018c6689e77cc4568734adf7b24a5a577242d27b8e0fd0de7935126921b4bc8947bc48507267c65a6b5f6659c79d
+EBUILD arrows-0.4.4.2.ebuild 588 BLAKE2B 3a483e2b16917fc0912b2ec8d1de09026c377f12bf2a908d09d752b9e12b7f7a029bab837f5b3b592e91edef6bdef9b8dc706680ca338a4a799ed6900709fadd SHA512 ba478788ba65dbb146a0d7b430d775ad59efa177bb8ec5eb8ea5bc1048f01a6d78c02678efb6c8d9bd68a7494bf1c36c4719acbb7e6edf4625d91e04ce9f3e68
 MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/arrows/arrows-0.4.4.2.ebuild b/dev-haskell/arrows/arrows-0.4.4.2.ebuild
new file mode 100644
index 000000000000..93694e58c95d
--- /dev/null
+++ b/dev-haskell/arrows/arrows-0.4.4.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="Arrow classes and transformers"
+HOMEPAGE="http://www.haskell.org/arrows/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/asn1-data/Manifest b/dev-haskell/asn1-data/Manifest
index b10c6b54215b..3276327ea5df 100644
--- a/dev-haskell/asn1-data/Manifest
+++ b/dev-haskell/asn1-data/Manifest
@@ -2,6 +2,5 @@ AUX asn1-data-0.7.1-ghc-7.10.patch 694 BLAKE2B 5c74f73562b63f78ea2aca0cbf3c01cc6
 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 740 BLAKE2B 518ae1cd11d6711af7998e9374450d1382150efa6f5b15fcd564a69f6a83fba149fc2c695d14d618b412786852c724b53bcba77bd1e17f1dfd9fa90ce2c26be8 SHA512 b3eed317a8b1b4bfb910fe2a4b8f67b4d64c1f89ce3fc582e9e29fd6fedc6dd6fda5e5c6523735e11905efb7569661a59dd8ad1a6417aae9bad44c826549d08f
-EBUILD asn1-data-0.7.1.ebuild 659 BLAKE2B 9174571abd6e4210bc5040161e92fa692acc76af0e9eac04a97d0125b951772ab51fdd46dc480a56a09e7076bc593aecb4b7ff70d699e41ae9e9d9030df9925b SHA512 24b0626f1582b8d0a19d4b1c0f1e6cc559640a1d6e7372af43c3223eb94e746585bde1941a189be756916c065552663b3650cb0509d04bbfa822adb23161be22
 EBUILD asn1-data-0.7.2.ebuild 765 BLAKE2B d19460a9c1d7603dad32ac6777fed576dc1f5ea58bfccb7cfc626cb34956afcd63e0cb5a26a3b13681b315e1d37c5791cab5173b4247e9f9f6a3ef9acc7360f4 SHA512 536d0d60c7ff8e6f9afa5de0604c293c2a367f1ecb8b78d1cf2eadb37eb1d837fecae136d2fa0cf401bebc63e77bb3c38766aa3838b46aca754b40089be28a27
 MISC metadata.xml 530 BLAKE2B 51cf206d4c4e31306e91d0c6376add5ec793ad5f59df2bf8b7f8513e3801e442ea3a846945f5e715271f49c14e6833f739cd93999fb5f920f6b4cc808c888e90 SHA512 b3d4af593f4fcbee0cae32b9cda14786e111cfcb043721b666005a710b72804acd528123f4a90e5222dc985a9475633c5ee1b5f6106cc49b3206347c438e4574
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 991ec5180b6d..000000000000
--- a/dev-haskell/asn1-data/asn1-data-0.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="https://hackage.haskell.org/package/${P}/${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-encoding/Manifest b/dev-haskell/asn1-encoding/Manifest
index a2b03ed1133b..99076f38af9d 100644
--- a/dev-haskell/asn1-encoding/Manifest
+++ b/dev-haskell/asn1-encoding/Manifest
@@ -3,8 +3,10 @@ DIST asn1-encoding-0.8.1.3.tar.gz 16099 BLAKE2B ef97e3cc0d40fcaa98d319f373efb780
 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 983 BLAKE2B 09a35c4d977c292f6f0c53254798f65197464544f7678926af42e5084c725cc8fba23600d0534fde64432425a18c1c6826eb35bd520f1d46f9336a7e9518c7b9 SHA512 04b82517949e5f1dee9c7bc397fb8f5c9df4ee65e95b66ad0136dd4dd8a52f1c02fb7a502e7667b11036f601bbb39aa2ff1495d714469f0f49050edfdcc33d1e
+DIST asn1-encoding-0.9.6.tar.gz 17343 BLAKE2B 6730f92353469ddb618c3537712b01c5537ed8a1733ad559d58371c28442102fcd05ebcce01cf9bc45bb1f85cb6e57dd3f8acdfef6103551139c4f4a2a01e162 SHA512 e31362881ebec21be5dab1c46284ea6e2571dd87f5c730690787303363a01712945ba85969c39bb2e2d76f9bcefce5d3bad247564e4b6959008804346f65fc9c
+EBUILD asn1-encoding-0.8.1.3.ebuild 1010 BLAKE2B 4b8c0049612fc085af7518dec8345a48e4e115dae04c7afc112e0627422b54d43e70f872d0c6222be9489718251191136466a06bc3046dc5c83f2f39df112705 SHA512 b648b5452e63728ec6fbe1333366980b8eac5e11d3049d79cc3c72a66924fd637aca8a7b47b507821ae5098469ed88423bc951fe02b76704ffbfad37f0b4512b
 EBUILD asn1-encoding-0.9.0.ebuild 857 BLAKE2B 63cf4f89e3e4cd1a735dfbeaea047a40a89101dff7e08309d414bb65c9d7539f9cc6d9ca5206ef00095a11a1a8002e171db29e3c4ca0e3f820823b5dbca01158 SHA512 e1a3ca984893220f40547cf7ebfa40679a3d1e6b803e92a9834eceed1d8690c522bfa3f1bb8abd6670ea24e25a02c34d2cdf6085cb109965f109969af3dd25bb
 EBUILD asn1-encoding-0.9.3.ebuild 789 BLAKE2B 4d8d5373c995dc69681c501a50e9eb8b46515c2fbf7fdb8cff861f885842537c53c67a5d517e128f3775da5dd2a9e3e25caedaf5645d2049731cc19a9bf0287c SHA512 16d8ab3b9703b66fbe93e9c412b6bcb60ce46199fffce6e7b7fe3502e02922f29255dc9388d90b8abf02677735c063d3f93f086b5fb53eafc086a62750d51b25
 EBUILD asn1-encoding-0.9.4.ebuild 787 BLAKE2B eed0a8d75626fb559e5ee09ac104d8659f7d812f9609b2dabc45782f4eed9a4476508a75087a29611edf634e5d1dc0ae910e47baa43462db5d9628ce4d163ab3 SHA512 c6ebcec6be8b0e542d3579e1e6b5168c2bb3ee23b9140d4a28da21bca652287d3afa8452ee190f6211af4db0eeaed3b346f3784e01b53c7735832c6284b7ac68
+EBUILD asn1-encoding-0.9.6.ebuild 774 BLAKE2B 67e2efb672e81c44d4f5e4be7af3602560cd504007472898a16c3f63da537e1a0ede3e5b69686e6de2d58ca4605874edf8690a3c5e89b060330c0ae2d952a2da SHA512 50b78a13b4479c5583851b25423f5c03070db09707fb4ccb5550c244aea3f4820624f8183479bd9b18df8488107efa75802b31de51e62fe56accbb8b8a7cef10
 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
index 8b21ce56cf6d..5413f76530ea 100644
--- a/dev-haskell/asn1-encoding/asn1-encoding-0.8.1.3.ebuild
+++ b/dev-haskell/asn1-encoding/asn1-encoding-0.8.1.3.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-haskell/asn1-types-0.2.1:=[profile?] <dev-haskell/asn1-types-0.3:=[profile?]
 	dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/asn1-encoding/asn1-encoding-0.9.6.ebuild b/dev-haskell/asn1-encoding/asn1-encoding-0.9.6.ebuild
new file mode 100644
index 000000000000..6157709240c4
--- /dev/null
+++ b/dev-haskell/asn1-encoding/asn1-encoding-0.9.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.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="https://hackage.haskell.org/package/${P}/${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.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/mtl
+		dev-haskell/tasty
+		dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/asn1-types/Manifest b/dev-haskell/asn1-types/Manifest
index 215e5d5991b6..d00f85a2e135 100644
--- a/dev-haskell/asn1-types/Manifest
+++ b/dev-haskell/asn1-types/Manifest
@@ -2,8 +2,10 @@ DIST asn1-types-0.2.0.tar.gz 5248 BLAKE2B b84ede6c89da0d73937a2fd08d5f9fce230ebd
 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
+DIST asn1-types-0.3.3.tar.gz 6478 BLAKE2B 3ed6229e8eb1215e47dbbe6791598744ab99a8613c3c5401a504a88f84d9ed82170b2372a19935458d619eb28d9e633d3d5cec324c453b5b67e50a95af2b730b SHA512 d83fca6d585103f7d112a314bfa4da98bf055cbc7541b55717db6260295fcb7dd96d1ac9a25e39ea31881f1a8454d19ed004d59f3c20118b26ef155a99ec5278
 EBUILD asn1-types-0.2.0.ebuild 527 BLAKE2B 906cea9992303fb9a15f65fd5d7c439ffdbc372c17f11fcc0910943c47169d0383233d3908cd58777a6490e57040eaa67f18a1d9982a43a25cfff58e8bba1e65 SHA512 4175fe7d9e552442e603de805105526ae2e57af40b23832b8860bd9443db380357f5259b71f4f524d8fbebd90114a4f2d00038dc45d9687727fb031bd21a9c67
 EBUILD asn1-types-0.2.3.ebuild 534 BLAKE2B c24399df4bc2683527f18db3a8f0a50a3ad1bc665a32d8bfeeb27e611de6ca7178dfb8b2e109159b9308ad1407a95ceeea1e25484c22014f2ee8e718581c9978 SHA512 6ce42dc7c358fa632b1a5713d1643ad37c4064a04982673575408b5bc262e452de5564256fbb5dc8ca9d999fac68de7fcdfe575f96f9dd77a3fcf0980cfb6bb7
 EBUILD asn1-types-0.3.0.ebuild 557 BLAKE2B da827b14504dfe8e3087dc2fed3a898556af70a42a924c7973f39fc9e43bb844d1ca75ab1fcfe4a41ec4d3ee8deb402c1b134422352c6328aeabc59761fb7260 SHA512 07e3defe9d4106ad0400e1bc65176ecc4a0295da487e10eec0026f1ea83050b936505e91f1cfb7a5d3c3370164e684a6d446f8f622573ef4b934b19356362f45
 EBUILD asn1-types-0.3.2.ebuild 596 BLAKE2B 30a660de8ad331d65574966f2d00cb30e8255f8649f31e0e4bcd43ddc4f2022799bc76ac7862eadcee791da56929597480efb4eef91c890407e9ee988535afba SHA512 d114f36aa64fce4159c3be49e740f9d396841dd8246bac62fd0a45a74debabf9985f1cbf69f35f3aa8f7d051cf536f50fa622e2eac23ae1e395278fcd55c4ad2
+EBUILD asn1-types-0.3.3.ebuild 576 BLAKE2B 4508486d7f0a0ce1df9bdf2f042af6bbcd6a4e6faa478f0b165b83b86d1117fa5bc7d96ed391c0193e313cc0fadc4bad7507ca421b9d3cc0d6ec33d63356a681 SHA512 0336d96e4cb4572c9c41ecd7511b819159b5d6f4303c09cc03928ef76e95b19962166b1097e38bf2551d47262e05be6e7d5792f73eb999fbe8d6257e8fb2ab07
 MISC metadata.xml 399 BLAKE2B cadbd47b3b299c5b2d7b59584d013ff7d8e4e13044a0aa4cc9be15cc8bbfd36e2d23fe2e0dafb7f375ed3f27c80ddb57af7f28cd148cd24d74917ae1d727dc4a SHA512 3ab84ea14383c4a7e38fae089b7b0c44a646c272cca19920fbabfeebf7a2433c2403de8842b16f958516696176e0eca24004e019763ebaf180bb1bc512637a4a
diff --git a/dev-haskell/asn1-types/asn1-types-0.3.3.ebuild b/dev-haskell/asn1-types/asn1-types-0.3.3.ebuild
new file mode 100644
index 000000000000..e1e050ef0dde
--- /dev/null
+++ b/dev-haskell/asn1-types/asn1-types-0.3.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="ASN.1 types"
+HOMEPAGE="https://github.com/vincenthz/hs-asn1"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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/atomic-primops/Manifest b/dev-haskell/atomic-primops/Manifest
index 7e978de84979..87c12ccacd79 100644
--- a/dev-haskell/atomic-primops/Manifest
+++ b/dev-haskell/atomic-primops/Manifest
@@ -2,8 +2,10 @@ DIST atomic-primops-0.4.tar.gz 24982 BLAKE2B c8b730a6eb7c8ed438b56b1fab88d318ee1
 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
+DIST atomic-primops-0.8.3.tar.gz 34880 BLAKE2B 44bda52c0e6f52fe6663f70b4f55b630fe89bb12e41f50134b54f51524a9f839aacf65e658cba72f8071a188db7b6b09ab81ccfaf95354d52dfe2a5b39befff6 SHA512 c92371741ea6e0a0208d539abea73c53269b155f3dc84ebea7b20afab5882852756a0c15fdc309c9a9d6ad575589d8f8a99adb9117bbe3d7465d97b17af08b09
 EBUILD atomic-primops-0.4-r1.ebuild 803 BLAKE2B 6b57a88a6c2679bb37e9bc8d5615becb21ace5e0f3865e603759c8912daa3906e9d34ff17d8cef88f233a120c91496fee3df55919a7df2c6061e73ecba9273c8 SHA512 3467db3af84286bcde2c4f58f43f839a17383dccee078d540f7520511d6431e373ceb91f8db3558f791d09424410acb896b6f98fbfe9620b666cf6a569e9c179
 EBUILD atomic-primops-0.6.1.1.ebuild 690 BLAKE2B 745f522463fd97e5e7845bf2588fa84409f16e048dfb416d97b4fe6d3620490ebf67959e96c81cfdeab71a1a091166feeaf9956bc0b037fb024c6f0534bec7d2 SHA512 2814a6091c4f1334ae400a263532d3f94b349daa85d6c49998e5341cb5e09a4dbb6bc08b8f7e520d40baee3c78cf427ecf5a9966f6cef1dd9deadefbdb9a52e2
 EBUILD atomic-primops-0.7.ebuild 690 BLAKE2B 745f522463fd97e5e7845bf2588fa84409f16e048dfb416d97b4fe6d3620490ebf67959e96c81cfdeab71a1a091166feeaf9956bc0b037fb024c6f0534bec7d2 SHA512 2814a6091c4f1334ae400a263532d3f94b349daa85d6c49998e5341cb5e09a4dbb6bc08b8f7e520d40baee3c78cf427ecf5a9966f6cef1dd9deadefbdb9a52e2
 EBUILD atomic-primops-0.8.0.4.ebuild 688 BLAKE2B d506ed751158a56493ee7bc76a44993d99fffadd7d910c8aa5ebfa3b69650284656457ec22ed2193cface10c8d677b6cbeaf6c400138879a68288bff2402e11e SHA512 3a38ba0018f88e1e8ef212db52a286ec5ee168c0d3e348cfefa6528bd70474b248c56e5b2adc6315b1ac26f732570ccd3147a85d8a8534c3d5c46f9c4f1f39e4
+EBUILD atomic-primops-0.8.3.ebuild 688 BLAKE2B 70bd0b4e370ad3ead69011fbc2e03222d6c08c68f3eced457d1597c2dd2e21e48494305b9c74f0f3ba6a6dd50bc50dfb22517c86ffe67b2411eb0219b4af774d SHA512 f8fd479c4ed137e374c90af519dfe96248323d17eb771a7b172b0fa90379ca0e76c03004aa0cea5803cc6e789b078976b766b41b5df4de5400bbd903c50eda64
 MISC metadata.xml 795 BLAKE2B fbbecd6e02a73d69ec58540a514741c4558bde56852eda9945be200d89c7cfd040b29402b8a4ac151226afef20b44d36ab0b2b722efcd1529914851b478a7d30 SHA512 51ea1759b6c00341781bf4873a21dcb02e7fd0814dded71cf5dd0ec0975b7ff439b8298098a60c3d9f72b56ceefa831b67cbfab9cbad1757924b69fdd6554784
diff --git a/dev-haskell/atomic-primops/atomic-primops-0.8.3.ebuild b/dev-haskell/atomic-primops/atomic-primops-0.8.3.ebuild
new file mode 100644
index 000000000000..1c12a46173f3
--- /dev/null
+++ b/dev-haskell/atomic-primops/atomic-primops-0.8.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="dev-haskell/primitive:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag debug debug)
+}
diff --git a/dev-haskell/attoparsec/Manifest b/dev-haskell/attoparsec/Manifest
index ec551fcd518d..4934c3a7463f 100644
--- a/dev-haskell/attoparsec/Manifest
+++ b/dev-haskell/attoparsec/Manifest
@@ -4,10 +4,12 @@ DIST attoparsec-0.12.1.5.tar.gz 64844 BLAKE2B 6810d621a29d0670d104c81d57ed4fe30a
 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
+DIST attoparsec-0.13.2.3.tar.gz 162346 BLAKE2B 02bcd5d2c4993db547a723fa9f30ddca882a3c13d7c68073e9ed2b093def2f86062b5d9d5c87d9a5ccd13d59ef1b2f962537979320d56444027a1fc931dc98fc SHA512 84805ff547f1aa5eebd320c1bd738bc1098a9789fb330eff7bdcb1b0477e9709d86f93bd8848f4a8501a123b6add6bd22af59cfa94af66f1d57703745706a194
 EBUILD attoparsec-0.10.4.0.ebuild 795 BLAKE2B b6dd45a28b1d5f228c9a45c9d4e44bbea5a1534b4e611473c7d2c41ff56e24b1fdfba24e5a32c363fdd4c5914c5bfd3fb22d3bffb6e585b5baf47f13c57dc57b SHA512 cdcec61060489a34700e8b6f7b9ccab1d45632f17bfa081147b3d106c5674968f89559b284f6dae40dda3b40cf43b78f23003ac76523736bfea229881deb59f5
 EBUILD attoparsec-0.11.2.1.ebuild 860 BLAKE2B be616a60901cc0b7a1487ced5c27620efc7fc5f422a9318d742c846ae0a373fdc99bf45c74e2fb9983a7e1d94a26760942dc32946c99ac61743e69693b0a63fd SHA512 5d2f2b9bd99bdf6209468dc2314e61e541634a1774ca696fb26ca32c12edfd8117b15ee2a63629c32400370f1c892fae8c61eed37fba14a4430911d9cd854f99
 EBUILD attoparsec-0.12.1.5.ebuild 960 BLAKE2B a3b4fb0397d1ccce58b1cd70df473a12731f824f64644dedb5a7328509f230dd7fd3c410ef8b5225ae0acbce19ea32fd47d583dd39078954c57b1697032578b9 SHA512 e6b7ff3e8f232e024c47af09bba9fe77043c2908df8ef4f7290034bced9320a05ff75dc81cf29f84c8c922d8c0bf5d70c896d01f4c54f9cb9ebca2bf43a7c8ec
 EBUILD attoparsec-0.13.0.1.ebuild 1001 BLAKE2B 2b9ea1dab09cfd4b4270ddbb22946a5206a5140afd56533b3a99388241ea1dbd4f8ed9a8a9d190a5bbea6dc756a772c6dfdd9e6671a84f32fffaefd20085e1ef SHA512 4f3d5d6eef19808a57f9bea8022d3c3c4c1d660a4a98ed43bdf6025bcef22a0871f8ba5e17cc756fc0e3e971df5b47a71c3df8a010cc0acf4223a94453ad4c6f
 EBUILD attoparsec-0.13.0.2.ebuild 977 BLAKE2B 5b090d037b434f4a6eb53b379a05f3950e93ee5ecaf6cb889bd288b330bb7b6edf159664ea6ee43e2e70d081dbcc877b8ecdcb217417ee68f7bf22ec9b57391d SHA512 63b03337034cf0d651806ca69e26c75e0ad1d28f96a73c509c488f8438de44999f87e8a08dba660fe932b5fda79e5b94df1fc8b91ba82812605d336ca0926ea8
 EBUILD attoparsec-0.13.1.0.ebuild 1123 BLAKE2B 4763bb27a3d5273eb1a0ca7e7960d1fa62b0dc4ea83665a8f9d2d635afef2de543896831b0cd12c24921e7e2e1049ff48a561fa08fe4da12754b57ada55df8b7 SHA512 3baeb843ba4814e2ea16834f91f57811636a92c18c2d5584dd065839fbb3ca1bbe80cab462dba664d3e9f4b981ff8d5c33d41a24992e6f8323d82fc0e49a2df0
+EBUILD attoparsec-0.13.2.3.ebuild 1016 BLAKE2B 5275ae71da8e6229c12c6af8e3cbd46c61a3acb438a76d4867f9d463555c987c18a40729a6493d083d482f23505cc5162dccee7b6248916741cd815a77e58547 SHA512 46c927c2377a70e7271a09ae2c945c03f9bba128b5066dd6ea250595e85e181675533097d37bb5dc0c8e1f60cd629a55ac38272afb9f8f5391f41877920c2bf5
 MISC metadata.xml 514 BLAKE2B 551631ac80f8d13c6993b532a7ccb86b3749ee0e63e580220fe8413b9c89627ac9da347ff69e49ecdc957733d03f9af431a814370e2c51b77417d25291ddb437 SHA512 77aa3fc771b12645bc64d295637eb3d6470fb1aa2ff6c12b37a2056bc554a93e150db3db72a20cd3cab9d162f8fb7ea2a3605a78c3fb53d48cd509ae85552aa5
diff --git a/dev-haskell/attoparsec/attoparsec-0.13.2.3.ebuild b/dev-haskell/attoparsec/attoparsec-0.13.2.3.ebuild
new file mode 100644
index 000000000000..20e44cf82d48
--- /dev/null
+++ b/dev-haskell/attoparsec/attoparsec-0.13.2.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+#hackport: flags: -developer
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Disable test-suite: circular depends
+inherit haskell-cabal
+
+DESCRIPTION="Fast combinator parsing for bytestrings and text"
+HOMEPAGE="https://github.com/bos/attoparsec"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # QC-2.10 finds contradiction
+
+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.20:=[profile?]
+	>=dev-haskell/text-1.1.1.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-developer
+}
diff --git a/dev-haskell/auto-update/Manifest b/dev-haskell/auto-update/Manifest
index d7d42f584c7e..28b22d609a99 100644
--- a/dev-haskell/auto-update/Manifest
+++ b/dev-haskell/auto-update/Manifest
@@ -1,7 +1,9 @@
 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
+DIST auto-update-0.1.6.tar.gz 10929 BLAKE2B fcc4c1909fcc52b5f8aca48e3662d494104b153c3511d56054457078a63ef5be1a56a0dc61aa1d87edbaef90526d03476046d0e13fcd748c33d163317a637a02 SHA512 ff0f4f835d0b24aafbe18dbc42a9c3cc396cea24be3f4b13b5f5dac49b3b21030c941c8b09a5c33ba175c9902d076aa12fc9eb5a6a79c94ee5c9b60935fa047f
 EBUILD auto-update-0.1.2.2.ebuild 537 BLAKE2B bca90d78508a269f989bfe05b9907fe6f6e6cb73acb61be59c9e75205eeb6f2b4ebb6393fc652961db6569cd5bd177e62f75d77c551e81497a21cf3ec6386138 SHA512 5a8b67425a51abe823afcf7e9e731d1aaad27cfcef70fe18c03f2ee922041215aef3ce6747b41e2d54402643fa7a8b8792ea5b68f2b7aa959a87ed1548e30b78
 EBUILD auto-update-0.1.3.ebuild 539 BLAKE2B 7db595e7b51d5c4cf4763e4ccae4e22efb029eab70a93ebdb8a4e767f48cb27dda397356e3b0b211a612884968bddb051a888de5fc958f924c67bddf3c3ae708 SHA512 26b06af5a0abd2617d400fff0472f1e0f53db98d23564dc940a200b9abb5aa1a0892f2b0ebb92e1e873b513e523ba4faef841151c793e6b834ec46eeb794019b
 EBUILD auto-update-0.1.4.ebuild 537 BLAKE2B d7d91b16750bfc08a03bcef7a5c2cd9b10f3e8395356204a991a60467864c1ea57822f72e42da005fe37a1e848502d820cc72cb9a8d7d22a238efe90fb8d8819 SHA512 edcac1b14a524fcece390e42c6bd7ef46dba67330f8bbeea189e664aa8ea749e99402e1ab607fad1aec2bf06685de8b170b0b47d77a9999c4344335da0992c51
+EBUILD auto-update-0.1.6.ebuild 639 BLAKE2B cc25cf0b4757ebaaea71f4807fd8c2c2631198ff7cc9bb0f03c950587ea74ff8b8af55f7a1a9dcea311b0baa7694461fb41871276f110d9c1bb1d3caf7d04b14 SHA512 fb7ee51682a73cca12570607e489f57fdf9e29216fe6eebd5adb755187843724380f9156da6fce4132937a1a10a739df786fc7cd9f77cf3cf73f92f3c9e3bcdf
 MISC metadata.xml 922 BLAKE2B acaccb87fe64e61842d227f07629a7f358ba47143dbc1e11b4ffddb09a3818423dcfdef002d033db50dcd6062b996561877f0b85c0ea79195735d3fdd34a8445 SHA512 34e86c54aaa8c98cc94f86f38d4c88bf862d965a02122905ae2dda86dd84100236b989f90eaf538da8f865dab8894647f7f50adb39c88437d1bf140e5e57dac5
diff --git a/dev-haskell/auto-update/auto-update-0.1.6.ebuild b/dev-haskell/auto-update/auto-update-0.1.6.ebuild
new file mode 100644
index 000000000000..576e43979d73
--- /dev/null
+++ b/dev-haskell/auto-update/auto-update-0.1.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficiently run periodic, on-demand actions"
+HOMEPAGE="https://github.com/yesodweb/wai"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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/exceptions
+		dev-haskell/hspec
+		dev-haskell/hunit
+		dev-haskell/retry )
+"
diff --git a/dev-haskell/base-unicode-symbols/Manifest b/dev-haskell/base-unicode-symbols/Manifest
index 7487916ec8e8..d8eee42ce0aa 100644
--- a/dev-haskell/base-unicode-symbols/Manifest
+++ b/dev-haskell/base-unicode-symbols/Manifest
@@ -1,3 +1,5 @@
 DIST base-unicode-symbols-0.2.2.4.tar.gz 5562 BLAKE2B 7482612b993cd4470a6268d49a5384a3907c95506092ff54b96ce2b823744fca9fd3ab18980b193da7a48fd572b84833b916446d73e34cbcbd54161b3c410016 SHA512 8dcdafa1075ccea8f188b880b90430b7e86270f68fcca47bbee7fa7e695bc90765566e09a0f032103d8cf2a265069e80288f56714190c9e68470141e469a994d
+DIST base-unicode-symbols-0.2.4.2.tar.gz 6584 BLAKE2B 5081d04cdbe5c7d75a1896a48728b72547016b99aa35f403ef43184a45bd69c6b15da0f6c6977b8a03c2b84ce92a63f5dbe4f8a1dee04d5d42a67675d93c5912 SHA512 127ba0a6c6f50e16c0bb0634bc7ee84d3596e541ccfd1be1ad261e85fab695613fd415e6a913a02f5dbc10dcaa9e3217db3123b564d070351e5a6a7c9a64b462
 EBUILD base-unicode-symbols-0.2.2.4.ebuild 574 BLAKE2B ea0f2efc26cd19ae5b7f7b1f12a47bf4122a00e18da2740f1d2f50bc7a102fa7e515c552a95546daa14fbc6fbfe0063565b7bfc42f9436ddcebc34dd765cb7bf SHA512 b393cffe2c4d2f59ef3d41c054781dfaa5daf7567cf0ebe918cdaa89648019014328404a3e0aad5d7c57d0638b3eade0634b8feab34cde12981257c272159075
+EBUILD base-unicode-symbols-0.2.4.2.ebuild 573 BLAKE2B 58cb7333ecba4a3de1b81bec9581f1e4b17b474f9a3e0c56bca12bb84f8186794e71022ea02ed5e3fc09960c410a7588fa4824da927a00f86f42901e435d7bfe SHA512 911715ed427bd9f8a6f1931e185ccfd553d4dce64c42faf2c23caea8bcf67c7c5ceaef324edd2729b053024c0e4df0680c0ef8b1cdc6d75048929a0246557675
 MISC metadata.xml 1004 BLAKE2B b12afc1bea8da697f8132d45076e1bc8c9a18e46a471b2496ba6264308283691ad5dc757de7586f21341c2930b08ad05021a4366418a4069b838f8b70614b0b6 SHA512 3dc724d28f44cf1fb90f8324cc2df0398a726d21b54a78d08a57c75a832aa14d8f5ce01dcd5c4310ddbf28e5fb15d2a5a265ce616c9d5a477450985448df3b5d
diff --git a/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.4.2.ebuild b/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.4.2.ebuild
new file mode 100644
index 000000000000..1805211ba097
--- /dev/null
+++ b/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.4.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+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="https://hackage.haskell.org/package/${P}/${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.6
+"
diff --git a/dev-haskell/base64-bytestring/Manifest b/dev-haskell/base64-bytestring/Manifest
index 14b5e71112c4..4bd6ce2bea8a 100644
--- a/dev-haskell/base64-bytestring/Manifest
+++ b/dev-haskell/base64-bytestring/Manifest
@@ -1,5 +1,5 @@
-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 776 BLAKE2B 898fcc5be43bf74aabea7e4a4b38ae303f53cb65d8a2ea68aafeb39d0f6cd6fa623b6288c3d1acf6ce02c9b8e1d0c7bddc3198cff4f4f6adb91f1fb55768d95e SHA512 19136cb63b496289050c76f37a97941f026e74e263d8c401eedc8473a9f5e693841eae7da8194fb58b573ce314434e63589938e6fd03fb46d70a28a4a041de1e
+DIST base64-bytestring-1.0.0.2.tar.gz 9830 BLAKE2B c6f860dd665efd9304225adc4cebc8adadb2972d135b859eaea6fef6b5fa8e8521b45a6fce355538dacebb6bf9eb7573b5eb3ca91333d1a0a115c6cc0c1c1a4b SHA512 8d8880cf806aa3932068e0a6faecde084829e72e73cf0a6b4eac99ae852dffbd85f968918546e18920044dd34c65b67bed1c62b6fe71f48b118bc337d86030e4
 EBUILD base64-bytestring-1.0.0.1.ebuild 728 BLAKE2B a1068ab4a5ec89162220b805655cc665aa0eb711145e4bbe9d07f7823cd0029c62ea4feeb0a12a3660754a99a515efe604d36e0f38fc0fb5813d559bfa7517d1 SHA512 49d513adcf05fabb8ca28272ee4f884b7ea4be8b8ddf91ff529fcad2c4f76658915d0492f12b9b5291f9545a46583d1f738e860fe107f5238dc25ecffa69a888
+EBUILD base64-bytestring-1.0.0.2.ebuild 742 BLAKE2B 94ca3dcaf821cd18276777805805a00eefd295cc81205e572a6ac45d63a5b0675f5a61b28318e11047588ae7cd461d369a3b6045a6d341fe5b36121249754ec7 SHA512 b5a22b72e44101b8261bcd3a56692d8a71ab39f312315f9dee54ebaff4534e7a4054eae1a18ac2766c429e6481fd7cd29723ae4725e5cc927a387cbec1393b2b
 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 8ff4a4eb8808..000000000000
--- a/dev-haskell/base64-bytestring/base64-bytestring-0.1.1.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="https://hackage.haskell.org/package/${P}/${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.2.ebuild b/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.2.ebuild
new file mode 100644
index 000000000000..25eb5e8e056d
--- /dev/null
+++ b/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast base64 encoding and decoding for ByteStrings"
+HOMEPAGE="https://github.com/haskell/base64-bytestring"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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/split
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+		dev-haskell/test-framework-quickcheck2 )
+"
diff --git a/dev-haskell/bio/Manifest b/dev-haskell/bio/Manifest
index dd68ee61b32d..a0aa4767a756 100644
--- a/dev-haskell/bio/Manifest
+++ b/dev-haskell/bio/Manifest
@@ -1,4 +1,4 @@
 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 1396 BLAKE2B aef7d6284af70b873d7ad29908cc872ee7b09431e4af102c823cad569574aa9f031772c2887ad644a547d576ec5fda11656a1c24683d9972e6c32af252621acd SHA512 bdb788b1a734cecb1547d2a7607a0f46bd30a54d0c9df0207004d99e1f1a81764df1fc6e3a2eb7c8ab4824d32ec13aaf39122a733b89e5074bcfd749b3381376
+EBUILD bio-0.5.3-r2.ebuild 1423 BLAKE2B 656c1291fb96b3aa6709a44394d1ba056ac7cd3fd6dcce27b9f11a486e6f646046e18dc7c804d11cb33202732b3eb753b84a8321d2a235048c29672fc4364e7f SHA512 0eac9b3802ccf73cddc16c59df089d49e3f042049229be1b7a3992410d44e118044008b240c1302b3e93183b63ee96fa1cfce096bd83c280ac819d45845162cf
 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
index 1293a6e6c51e..9d49efd38d86 100644
--- a/dev-haskell/bio/bio-0.5.3-r2.ebuild
+++ b/dev-haskell/bio/bio-0.5.3-r2.ebuild
@@ -16,6 +16,7 @@ LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="+examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-haskell/binary-0.4:=[profile?]
 		dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/boolean/Manifest b/dev-haskell/boolean/Manifest
index c47e41ffe497..1aca1221dccb 100644
--- a/dev-haskell/boolean/Manifest
+++ b/dev-haskell/boolean/Manifest
@@ -1,3 +1,5 @@
 DIST Boolean-0.2.3.tar.gz 6608 BLAKE2B ded6dd8214b2228239c93bfc78ba33bd167354578dc97e323da65984a12671a06474089b20986fac53292e74c6fb3288249af8ef1d375140006a66744f15af59 SHA512 803af486e750ba52bc85f8d8599f6a1b36d3d91f2413ac9a7b038d1f091f9a4cee128b24a4de308430b291eb8be781eb100f495106b78f37697a845f8793ad98
+DIST Boolean-0.2.4.tar.gz 6634 BLAKE2B 6964300eb6d4ed8d74a087e7349fc816c4af770af6127fba0285e6afcd22c072b7101c09d907cb794645c3726d0db36b8855a0c1f7b3d6298e49062b68d9944e SHA512 2b92666edbc2b0cf0e0f0d09125b78324229996ea1896b58779daff7f7d10b4dc4d1b8ebbcd63690cb61b68264d797fa40312ca0e934962bbeee4fb6fba1805a
 EBUILD boolean-0.2.3.ebuild 607 BLAKE2B 3999fa7e981edb1633f13223dded18da08be480d7390b968e8d626a72164505f76da253c0cb9414517cdf6303e95904ed82c4979cd1d0d8487c0c34d723f71bf SHA512 ab169c2abba86bf838b34dcf11cc30758e86f5f91583143f7485f8438c6519d639d46cf1bbc9e918a6dc736e90696c3f6267834f9245d24535d70100d6ec6b8c
+EBUILD boolean-0.2.4.ebuild 607 BLAKE2B a006fb725d5eb8ef52b85c464eb72a953dfd19343979754ecb9f7a6d1ad87cd5b26c702f610faf723af93f085c6bde8665d8e33f8dec31224197887f7ebe119f SHA512 82865356ff6a932659832102bd244339718520b94da300e06fb4995c02fc0532e9a96f141b7f4de0016f648b1d2b71f2524a45811f49583f7b78256a352ced7f
 MISC metadata.xml 388 BLAKE2B 0c83c212e1e298bf294348d9bd095d608aa10245489dba0905116b3c6de225038f1fb5f81ef13d9207430a813a5e8101085735b2f8b7bd55446ef24414e849ad SHA512 47abe89754b9a3e77f5598ad7aa66d07037d283c7bfd90ffbfb9b5ee64a1cef1d96a3096c5f1f3c885665f1fff84f6dfe038da1d1e624397943f3ed527aff924
diff --git a/dev-haskell/diff/diff-0.1.3.ebuild b/dev-haskell/boolean/boolean-0.2.4.ebuild
index f2101d15082c..2b6933ed35b4 100644
--- a/dev-haskell/diff/diff-0.1.3.ebuild
+++ b/dev-haskell/boolean/boolean-0.2.4.ebuild
@@ -1,27 +1,29 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# ebuild generated by hackport 0.2.17.9999
+EAPI=6
 
-EAPI=4
+# ebuild generated by hackport 0.5.1.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
-MY_PN="Diff"
+MY_PN="Boolean"
 MY_P="${MY_PN}-${PV}"
 
-DESCRIPTION="O(ND) diff algorithm in haskell"
-HOMEPAGE="http://hackage.haskell.org/package/Diff"
+DESCRIPTION="Generalized booleans and numbers"
+HOMEPAGE="http://hackage.haskell.org/package/Boolean"
 SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.8.2"
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
+	>=dev-haskell/cabal-1.6
+"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/boxes/Manifest b/dev-haskell/boxes/Manifest
index c33c69e1f128..90b21f9c7afe 100644
--- a/dev-haskell/boxes/Manifest
+++ b/dev-haskell/boxes/Manifest
@@ -1,3 +1,5 @@
 DIST boxes-0.1.4.tar.gz 6481 BLAKE2B f3ecd92e3693aa5e0b93e21b255e57c1d79b05e5acc61810bc7dd8930a124c5afd8163ab7599c7e6e2e5dbe0d1b9215c52d9689cf43b0b6710e0b13a982de97d SHA512 b8afb3216208269883f173f57fc0b53be919e5fd171bf2b7d8d5ed2b0af9c3ca4f9005fc4df43ba8ba4ade694d59a83ff0d419cfbd32e54e80ba6fbe748e9524
+DIST boxes-0.1.5.tar.gz 7598 BLAKE2B e90b94b85d2cc47904df690de2a9bc0ff058230d0134315b02ffc436e172deded72880084542628594968e82e8e81268e95582d39f4cd7d3f499d25e56faac35 SHA512 44527be9a8351aef9e6a98bc90276c0137892e2672ca5ae15968ac21cfc1f0ce92d2c734c26b5493b2f8597ab1a65cb9cf5d050b6b02b0a61d6b6df4143ba4d7
 EBUILD boxes-0.1.4.ebuild 654 BLAKE2B fc6cb52c97a75bd9bb836970e34a5d74d79c067ab0e57eb6be87d5a0829d7719ec8c257e0f2f07e142d8671e82e709899cedaf4296b473c6e5c558b1da51041d SHA512 f70a009075bf49d78b957bff129910ba35d4e82b8ff175d98facfc3ced3495e2ca26ef8ad66d241b0ff292747fea626c5e42a4037918d8f7b7e8dc931b50b0af
+EBUILD boxes-0.1.5.ebuild 654 BLAKE2B da0d53686df95dbfc88c6da1a9c0c5145e874e4ba8636dca886fc0ab3f0c5696f257f281b57962c821f7df324c6f77cd9e398a4f42aa2d2cd65d30366f9140ae SHA512 994d83fbd82e9044cb373ec299f2c538b229d90004eb56d5b9d78ad6062027085eae4655b2cd7cd8b6167b73e3e04b4521b957c59c62111e26816e89d8f96145
 MISC metadata.xml 383 BLAKE2B ce3aaa3cdddb14a6846338bb09b5fedc5b69799f69a598db022278ead49f4282b711497ff54de9df858c9d7a7da2265e0dba1e8cb594f957156432e3c75b3d18 SHA512 0d283c92fd83e3fdf7d9e0598bf3ba4b3228e39b5c07dcc5cd897d29e32e77ac108d9aba71afee1b076d6a2c74b477636b8ae853496297cdda6cd7de74fe85be
diff --git a/dev-haskell/boxes/boxes-0.1.5.ebuild b/dev-haskell/boxes/boxes-0.1.5.ebuild
new file mode 100644
index 000000000000..e048becdf18d
--- /dev/null
+++ b/dev-haskell/boxes/boxes-0.1.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="2D text pretty-printing library"
+HOMEPAGE="http://hackage.haskell.org/package/boxes"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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/bytes/Manifest b/dev-haskell/bytes/Manifest
index d1fe669fe2a1..c24d3f1bd117 100644
--- a/dev-haskell/bytes/Manifest
+++ b/dev-haskell/bytes/Manifest
@@ -1,3 +1,5 @@
 DIST bytes-0.15.2.tar.gz 18834 BLAKE2B 18f0e2618a3ed7f4eefaabd0c4b4ca6b99e4493ae0b73dee9a7f0fe1c2e980a4e8714e50198177a657d6ac06c08227350dc342178f5565444ea9f23904d01585 SHA512 339da2fe49a6acd307057bfcc79e7ac09eefb9a93ec60cd52a8d425337e7bf355ca8aa42f304863df773b0ef2c459b53571920611cf1ef8f98e78d112cc6ad29
-EBUILD bytes-0.15.2.ebuild 1589 BLAKE2B 81dc7d47dc90537b6e5583f33f5be099bd1cfae63a9f8d0cbf6f13d7e8f83f280d111a68c649a1713fd7e8b013d82e12e34ed7dc2ee93ac0daefcdd500893825 SHA512 f94f247704557d415a552d8d9c7e547a0a629169c39355f05e548e545180a322654a62780b7e877355b16a3d0fbc5bce137a7557b422c70a439ada11d692e2f1
+DIST bytes-0.15.5.tar.gz 19354 BLAKE2B cd6845be4c541a231d52e985532379c166a84346f57687f6407716ed0c9ea17b0fe10dc2f5cf500898398dea8227ec2277967847a8eec49e49e21236d14a1b62 SHA512 c9c6b2978345e4e8eb3b12e0600e286f73a419db403fb3fe003b637cd045b1d52207f8ab06d8fcb583fd094095e62de81e4066c851b3a419c0731534a645c7f6
+EBUILD bytes-0.15.2.ebuild 1616 BLAKE2B 19e5960818467c840418c0431391378053e155dc42083ec46b5a5aca9874d61447212cb519e6a3a7e0391c065bb680b0647ae4372a646737f251556b14330f30 SHA512 76378492743de8a7ed68ce03898b441dfadb5cc30644670514841b1baf863d95abc76e435129b093de859ed0e4d16e8b60773dffa4399f3444973f59eae658a2
+EBUILD bytes-0.15.5.ebuild 1745 BLAKE2B afde13a66c44ccc9bb31fd1b61ae5b5d0ab22a7c1ccd834925381f585c3a0942ab1d22886e35c24c29ce99aa8f5bcb6e4c148b52c7471feae1c75be4ec03f283 SHA512 751b935091825309dd22a52b7429dd6f85a9a62b3517a59ad828e3b234caa477a3ca6b8487481c285c671959ede48bec7dc6831301bf18017d016b94acd90ca1
 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
index 54e863841f19..43080d606bbf 100644
--- a/dev-haskell/bytes/bytes-0.15.2.ebuild
+++ b/dev-haskell/bytes/bytes-0.15.2.ebuild
@@ -17,6 +17,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="+test-doctests"
+RESTRICT="!test? ( test )"
 
 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?]
diff --git a/dev-haskell/bytes/bytes-0.15.5.ebuild b/dev-haskell/bytes/bytes-0.15.5.ebuild
new file mode 100644
index 000000000000..17287247ee2f
--- /dev/null
+++ b/dev-haskell/bytes/bytes-0.15.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+test-doctests"
+
+RESTRICT=test # USE=doc breaks doctest as:
+# doctests: <command line>: cannot satisfy -package bytes-0.15.5
+#    (use -v for more information)
+
+RDEPEND=">=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/semigroups-0.5:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[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.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
+	test? ( test-doctests? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-lib-werror \
+		$(cabal_flag test-doctests test-doctests)
+}
diff --git a/dev-haskell/bytestring-builder/Manifest b/dev-haskell/bytestring-builder/Manifest
index a5a46a9c77cb..bc1b3996ea99 100644
--- a/dev-haskell/bytestring-builder/Manifest
+++ b/dev-haskell/bytestring-builder/Manifest
@@ -1,5 +1,7 @@
 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
+DIST bytestring-builder-0.10.8.2.0.tar.gz 47366 BLAKE2B 37bb8898f30791b20e30766bc085e729088d446f90fde21228d8241f6a62f6a28316cb191e05a48b51832655f3d989cd1abe47b3e3ea6dddc127cc09ec624e87 SHA512 bb3c5bee6f05d7ce9213f490f65293d3eb2a59f2f7b4d6423a66e7e20e375ec957c8a030fc58296b59d5314a6fd4684e03fe625b8edad89429e503ada73367e0
 EBUILD bytestring-builder-0.10.6.0.0.ebuild 537 BLAKE2B 0af2d8ad6b94a4bd3d51f54715b8a46b2470b4c7952b06820c11648700a4e009afc8b073c79c1af7100525590cc85e1b5f953eb0b6b5f015313f79e0d2b71a64 SHA512 c319686ebd8d3718e2ce7de11d1060ad8f3a5f9594b9750f813dc8bcb881240fd98d48a463296e6f131a3a36c54ca8c068850216076531a5994ffecc367f7b6b
 EBUILD bytestring-builder-0.10.8.1.0.ebuild 566 BLAKE2B 5dac46c890fdf084a8415a8a797787afe1dac08a67b96f515e9466211f9be359deec51cebbf2462117aaacc2959570a3b70d6a18194c78bb62c1a4ae3d6756b5 SHA512 18f27d7e0e997fe079c41bb323ee6011dcc61bb681720748bf45fffe09834d71d471e87e25d613c171200c715220e4a2c726466147a5784c630d9019ad80ece0
+EBUILD bytestring-builder-0.10.8.2.0.ebuild 566 BLAKE2B d7c031e56c1febc43d2b958ef4a7285e64e1cbaa749f7b8e33c6069f14256a9b15118bd88518108645f11965658e7ffcb1515aaa35e9b9835c547f0f0bc4d4ce SHA512 d76520ed6dc9edc25b34282b8643b31a6c5de2f660579989d15323884266567f06802a60562f60a33c542cbf6337845a0c1fc1752acba6ed3438cda794c09d82
 MISC metadata.xml 1612 BLAKE2B 25d3bd6bf77c1253da3736dd3c9731a7613c392c2c9b1eaee6829fc01c492127408eb69be113cca4353441abe939dbf449e3a629432d01dadd391f165d08dbe0 SHA512 98c65c411de64a52485367b4263905b0893bcd358ca8c27398216df8ab6adfbd6fd85be34bae2fbe9583083e7ca4ef7838fe35c1ddf35f293d5bdb26dcead5bb
diff --git a/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.2.0.ebuild b/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.2.0.ebuild
new file mode 100644
index 000000000000..ec45702f1b2e
--- /dev/null
+++ b/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="The new bytestring builder, packaged outside of GHC"
+HOMEPAGE="http://hackage.haskell.org/package/bytestring-builder"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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-handle/Manifest b/dev-haskell/bytestring-handle/Manifest
index 9e7c393c6952..d7ae416f18a3 100644
--- a/dev-haskell/bytestring-handle/Manifest
+++ b/dev-haskell/bytestring-handle/Manifest
@@ -1,3 +1,5 @@
 DIST bytestring-handle-0.1.0.4.tar.gz 6204 BLAKE2B bcda8d126b5e60f1f78be576ec0233f8b0afe80409afd9a796c0a86e83f3b05702eb40ed09af1ebb2d2b8b194924084a0799ca6b498acd654a18d679b1184415 SHA512 17649968ffbebf1a567059ecf3f19e8d8f6a1bb53a0b491e35b62d572cff9f949822953452ee72d193546d8779d6d71dfd82ae5cfd2d3b7564ac73df7283facb
+DIST bytestring-handle-0.1.0.6.tar.gz 6203 BLAKE2B e821b33a97983e124c679c2b9f2316151e695ebf615f739d50b5d4524804878dddb861d2abd7708ad635cd563a007e867232f81f229b368b5ca4afb90d4730cf SHA512 a585488207680a6f1ba6538cf10d03e059010d42994803f9edc6d9c1fff08e479117a6d1449f923a8d5de9884b93438e80b81c75978e5c3145310c21ba14498c
 EBUILD bytestring-handle-0.1.0.4.ebuild 976 BLAKE2B 80f1339c0448450e742ac89d1fb78a7c06d7f555428d8e390884f098a1adf4f2e335cf50e9afa35eceaad900961532cb241310c430819484b40fd457fbf66fca SHA512 cfacdad6b8a93f3d0c8d76a55c6743de15cfab0a428ae91f8a1461971e8b877bb8ba65c6ab3933352b6a6f9664d4f107cddfa3b3fcf62b7f7d72999b056e34a9
+EBUILD bytestring-handle-0.1.0.6.ebuild 1020 BLAKE2B 632e3950dacd2ccfe3fc0f8b992f43ed6abd75d1f5cf02588565af04ad30fae83b9c3f7e2a55be90db1087141ff191161c8f5109ab97e726d73b5c90b9c6c88b SHA512 698c19c9861825ebad42aaf8cbbfb2822d6756b27ecb3224cc00343710275efa1132f191a2e949b19b892ddec1c77c797b33692c0ea0d3c8eb7ee5f0b86f75c6
 MISC metadata.xml 316 BLAKE2B daa54860b18245646d20089598390b0fba4e618749bfdd5bd719773856b48ca0bccd48f320947293f570f251a43618282e25aa39a30a2486d52e71fae8dab186 SHA512 67707af77347270b5c525ece5a127ae66affc8ae3cb5860748950171e8d8416c294b0f1da5be25bbdba9fa75bc91878e2f04dc73bfc1d35af02f9635fcdc47f0
diff --git a/dev-haskell/bytestring-handle/bytestring-handle-0.1.0.6.ebuild b/dev-haskell/bytestring-handle/bytestring-handle-0.1.0.6.ebuild
new file mode 100644
index 000000000000..fa9840c071ac
--- /dev/null
+++ b/dev-haskell/bytestring-handle/bytestring-handle-0.1.0.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="ByteString-backed Handles"
+HOMEPAGE="http://hub.darcs.net/ganesh/bytestring-handle"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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.7
+		>=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 \
+		'base >= 4.2 && < 4.11' 'base >= 4.2' \
+		'QuickCheck >= 2.1.2 && < 2.11' 'QuickCheck >= 2.1.2'
+}
diff --git a/dev-haskell/cabal-doctest/Manifest b/dev-haskell/cabal-doctest/Manifest
index 7a03d0da22e5..45909cd9a31d 100644
--- a/dev-haskell/cabal-doctest/Manifest
+++ b/dev-haskell/cabal-doctest/Manifest
@@ -1,3 +1,5 @@
+DIST cabal-doctest-1.0.8.tar.gz 10812 BLAKE2B ccfff885efdcb4e2d1233ef6e9a1ae6b2e2101dd0811634dd1be284439e3fe2ffa8f1817d3b1f5106a49365a848b2178c637450a23de7b326c4f476a0e73b3bb SHA512 121827f4f9117673c5c41beeaff2ef74f75ca55fba8460f6289d69b1ebfdebb9568f23b4b7d0ab2f3d436cbcdaa073709a26562b39e5f57a6a705088d0a2ff71
 DIST cabal-doctest-1.tar.gz 5056 BLAKE2B c73c636d4aa6c23a3d12cae969430405ed7ee8a3ebd27498c92712719c0111d64a200e28a8a17fb262d4627179b765757b9d041322fdba2fdc6f6b6f787f90d2 SHA512 2360f44b072123bfc9aeb23352f96777e5e2acbefd38659af26b17e7b8a4d3d332eb4bb3da7c1cb354660bb019c2a30e4323d295dbaf1356e2d6a8ffab51f82e
+EBUILD cabal-doctest-1.0.8.ebuild 613 BLAKE2B 5d1251e1ab4e2f57ada4216afbcdbce3045bf906ad7e89d7fe3a82345005408e0b7ebeda22114cd346b1e794ccf0ef599b0cd27afa1dc112a46504dce7ba545d SHA512 e4536edf2d62466ba0c116b2063ad10d209f6265b9c8622259b3675eb638b59161ae10d0ac4d667dcc5eea485bc5ef5e4e8c3fcd09a3a85591094a3883a952e4
 EBUILD cabal-doctest-1.ebuild 613 BLAKE2B 6079192022941b6c5aad9ea8e87b1e6dff09c2a6b960d8e8ab9964a50f8f8e6246761e9cee15f3524674d93f43cc0e8782fb126f18c3c2591461a69e99c74e9a SHA512 9be2542560a8ba9026432d790f8d5b0ff1943b5cd3d2ca35b35f3f4b05105ca344472c84427622a56ba5378d1b3128636b237e58b4ef36faf1c017e90f050dd4
 MISC metadata.xml 723 BLAKE2B db4d3a4ba2f8356000273e0c98e91fdd1c781f48639075b8ca3ab59ce32e92d16c32e416c5421815ebd5fb1602aa0f485636c675fc7eace97f7d6da56c30c6b8 SHA512 916c984fc5af470538d6960698608f85e34b679f1ae72074d3b81dbd3e50418e6722d7897419dc669aeea52828d3b8577ba68cc21e5bf42fda287fe3a0d643a8
diff --git a/dev-haskell/cabal-doctest/cabal-doctest-1.0.8.ebuild b/dev-haskell/cabal-doctest/cabal-doctest-1.0.8.ebuild
new file mode 100644
index 000000000000..fc699db32cf3
--- /dev/null
+++ b/dev-haskell/cabal-doctest/cabal-doctest-1.0.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-3.1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/cairo/Manifest b/dev-haskell/cairo/Manifest
index 1ed65eae7014..e738d61b08f9 100644
--- a/dev-haskell/cairo/Manifest
+++ b/dev-haskell/cairo/Manifest
@@ -1,7 +1,9 @@
 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
+DIST cairo-0.13.6.1.tar.gz 53029 BLAKE2B 8363b436271bc1666116819d9ac39297e3a8c61e18ef7758e188e194a1a51fd8a335d61707cecc5f5d240fcf1f4c71add7be945ec8686e80b36de97c88ecfda6 SHA512 e268d27298c2b274eb12555ff67e4abb175a1269ed3087b9a5cf1a128252d8d390e3ef393e76f27b857558451fb0a137f4f44e095053a9ca20159a332b8878ef
 EBUILD cairo-0.12.5.3.ebuild 1151 BLAKE2B 56f252e9a5754146c23e804c0a6d5a018939c12345ce2ff643fc1d07a059b9e8cff2974e133cac10663ce8b6bae4b6d6a120494c4626fa3cc29825f117681597 SHA512 915b5783f9c7af8ca539878c3579a2c90f373af2fa67603008958a7edbe92203961721bd4f136740e3c73f455ae4a11622821dac0844923c88787699b068fc16
 EBUILD cairo-0.13.1.1.ebuild 1050 BLAKE2B 07b3ac85d7dbd368afe97344de2c57b396bcde036dbd49cdde18c4c5e57d9d6f4b8c5bce31dbad2b71ab1a2784f5f1b417582589e4f21ae0d859a5d6b78ea90c SHA512 97b03476f8af15baefd6fd845c72d457a74b379d868791c6d79a8322b8f0fad953d948db334eafb4a6d04c6097f1e19731f58915e82992e36f7ee2052242fcc1
 EBUILD cairo-0.13.3.1.ebuild 1048 BLAKE2B ce1783745ab6813338ca00c28bfa9f4abc2a4db81193aec44d261beee9cacb2ab79a95aac93463416ee94c9bc3382fdf4ebeccf0ed04a75fd762911984543757 SHA512 7e7323a7eb9cd8f505680f896a7ab7656de6d799f7ec63ad94c368b1b9d539961504adf85716c34683c1680169bed1bdc1723371cbf536271c22f348b2f1a9c9
+EBUILD cairo-0.13.6.1.ebuild 1118 BLAKE2B 2f91907fc883ace69e4001c5140d820aa506c5626436f47c6990a64f090fc28ffd1ac12eeaa1c59ee46859fd9ed1efc2463007282a1f68387bbf2f780933c5a9 SHA512 47bcfdb3ebf201f5019faf4439e1ca245cac564dc5deee4ab55331e6acaf4052607667e4d30e03d5c3ae82a6dd4e52d353d76d4fa4dd4c7315da67387ac1e073
 MISC metadata.xml 468 BLAKE2B 04053766d0971041ea0c68c8945622845833dee8fac5b144799ea1c21874fc739f9c60ee5f418a9a4e94e12f9bd8d621a8419fa6b916bf8fc518aa0cebab90cf SHA512 30c5d32612972f08d6d51603a6972b6a084b2f68e644c72ceb4472bbac83122916070ffc597b8199874c62fc80dcee775ca6632a45e82619d9927669559c79a9
diff --git a/dev-haskell/cairo/cairo-0.13.6.1.ebuild b/dev-haskell/cairo/cairo-0.13.6.1.ebuild
new file mode 100644
index 000000000000..343dd2824e54
--- /dev/null
+++ b/dev-haskell/cairo/cairo-0.13.6.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+#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="https://hackage.haskell.org/package/${P}/${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.10.1:=
+	x11-libs/cairo
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.1
+	>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
+	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/case-insensitive/Manifest b/dev-haskell/case-insensitive/Manifest
index a4ad84541b3d..e598b714a2cc 100644
--- a/dev-haskell/case-insensitive/Manifest
+++ b/dev-haskell/case-insensitive/Manifest
@@ -2,8 +2,10 @@ DIST case-insensitive-1.0.0.2.tar.gz 4803 BLAKE2B 53e45eaa6f6381138369601c7f46ab
 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
+DIST case-insensitive-1.2.1.0.tar.gz 53609 BLAKE2B a1c5c7574d0f3678ac0f3e6b53cbe78ae03c7ea7c4579fe0c9314bf4f22c7968701ba8c3e9dd9dbd64781e34c9f32948f121029301132d9dfdaf3d3fdeee0e6b SHA512 8e3bab4d1035d0bf96da24c7a4b79953b855c849cb0197bf65dc66b4394a92fea263fcffca4179005507a35234b7f60d873df41bc01a94fb2dfdbd91092e176b
 EBUILD case-insensitive-1.0.0.2-r1.ebuild 1047 BLAKE2B e22100d1da16967cf839d7c5e0a8e174d1c57125eadad3c3cec571a3856a2d6176c6c50461e81893994c53da42d2c00defee10f5c9aa1524d7b0006de6e23339 SHA512 d0352ba2d8a4f87fffa5a17896dd00221a886d9af3bcab1c528fd42f8b8259001810acba533007f939e8a68fc3f1bdbdd11973e9e90caa6b9246569b2547749f
 EBUILD case-insensitive-1.1.0.3.ebuild 913 BLAKE2B 2fc94b34e63cf36ef9507f374bbfd119030c6dd955aa43f0894be8ecb31cf46bed0a898159521b51960ce75a345d98a47620dbc4edc0b23ac9bf49fbe6bc4af9 SHA512 517f62b1fab4d6bf046cb8b4ab8ef8475b27cb4e9947da11b22373de0efd9b5f38327fbf80d62476c6c1d5711a45ffe637dd8dd3583412abc5254688d5719f3c
 EBUILD case-insensitive-1.2.0.5.ebuild 911 BLAKE2B 24e2ca8b36c2ae7c0e2e8fe38fdf8df4b79b55e04c5cb37015401175eae97d61254231785911c0eba967a8d8422c89dd4fcfd4221ed4202a2541264622d69c23 SHA512 5781eeb4caf42d61ae96193591361d2388a31149cf62cafe0f23ba0dbd9f8bf63f1c58e3928b5b5ba3a0ab03d6db96cdcb70066c9c77267f3d54de46597755a6
 EBUILD case-insensitive-1.2.0.7.ebuild 993 BLAKE2B b4dbfad177fc703bf637b0b4c82f1240025d2207286cddd0f006b1d090365c36ada83575473345743f613b4a51050c0fef30854bbda8303542556d3c3965177e SHA512 ccf777b4c57aa065ab8bc67d1cdd3a80030e4b0e07e8e4c8f5b42295d283761b1246465108fb0454545f80a0bb4f1844cf8d05d15dd14d8c5b2e8e261fd2e359
+EBUILD case-insensitive-1.2.1.0.ebuild 786 BLAKE2B d7ab8ec55ab712cab27a453f1ace2fd6224d81bd8d11aa9b8481e371faf743b1bc7b9da7727e32f1572126506496160577910d1622d395f4ac30a7c9dbee175a SHA512 dc473dd72bf7c87eef286c31d36cedc2865135335e9a5793b2b33333ec6353a8cdad6a125f6b2f31bbcaf4f65782361b475a821e8009428ce92c45e02c3db1f1
 MISC metadata.xml 626 BLAKE2B e9dc5be2cb3f7fb2ab130876af4d516dbadf5af192e362d78e5c184d28328637976eab0198e238bdc5d3213a9fead79618a23c4232e3858960b1ad3073b8e3a3 SHA512 70e1884bd4380cc54462df82c8087812bef88dd63825454f73e5554608dfd4abdf98a838aa862bed1495b891c9dbff5a7b311c29f2828296f151552eed4ae692
diff --git a/dev-haskell/case-insensitive/case-insensitive-1.2.1.0.ebuild b/dev-haskell/case-insensitive/case-insensitive-1.2.1.0.ebuild
new file mode 100644
index 000000000000..7f06b349052d
--- /dev/null
+++ b/dev-haskell/case-insensitive/case-insensitive-1.2.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/hashable-1.0:=[profile?]
+	>=dev-haskell/semigroups-0.18:=[profile?]
+	>=dev-haskell/text-0.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hunit-1.2.2
+		>=dev-haskell/test-framework-0.2.4
+		>=dev-haskell/test-framework-hunit-0.2.4 )
+"
diff --git a/dev-haskell/cereal/Manifest b/dev-haskell/cereal/Manifest
index d8781190fef4..602b89416a83 100644
--- a/dev-haskell/cereal/Manifest
+++ b/dev-haskell/cereal/Manifest
@@ -3,5 +3,5 @@ DIST cereal-0.4.0.1.tar.gz 22305 BLAKE2B 04867fc50e60684f47b609c3fc01a0c8ce4acbd
 DIST cereal-0.4.1.1.tar.gz 22656 BLAKE2B 72f7ffa9c3cbcff11b62a97eb9df5421f6776c09349fbd762a6896403cf89a5ffee6d0e56cc1c4df4894a8c4fda3aace91cc2db5b6cbbf8b8aedd966ac91b8bc SHA512 dcc0604ff78ea2d9e8c5a163d832879d5fad63f9cbc798ab2a785aa6b04f7a6262f42a478f61351cf9fc18f0eadaa83bc83146b614c286316a824787cd70b8a2
 EBUILD cereal-0.3.5.2.ebuild 560 BLAKE2B 08a49bd259086fd02cbc59e7e1a4d20d6560a6c124a9627bf09a41d61f78caec09e744de13e9966a01edf58ceea8fa6ce1aa1046f71a850a4d8569d3f6c28742 SHA512 f45df3be76be586ce393c36be997749e2b314178228ecaad8fbbadb9f292b782a34c70dbeded24436e02ac5657af6c979e8ab1dc427c6a5c87862a1abd8680f8
 EBUILD cereal-0.4.0.1.ebuild 566 BLAKE2B 7186399d83f9741f54ed42904db0b2a26d66b663831e5fad15d2894f7419b6b76994c4c7fd600ad8a87bc42d116df45af40d73c1e0b43551758d9f93e2d0fa76 SHA512 3011b6e58a0dc5765ec45a0290b7cf6e703359c071e310000b4bb4e72ce991184baa70abc1f54b80ff3a60d40fca20177cac12d661adec06cf3602db4e225e37
-EBUILD cereal-0.4.1.1.ebuild 932 BLAKE2B 3317f7eaf34cc7e3a8cf20a3512ec43fb1e7f4c062e932a8e2e3be4bb8d78a78f583bc2602137b97719fa1955840197252df7fb569e31545fbf4219957cd89fd SHA512 5df4e9609f67274b4fc44e991b2a6f89b327fd8449b0fdbff045f763b3bfb111a28415caa36dbab24a98e87f027758edfc0b4cfac406ff441bf3c4e1ae4acc62
+EBUILD cereal-0.4.1.1.ebuild 959 BLAKE2B 3a85dea37d7bf7f00980ae02fd6a21fe3607be213af4ebf974e0ced3ceb11801b045d3f6a5809b2083d867cb7b92cef81aace14d455626497314fc58f23f4050 SHA512 031c12d1d6c9798522ada074b0cb4caea596089512abe4fc2aa22919c142d40f010749d51e91c597a269af991b3898d950944a88d1dc5c21f18958b563fa0bc7
 MISC metadata.xml 626 BLAKE2B 8b17332c2cb03e9e7da8eaafc943fb0440eae0ed4907e8eb59f0cfb5d835dbf04d0b5405a260e296be197ea7876e031798edd3e9936ccf624378d3fe550aeadc SHA512 482536773d4b76e43a1057fdb5ffc27b8b4b346fa6a6384716d0867076d514ad9cf91b94e1df6b9722d63b1c473ab21267061567413d355e0a9626310c064f3b
diff --git a/dev-haskell/cereal/cereal-0.4.1.1.ebuild b/dev-haskell/cereal/cereal-0.4.1.1.ebuild
index 92a685f13ec2..6461da350f63 100644
--- a/dev-haskell/cereal/cereal-0.4.1.1.ebuild
+++ b/dev-haskell/cereal/cereal-0.4.1.1.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
diff --git a/dev-haskell/chell/Manifest b/dev-haskell/chell/Manifest
index 03ebc982fac3..f16432845cfc 100644
--- a/dev-haskell/chell/Manifest
+++ b/dev-haskell/chell/Manifest
@@ -1,3 +1,5 @@
 DIST chell-0.4.0.1.tar.gz 12441 BLAKE2B 450827af0cfe005b6c6c17e59229d7aceef6b4609b9c81672829d4c4818e5d9ab03752e6b44efc73fd0a614c881e0326faec881613e8f2ce68c75bcbd1e06e69 SHA512 5a11e38fdd6c4f323d077dc3adc35c9626229a49f6ed32a0202031094f2612ec3e26a28f96819366439c1ec97ddfd839050f207d03c90a749890ef2bb345b8c3
+DIST chell-0.4.0.2.tar.gz 12424 BLAKE2B 2e525ecacd0f703a873b89afce7c62937634021e65a54ce901b4b50e535131e1fb831173e4d2b3d52ff351df09eaa386377052b35c7e70c75028b59c87ee21ab SHA512 050c5818ad2cd954ef79b230de2f03fdfb19e99c8624a24bb7845bb20e3b5d5d427a9623491ffc706c5635f545eb99466bde7a851c4344d11df1a70bfb2bbe22
 EBUILD chell-0.4.0.1.ebuild 1061 BLAKE2B 4f1bdfa54060cb3b191da3b8c2d56af350f99300baca23f6c80654fea69e5bc349b47d3304a8e63b80edae0548d3120b2fbbd8f238dfa42bc0eb173d1a43aea9 SHA512 a8bc3babadf9e5eed6b060c761ef80a02344bc3802a7f7ed5430ce51023e67e82e60d288c95e421cd9714c7428056af20b30836227802364775ecf819e857706
+EBUILD chell-0.4.0.2.ebuild 1087 BLAKE2B 90fa219e7044e4d476dd1064acdaa0bb1ebe571e0c778ecba75760991aad687676f70bf8f56eef7fcb346a8f4d071fa3b40ffcda13811508df5b18f8904e333d SHA512 8b715c4d843b7401ad8b396cfab414a8e7cd080ad87ec0f55bbde72ff0551d4efd5999e28aed52558ec440087c9fe043b733c786fd1566cc6d06243506159963
 MISC metadata.xml 1348 BLAKE2B 7a683e9440cbb07cc4d3546f3b8727801ed177136eb20a3df82a0ce11589e4f236bd175b68b796d447e6b9eec4a87238050d88371d8c92d8a054b01f4c71e9f7 SHA512 4c6e16171c20c2f2e21ca663a5c9b76d57e202ee1cb99317417de758b6fcefe0a7b44ea0177c20f8549ca7f48e4238d8b854a0d12548d9041c2265a4b9138ad5
diff --git a/dev-haskell/chell/chell-0.4.0.2.ebuild b/dev-haskell/chell/chell-0.4.0.2.ebuild
new file mode 100644
index 000000000000..6441b6c481c4
--- /dev/null
+++ b/dev-haskell/chell/chell-0.4.0.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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"
+inherit haskell-cabal
+
+DESCRIPTION="A simple and intuitive library for automated testing"
+HOMEPAGE="https://john-millikin.com/software/chell/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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-lang/ghc-7.8.2:=
+	color-output? ( >=dev-haskell/ansi-terminal-0.5:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'ansi-terminal >= 0.5 && < 0.8' 'ansi-terminal >= 0.5'
+	default
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag color-output color-output)
+}
diff --git a/dev-haskell/clientsession/Manifest b/dev-haskell/clientsession/Manifest
index c1c2d2cf1a0d..875baba7f871 100644
--- a/dev-haskell/clientsession/Manifest
+++ b/dev-haskell/clientsession/Manifest
@@ -1,3 +1,5 @@
 DIST clientsession-0.9.1.1.tar.gz 7928 BLAKE2B f947dc1945f887fbb20227294b4c264366bfcc0d8ef415a11536f83d41d07186c70dbde616dabff99f1e0b3b06422c1c7810780d01ae4c9ece154b8566eee973 SHA512 dae2c63fe20bfaf3b6521dbfb48d6b79254d5365903766e75406dec94325572c22dbf85cdbf9dc6abe6c6a7dc496436a5d46a16826036de71b2a5f58eec53e62
-EBUILD clientsession-0.9.1.1.ebuild 1216 BLAKE2B f25ad28a7ceaa21797d91fcf437f400a945381347c821f4edd9581870da519b060265a8b775400b7e25bc7bbd96c326801c110a38a80070c45d29f764e6d3a86 SHA512 93775b11823c1d3b760240bf3245d652077b35227d7847af1f500488bbb536341cdedc063cfcce56238e1ab6dd8650f8237f9384dc9fa09fba5f62d2f4531e3f
+DIST clientsession-0.9.1.2.tar.gz 7991 BLAKE2B 368276fbb8356dbb3aefa4705401e1d621bff7c5647be312cff0e6366de0c34478d7a558be1001a5a86d88c0821bb715a414d1bf2c0996426fc3bcedc825c2c5 SHA512 27b44924843363f86b7c27aec1a73e8d74fcf42075cbe45ded4f26d690eb086bac0a4091e66bbdcb431c090aed0ddb64384ca6c555b8ba4c7372f1c42117587a
+EBUILD clientsession-0.9.1.1.ebuild 1243 BLAKE2B 2b635aaf4298300f4680e75024c275233e2d1876fb66fbcc45dc9c22b5dd5a08728de63f38abcb88178bb0a8f087fdf0592a78f8e379c3a263c6f38c746fdf64 SHA512 e907e0ef5ac41e76a0b46911d512b3d1b30459907be62cff153151520c30f83631d2f307694d585fcfe4281e296698595a281dd98f278eb61d505f4b7315ce2a
+EBUILD clientsession-0.9.1.2.ebuild 1214 BLAKE2B 26d3f72061dd421ae6a635b28675d90ba7de6a9ac7c26a5eb69d6006841c183c55458cde9b4512c8fbe91a3ff089554c74cff43dd9e16983bbf7a297dab4592f SHA512 6d3dcad37fc3953f7241de31b1cf44c5e161c60eb547f087a1cbde0ec7ebf66fe657b537659461aa716ccb19a12100cb72f95e57c5e5afc8ba78f5bac9fee0b3
 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
index 397272f81c4e..eeee5b2fe72a 100644
--- a/dev-haskell/clientsession/clientsession-0.9.1.1.ebuild
+++ b/dev-haskell/clientsession/clientsession-0.9.1.1.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-haskell/base64-bytestring-0.1.1.1:=[profile?]
 	>=dev-haskell/cereal-0.3:=[profile?]
diff --git a/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild b/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild
new file mode 100644
index 000000000000..30215ce18ea1
--- /dev/null
+++ b/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="Securely store session data in a client-side cookie"
+HOMEPAGE="https://github.com/yesodweb/clientsession/tree/master"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+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/cmark/Manifest b/dev-haskell/cmark/Manifest
index d99cecd9aebf..b3bea044f524 100644
--- a/dev-haskell/cmark/Manifest
+++ b/dev-haskell/cmark/Manifest
@@ -7,5 +7,5 @@ EBUILD cmark-0.3.4.ebuild 696 BLAKE2B 729085382a31dac878c86571340f0cf03c5ac8b0af
 EBUILD cmark-0.4.0.1.ebuild 694 BLAKE2B 6eb3a076a12224d62cbb9eaffdc7fae2bdaac02aaaa05290ca4e228198e21746cdb49713a2f24174470b897f230eb8df7b22558c55266c947113745801cc31ec SHA512 ec7fad869d5c1195a51c408c8b1f45851f6f8cd2995b7546ebd0bfe023e8d7aab0a5e49e0cc6729cdc1aa2976d65e1b237e182337999dc766e42ef0d3133738c
 EBUILD cmark-0.5.5.ebuild 792 BLAKE2B d64350c824c19ac265af49df22a29997ba31547359c85581475cd8cee7b70a9e6364e16a62e70cf0606ae0b796240fe524abbcf1d38a00505c0e3fcb62725305 SHA512 70baaab7312a26046b92fd7ca7574d618a33ead32ef0b39936a111965e5f3a668f188beea60926560ba896bc1f7959900e999f96b5c747f279ca3477119296bc
 EBUILD cmark-0.5.6.ebuild 905 BLAKE2B 2785c56ef95531775c240b606cf929a85772e340ee05e7539b249b69a578e200e1879de854bccb050c94954e81d2a2f7eaf11bba3981a62d71ca0e96f2358364 SHA512 2b8aaadba72cd0f1333a111d2c74b41022ac195e7e7d7af72367216e8c25de0b26511dfa6554f5b5255fa0ea2755c25d66f6f4101bded4ea5b6d9d3137e86d0d
-EBUILD cmark-0.6.ebuild 907 BLAKE2B be3ece2a48b31fc384718823099756bac267b6b0a1c41fc62e887d7de20c41424316c37078211ba655f4b08bd2d9bcdc55f5ffaa5fe13548769c045dbb362427 SHA512 dbf3241dc2f2aa93f74556b98fe60bd3343face88649bbce175879fe58199e9575a60c17760ff5f7c44d3d438a129af1acc22a92cf07e9005466936ff2bbb89d
+EBUILD cmark-0.6.ebuild 904 BLAKE2B 060cc1a7c9909a98bd7c11611d9b0115f4e79d6fff997adfe99c5a101c6287c7df33021bd9c68b46e5490ed19f0a947c496b77678352bd79eac8bd2cff8083b0 SHA512 b5e30412503a9ad8001549dd241a7f174f61d492ea741fa4a726a11156361f9fa4a4b45af24a138152f5dfb8b38b836208b9d9b134a3332ed3008287bcea4b60
 MISC metadata.xml 3529 BLAKE2B b8b6571f4e38d3cb44e700f899e834cf0a562dc695367b73b3bad6a57264fc7a6fd6eb76ea7e4a4c1e21d34e77d1a10475fa10d4c3dcc38010748212c526a0a1 SHA512 81816dbafd239df87356729fa48f70a7be0c4c2567340a0f06d1698e66d9161b4e0ca69bf881041d90b331aaed966f57c9b631a3b2151a441a40147ab163cc8e
diff --git a/dev-haskell/cmark/cmark-0.6.ebuild b/dev-haskell/cmark/cmark-0.6.ebuild
index 5d36f5081c5e..ebd870a5758e 100644
--- a/dev-haskell/cmark/cmark-0.6.ebuild
+++ b/dev-haskell/cmark/cmark-0.6.ebuild
@@ -20,7 +20,7 @@ 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:0= )
+	system-cmark? ( app-text/cmark )
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.14
diff --git a/dev-haskell/cmdargs/Manifest b/dev-haskell/cmdargs/Manifest
index d43a758bd90d..b5c4dc9c7c33 100644
--- a/dev-haskell/cmdargs/Manifest
+++ b/dev-haskell/cmdargs/Manifest
@@ -1,7 +1,9 @@
 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.20.tar.gz 64550 BLAKE2B 08511df092c2a7010af94bc8d9b54b29c0e76c33be06a9521eccc85092b57a45ae9f9d22b0f8e81266073c81185b66266d1f2321c327ae730c6ccebea7f6d6cf SHA512 b9e270aa5dabd84eaaa47b95a450ef5b5f43cd19646f2a407579f855857d396e5ab9ca0038e1e876849a596ecb8cdc9964c45970825a0a95021d69b23699da79
 DIST cmdargs-0.10.7.tar.gz 61526 BLAKE2B ba9e6d639218576f0c576c93c4932fb9f7a5e15273df388798e582e6b3e3751e8e1d8e03c814114ff614f49fea5c9680a1b7b46ab9d8e1fcd934db8760ed6967 SHA512 b9091e4f708db1e7c8bac367c4faad5c311a3194aefbf2776316b4ecc559314f01ceb0102df007819996b00200c5300e5b56e1035d45561e924bbfc3b38b656a
 EBUILD cmdargs-0.10.13.ebuild 729 BLAKE2B 57b9b645a50cf4504d665d3441e29e76c878b7d806457b7ec58d5c099de392c7e92c6347451a63ff2679ca619a2db3651f5718d908d61964fdd0351f13221c61 SHA512 e6839ac45e6e8ff46c35258347844f5412175ac12304fdcdcdd6be2373832a1475260c20c4e6409eb37f3f719c010a426b261275c01d9ad62ef856fa71b8e33d
 EBUILD cmdargs-0.10.14.ebuild 731 BLAKE2B 6236ce47de68578bea52e4a1a1741902b56f34fe12e0d282732869d3bb2ddcdf32a3ea856ebae933beb87847e123966b8060f239561c80fd5027e00c0232ffe1 SHA512 f034d9febf174d16b2ed4f75fdc51879dd683840e9a2525e110ea8fd40b9ede46c0fa18ddd531d38bfa78ec956844bdeacff70c08e2048bea0c7aa736ef8444e
+EBUILD cmdargs-0.10.20.ebuild 726 BLAKE2B 99d23fdfd04c8412035426af691eaa39d50120a69fee09c36d1a302d5a86e04a743d603a6353c52ce8fb2079d07299f74b6b8d2c0ca4903c404ad654686769a8 SHA512 1904a5b649fb307ff8a5c5c762561f74b2a4b37278446cf5966fe6144dca16d4b5cd1b3b94bea048340bae6f75e111bf6ca4daa7b2880aa573abe05d9beed530
 EBUILD cmdargs-0.10.7.ebuild 732 BLAKE2B 910ee6ab108791b0bfcb97c6f42e40b5712e50d671445860d5a3a77b627c077df774e0b4b49b7d6e18929a1f29d16330cd5bdad64f65ef61896d5d7e28269cb9 SHA512 af61629d92a0d5f013b0f6e88c208c14718163eed679385a90098f9fe1396ded474b61a4cbd2db745c982502ef018d96cb4ddbd8054e4afd589165460cbb2aed
 MISC metadata.xml 1399 BLAKE2B 19e4eb5aa40c08e1cbcd82eda918e9790c065295de89a1039b1ea247922f82107b1df2a7a42d50cceba092972cf77af689c877418faec763c9443e1851aba6c5 SHA512 2c94fcc315c08a3c34dbf1cb4cb7131b76d612701abe89b7c18c7ea09bf1b29ea80fb6716551bd452594df6b8f62f6032b51467a121cd6184627e5622c26ae83
diff --git a/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild b/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild
new file mode 100644
index 000000000000..15cd81e1e236
--- /dev/null
+++ b/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Command line argument processing"
+HOMEPAGE="https://github.com/ndmitchell/cmdargs#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+quotation testprog"
+
+RDEPEND=">=dev-haskell/semigroups-0.18:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag quotation quotation) \
+		$(cabal_flag testprog testprog)
+}
diff --git a/dev-haskell/code-page/Manifest b/dev-haskell/code-page/Manifest
index 03462f5b9981..5537a94be532 100644
--- a/dev-haskell/code-page/Manifest
+++ b/dev-haskell/code-page/Manifest
@@ -1,3 +1,5 @@
 DIST code-page-0.1.1.tar.gz 4606 BLAKE2B c8529b737a29539a360a32a03d6a942077c9bbe7732e9eeb201ea65022ffa322f3cb3272a8356aba1a12e7b7a9809a93579a0479c10e899548dd425f5470c057 SHA512 867fb373680e638fcb32501a261b61e708008b9d449d5a28d11336b5961e4a0098c51e90069155ebee7a9229acac288df4598b0f6edd0b4c6b61cdd2711f5ba9
+DIST code-page-0.1.3.tar.gz 4718 BLAKE2B 0062024dd536b23359d84a8f6aa5bb66a241ae41190a59c9c2cdde34f3ee1664ad180a1d7b8332904b761956bbb73bb85f74f818763a37021dfa5fa09d36a040 SHA512 1a8f650051d749840562d4ac8789f9834afa73e64582f2781d542d281d894c420cdb7a5b8a2bf30c983bec99a27bec8b63a32b1cabd3ab26a964e0a9b9b647bc
 EBUILD code-page-0.1.1.ebuild 551 BLAKE2B 86f3c9bbf6fbd27641836b296d673ba6a1b303ae4d6d1f019eeb7898e744eeab9dca7b4489e3cce83d000660d4ce2f7b485e0df0f8a7580dc3cc725f32bac746 SHA512 e8db46688fbe559e1ae1759a65daf7147edd80a0ccbb7423ae9f3e03f2d0e8ea308f0b86f61674837bf1ac8a60da5ff93be2394343890f78cd336bfc292b3a36
+EBUILD code-page-0.1.3.ebuild 553 BLAKE2B fa95640c095c68d70f45a0d3b6ba257c7ce6411272db30435335c932cc7da8e4e16f2fb17a376617958c95d2fdb4ba8ae53d59d90af741fe68db6eb6971f1166 SHA512 16633aeb51b05428940a008552caee90e30481f79639c1be1da30e633619cf7a5398bd6ef509830e663e81f6e5dfe06e1aa625b25c3b0ea2961d1259427b8572
 MISC metadata.xml 746 BLAKE2B 4d5803af18ea6f3e41126603c0185048c59762afe39cd0879c5f810ada3500cc73297d37e45cc7ced1f3ad541fe1cf8ed80fc8f98f667ebccb2602b96376b258 SHA512 964781fdc03c324df2cf8a76fe3b7dd58fb1511d1d8281a57ca8eedb4ace74404d43b566a6b1f083b0a7b986e1181c81e83726a2c0c865f922a13cd0d8c8d0a3
diff --git a/dev-haskell/code-page/code-page-0.1.3.ebuild b/dev-haskell/code-page/code-page-0.1.3.ebuild
new file mode 100644
index 000000000000..c489613c0234
--- /dev/null
+++ b/dev-haskell/code-page/code-page-0.1.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="Windows code page library for Haskell"
+HOMEPAGE="https://github.com/RyanGlScott/code-page"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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/colour/Manifest b/dev-haskell/colour/Manifest
index 14b091473b9f..20cd73ad9ac0 100644
--- a/dev-haskell/colour/Manifest
+++ b/dev-haskell/colour/Manifest
@@ -1,3 +1,5 @@
 DIST colour-2.3.3.tar.gz 20392 BLAKE2B c0ac11ac27c4ba0e4501f2177e35389bbf297e72678b07cbaa9bc43ee6d1b7f2583228e6de17f98320a266c29d9a9472567be310647a84704fa3dd961f1926f6 SHA512 3498215698c3c4010a2bcb6ef87ad263f5a5425167751730919363a0e6806a5c8c2ba82b403b7898addd74feaa756c9df339a37a2b2f2d727680c14ffc21ccf8
+DIST colour-2.3.5.tar.gz 20485 BLAKE2B 64cc4df8f7b36fa4c7a9b474db566b7623f9c7b0892f379acc866f384aa5e557cab5965869b0ba84167232658375ab568a3f5e90a0a1deba81520717899637c6 SHA512 2232f51b3cfdda1a64436e8395c2441e49db083982a0370d3ec38c304b0a6234666887b3abc886107a9b21c425d3253284cce0186c1a210a302a0a14808364d8
 EBUILD colour-2.3.3-r1.ebuild 1192 BLAKE2B 3350bebacb9b76d2c06174af38ea7c3bce0afccbf2b42ccec13ecef7abcb25473db9de567256b57e848f7e0b8b874189c0c55429750bfe9f00697f2eb81e4e4c SHA512 997c4ec3d0235774d255bad8a612d0758d05fb82859f4acb8197afc141fb8b2d1e4da9b386dfa63e6f9d2597092cab3d6fa020678dcce1484d4cb7b4ef742122
+EBUILD colour-2.3.5.ebuild 675 BLAKE2B 9b28b5822d794ae3b030679dd806524558cbc2781247fff4705404cfc89482f8bb5ba0921f64187459df118255d75f55d46e289904d39fcab503b1ee3986944c SHA512 6f1bd7c458b7304d01650b8e0f18eec4a2036ca1b7ff77cf363a382687b127bec7b286db9b224c0c4bf8f6ff74a65527a45bb9b67133dcf65e8ccd7a8108b351
 MISC metadata.xml 494 BLAKE2B 3e64417d61195a8ffdaf511f43813fd558933fc983f637f0da4cc7c33843f5cb965451164ceb906e317b1dce823535f1c970e0c88b552e5d2d61fb88ac7d439d SHA512 32e07ce3aceeee92cd07819b05b61683492e0ab0805ca94391d898d589cfbe47aa468c84a7dc36f2410e6b24c7120dbd062cf5170e1eb55fe42e747175736caf
diff --git a/dev-haskell/colour/colour-2.3.5.ebuild b/dev-haskell/colour/colour-2.3.5.ebuild
new file mode 100644
index 000000000000..50d0c946cf1c
--- /dev/null
+++ b/dev-haskell/colour/colour-2.3.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop test-suite: circular depend
+inherit haskell-cabal
+
+DESCRIPTION="A model for human colour/color perception"
+HOMEPAGE="http://www.haskell.org/haskellwiki/Colour"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# circular dependencies: colour -> ansi-terminal -> test-framework -> colour
+RESTRICT=test
+
+RDEPEND=">=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+"
diff --git a/dev-haskell/comonad/Manifest b/dev-haskell/comonad/Manifest
index 103fb6ddc491..7a4ac93ae1d7 100644
--- a/dev-haskell/comonad/Manifest
+++ b/dev-haskell/comonad/Manifest
@@ -1,9 +1,11 @@
 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.0.5.tar.gz 17911 BLAKE2B bbd1610cf727a73912e4250d419020f8b862bc45de144d3d568a6314e9f4e47ae6325b77587ce87a24bc76f988f336be3c5cc03ec2bb358559319cf85956df19 SHA512 45c1d65768d229ad936dbb9ed75912985c9e2b821befb3863e4095f8af7d54984ef54a4233693497a3295c2da39eff80988f1d4c775230d7a899791ea5fb3e2f
 DIST comonad-5.tar.gz 16383 BLAKE2B 110f27389b05817c795144d33282ba6a0b91346c3a52ad7b695027ae290f626caa97be4204eae6987d58381587e7ef91c9a97caedcf60b1adbea639f63db54fa SHA512 1acdee67bc2fd6061228541f417e02ffaa9ac412ac3a84b4b3f5b1e82a5626a63ad01f1a085262293682011b99ee8a3d70f34f75b6ce42bb24b91e167d5f816f
 EBUILD comonad-3.1.ebuild 792 BLAKE2B 4062653078252a517bab1ebd2c7fed45f69cfde76a9c6ece1b55353776cfbd42b66ff4197f9f2db48d3f40fbe3be3363052f2b59ce6de680d07c9f90420203a3 SHA512 c694cce45db4d6344f9ae1e9f7c914b77229b57f51c3a53f1ec6e96e9fe28644c36666a2098889eb70758c25e4f77a8044ebb53a9dd05858f9f0d6e8aa9d4ddf
-EBUILD comonad-4.0.ebuild 1190 BLAKE2B 30ba3861cdc28bb31e331a33d8e94d186ed3da2d9748c21e7a370970b9a39f26e087440f2a24b22e70a7030c81d9f95834193aff4e9ae951a6b7939fd0c1bff6 SHA512 e4c6e72bb578c757e43742fcbb3083f06f146d053d3dcd3cb9d91145bdce546f3a9b56f85e30f267caa1ca872770a7559d64f7a41222c34236bb701415b0e7f2
-EBUILD comonad-4.2.7.2.ebuild 1431 BLAKE2B 9cb73f7c0f971bbc121452f2263bee9cd9b7c195e7c10d2611d616855de6af854e10f35148d6c18cb94f43b8eb719ee2bdf0862e85dc3f7278a044e53ebc9986 SHA512 79c9e12ab07e654003489f06ed4182b7d25f046dbd6f201e1a6606ec66ecb9f4a17c78a85b3e94a7f1e51f2daa3932413fb7b711c5cb7484dc4fe817aed5cc9c
-EBUILD comonad-5.ebuild 1431 BLAKE2B d2f9b6a13c3d13a0cbee27160fda69737969b9c199da523719ecfaf72e5d2039775ed48b5221aad3670fc80c6ed3a29ce71395564cdcc9e03efbb7024a9ba980 SHA512 a1ad0e65c50a4ca471fc6e3e8fa2c435dea84d2ae519c72a1098c83eeb9bd09f2294b5d1eb2027864fd2a468124c38bed77afde70e48503b38cd8232e3fa4b9a
+EBUILD comonad-4.0.ebuild 1217 BLAKE2B 98af78ca3dc59ae41e4f37fd1e83660a9b4a5587d76fd435fa81ade284303a45b9aa2bc5c9a4a66e5702c15653ab9eebdf365113a5acc829391415fd0c8b6ee3 SHA512 62d8ebbced7a445660f2b3dbcb6eeb733c3923be5558fd435c552bd149f271ccf5fb376cc19419c6eb03ccf028770ace5a76d13d821f49af8a86e2d67e73be7e
+EBUILD comonad-4.2.7.2.ebuild 1458 BLAKE2B 04ceec1d96d1af2b46f6574eadea1a2a034129ce8354c8d336edfdb6103ff94fd760f72f1e5a30bc2ffd23d9013be33cd08ced771711e2f6ac1ca2a067e8e3d0 SHA512 602b92947f6326e6d2c17ad34d9208fa8f3185274561bd4910bd312442439ed1edbb36859090c2b0b06408e97cb54bffc04705d93afb2b06d9b91cbd7958f9de
+EBUILD comonad-5.0.5.ebuild 1301 BLAKE2B 8eb5cedb4c70dc0cf5b71ff4af21195bd187edb2dfda64c3e648e56146bea8cd10e3f86931b43a5e822e2bd015c555cc8454e25f81195e59cfab80b6b8bd5891 SHA512 5ec27c0627aee7992ca3b8328f84aa8ef459f1e87bd4c963f6bec50ea60c4b0b4c460f75dc4839d3ef9090e61772cbfdb71fd97bf4eb677d483c3791460083a4
+EBUILD comonad-5.ebuild 1458 BLAKE2B ed207a149b21de802ddaf2ef8ecfb076f1c0d0ae9ac0ea8212b9cbb636aef70a0d1a9074bf26d7871ba66ab2790c23d4306af8095c6e33d3aad35380337b60e9 SHA512 d58cb6d6e7f349609f1190259e34d751cc302cfa717f4a26b270d48796d236c0eccd18b77a4949d54ebbfc382161803baa967d3d45f096594940a7f4cb715dd9
 MISC metadata.xml 1349 BLAKE2B e965c5d8d4657a8ac01dccc1569bce7cbe5349cb09e1f24d752861b2fa0413494ab80459a69e3282fb031b1feb0f8833bea1fded0ce5c4900d944f1601a37907 SHA512 e1a1bc3b06320550e0d437cf39b71b01a838fa1c3ae122d12b6639a2391474ae53c6313f4f1ea15a3e659feb23e5c43b9d3a3bf1f29810c1be612312eec5c264
diff --git a/dev-haskell/comonad/comonad-4.0.ebuild b/dev-haskell/comonad/comonad-4.0.ebuild
index 700ca8942fcb..397c594bdd5a 100644
--- a/dev-haskell/comonad/comonad-4.0.ebuild
+++ b/dev-haskell/comonad/comonad-4.0.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="+test-doctests"
+RESTRICT="!test? ( test )"
 
 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?]
diff --git a/dev-haskell/comonad/comonad-4.2.7.2.ebuild b/dev-haskell/comonad/comonad-4.2.7.2.ebuild
index 6edd25124a50..fd9f2ce3ed98 100644
--- a/dev-haskell/comonad/comonad-4.2.7.2.ebuild
+++ b/dev-haskell/comonad/comonad-4.2.7.2.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="amd64 x86"
 IUSE="+containers +contravariant +distributive +test-doctests"
+RESTRICT="!test? ( test )"
 
 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?]
diff --git a/dev-haskell/comonad/comonad-5.0.5.ebuild b/dev-haskell/comonad/comonad-5.0.5.ebuild
new file mode 100644
index 000000000000..b17c0e77877d
--- /dev/null
+++ b/dev-haskell/comonad/comonad-5.0.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+containers +distributive +test-doctests"
+
+RESTRICT=test # broken on USE=doc
+
+RDEPEND=">=dev-haskell/semigroups-0.16.2:=[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:=
+	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
+	test? ( test-doctests? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag containers containers) \
+		$(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
index c9c16cae68d3..9903125e4a29 100644
--- a/dev-haskell/comonad/comonad-5.ebuild
+++ b/dev-haskell/comonad/comonad-5.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="amd64 x86"
 IUSE="+containers +contravariant +distributive +test-doctests"
+RESTRICT="!test? ( test )"
 
 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?]
diff --git a/dev-haskell/concurrent-extra/Manifest b/dev-haskell/concurrent-extra/Manifest
index ec632bea5fc3..1827e314b0e0 100644
--- a/dev-haskell/concurrent-extra/Manifest
+++ b/dev-haskell/concurrent-extra/Manifest
@@ -1,3 +1,5 @@
 DIST concurrent-extra-0.7.0.10.tar.gz 16205 BLAKE2B 94fd5aca0a3365c482ae61985372458c269f5a6994b81574f8087c9a4b170a75aba67592671abe33e892af231752e7caf27aa66f9b93807bca1a14eb29de31a0 SHA512 2414fdb493834480f31e13b515233ea7739d46a170da12683b944de8372289cdafebfe8cf242c2edcceafc1fe3e659b0b20a0dcb4826d925cc50f6c1ebe73a58
+DIST concurrent-extra-0.7.0.12.tar.gz 15844 BLAKE2B 1220bdaa6bbc364c4a2e12adc3dd953459d8dcbc251db776e906facc2b80aa4239d35cc29c19fea767e27c0a451b5b29c3010f8a97943db6e73801980888b7c7 SHA512 b02bfa8473faeba15bf26f4c243190dee7820dd961bc86cb7cd1eb856451a9351899eea59b3668f0b811c95f828cd8c36744dfa03144ca0a949e3b663ae84ad2
 EBUILD concurrent-extra-0.7.0.10.ebuild 1110 BLAKE2B cc1fbe9d4a5865215a755053edf9169730e8044aaa63d9f2fe37ef5651c272e455e69500825732023a3f59234398bfb073e806bb40b44f5c75bf2c55fae1e064 SHA512 068d6263d5b344a4c64350d94fd2990ca4599e91f6fadbe31503be49a4bd2d97988bbb96a099d638f31b3d221c79ad02274370cac2db01f348a6e6a721692b44
+EBUILD concurrent-extra-0.7.0.12.ebuild 856 BLAKE2B 421a93223d696d59d2c58346e8b41b37cb846efd543cc0519b9ce58ef27ab8eedec5cc13537ce260bb6c345835c9b4204835b15343cbcbc1b26324057ef818a8 SHA512 9df99d38fb12eddfdd37972f46c081af5c2bcff0a815b95f0429a04961b4165f79359fa54ee87b8f4b9e6ae8a4be9687704fc2ea8be74d26f68a927f8a96fc85
 MISC metadata.xml 1335 BLAKE2B 28eafe7f6d2efbb0a658951a8310d879cc509c917e0b24d90a42e0ea4ae2ee06d322032ccbeedea88eb2ce719ae7790101f5bb9204f37febb357c0cb0b2a77fe SHA512 0b50541d1736c51687e86edc63932699fb35a2c90ff896a71d5dd73e89c2b5889fc1f001859ba3c5e7eadfe2877091393ebb1419091adb39c31c506f1b40797e
diff --git a/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.12.ebuild b/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.12.ebuild
new file mode 100644
index 000000000000..802906dbbfbe
--- /dev/null
+++ b/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.12.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Extra concurrency primitives"
+HOMEPAGE="https://github.com/basvandijk/concurrent-extra"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test #stresstest fails, all others pass
+
+RDEPEND=">=dev-haskell/stm-2.1.2.1:=[profile?]
+	>=dev-haskell/unbounded-delays-0.1:=[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/random-1.0
+		>=dev-haskell/test-framework-0.2.4
+		>=dev-haskell/test-framework-hunit-0.2.4 )
+"
diff --git a/dev-haskell/convertible/Manifest b/dev-haskell/convertible/Manifest
index 989a60b7924b..18f4eea85b48 100644
--- a/dev-haskell/convertible/Manifest
+++ b/dev-haskell/convertible/Manifest
@@ -1,5 +1,5 @@
 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 1119 BLAKE2B 0ae23e20887b2804cfadba21d77d46e0b92903f9183755c6e57ba4f971a00e5ecd61791c7c2fda41616542598e059fd7ff549aaa7ef413563d55e5a0c86a348f SHA512 a353b72ea5288fb34eb7d8f58221db778336694f2a05277f7f92251b5b4cf1df795fc3b41583d269f56ad3129599d88adca1123e84282bf6fcea604c91665548
+EBUILD convertible-1.0.11.1.ebuild 1146 BLAKE2B 26837576350da24461fdb2392891ffabca50f7c2295bd124a66f79df260bcc8e24509f59bcf1482d1ee3a40101bc73bc8e316585c52330192e33e7a125910d78 SHA512 4c4632ed0568a7241d18a94855d10a48a889154bc4b862b3df00ddd2c3bde08a2194c686b8a72f514eac18e7de90baeea2724ec2596b0a49ca124d3ee4fddd7b
 EBUILD convertible-1.1.1.0.ebuild 811 BLAKE2B 49f75bb75b87ba3425dcb289b4950aba7ae24b66f667fbc9c609195829b6a0a485d40417dfb82ed014718addf5132478bfc15de30f33df4f06cb63c32c4bebf5 SHA512 569c8598f866bc8617d0de41ccb1bd7e97e282bd23950a1166324a6afb3d2844063f6e017efb259f924b4874757af23b1c263f963cf2f10d091576d0764a2f36
 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
index 7d5542c25bb1..5c35140fd4d0 100644
--- a/dev-haskell/convertible/convertible-1.0.11.1.ebuild
+++ b/dev-haskell/convertible/convertible-1.0.11.1.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-haskell/mtl[profile?]
 		>=dev-haskell/text-0.7[profile?]
diff --git a/dev-haskell/cookie/Manifest b/dev-haskell/cookie/Manifest
index a890862a3fb0..f741b3a90d21 100644
--- a/dev-haskell/cookie/Manifest
+++ b/dev-haskell/cookie/Manifest
@@ -1,5 +1,7 @@
 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
+DIST cookie-0.4.4.tar.gz 5996 BLAKE2B 11ba2d50e004ae498525948c4eb68c470659e306e7a59794fefa8a0441960d2c956f356ef7eb9089866d336f856b30ee208589690767ccfdb886d2920f44b9c2 SHA512 3e17c7c3190602154a196c13b9e65eb139adfe5258441e48ebe5bd9e880af66a7c206f0eca441eeb9ab1700fa49c639adb9414d93f36147c11a1fe3f9fb4a775
 EBUILD cookie-0.4.2.1.ebuild 838 BLAKE2B da54f5a2fdde35290b121b36c6b4cf3c9b1b2bfa7e2ee3a99a804d3cc96932e637daf634a765ebd15f21867162988e6e78e3e85a180bf36ebddd1799faaa7b29 SHA512 c03cc044193443ec7257207b919860f734609e220fdb7e02e07c88c56a9a87e4a8dc311e8cce9fa81569e67bf2f46b915961ada14ebabb81db3bad7c887da54e
 EBUILD cookie-0.4.2.ebuild 838 BLAKE2B baad2057eb4d8f08b7f45fd375eea9d455e9bf6a2de8676eb0a7b3499726408035fbbbc367a9711cab57b0e0dad81e5abe302a88ac6f6f120621efa7f7d52692 SHA512 b4f8b0623a288bffe82ae601ab98fc26ba2df6be0982bcd8634ac65e8150708d5417fa49ac416a2e398feb27f69b0696fa85082a06ad909a5839b610f1e21b61
+EBUILD cookie-0.4.4.ebuild 757 BLAKE2B 9a60a984b22aed4b16b06f28064b1fabcf5b0d7a6cc962812b17c34540e776770a001e2ad221a32b0ce9b876ee39d4878e9755e12bf800cbb63bb91d3486c94c SHA512 4fc8bb99fc42677834d077897757f466b540ffd4ee47ef310a79133209d155c86f6eeb8b8a39246169afe004fb564888ba80bf39e08fb2292cb22a5406d8684f
 MISC metadata.xml 404 BLAKE2B 486feca0dd4def1819e86debbe66867edcb76240a7402687fcaa55d68f37fb30d23b954fc48f9b6c780d2f1603fbc57aadb113812ab2fb356b6c0bdaef06b277 SHA512 ea8b9fd38fd063c656e385e73db44db2e8b7e00f073ac9e692ff9fd5d0a8dd1eb1e1ed77f64f502d14cec43f00d1114758b51f3c551a9708a89624217099db09
diff --git a/dev-haskell/cookie/cookie-0.4.4.ebuild b/dev-haskell/cookie/cookie-0.4.4.ebuild
new file mode 100644
index 000000000000..ddbacaffbeb5
--- /dev/null
+++ b/dev-haskell/cookie/cookie-0.4.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/data-default-class:=[profile?]
+	>=dev-haskell/text-1.1:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+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 )
+"
diff --git a/dev-haskell/cpphs/Manifest b/dev-haskell/cpphs/Manifest
index f2eece2244f8..7d3598f92177 100644
--- a/dev-haskell/cpphs/Manifest
+++ b/dev-haskell/cpphs/Manifest
@@ -4,10 +4,12 @@ DIST cpphs-1.17.1.tar.gz 72200 BLAKE2B 4c88456ae4b35954e3615437e8959e9a4ce1c6b43
 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
+DIST cpphs-1.20.8.tar.gz 45108 BLAKE2B 8e373db64d0d2a21e123eb136aadfd45cb373411e0684c445e25eb6062ecf4c29ccce3214986680ab886a71bccade3ac381f8f82916002388af3103bc38e797d SHA512 ec9323f9e1cb6de450d8af6b6b98005bf46427c2926694e1cba942fd54a03d9d36a7e8f2541eb095949110ddaf6317597699b7c4472942a509d496cb9b4da747
 EBUILD cpphs-1.15.ebuild 582 BLAKE2B f7ae8e1d35b3b9a4600d47b1e018791d97ffa6891fed499a2b24a04a6c6624bce6fbb216ef0dd38f4c7810a26356cb389131aef58d4e0408c1e25fe884254ede SHA512 7ca3931fbae54c9d5425184b49d5c929fc5d97048a84332bd6266229801f9caee08375d9f80e0a2e2f1e3ecc4119603bfbe4ce35bae41df7a7037e49edbfd084
 EBUILD cpphs-1.16.ebuild 582 BLAKE2B 86ca52d4f601e672a4f19abdbeba6d426b920ffffd26954fcf274aa1ef352d5da3733ec698e3ba8a88da617ccaa54edb97a03f985440f2895ccb5cddcafb1f50 SHA512 2cda3f7789e40ffc6c3580152d136ec62012800e482982227f21eba12347a84a71a65422c0898d773d265ead8e1ec98c938fb68e3172e4f0727327ac608d97bf
 EBUILD cpphs-1.17.1.ebuild 587 BLAKE2B e453d94911523bd4e0afe95afae84242340dfdaff1ecbcc069f2cc713fe9f7a28a1dc8c4c19f1d5fc7024731004de7eb408860b70a63f096bd40c66f4240795c SHA512 0f36f4dbe0f247e5d875eeb082d97a645d3d460d58c8e408389e588095ae5374b2cca2ce9d0602dded6cdd3827184af18793b9b4149ec84376e0670bae108b1f
 EBUILD cpphs-1.18.8.ebuild 634 BLAKE2B 84677467b3cc4054f033c5bfb4a04fb693a56c9f1caab98b2b9353a0e8956d1bf006018be416da55d6f0933b47cf5c0ca69a24cbabef6c4fc76e12ab4b6c1e36 SHA512 60ff1465ff69b1a9dfdcaa6f1cabcd85feb0f54f7d47c234e6fbdb98f8c2d7799f288bfdff4f932441916921619c2cca14125e6dd4dd2684bace321a21e065b6
 EBUILD cpphs-1.19.3.ebuild 898 BLAKE2B 63bffdaef459de013d6ab9a908b691934a010931761cfcd43408f29453e79f8f5c2329ebb21b007adae74b79fa74627e87d3048444fb9f8ed8d5265f3b58bdc4 SHA512 fdcab7ba8cda008a299512bcdbd4686e5146b1400e56d5e8ffd99556e3f8036ff2a345379542bf1377f0b85fbe5a10f7c7f8e064f28a7f45736db06a8dd7dd5d
 EBUILD cpphs-1.20.2.ebuild 707 BLAKE2B 9381c878310a85024fb0538a6cf808f02c3b407c18185beeb2a4a8ce1d0801ae193aadd117aff427420edcd0aff80fa339aeea7c68677ba28677b829af2e4565 SHA512 1fe50240965466e78b76be29aa61ff4660ab18e1ac3500e965927bfdd583734e9fd762a4788a7a6cee8b248f5010dade67dd1171e233ab9bca11218f11f32204
+EBUILD cpphs-1.20.8.ebuild 705 BLAKE2B c440b32ba593c914cec68cdaf130f3dc12da177dddf9b6080793df28690637be30aeaa73e7780f059cc115acddcfbb0e5cd79c9b5a3a3950df5cae2a0743ba10 SHA512 cb85db5816e0a78439fc5f04a0d200993e7caeef78cb522e43576197713a391ac0e4ce666611ad1913ef40cb21c4cab8982870d44908f4d980cfbb02120b04f1
 MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/cpphs/cpphs-1.20.8.ebuild b/dev-haskell/cpphs/cpphs-1.20.8.ebuild
new file mode 100644
index 000000000000..cba8678b4c0c
--- /dev/null
+++ b/dev-haskell/cpphs/cpphs-1.20.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 liberalised re-implementation of cpp, the C pre-processor"
+HOMEPAGE="http://projects.haskell.org/cpphs/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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/css-text/Manifest b/dev-haskell/css-text/Manifest
index 3f31f543c483..ac59d8ba2bdb 100644
--- a/dev-haskell/css-text/Manifest
+++ b/dev-haskell/css-text/Manifest
@@ -1,3 +1,5 @@
 DIST css-text-0.1.2.1.tar.gz 3947 BLAKE2B 815ff937c708e211c53524fcb89777da56591f4f0f5050d812b43ad292c1bf5653b3383af0cf7478a428236d7f92f3668de57ff8fa3e1f0ebb041db7a961c3c6 SHA512 837b5e45ea87e4656a1a33b9a1ab098c03fa90a150ca6626dd4eaa75b4d35332703d2de6182d61dc1a144402366c6e74c3a85b60ff864aa080f8c8ef7b670bbc
+DIST css-text-0.1.3.0.tar.gz 4594 BLAKE2B 0ea86030b7e2a8f015bcc1a122e325948570baa3f72b961ca13d731c8a464ab06360eb451ca826175c73288d2eb4b51715c674151f2f3aaf1750ac2155e451ee SHA512 2f7b4fc758e3e6da7dadbaf48c9174770de8230ef4578d9fda610ca9b7a4ad497284623e382bf55111ddc852550275415f58311a2e726721f050d9f704050628
 EBUILD css-text-0.1.2.1.ebuild 666 BLAKE2B 6bba36240fa3be456dce8e2373afdcf6330a811afc845f61aad288b05a450d86e1761d2947e95d8188595c472ca1fccdbbfe8840d80d074e87185374103830b9 SHA512 3811a5196492b371e28c47aea68d4e68fdfaaf82e5a738c80a2fb031fa31fa575ec8a96b4eebdaf5dcfb57221d38de9d17adf00f675bd70f7acf270e2422d35f
+EBUILD css-text-0.1.3.0.ebuild 788 BLAKE2B 267eab56f80d38047d5766badd9517d165feb46c9189252659d1faf5895afa6ae57310b3289173d1364e5cd292cb40d1d3b66b5fec72c8d20f4d1c5be57a68e0 SHA512 db59b4c2862bd601f7f50c965896f4870fce92946569059a2350bb187293bb736a08b318cd7d22a5cc496cec0c6fde3e6385f4895fe93dd803add75090d36abb
 MISC metadata.xml 315 BLAKE2B 603436f2ee77dd27b2bcfb67544e148679626e7fef272371720302c2af79126aa2a50adff83ba3aa6397196df401d4434665d636fded9e7f1b939f50cbc53d97 SHA512 0b3bdec757e4d97dbaf34a73267d47fb1a1c758c2a2da9084e3be508c98f94258a57cc48500bab0fd3487435840e5d57d9990ac7b37ba86930dfb5d16c21d911
diff --git a/dev-haskell/css-text/css-text-0.1.3.0.ebuild b/dev-haskell/css-text/css-text-0.1.3.0.ebuild
new file mode 100644
index 000000000000..e3de5421b4e7
--- /dev/null
+++ b/dev-haskell/css-text/css-text-0.1.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="CSS parser and renderer"
+HOMEPAGE="https://github.com/yesodweb/css-text.git#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # fails test, not sure if it's severe
+
+RDEPEND=">=dev-haskell/attoparsec-0.10.2.0:=[profile?]
+	>=dev-haskell/semigroups-0.16.1:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/data-accessor/Manifest b/dev-haskell/data-accessor/Manifest
index b34405addf0d..d7152f1f1cf6 100644
--- a/dev-haskell/data-accessor/Manifest
+++ b/dev-haskell/data-accessor/Manifest
@@ -1,3 +1,5 @@
 DIST data-accessor-0.2.2.7.tar.gz 9670 BLAKE2B ac672adce3fe9dcf4bd01b47a05c089fef14e485835271627b9dc3f4a85aa39b98e2cc36213988516d2eb45bd9acb03e9ba2f822d215bfc322a35e7a9a0cf73b SHA512 42f78d5be738e83e2bc64a2f38bc70748ecb741433916c4e527355f5e808a844e43b14607cfff149a5951f557c73a947469c878340738244e3778f475ccd021d
+DIST data-accessor-0.2.3.tar.gz 10324 BLAKE2B 1db06e59b36c882310d3cf597a3642c3fb7b1b30df41d4fc0eb7f21087fd1f55ce70c8d7b460cd64384034395ab98ebc9ddf1059060f9dbfbf70012a11da0ee3 SHA512 7e875010f9835e3706d9d760e9490e567d14498cb86d485a6b29793d95172e1c5d767aee181eef7e0f160966b93144164cd5b6dc474fb44c1367b4a90d1490b4
 EBUILD data-accessor-0.2.2.7.ebuild 656 BLAKE2B 035dcbb318118a26216b8c423e11016f2ce15121598ea326ea4e5503e85f1b1f2740571e19d787939d54af13dbbbd3eed3ba112c7a49e863b527868ac7561c1c SHA512 cbc28043fd4bbab2367ce18b0f5b7ce807466f0d3f5cf1fb7171495c635f115ab517ab33318e7f83aaf9b15e966035c9f13ba1668b552fa5d335ed00eaf3cbe3
+EBUILD data-accessor-0.2.3.ebuild 573 BLAKE2B 7d39618a0be4ccac12c7a3c4b4a57f9ccdb6307e575dc3f786c20f8f566fb7078e33185cc04da43e9e1dbb204003d95b8af46efa7fcb541583a0343fe2e1e2de SHA512 70691519782c85354948f8b8d8349031da429c3544e67002d1af3e2fca1f36a0ed59c3d505bd9b082bfa76575547fac4c474c46e829273f9001679a9669163fb
 MISC metadata.xml 2766 BLAKE2B 479dee85b4b018bdfc63524d77c5655bef1135dea72120d1dea1a0798d544af47996b7317a44624abf311f1156837f5fb8bd2ec2d198438b6ee59ad190e979ee SHA512 3431d5aac5f153e477c641a57f39dd2e1a2ebe690db42f9e41737991cb0098c16d2ce09943d3eb09451574cc7865f9ac769f1a8e08c808ad918a9de329d31636
diff --git a/dev-haskell/data-accessor/data-accessor-0.2.3.ebuild b/dev-haskell/data-accessor/data-accessor-0.2.3.ebuild
new file mode 100644
index 000000000000..62dbaad16faf
--- /dev/null
+++ b/dev-haskell/data-accessor/data-accessor-0.2.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.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="https://hackage.haskell.org/package/${P}/${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/dataenc/Manifest b/dev-haskell/dataenc/Manifest
index 9c868048873f..ff62f4c327d6 100644
--- a/dev-haskell/dataenc/Manifest
+++ b/dev-haskell/dataenc/Manifest
@@ -1,5 +1,5 @@
 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 807 BLAKE2B fffb6bfa324aa8e425a0336e1b04753894ae194ed0075072aaa41948a3c945cac8aea01f879866150c3097aedaf638e6e05880cd41cf1a99fc80bd656e0a678c SHA512 c453227f030355490d15319c989f323d27f9d1264b80a3582c3e0f29d416c310e8931077bd88abe9d3670095f35342b661708b81baf010bcd2225422187c50c2
-EBUILD dataenc-0.14.0.7.ebuild 1140 BLAKE2B 4b0d0fa3e0b86082213ed2b6b50dd84078c075076606e1378b736ae1a28fa55e30e2c150dca8c2f09f06a9474e00c65d44a5b805eb3a9b5d513b6cd2fb5783ef SHA512 977669413865732582ee58f6ed53c6d1b7125130aa6abad040c28a90089f14b2af92b3b19e6afa9af3e09db2d03fc4d6a331e35e1c113f13780ad708e17898f4
+EBUILD dataenc-0.14.0.7.ebuild 1167 BLAKE2B ef6390fc4b3bc4b0c2d9b1120389ef5f9f12fba21bd06610779e3bd106a5cd9150c6665db24c4c099ff0e57cd3cdb31c7d2a32d0968f9514d1ad15084028f6c6 SHA512 599b48337b47ffd09f475810c422ae72ac47128686c391fe6b241856849a4280e13089eb09357ed87838062d5f4e05125d1dd626d244f3113d0093921fb12929
 MISC metadata.xml 481 BLAKE2B 3692a18b12132405687d94af86493582c1a0080c549b0c29c8849861b42e42cf807ac37021cbbc59992d7065b469b6a88e6be916d61f11430d1f1a7523d7b3c1 SHA512 195d8c9c9c9080cf2f11c4535237ca3334d055018471dc9974a54c13e95362d79dde8fb556720e781a56ecfa2e5772a48ef45a7d0d270a29958777312768dbaa
diff --git a/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild b/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
index 0dd392d1dd9f..43b3d68e0bb5 100644
--- a/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
+++ b/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
diff --git a/dev-haskell/dav/Manifest b/dev-haskell/dav/Manifest
index c17c80723525..fa6442eb2602 100644
--- a/dev-haskell/dav/Manifest
+++ b/dev-haskell/dav/Manifest
@@ -3,9 +3,11 @@ DIST DAV-0.5.1.tar.gz 18657 BLAKE2B 0638bd6f1b860163f0261035d638f78af557d9998917
 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
+DIST DAV-1.3.3.tar.gz 20524 BLAKE2B 23eeaddac4e9bbc5e969caa978f2b806c025fa8cda7337c81956950644d564d20e37a6ee468baf07ac2ffcffcbc7be8f7165360548753ecede6b876f1d6d012c SHA512 bbc9a4d685e25ac763c05dd8dc72d7db39196dbbb0cd898b66f644abc8333cd82950439fd446770c5aae737fd863afe881129ce551dadf9d0f75ef52df738fae
 EBUILD dav-0.4.1.ebuild 1187 BLAKE2B 7c9303727be015279330bbb7e1aec42b4a00a6ea3fec78c209f4329908dfd774d48084f3b95d1912d68396b9cf1e53250557b78644ab934d65a91e703a94f45b SHA512 9c932745b5c0ff97c4740cf6693ab66279e4ecc4a32f6c40e29f762628235dae4151ed89b2410a29c3e2c1630daf316ddc59355e8336a877e53c668b2ad72adf
 EBUILD dav-0.5.1.ebuild 1216 BLAKE2B 1bd2ff41970c28ae5f3914504c5061852867bc1d3581ff3182de091ff0c02f524be594bfb098ac6a2cbe07bd05f1d400a31b8057b204a6a9417703b6d60e1535 SHA512 c1616b1a379117ee26dd23e65fbc783e5a1a69c186649811f29c4dbe01d2a44be1fec21cef980cf7a904332ad866cdef6576f028ae0fd0d147ff96bc04fba3a9
 EBUILD dav-0.6.2.ebuild 1340 BLAKE2B 1cd86d146e9cfd301a3a101d8b7d954ec80abf0f1c308d9f053db7772264785b0e7647318932ea13829cc90d636101d754fe7b3b4672a1ccd31e5c08775fe8e3 SHA512 575e91245fc592a7c7a66ed789a11dbfaf1c4349f1a5e6d579db44df70deaa9fc133901e618e70ba517f64919e4911234d32561533b6d71c7ecb7f554022cde3
 EBUILD dav-1.0.7.ebuild 1550 BLAKE2B 658f4b33ee7925ec873a1c13ad47b9ff814b8a8764480d9ba8e4b17b279fd66df316dd1b93d244313d82e9a03e5d2b5fc46686b3aef0c7b7054fbc8ce2dbeb00 SHA512 2c11cc77aeca791519dece66fc10f0c198b2000d4206ba8064605c117ee6c77a4049a07a2e370f149062826e0fe10a13b0dc1f3a3d756b8e68c31f12c2515881
 EBUILD dav-1.3.1.ebuild 1618 BLAKE2B 070c28bfcf97fbbf55fa9f9a15076a095e52e1f67140df8f850f9b58d8f4559f0cbd88478a42932731361c508d79843d5d5e82a6d5a1512ade891c938562a5a0 SHA512 92724303f76f84c5998539ecf4a9d5761ac06ccf620b7c6fd2e4c5be4c87aca8d3136ab5be54463a52f9f209361df496ec66c60ffabd16d05a91005ed2d831b1
+EBUILD dav-1.3.3.ebuild 1574 BLAKE2B cd5f655e788ba3c0d96ecde7b96f350bf91a146cca659dcf25aa0573a3a070e425dc6fcaec4aaeeb838c96c397278e30b40617d644fa34b6f67a26ffdd4ab3f3 SHA512 d2da0a23c267e52562b617d6e28563e3a00cf54dea5112660db86d715f2062c709b53b02f90b53ef40c1f7c07b2b6ca09624e4dd0b88c0b30c40b16d3fcfad7a
 MISC metadata.xml 650 BLAKE2B c387958eada84c6abeb2c338a51d77a6070c9abfe4a30a9b32e0385b0cdbe2019505f8762390ec0d39961ded95f859f8238c7e04d61d4b85c61551fd0d4b948d SHA512 0d4eb14205b9b25fd1821ad4c43f905b5cad5ff376491fe0e9b1e6758dbbb5930cead0552dd9ba0af0a9d35a9d60c015874427e9ee51665913831d217bbfe957
diff --git a/dev-haskell/dav/dav-1.3.3.ebuild b/dev-haskell/dav/dav-1.3.3.ebuild
new file mode 100644
index 000000000000..4bb444abb2b3
--- /dev/null
+++ b/dev-haskell/dav/dav-1.3.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: -mtl-compat
+
+CABAL_FEATURES="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="https://hackage.haskell.org/package/${MY_P}/${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-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/diff/Manifest b/dev-haskell/diff/Manifest
index 5b68d8875550..6698b70be4a8 100644
--- a/dev-haskell/diff/Manifest
+++ b/dev-haskell/diff/Manifest
@@ -1,8 +1,6 @@
-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 592 BLAKE2B 112762f63a4bdaf36ae76f35e7fd9cdc8bc556b1ca91ef2fe04f830866da1e83d5017fe3b72f1f15e541179480f31c457f9bd54ff9955562c2d485806d0c5886 SHA512 9a5008975d5593011528b79164a603ad535b6c0a7958287fa2fd1a6b42ad1ef5af3d437470a1d0ee1a2249290e31dcc4f06ed31f51a47c5f05f7fd6d75622587
 EBUILD diff-0.3.0.ebuild 598 BLAKE2B 7ee5026be3c90cd93079312d5140851af802a285cac5b8dc631f14645bbd74231f2dcd599b318ba742f75112869bc96b53c7654a473d578de9d166c5aa69f688 SHA512 d4d6e423f9f5e13f3b78023230857c3193c5a2eab64453e9ec9e232816f4986cc226d8285d13062ac85ecca9477ef9262acdd930a7ea85a0003913871d125e84
 EBUILD diff-0.3.2.ebuild 600 BLAKE2B 3da5742b401b130a0225729db4c2b9989ad0fd4f2df196791056f12e5ae57cb1b80aef6d3afbd0a25656620a257348215b3a0dac7b966dba9043b18fc7a73d4c SHA512 2c9b62ab9b5d3ea6088bfe7e78e654025dded90b92963568eba535ecf8df18e0cdb94d78f698887aa2b9cbd189005721b232b56b48cc304e47f7cc45d0764db5
 EBUILD diff-0.3.4.ebuild 715 BLAKE2B 7dac9c13a9fa41e76e4120f4adc4cd98926647a92b0a9a312378a996ac9175b029bdb71fafc010271f6bbe4c6da8a6184c677b3a71f4f242a24ea74f1ab5762a SHA512 a97d6abc6d823e8ba43c9717df85d8f7220265dc85212be1ecbc2976e9db83863b087069587674a1822b02dbb7282b8347fc25ec51d87422a15bd6f96b2e016a
diff --git a/dev-haskell/djinn-lib/Manifest b/dev-haskell/djinn-lib/Manifest
index 03a4fcc298e9..c0ba14970fdb 100644
--- a/dev-haskell/djinn-lib/Manifest
+++ b/dev-haskell/djinn-lib/Manifest
@@ -1,3 +1,5 @@
 DIST djinn-lib-0.0.1.2.tar.gz 14608 BLAKE2B adc6fae2191fc1d1160bc1ce0b6f87ca9803f4431fb3cb2abb94357b7ed8867169e9eeba88e7e379361a5923ebea4237156e6bbf38b3ddfcc2b8905ad37fa850 SHA512 403878b72540362a6b6d545a65ded9f10d05c623180adf8a03e732fac30dd00a42b090b9e4f9da16baa5dc1fdbd6f29a97158174917f3c0527a37b6ecbcfbe8e
+DIST djinn-lib-0.0.1.3.tar.gz 14791 BLAKE2B 2c690f8224fd6e00839f2047893238a6801d44bef6e3b66874ca33d4cf2539fdd65a2846277affc8ea568991e380666eab62e425bb77c97c0079ebf0f28ea199 SHA512 9e531055f499a160fc1c32adeba26ef1c90aa92419140ee5659ea70100d51a1e376b2c2e87dc3816928362778dfb20362371aebdd53ad557a1bf09467d33b190
 EBUILD djinn-lib-0.0.1.2.ebuild 602 BLAKE2B ec70ce6f3f89e6e0eb4fc9b6ef0a144ea800e32dacedf89da96d14a1d0538023d85bb45dde3500bfc76e034eef8adabb570f9bf84413ff2661a4e43fea2b5ee1 SHA512 d9774b1ea68eaef9ad244303034f21421e5559a75fe1d3d6e8361261a315f9aeda0641f87f717ddfeb8c5ae531992c5dcb67783f49b034b5abbcb6dabc5ae8ce
+EBUILD djinn-lib-0.0.1.3.ebuild 597 BLAKE2B f6e0ec0b7b95c37ba853287ed644b516539726a233e16623ec0bec161b391a53151c1c6dbc7fffb599f167570e42abc16e0163f3137e4be3ce1f00ca45d314de SHA512 3080c341485a760da7c32202411af297fefae8277c6ac7357e70453621cdad815ccd243607c1f9d06aaef7f519b98cfe82ebc497149efad1797c38066800a080
 MISC metadata.xml 462 BLAKE2B d34a73019456e301be155a651f84010a0c64da051e2c1d517a013c815a4a9c4cf421ff9bbcc345635bb1cb2601e4b1c278555caac646b08cba111c34159cdcd7 SHA512 9c584deb7c2de0824ab0d878a26c0005252a15792d479de4cbb4aadb4a6147e344467fcbceeb2965497c62c913d309ddd2c7f1aff23003b02552a8c40fbecff9
diff --git a/dev-haskell/djinn-lib/djinn-lib-0.0.1.3.ebuild b/dev-haskell/djinn-lib/djinn-lib-0.0.1.3.ebuild
new file mode 100644
index 000000000000..e975bcaadc1f
--- /dev/null
+++ b/dev-haskell/djinn-lib/djinn-lib-0.0.1.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6
+
+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="https://hackage.haskell.org/package/${P}/${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
+"
diff --git a/dev-haskell/doctemplates/Manifest b/dev-haskell/doctemplates/Manifest
index 74a4bc874719..3a16f7a4767d 100644
--- a/dev-haskell/doctemplates/Manifest
+++ b/dev-haskell/doctemplates/Manifest
@@ -1,3 +1,5 @@
 DIST doctemplates-0.1.0.2.tar.gz 5924 BLAKE2B 80c20a0dd097770d2e6fda2f38435393c65b9fa91bc521a6c52e91a7ac11a637787aa740be1cfaa051fa077d8dc20cb8b7949b930317e426d203d60458865471 SHA512 043cc1ff32c7b1b9ac2d528d647c08769ec6ffbf3cbf080422b6f435737030ed4085735ab9c1974bbae87099a31614b66ae800fefab7120e9add5ab03815c430
+DIST doctemplates-0.2.2.1.tar.gz 6139 BLAKE2B 5667ed03cec2605c131246625dcdffc06aed3d9237e09490509bfbe69a80483fb58bb248706076ac2c4fde2bf178b3695f14d93615bcd788ddbeca841088855e SHA512 e1ad0d61dc97a69febf55ad76ee05e6696b76b0df5ee925072e934b977d1ca4c8d9ce0bc9acb311ec1992ce783e86fcaec93a93fc47fecffbd0071f002013485
 EBUILD doctemplates-0.1.0.2.ebuild 856 BLAKE2B 7bd03b23a2ba44e09603cdfd324d391e277fe79e01d1e061e4625b507f9e16dc69a14b19f3895618555820b9c23be1a90e3e66671fb1afa866681d216a2ac225 SHA512 ea2657513a05790bd39c6797a12a38e4762ec5e3eed09a1bfc6cc76ee19dd881d062997c6823dbf38146866c1a3a25898594022548296e40612c15adc04a38e0
+EBUILD doctemplates-0.2.2.1.ebuild 947 BLAKE2B 71f740832cfd9121d5d33629f623c4034761c005579f9ce1a01fd8d5063ffa8257361226c3e96eacda750fcd52ae40997b9207f9b40035f8b9cc9aa96498f2c1 SHA512 ad310400e1bc86d450f03920e4833e9bec7e9e1e0c764041fa942a38679cc46ebbd9da7bd4d2ae7b91108ad7baea45f8c55f13107052f915442c3eb80648ade4
 MISC metadata.xml 392 BLAKE2B d2e1fb4cd495de5e771a27e2982639991434dc9797b7d9c44ccccebfd4b9e0783d85384d31865055e5a882b39b4be8b954401350e4f1c71d089a60c5cff83b6e SHA512 083b9d618d32c53f48b9bcf72fccc3f6fcf600b4fb63a59e43caf11b0e3bd2d4effdd3804ddc69829c7108a9093f412cb1eb0df9a74ef22a6b12a497a93d4d1e
diff --git a/dev-haskell/doctemplates/doctemplates-0.2.2.1.ebuild b/dev-haskell/doctemplates/doctemplates-0.2.2.1.ebuild
new file mode 100644
index 000000000000..f56f72680195
--- /dev/null
+++ b/dev-haskell/doctemplates/doctemplates-0.2.2.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pandoc-style document templates"
+HOMEPAGE="https://github.com/jgm/doctemplates#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[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/edisonapi/Manifest b/dev-haskell/edisonapi/Manifest
index 11001beeedb4..884d439b5708 100644
--- a/dev-haskell/edisonapi/Manifest
+++ b/dev-haskell/edisonapi/Manifest
@@ -1,3 +1,5 @@
+AUX edisonapi-1.3.1-ghc-8.8.patch 12396 BLAKE2B 54431687f9bd4017932e6629da3d779dadaf53ecdc42a1cffe4cc6754dfb9cb6f80e2c3d0850855ce5e95daa7c816cebc98ab48ce9b964ea649fe4a01d7ec688 SHA512 66e2948730c80dd42254d980a66000483fd84fe5a189288354a556ba3a0a31784a2847d693e5cdb09b107cd5a0a0dbe656c1b14579f744c0ced23f95899c58fe
 DIST EdisonAPI-1.3.1.tar.gz 30512 BLAKE2B 7ed05eccc78814672538e3be05fa3d265cd883f080b3e0b10ef57a73473e26597c7c01673d842a9c16306ef67f17a5fed78b7a5060dfe73bbd68a5cdd4d9ea41 SHA512 677161da64856421c834856ee2f5ef7f59880883433d5c5c4061f0ab2faa0cb39c4eb83061820b77dab852acc4cce5dc75740fe454b15dbc2e67e6e84510ce42
+EBUILD edisonapi-1.3.1-r1.ebuild 724 BLAKE2B e266985802f6280f4fd32d15f182eb61953c11856f17e4f26f54fb215f7e30c99493b16b875b1ba70db075fe86278d966b04307b9955b0447036d421120c5506 SHA512 c927acf7b127061aa67137a49c505f3bffbae1c0bb5275e30622944b3609e224f994644a487da03d7599dfa02f9ebe3cedcd26106a69ab6a982bac4bb62341d8
 EBUILD edisonapi-1.3.1.ebuild 671 BLAKE2B 11cb0ab44cdb735031cfff6843f680533f63c6577ac52e8c08ba18263c5a93580af1376087d058cc53569f1ff8338003a7cc1646731ee89cb1625643068f64f3 SHA512 91737aed94e1ddfec9b0c09149f5c23ff9ec2147813ef98b6d3a7be868185e91ef19e0366a7dd0431703c086c8175d8a4995728d6f96f7eab5b49078750826b1
 MISC metadata.xml 825 BLAKE2B df4da54ccc2fe1f75a6a9246e3c456e399c021b1a4955fa826a41ad753c5656153f831fc2b81b8f3c1ec9864c0e60a0815ed05dbbe5d3afc8d7b4aa1584b9487 SHA512 e9f396de6cf64bf70188595f431e434dccab4a8975ce21f03c25aa2d6c672c07ac8048106581a0729e79d7b2a7da9c3921a930afbd1f87a585bd8078d9bd210a
diff --git a/dev-haskell/edisonapi/edisonapi-1.3.1-r1.ebuild b/dev-haskell/edisonapi/edisonapi-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..6469f7fa5423
--- /dev/null
+++ b/dev-haskell/edisonapi/edisonapi-1.3.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# 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="https://hackage.haskell.org/package/${MY_P}/${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}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.3.1-ghc-8.8.patch" )
diff --git a/dev-haskell/edisonapi/files/edisonapi-1.3.1-ghc-8.8.patch b/dev-haskell/edisonapi/files/edisonapi-1.3.1-ghc-8.8.patch
new file mode 100644
index 000000000000..81035f311357
--- /dev/null
+++ b/dev-haskell/edisonapi/files/edisonapi-1.3.1-ghc-8.8.patch
@@ -0,0 +1,298 @@
+commit 8da6c0f7d8666766e2f0693425c347c0adb492dc
+Author: Andrés Sicard-Ramírez <asr@eafit.edu.co>
+Date:   Thu Jul 4 18:15:17 2019 -0500
+
+    Supported GHC 8.8.1.
+    
+    All changes were required by the MonadFail proposal.
+
+diff --git a/EdisonAPI.cabal b/EdisonAPI.cabal
+index 0f8f161..072cbd2 100644
+--- a/EdisonAPI.cabal
++++ b/EdisonAPI.cabal
+@@ -40,6 +40,8 @@ Library
+   Build-Depends:
+      base == 4.*,
+      mtl >= 1.0
++  if impl(ghc < 8.0)
++    build-depends: fail
+   Default-Language: Haskell2010
+   Default-Extensions:
+      MultiParamTypeClasses
+diff --git a/src/Data/Edison/Assoc.hs b/src/Data/Edison/Assoc.hs
+index fac1c59..3993dce 100644
+--- a/src/Data/Edison/Assoc.hs
++++ b/src/Data/Edison/Assoc.hs
+@@ -71,6 +71,8 @@ module Data.Edison.Assoc (
+ 
+ import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
+ 
++import qualified Control.Monad.Fail as Fail
++
+ import Data.Edison.Prelude
+ 
+ import Data.Edison.Seq(Sequence)
+@@ -212,7 +214,7 @@ class (Eq k,Functor m) => AssocX m k | m -> k where
+   --
+   --   This function is /ambiguous/ at finite relation types if the key appears
+   --   more than once in the finite relation.  Otherwise, it is /unambiguous/.
+-  lookupM        :: (Monad rm) => k -> m a -> rm a
++  lookupM        :: (Fail.MonadFail rm) => k -> m a -> rm a
+ 
+   -- | Return all elements bound by the given key in an unspecified order.
+   --
+@@ -236,7 +238,7 @@ class (Eq k,Functor m) => AssocX m k | m -> k where
+   --
+   --   This function is /ambiguous/ at finite relation types if the key appears
+   --   more than once in the finite relation.  Otherwise, it is /unambiguous/.
+-  lookupAndDeleteM :: (Monad rm) => k -> m a -> rm (a, m a)
++  lookupAndDeleteM :: (Fail.MonadFail rm) => k -> m a -> rm (a, m a)
+ 
+   -- | Find all elements bound by the given key; return a sequence containing
+   --   all such bound elements in an unspecified order and the collection
+@@ -395,7 +397,7 @@ class (AssocX m k, Ord k) => OrdAssocX m k | m -> k where
+   --
+   --   This function is /ambiguous/ at finite relation types if the finite relation
+   --   contains more than one minimum key.  Otherwise it is /unambiguous/.
+-  minView            :: (Monad rm) => m a -> rm (a, m a)
++  minView            :: (Fail.MonadFail rm) => m a -> rm (a, m a)
+ 
+   -- | Find the binding with the minimum key and return its element. Signals
+   --   an error if the associative collection is empty.  Which element is chosen
+@@ -426,7 +428,7 @@ class (AssocX m k, Ord k) => OrdAssocX m k | m -> k where
+   --
+   --   This function is /ambiguous/ at finite relation types if the finite relation
+   --   contains more than one minimum key.  Otherwise it is /unambiguous/.
+-  maxView            :: (Monad rm) => m a -> rm (a, m a)
++  maxView            :: (Fail.MonadFail rm) => m a -> rm (a, m a)
+ 
+   -- | Find the binding with the maximum key and return its element.  Signals
+   --   an error if the associative collection is empty.  Which element is chosen
+@@ -777,7 +779,7 @@ class (Assoc m k, OrdAssocX m k) => OrdAssoc m k | m -> k where
+   --   minimum key exists in the relation.  Furthermore, it is /ambiguous/
+   --   with respect to the actual key observed unless the @Eq@ instance on
+   --   keys corresponds to indistinguisability.
+-  minViewWithKey  :: (Monad rm) => m a -> rm ((k, a), m a)
++  minViewWithKey  :: (Fail.MonadFail rm) => m a -> rm ((k, a), m a)
+ 
+   -- | Find the binding with the minimum key in an associative collection and
+   --   return the key and the element.  Signals an error if the associative
+@@ -800,7 +802,7 @@ class (Assoc m k, OrdAssocX m k) => OrdAssoc m k | m -> k where
+   --   maximum key exists in the relation.  Furthermore, it is /ambiguous/
+   --   with respect to the actual key observed unless the @Eq@ instance on
+   --   keys corresponds to indistinguisability.
+-  maxViewWithKey  :: (Monad rm) => m a -> rm ((k, a), m a)
++  maxViewWithKey  :: (Fail.MonadFail rm) => m a -> rm ((k, a), m a)
+ 
+   -- | Find the binding with the maximum key in an associative collection and
+   --   return the key and the element.  Signals an error if the associative
+diff --git a/src/Data/Edison/Coll.hs b/src/Data/Edison/Coll.hs
+index 88ae755..be4df08 100644
+--- a/src/Data/Edison/Coll.hs
++++ b/src/Data/Edison/Coll.hs
+@@ -97,6 +97,7 @@ module Data.Edison.Coll (
+ ) where
+ 
+ import Prelude hiding (null,foldr,foldl,foldr1,foldl1,lookup,filter)
++import qualified Control.Monad.Fail as Fail
+ import Data.Monoid
+ 
+ import Data.Edison.Prelude
+@@ -421,7 +422,7 @@ class CollX c a => Coll c a | c -> a where
+   --   This function is /ambiguous/ at bag types, when more than one
+   --   element equivalent to the given item is in the bag.  Otherwise
+   --   it is /unambiguous/.
+-  lookupM    :: (Monad m) => a -> c -> m a
++  lookupM    :: (Fail.MonadFail m) => a -> c -> m a
+ 
+   -- | Return a sequence containing all elements in the collection equal to
+   --   the given element in an unspecified order.
+@@ -504,7 +505,7 @@ class (Coll c a, OrdCollX c a) => OrdColl c a | c -> a where
+   --
+   --   This function is /ambiguous/ at bag types, if more than one minimum
+   --   element exists in the bag.  Otherwise, it is /unambiguous/.
+-  minView    :: (Monad m) => c -> m (a, c)
++  minView    :: (Fail.MonadFail m) => c -> m (a, c)
+ 
+   -- | Return the minimum element in the collection.  If there are multiple
+   --   copies of the minimum element, it is unspecified which is chosen.
+@@ -523,7 +524,7 @@ class (Coll c a, OrdCollX c a) => OrdColl c a | c -> a where
+   --
+   --   This function is /ambiguous/ at bag types, if more than one maximum
+   --   element exists in the bag.  Otherwise, it is /unambiguous/.
+-  maxView    :: (Monad m) => c -> m (a, c)
++  maxView    :: (Fail.MonadFail m) => c -> m (a, c)
+ 
+   -- | Return the maximum element in the collection.  If there are multiple
+   --   copies of the maximum element, it is unspecified which is chosen.
+diff --git a/src/Data/Edison/Prelude.hs b/src/Data/Edison/Prelude.hs
+index 2ac6968..8281f46 100644
+--- a/src/Data/Edison/Prelude.hs
++++ b/src/Data/Edison/Prelude.hs
+@@ -10,14 +10,19 @@
+ --   This module is a central depository of common definitions
+ --   used throughout Edison.
+ 
++{-# LANGUAGE GeneralizedNewtypeDeriving #-}
++
+ module Data.Edison.Prelude (
+ -- * Hashing classes
+   Hash (..)
+ , UniqueHash
+ , ReversibleHash (..)
+ , Measured (..)
++-- * Pure MonadFail
++,  runFail_
+ ) where
+ 
++import Control.Monad.Fail
+ import Data.Monoid
+ 
+ -- | This class represents hashable objects. If obeys the 
+@@ -62,3 +67,14 @@ class UniqueHash a => ReversibleHash a where
+ --   the computation.
+ class (Monoid v) => Measured v a | a -> v where
+   measure :: a -> v
++
++-- From Agda source code: src/full/Agda/Utils/Fail.hs
++-- | A pure MonadFail.
++newtype Fail a = Fail { runFail :: Either String a }
++  deriving (Functor, Applicative, Monad)
++
++instance MonadFail Fail where
++  fail = Fail . Left
++
++runFail_ :: Fail a -> a
++runFail_ = either error id . runFail
+diff --git a/src/Data/Edison/Seq.hs b/src/Data/Edison/Seq.hs
+index 78ca245..0394d58 100644
+--- a/src/Data/Edison/Seq.hs
++++ b/src/Data/Edison/Seq.hs
+@@ -58,6 +58,7 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
+                        zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
+ 
+ import Control.Monad
++import qualified Control.Monad.Fail as Fail
+ import Data.Monoid
+ 
+ import Data.Edison.Prelude
+@@ -221,7 +222,7 @@ class (Functor s, MonadPlus s) => Sequence s where
+   --   This function is always /unambiguous/.
+   --
+   --   Default running time: @O( 1 )@
+-  lview     :: (Monad m) => s a -> m (a, s a)
++  lview     :: (Fail.MonadFail m) => s a -> m (a, s a)
+ 
+   -- | Return the first element of a sequence.
+   --   Signals an error if the sequence is empty.
+@@ -249,7 +250,7 @@ class (Functor s, MonadPlus s) => Sequence s where
+   --   This function is always /unambiguous/.
+   --
+   --   Default running time: @O( 1 )@
+-  lheadM    :: (Monad m) => s a -> m a 
++  lheadM    :: (Fail.MonadFail m) => s a -> m a 
+ 
+   -- | Delete the first element of the sequence.
+   --   Signals error if sequence is empty.
+@@ -277,7 +278,7 @@ class (Functor s, MonadPlus s) => Sequence s where
+   --   This function is always /unambiguous/.
+   --
+   --   Default running time: @O( 1 )@
+-  ltailM    :: (Monad m) => s a -> m (s a)
++  ltailM    :: (Fail.MonadFail m) => s a -> m (s a)
+ 
+   -- | Separate a sequence into its last (rightmost) element and the
+   --   remaining sequence.  Calls 'fail' if the sequence is empty.
+@@ -291,7 +292,7 @@ class (Functor s, MonadPlus s) => Sequence s where
+   --   This function is always /unambiguous/.
+   --
+   --   Default running time: @O( n )@
+-  rview     :: (Monad m) => s a -> m (a, s a)
++  rview     :: (Fail.MonadFail m) => s a -> m (a, s a)
+ 
+   -- | Return the last (rightmost) element of the sequence.
+   --   Signals error if sequence is empty.
+@@ -319,7 +320,7 @@ class (Functor s, MonadPlus s) => Sequence s where
+   --   This function is always /unambiguous/.
+   --
+   --   Default running time: @O( n )@
+-  rheadM    :: (Monad m) => s a -> m a
++  rheadM    :: (Fail.MonadFail m) => s a -> m a
+ 
+   -- | Delete the last (rightmost) element of the sequence.
+   --   Signals an error if the sequence is empty.
+@@ -347,7 +348,7 @@ class (Functor s, MonadPlus s) => Sequence s where
+   --   This function is always /unambiguous/.
+   --
+   --   Default running time: @O( n )@
+-  rtailM    :: (Monad m) => s a -> m (s a)
++  rtailM    :: (Fail.MonadFail m) => s a -> m (s a)
+ 
+   -- | Returns 'True' if the sequence is empty and 'False' otherwise.
+   -- 
+@@ -948,7 +949,7 @@ class (Functor s, MonadPlus s) => Sequence s where
+   --   This function is always /unambiguous/.
+   --
+   --   Default running time: @O( i )@
+-  lookupM   :: (Monad m) => Int -> s a -> m a
++  lookupM   :: (Fail.MonadFail m) => Int -> s a -> m a
+ 
+   -- | Return the element at the given index, or the
+   --   default argument if the index is out of bounds.  All indexes are
+diff --git a/src/Data/Edison/Seq/ListSeq.hs b/src/Data/Edison/Seq/ListSeq.hs
+index 1ad677f..890b66f 100644
+--- a/src/Data/Edison/Seq/ListSeq.hs
++++ b/src/Data/Edison/Seq/ListSeq.hs
+@@ -40,9 +40,9 @@ module Data.Edison.Seq.ListSeq (
+ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
+                        filter,takeWhile,dropWhile,lookup,take,drop,splitAt,
+                        zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
+-import qualified Control.Monad.Identity as ID
++import qualified Control.Monad.Fail as Fail
+ import qualified Prelude
+-import Data.Edison.Prelude
++import Data.Edison.Prelude ( runFail_ )
+ import qualified Data.List
+ import Data.Monoid
+ import qualified Data.Edison.Seq as S ( Sequence(..) ) 
+@@ -54,16 +54,16 @@ singleton      :: a -> [a]
+ lcons          :: a -> [a] -> [a]
+ rcons          :: a -> [a] -> [a]
+ append         :: [a] -> [a] -> [a]
+-lview          :: (Monad rm) => [a] -> rm (a, [a])
++lview          :: (Fail.MonadFail rm) => [a] -> rm (a, [a])
+ lhead          :: [a] -> a
+-lheadM         :: (Monad rm) => [a] -> rm a
++lheadM         :: (Fail.MonadFail rm) => [a] -> rm a
+ ltail          :: [a] -> [a]
+-ltailM         :: (Monad rm) => [a] -> rm [a]
+-rview          :: (Monad rm) => [a] -> rm (a, [a])
++ltailM         :: (Fail.MonadFail rm) => [a] -> rm [a]
++rview          :: (Fail.MonadFail rm) => [a] -> rm (a, [a])
+ rhead          :: [a] -> a
+-rheadM         :: (Monad rm) => [a] -> rm a
++rheadM         :: (Fail.MonadFail rm) => [a] -> rm a
+ rtail          :: [a] -> [a]
+-rtailM         :: (Monad rm) => [a] -> rm [a]
++rtailM         :: (Fail.MonadFail rm) => [a] -> rm [a]
+ null           :: [a] -> Bool
+ size           :: [a] -> Int
+ concat         :: [[a]] -> [a]
+@@ -92,7 +92,7 @@ reduce1'       :: (a -> a -> a) -> [a] -> a
+ copy           :: Int -> a -> [a]
+ inBounds       :: Int -> [a] -> Bool
+ lookup         :: Int -> [a] -> a
+-lookupM        :: (Monad m) => Int -> [a] -> m a
++lookupM        :: (Fail.MonadFail m) => Int -> [a] -> m a
+ lookupWithDefault :: a -> Int -> [a] -> a
+ update         :: Int -> a -> [a] -> [a]
+ adjust         :: (a -> a) -> Int -> [a] -> [a]
+@@ -252,7 +252,7 @@ inBounds i xs
+   | i >= 0    = not (null (drop i xs))
+   | otherwise = False
+ 
+-lookup i xs = ID.runIdentity (lookupM i xs)
++lookup i xs = runFail_ (lookupM i xs)
+ 
+ lookupM i xs
+   | i < 0 = fail "ListSeq.lookup: not found"
diff --git a/dev-haskell/edisoncore/Manifest b/dev-haskell/edisoncore/Manifest
index 9e84d13ea8de..f169665395df 100644
--- a/dev-haskell/edisoncore/Manifest
+++ b/dev-haskell/edisoncore/Manifest
@@ -1,3 +1,6 @@
+AUX edisoncore-1.3.2.1-ghc-8.8.patch 57508 BLAKE2B 0651b4be26461cfe2bd3a57742ee138863ec6b47940065754642bd6320d814dfc8cb63bd4b37131bb3135752d03cdab335c2f1ebf5ccd87bd9219bd39d43c3e3 SHA512 9e5b60ec6023f2be4af4ecae0fcf00f8b6f758ea6bbd21c3dea4d3dd9ff128736e743e9a020a445e27e4ff1fb6c43061427f042353fe84528f2d715b5784302b
 DIST EdisonCore-1.3.1.1.tar.gz 80699 BLAKE2B e92848bb282d478c84817e0c0c2515b0fcb227b8224b020e8e50df4deb53915ccb7aa172a86eef787aa985efaaffbb42deab0fbb5b8669adf9635129b017fee8 SHA512 2e290a5c792a136931387936f457a45913edeedb9eda8006649b974d9aea294b9f1b7e5b2aa020c3ed151934cef8b2bd228e2cb56f7db37f35d59dcb23f7bcb8
+DIST EdisonCore-1.3.2.1.tar.gz 82522 BLAKE2B 758e02e462d4f86b95a66792ce26dda6d1a00506a8071f3716f9a7484fc992af9e1709a9bbb958ee71175b2c51c4574493a35b6eaa7a1bfab415ed4ce7e2a8b4 SHA512 6812b04edb1abdfc2486d66bb86d6370b76667de1603ab421d92a6ecc17a25014e0ab97f53dd4f1e75cacf32c31611e8f2dd6c740c840e349c3c762ae00df65f
 EBUILD edisoncore-1.3.1.1.ebuild 846 BLAKE2B 4e7926cd4ac89d36681068a4ab4d85ff328825f6e4c72b5e88f91a81ca4bd616a17412e81ce5d237cba8a08075074960baeb6d2a3e4f4abb1c7952435acfceda SHA512 30077a71ea972ec3ad9d42a4fe9ca922a421af50c305bda94367502492b9b18f554a18a97ede76a44c9d15d7e4bf1d0243a7f470c61944bbb2c32875af4e22a9
+EBUILD edisoncore-1.3.2.1-r1.ebuild 985 BLAKE2B b83c04eea598842e812aa02a96379a2cde60983c9ffc2a09ffdc68018db0e66efe1c6b79c36db50f710ffb95db57341af4b818acf2b7cb07cc43309f524c43cc SHA512 f3507b57ebac7f9ae6bdcc141481f8a1e245d2a03b0cd7a9d5d12902730f0da8b3cdfaa6973bcf6f5252006652a47bd3f5e94b6f02d3f7ac870bfb220681c61c
 MISC metadata.xml 604 BLAKE2B 470c5efc02f3d04ba57508b958cfcf4b5cceb00ae59e98b8d35d29eadcca522529f56a4a2f6b0d14424fee9c9fad879f719547557cab168508bf4eb862d5aab9 SHA512 025104263582c6b0f1c6c1016ca8b64094bfffae4c6778996da351bd8febcbe705227cb5eeb516f59211fecf0b1edac6f77eb2dffc2654175952621d678195e4
diff --git a/dev-haskell/edisoncore/edisoncore-1.3.2.1-r1.ebuild b/dev-haskell/edisoncore/edisoncore-1.3.2.1-r1.ebuild
new file mode 100644
index 000000000000..87a59c476f7a
--- /dev/null
+++ b/dev-haskell/edisoncore/edisoncore-1.3.2.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.5.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="https://hackage.haskell.org/package/${MY_P}/${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-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.3.2.1-ghc-8.8.patch" )
diff --git a/dev-haskell/edisoncore/files/edisoncore-1.3.2.1-ghc-8.8.patch b/dev-haskell/edisoncore/files/edisoncore-1.3.2.1-ghc-8.8.patch
new file mode 100644
index 000000000000..5589433edc69
--- /dev/null
+++ b/dev-haskell/edisoncore/files/edisoncore-1.3.2.1-ghc-8.8.patch
@@ -0,0 +1,1268 @@
+diff --git a/EdisonCore.cabal b/EdisonCore.cabal
+index 901cd83..ad1af00 100644
+--- a/EdisonCore.cabal
++++ b/EdisonCore.cabal
+@@ -62,8 +62,10 @@ Library
+      array
+ 
+   if impl(ghc < 8.0)
+-    -- Provide/emulate Data.Semigroups` API for pre-GHC-8
+-    Build-Depends: semigroups == 0.18.*
++    Build-Depends:
++      fail,
++      -- Provide/emulate Data.Semigroups` API for pre-GHC-8
++      semigroups == 0.18.*
+ 
+   Default-Language: Haskell2010
+   Default-Extensions:
+diff --git a/src/Data/Edison/Assoc/AssocList.hs b/src/Data/Edison/Assoc/AssocList.hs
+index c577492..15d9884 100644
+--- a/src/Data/Edison/Assoc/AssocList.hs
++++ b/src/Data/Edison/Assoc/AssocList.hs
+@@ -58,8 +58,9 @@ import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
+ import qualified Prelude
+ import Data.Monoid
+ import Data.Semigroup as SG
+-import Control.Monad.Identity
++import qualified Control.Monad.Fail as Fail
+ import qualified Data.Edison.Assoc as A
++import Data.Edison.Prelude ( runFail_ )
+ import qualified Data.Edison.Seq as S
+ import qualified Data.Edison.Seq.BinaryRandList as RL
+ import Data.Edison.Assoc.Defaults
+@@ -82,10 +83,10 @@ size          :: Eq k => FM k a -> Int
+ member        :: Eq k => k -> FM k a -> Bool
+ count         :: Eq k => k -> FM k a -> Int
+ lookup        :: Eq k => k -> FM k a -> a
+-lookupM       :: (Eq k, Monad rm) => k -> FM k a -> rm a
++lookupM       :: (Eq k, Fail.MonadFail rm) => k -> FM k a -> rm a
+ lookupAll     :: (Eq k,S.Sequence seq) => k -> FM k a -> seq a
+ lookupAndDelete    :: Eq k => k -> FM k a -> (a,FM k a)
+-lookupAndDeleteM   :: (Eq k,Monad rm)   => k -> FM k a -> rm (a,FM k a)
++lookupAndDeleteM   :: (Eq k, Fail.MonadFail rm)   => k -> FM k a -> rm (a,FM k a)
+ lookupAndDeleteAll :: (Eq k,S.Sequence seq) => k -> FM k a -> (seq a,FM k a)
+ lookupWithDefault  :: Eq k => a -> k -> FM k a -> a
+ adjust             :: Eq k => (a -> a) -> k -> FM k a -> FM k a
+@@ -143,11 +144,11 @@ unionSeqWithKey  :: (Eq k,S.Sequence seq) =>
+                         (k -> a -> a -> a) -> seq (FM k a) -> FM k a
+ intersectionWithKey :: Eq k => (k -> a -> b -> c) -> FM k a -> FM k b -> FM k c
+ 
+-minView          :: (Ord k,Monad m) => FM k a -> m (a,FM k a)
++minView          :: (Ord k, Fail.MonadFail m) => FM k a -> m (a,FM k a)
+ minElem          :: Ord k => FM k a -> a
+ deleteMin        :: Ord k => FM k a -> FM k a
+ unsafeInsertMin  :: Ord k => k -> a -> FM k a -> FM k a
+-maxView          :: (Ord k,Monad m) => FM k a -> m (a,FM k a)
++maxView          :: (Ord k, Fail.MonadFail m) => FM k a -> m (a,FM k a)
+ maxElem          :: Ord k => FM k a -> a
+ deleteMax        :: Ord k => FM k a -> FM k a
+ unsafeInsertMax  :: Ord k => k -> a -> FM k a -> FM k a
+@@ -169,9 +170,9 @@ partitionLT_GE   :: Ord k => k -> FM k a -> (FM k a,FM k a)
+ partitionLE_GT   :: Ord k => k -> FM k a -> (FM k a,FM k a)
+ partitionLT_GT   :: Ord k => k -> FM k a -> (FM k a,FM k a)
+ 
+-minViewWithKey    :: (Ord k,Monad m) => FM k a -> m ((k, a), FM k a)
++minViewWithKey    :: (Ord k, Fail.MonadFail m) => FM k a -> m ((k, a), FM k a)
+ minElemWithKey    :: Ord k => FM k a -> (k,a)
+-maxViewWithKey    :: (Ord k,Monad m) => FM k a -> m ((k, a), FM k a)
++maxViewWithKey    :: (Ord k, Fail.MonadFail m) => FM k a -> m ((k, a), FM k a)
+ maxElemWithKey    :: Ord k => FM k a -> (k,a)
+ foldrWithKey      :: Ord k => (k -> a -> b -> b) -> b -> FM k a -> b
+ foldlWithKey      :: Ord k => (b -> k -> a -> b) -> b -> FM k a -> b
+@@ -309,7 +310,7 @@ count _ E = 0
+ count key (I k _ m) | key == k  = 1
+                     | otherwise = count key m
+ 
+-lookup key m = runIdentity (lookupM key m)
++lookup key m = runFail_ (lookupM key m)
+ 
+ lookupM _ E = fail "AssocList.lookup: lookup failed"
+ lookupM key (I k x m) | key == k  = return x
+@@ -319,7 +320,7 @@ lookupAll _ E = S.empty
+ lookupAll key (I k x m) | key == k  = S.singleton x
+                         | otherwise = lookupAll key m
+ 
+-lookupAndDelete key m = runIdentity (lookupAndDeleteM key m)
++lookupAndDelete key m = runFail_ (lookupAndDeleteM key m)
+ 
+ lookupAndDeleteM _ E = fail "AssocList.lookupAndDeleteM: lookup failed"
+ lookupAndDeleteM key (I k x m)
+diff --git a/src/Data/Edison/Assoc/Defaults.hs b/src/Data/Edison/Assoc/Defaults.hs
+index a9ef520..8e2b37d 100644
+--- a/src/Data/Edison/Assoc/Defaults.hs
++++ b/src/Data/Edison/Assoc/Defaults.hs
+@@ -15,6 +15,8 @@ module Data.Edison.Assoc.Defaults where
+ 
+ import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
+ 
++import qualified Control.Monad.Fail as Fail
++
+ import Data.Edison.Assoc
+ import qualified Data.Edison.Seq as S
+ import qualified Data.Edison.Seq.ListSeq as L
+@@ -190,7 +192,7 @@ lookupAndDeleteDefault k m =
+      Nothing -> error (instanceName m ++ ".lookupAndDelete: lookup failed")
+      Just x  -> (x, delete k m)
+ 
+-lookupAndDeleteMDefault :: (Monad rm, AssocX m k) => k -> m a -> rm (a, m a)
++lookupAndDeleteMDefault :: (Fail.MonadFail rm, AssocX m k) => k -> m a -> rm (a, m a)
+ lookupAndDeleteMDefault k m =
+   case lookupM k m of
+      Nothing -> fail (instanceName m ++ ".lookupAndDelete: lookup failed")
+diff --git a/src/Data/Edison/Assoc/PatriciaLoMap.hs b/src/Data/Edison/Assoc/PatriciaLoMap.hs
+index 3073f83..43c2d85 100644
+--- a/src/Data/Edison/Assoc/PatriciaLoMap.hs
++++ b/src/Data/Edison/Assoc/PatriciaLoMap.hs
+@@ -55,10 +55,11 @@ module Data.Edison.Assoc.PatriciaLoMap (
+ 
+ import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
+ import qualified Prelude
+-import Control.Monad.Identity (runIdentity)
++import qualified Control.Monad.Fail as Fail
+ import Data.Monoid
+ import Data.Semigroup as SG
+ import qualified Data.Edison.Assoc as A
++import Data.Edison.Prelude ( runFail_ )
+ import qualified Data.Edison.Seq as S
+ import qualified Data.Edison.Seq.ListSeq as L
+ import Data.Edison.Assoc.Defaults
+@@ -210,9 +211,9 @@ member k (L j _) = (j == k)
+ member k (B _ m t0 t1) = if zeroBit k m then member k t0 else member k t1
+ 
+ lookup :: Int -> FM a -> a
+-lookup k m = runIdentity (lookupM k m)
++lookup k m = runFail_ (lookupM k m)
+ 
+-lookupM :: (Monad rm) => Int -> FM a -> rm a
++lookupM :: (Fail.MonadFail rm) => Int -> FM a -> rm a
+ lookupM _ E = fail "PatriciaLoMap.lookup: lookup failed"
+ lookupM k (L j x)
+   | j == k    = return x
+@@ -233,7 +234,7 @@ lookupAndDelete        = doLookupAndDelete
+                            (error "PatriciaLoMap.lookupAndDelete: lookup failed")
+                            (,)
+ 
+-lookupAndDeleteM :: Monad m => Int -> FM a -> m (a, FM a)
++lookupAndDeleteM :: Fail.MonadFail m => Int -> FM a -> m (a, FM a)
+ lookupAndDeleteM       = doLookupAndDelete
+                            (fail "PatriciaLoMap.lookupAndDelete: lookup failed")
+                            (\x m -> return (x,m))
+@@ -583,25 +584,25 @@ ordListFM_rev (B _ _ t0 t1) = merge (ordListFM_rev t0) (ordListFM_rev t1)
+             GT -> x : merge xs (y:ys)
+             EQ -> error "PatriciaLoMap: bug in ordListFM_rev"
+ 
+-minView :: Monad m => FM a -> m (a, FM a)
++minView :: Fail.MonadFail m => FM a -> m (a, FM a)
+ minView fm =
+    case ordListFM fm of
+      [] -> fail $ moduleName++".minView: empty map"
+      ((k,x):_) -> return (x,delete k fm)
+ 
+-minViewWithKey :: Monad m => FM a -> m ((Int, a), FM a)
++minViewWithKey :: Fail.MonadFail m => FM a -> m ((Int, a), FM a)
+ minViewWithKey fm =
+    case ordListFM fm of
+      [] -> fail $ moduleName++".minViewWithKey: empty map"
+      ((k,x):_) -> return ((k,x),delete k fm)
+ 
+-maxView :: Monad m => FM a -> m (a, FM a)
++maxView :: Fail.MonadFail m => FM a -> m (a, FM a)
+ maxView fm =
+   case ordListFM_rev fm of
+      [] -> fail $ moduleName++".maxView: empty map"
+      ((k,x):_) -> return (x,delete k fm)
+ 
+-maxViewWithKey :: Monad m => FM a -> m ((Int, a), FM a)
++maxViewWithKey :: Fail.MonadFail m => FM a -> m ((Int, a), FM a)
+ maxViewWithKey fm =
+    case ordListFM_rev fm of
+      [] -> fail $ moduleName++".maxViewWithKey: empty map"
+diff --git a/src/Data/Edison/Assoc/StandardMap.hs b/src/Data/Edison/Assoc/StandardMap.hs
+index 5ca48c5..e7b6a0e 100644
+--- a/src/Data/Edison/Assoc/StandardMap.hs
++++ b/src/Data/Edison/Assoc/StandardMap.hs
+@@ -51,6 +51,7 @@ module Data.Edison.Assoc.StandardMap (
+ 
+ import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
+ import qualified Prelude
++import qualified Control.Monad.Fail as Fail
+ import qualified Data.Edison.Assoc as A
+ import qualified Data.Edison.Seq as S
+ import qualified Data.Edison.Seq.ListSeq as L
+@@ -81,10 +82,10 @@ member            :: Ord k => k -> FM k a -> Bool
+ count             :: Ord k => k -> FM k a -> Int
+ lookup            :: Ord k => k -> FM k a -> a
+ lookupAll         :: (Ord k,S.Sequence seq) => k -> FM k a -> seq a
+-lookupM           :: (Ord k,Monad m) => k -> FM k a -> m a
++lookupM           :: (Ord k, Fail.MonadFail m) => k -> FM k a -> m a
+ lookupWithDefault :: Ord k => a -> k -> FM k a -> a
+ lookupAndDelete   :: Ord k => k -> FM k a -> (a, FM k a)
+-lookupAndDeleteM  :: (Ord k,Monad m) => k -> FM k a -> m (a, FM k a)
++lookupAndDeleteM  :: (Ord k, Fail.MonadFail m) => k -> FM k a -> m (a, FM k a)
+ lookupAndDeleteAll :: (Ord k,S.Sequence seq) => k -> FM k a -> (seq a,FM k a)
+ adjust            :: Ord k => (a->a) -> k -> FM k a -> FM k a
+ adjustAll         :: Ord k => (a->a) -> k -> FM k a -> FM k a
+@@ -103,11 +104,11 @@ filter            :: Ord k => (a -> Bool) -> FM k a -> FM k a
+ partition         :: Ord k => (a -> Bool) -> FM k a -> (FM k a,FM k a)
+ elements          :: (Ord k,S.Sequence seq) => FM k a -> seq a
+ 
+-minView           :: (Ord k,Monad m) => FM k a -> m (a, FM k a)
++minView           :: (Ord k, Fail.MonadFail m) => FM k a -> m (a, FM k a)
+ minElem           :: Ord k => FM k a -> a
+ deleteMin         :: Ord k => FM k a -> FM k a
+ unsafeInsertMin   :: Ord k => k -> a -> FM k a -> FM k a
+-maxView           :: (Ord k,Monad m) => FM k a -> m (a, FM k a)
++maxView           :: (Ord k, Fail.MonadFail m) => FM k a -> m (a, FM k a)
+ maxElem           :: Ord k => FM k a -> a
+ deleteMax         :: Ord k => FM k a -> FM k a
+ unsafeInsertMax   :: Ord k => k -> a -> FM k a -> FM k a
+@@ -165,9 +166,9 @@ foldWithKey'      :: Ord k => (k -> a -> b -> b) -> b -> FM k a -> b
+ filterWithKey     :: Ord k => (k -> a -> Bool) -> FM k a -> FM k a
+ partitionWithKey  :: Ord k => (k -> a -> Bool) -> FM k a -> (FM k a,FM k a)
+ 
+-minViewWithKey    :: (Ord k,Monad m) => FM k a -> m ((k, a), FM k a)
++minViewWithKey    :: (Ord k, Fail.MonadFail m) => FM k a -> m ((k, a), FM k a)
+ minElemWithKey    :: Ord k => FM k a -> (k,a)
+-maxViewWithKey    :: (Ord k,Monad m) => FM k a -> m ((k, a), FM k a)
++maxViewWithKey    :: (Ord k, Fail.MonadFail m) => FM k a -> m ((k, a), FM k a)
+ maxElemWithKey    :: Ord k => FM k a -> (k,a)
+ foldrWithKey      :: (k -> a -> b -> b) -> b -> FM k a -> b
+ foldlWithKey      :: (b -> k -> a -> b) -> b -> FM k a -> b
+diff --git a/src/Data/Edison/Assoc/TernaryTrie.hs b/src/Data/Edison/Assoc/TernaryTrie.hs
+index 8b2dd57..431b348 100644
+--- a/src/Data/Edison/Assoc/TernaryTrie.hs
++++ b/src/Data/Edison/Assoc/TernaryTrie.hs
+@@ -55,8 +55,10 @@ module Data.Edison.Assoc.TernaryTrie (
+ import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
+ import qualified Prelude
+ import qualified Data.Edison.Assoc as A
++import Data.Edison.Prelude ( runFail_ )
+ import qualified Data.Edison.Seq as S
+ import qualified Data.List as L
++import qualified Control.Monad.Fail as Fail
+ import Control.Monad.Identity
+ import Data.Monoid
+ import Data.Semigroup as SG
+@@ -83,10 +85,10 @@ size          :: Ord k => FM k a -> Int
+ member        :: Ord k => [k] -> FM k a -> Bool
+ count         :: Ord k => [k] -> FM k a -> Int
+ lookup        :: Ord k => [k] -> FM k a -> a
+-lookupM       :: (Ord k, Monad rm) => [k] -> FM k a -> rm a
++lookupM       :: (Ord k, Fail.MonadFail rm) => [k] -> FM k a -> rm a
+ lookupAll     :: (Ord k,S.Sequence seq) => [k] -> FM k a -> seq a
+ lookupAndDelete    :: Ord k => [k] -> FM k a -> (a, FM k a)
+-lookupAndDeleteM   :: (Ord k, Monad rm) => [k] -> FM k a -> rm (a, FM k a)
++lookupAndDeleteM   :: (Ord k, Fail.MonadFail rm) => [k] -> FM k a -> rm (a, FM k a)
+ lookupAndDeleteAll :: (Ord k, S.Sequence seq) => [k] -> FM k a -> (seq a,FM k a)
+ lookupWithDefault  :: Ord k => a -> [k] -> FM k a -> a
+ adjust        :: Ord k => (a -> a) -> [k] -> FM k a -> FM k a
+@@ -527,7 +529,7 @@ member = memberUsingLookupM
+ 
+ count = countUsingMember
+ 
+-lookup m k = runIdentity (lookupM m k)
++lookup m k = runFail_ (lookupM m k)
+ 
+ lookupM [] (FM Nothing _)
+   = fail "TernaryTrie.lookup: lookup failed"
+@@ -854,18 +856,18 @@ intersectionWithKey f
+ 
+ -- OrdAssocX
+ 
+-minViewFMB :: Monad m => FMB k a -> (FMB k a -> FM k a) -> m (a, FM k a)
++minViewFMB :: Fail.MonadFail m => FMB k a -> (FMB k a -> FM k a) -> m (a, FM k a)
+ minViewFMB E _ = fail $ moduleName++".minView: empty map"
+ minViewFMB (I i k (Just v) E m r)        f = return (v, f (I i k Nothing E m r))
+ minViewFMB (I _ _ Nothing  E (FMB' E) _) _ = error $ moduleName++".minView: bug!"
+ minViewFMB (I _ k Nothing  E (FMB' m) r) f = minViewFMB m (\m' -> f (mkVBalancedFMB k Nothing E (FMB' m') r))
+ minViewFMB (I _ k mv l m r)              f = minViewFMB l (\l' -> f (mkVBalancedFMB k mv l' m r))
+ 
+-minView :: Monad m => FM k a -> m (a,FM k a)
++minView :: Fail.MonadFail m => FM k a -> m (a,FM k a)
+ minView (FM (Just v) fmb) = return (v, FM Nothing fmb)
+ minView (FM Nothing fmb)  = minViewFMB fmb (FM Nothing)
+ 
+-minViewWithKeyFMB :: Monad m => FMB k a -> ([k] -> [k]) -> (FMB k a -> FM k a) -> m (([k],a),FM k a)
++minViewWithKeyFMB :: Fail.MonadFail m => FMB k a -> ([k] -> [k]) -> (FMB k a -> FM k a) -> m (([k],a),FM k a)
+ minViewWithKeyFMB E _ _ = fail $ moduleName++".minView: empty map"
+ minViewWithKeyFMB (I i k (Just v) E m r)        kf f = return ((kf [k],v),f (I i k Nothing E m r))
+ minViewWithKeyFMB (I _ _ Nothing  E (FMB' E) _) _ _ = error $ moduleName++".minViewWithKey: bug!"
+@@ -874,7 +876,7 @@ minViewWithKeyFMB (I _ k Nothing  E (FMB' m) r) kf f = minViewWithKeyFMB m (kf .
+ minViewWithKeyFMB (I _ k mv l m r)              kf f = minViewWithKeyFMB l kf
+                                                         (\l' -> f (mkVBalancedFMB k mv l' m r))
+ 
+-minViewWithKey :: Monad m => FM k a -> m (([k],a),FM k a)
++minViewWithKey :: Fail.MonadFail m => FM k a -> m (([k],a),FM k a)
+ minViewWithKey (FM (Just v) fmb) = return (([],v),FM Nothing fmb)
+ minViewWithKey (FM Nothing fmb)  = minViewWithKeyFMB fmb id (FM Nothing)
+ 
+@@ -906,7 +908,7 @@ deleteMin = deleteMinUsingMinView
+ unsafeInsertMin :: Ord k => [k] -> a -> FM k a -> FM k a
+ unsafeInsertMin = insert
+ 
+-maxViewFMB :: Monad m => FMB k a -> (FMB k a -> FM k a) -> m (a, FM k a)
++maxViewFMB :: Fail.MonadFail m => FMB k a -> (FMB k a -> FM k a) -> m (a, FM k a)
+ maxViewFMB (I _ _ (Just v) l (FMB' E) E) f = return (v, f l)
+ --maxViewFMB (I i k (Just v) l (FMB' E) E) f = return (v, f (I i k Nothing l (FMB' E) E))
+ maxViewFMB (I _ _ Nothing  _ (FMB' E) E) _ = error $ moduleName++".maxView: bug!"
+@@ -914,7 +916,7 @@ maxViewFMB (I i k mv l (FMB' m) E)       f = maxViewFMB m (\m' -> f (I i k mv l
+ maxViewFMB (I _ k mv l m r)              f = maxViewFMB r (\r' -> f (mkVBalancedFMB k mv l m r'))
+ maxViewFMB E                             _ = error $ moduleName++".maxView: bug!"
+ 
+-maxView :: Monad m => FM k a -> m (a, FM k a)
++maxView :: Fail.MonadFail m => FM k a -> m (a, FM k a)
+ maxView (FM Nothing E)  = fail $ moduleName++".maxView: empty map"
+ maxView (FM (Just v) E) = return (v,FM Nothing E)
+ maxView (FM mv fmb)     = maxViewFMB fmb (FM mv)
+@@ -930,7 +932,7 @@ maxViewWithKeyFMB (I _ k mv l m r)              kf f = maxViewWithKeyFMB r kf
+ maxViewWithKeyFMB E                             _ _ = error $ moduleName++".maxViewWithKey: bug!"
+ 
+ 
+-maxViewWithKey :: Monad m => FM k a -> m (([k],a), FM k a)
++maxViewWithKey :: Fail.MonadFail m => FM k a -> m (([k],a), FM k a)
+ maxViewWithKey (FM Nothing E)  = fail $ moduleName++".maxViewWithKey: empty map"
+ maxViewWithKey (FM (Just v) E) = return (([],v),FM Nothing E)
+ maxViewWithKey (FM mv fmb)     = maxViewWithKeyFMB fmb id (FM mv)
+diff --git a/src/Data/Edison/Coll/Defaults.hs b/src/Data/Edison/Coll/Defaults.hs
+index 213ed36..d927f38 100644
+--- a/src/Data/Edison/Coll/Defaults.hs
++++ b/src/Data/Edison/Coll/Defaults.hs
+@@ -14,8 +14,9 @@
+ module Data.Edison.Coll.Defaults where
+ 
+ import Prelude hiding (null,foldr,foldl,foldr1,foldl1,lookup,filter)
+-import Control.Monad.Identity
++import qualified Control.Monad.Fail as Fail
+ 
++import Data.Edison.Prelude ( runFail_ )
+ import Data.Edison.Coll
+ import qualified Data.Edison.Seq as S
+ import qualified Data.Edison.Seq.ListSeq as L
+@@ -81,7 +82,7 @@ disjointUsingToOrdList xs ys = disj (toOrdList xs) (toOrdList ys)
+         disj _ _ = True
+ 
+ intersectWitnessUsingToOrdList ::
+-        (OrdColl c a, Monad m) => c -> c -> m (a,a)
++        (OrdColl c a, Fail.MonadFail m) => c -> c -> m (a,a)
+ intersectWitnessUsingToOrdList as bs = witness (toOrdList as) (toOrdList bs)
+   where witness a@(x:xs) b@(y:ys) =
+           case compare x y of
+@@ -92,7 +93,7 @@ intersectWitnessUsingToOrdList as bs = witness (toOrdList as) (toOrdList bs)
+         witness _ _ = fail $ instanceName as ++ ".intersect: failed"
+ 
+ lookupUsingLookupM :: Coll c a => a -> c -> a
+-lookupUsingLookupM x ys = runIdentity (lookupM x ys)
++lookupUsingLookupM x ys = runFail_ (lookupM x ys)
+ 
+ lookupUsingLookupAll :: Coll c a => a -> c -> a
+ lookupUsingLookupAll x ys =
+@@ -100,7 +101,7 @@ lookupUsingLookupAll x ys =
+     (y:_) -> y
+     [] -> error $ instanceName ys ++ ".lookup: lookup failed"
+ 
+-lookupMUsingLookupAll :: (Coll c a, Monad m) => a -> c -> m a
++lookupMUsingLookupAll :: (Coll c a, Fail.MonadFail m) => a -> c -> m a
+ lookupMUsingLookupAll x ys =
+   case lookupAll x ys of
+     (y:_) -> return y
+diff --git a/src/Data/Edison/Coll/EnumSet.hs b/src/Data/Edison/Coll/EnumSet.hs
+index c93ab07..cce68e6 100644
+--- a/src/Data/Edison/Coll/EnumSet.hs
++++ b/src/Data/Edison/Coll/EnumSet.hs
+@@ -157,6 +157,7 @@ module Data.Edison.Coll.EnumSet (
+ 
+ import qualified Prelude
+ import Prelude hiding (filter,foldl,foldr,null,map,lookup,foldl1,foldr1)
++import qualified Control.Monad.Fail as Fail
+ import qualified Data.Bits as Bits
+ import Data.Bits hiding (complement)
+ import Data.Word
+@@ -251,7 +252,7 @@ count = countUsingMember
+ lookup :: (Eq a, Enum a) => a -> Set a -> a
+ lookup = lookupUsingLookupAll
+ 
+-lookupM :: (Eq a, Enum a, Monad m) => a -> Set a -> m a
++lookupM :: (Eq a, Enum a, Fail.MonadFail m) => a -> Set a -> m a
+ lookupM x s
+    | member x s = return x
+    | otherwise  = fail (moduleName++".lookupM: lookup failed")
+@@ -340,12 +341,12 @@ deleteMax (Set w)
+    | w == 0    = empty
+    | otherwise = Set $ clearBit w $ msb w
+ 
+-minView :: (Enum a, Monad m) => Set a -> m (a, Set a)
++minView :: (Enum a, Fail.MonadFail m) => Set a -> m (a, Set a)
+ minView (Set w)
+    | w == 0    = fail (moduleName++".minView: empty set")
+    | otherwise = let i = lsb w in return (toEnum i,Set $ clearBit w i)
+ 
+-maxView :: (Enum a, Monad m) => Set a -> m (a, Set a)
++maxView :: (Enum a, Fail.MonadFail m) => Set a -> m (a, Set a)
+ maxView (Set w)
+    | w == 0    = fail (moduleName++".maxView: empty set")
+    | otherwise = let i = msb w in return (toEnum i, Set $ clearBit w i)
+diff --git a/src/Data/Edison/Coll/LazyPairingHeap.hs b/src/Data/Edison/Coll/LazyPairingHeap.hs
+index e41ce2e..3dcebe4 100644
+--- a/src/Data/Edison/Coll/LazyPairingHeap.hs
++++ b/src/Data/Edison/Coll/LazyPairingHeap.hs
+@@ -49,6 +49,7 @@ import Data.List (sort)
+ import Data.Monoid
+ import Data.Semigroup as SG
+ import Control.Monad
++import qualified Control.Monad.Fail as Fail
+ import Test.QuickCheck
+ 
+ moduleName :: String
+@@ -359,7 +360,7 @@ lookupAll y h = look h S.empty
+             EQ -> S.lcons x $ look i $ look xs rest
+             GT -> rest
+ 
+-minView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
++minView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
+ minView E = fail "LazyPairingHeap.minView: empty heap"
+ minView (H1 x xs) = return (x,xs)
+ minView (H2 x h xs) = return (x,union h xs)
+@@ -369,7 +370,7 @@ minElem E = error "LazyPairingHeap.minElem: empty heap"
+ minElem (H1 x _) = x
+ minElem (H2 x _ _) = x
+ 
+-maxView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
++maxView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
+ maxView E = fail "LazyPairingHeap.maxView: empty heap"
+ maxView xs = return (y,xs')
+   where (xs', y) = maxView' xs
+@@ -474,7 +475,7 @@ deleteMax = deleteMaxUsingMaxView
+ lookup :: Ord a => a -> Heap a -> a
+ lookup = lookupUsingLookupAll
+ 
+-lookupM :: (Ord a, Monad m) => a -> Heap a -> m a
++lookupM :: (Ord a, Fail.MonadFail m) => a -> Heap a -> m a
+ lookupM = lookupMUsingLookupAll
+ 
+ lookupWithDefault :: Ord a => a -> a -> Heap a -> a
+diff --git a/src/Data/Edison/Coll/LeftistHeap.hs b/src/Data/Edison/Coll/LeftistHeap.hs
+index 751394b..10ccf5a 100644
+--- a/src/Data/Edison/Coll/LeftistHeap.hs
++++ b/src/Data/Edison/Coll/LeftistHeap.hs
+@@ -47,6 +47,7 @@ import Data.Edison.Coll.Defaults
+ import Data.Monoid
+ import Data.Semigroup as SG
+ import Control.Monad
++import qualified Control.Monad.Fail as Fail
+ import Test.QuickCheck
+ 
+ moduleName :: String
+@@ -173,7 +174,7 @@ toSeq h = tol h S.empty
+   where tol E rest = rest
+         tol (L _ x a b) rest = S.lcons x (tol b (tol a rest))
+ 
+-lookupM :: (Ord a, Monad m) => a -> Heap a -> m a
++lookupM :: (Ord a, Fail.MonadFail m) => a -> Heap a -> m a
+ lookupM _ E = fail "LeftistHeap.lookupM: XXX"
+ lookupM x (L _ y a b) =
+   case compare x y of
+@@ -299,7 +300,7 @@ partitionLT_GT y h = (h', C.unionList hs)
+                       (b', hs'') = collect b hs'
+                   in (node x a' b', hs'')
+ 
+-minView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
++minView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
+ minView E = fail "LeftistHeap.minView: empty collection"
+ minView (L _ x a b) = return (x, union a b)
+ 
+@@ -307,7 +308,7 @@ minElem :: Ord a => Heap a -> a
+ minElem E = error "LeftistHeap.minElem: empty collection"
+ minElem (L _ x _ _) = x
+ 
+-maxView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
++maxView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
+ maxView E = fail "LeftistHeap.maxView: empty collection"
+ maxView (L _ x E _) = return (x, E)
+ maxView (L _ x a E) = return (y, L 1 x a' E)
+diff --git a/src/Data/Edison/Coll/MinHeap.hs b/src/Data/Edison/Coll/MinHeap.hs
+index ba38960..94e2f1b 100644
+--- a/src/Data/Edison/Coll/MinHeap.hs
++++ b/src/Data/Edison/Coll/MinHeap.hs
+@@ -46,6 +46,7 @@ import Data.Edison.Seq.Defaults (tokenMatch,maybeParens)
+ import Data.Monoid
+ import qualified Data.Semigroup as SG
+ import Control.Monad
++import qualified Control.Monad.Fail as Fail
+ import Test.QuickCheck
+ 
+ data Min h a = E | M a h  deriving (Eq)
+@@ -75,7 +76,7 @@ strict    :: (C.CollX h a,Ord a) => Min h a -> Min h a
+ 
+ toSeq     :: (C.Coll h a,S.Sequence s) => Min h a -> s a
+ lookup    :: (C.Coll h a,Ord a) => a -> Min h a -> a
+-lookupM   :: (C.Coll h a,Ord a,Monad m) => a -> Min h a -> m a
++lookupM   :: (C.Coll h a, Ord a, Fail.MonadFail m) => a -> Min h a -> m a
+ lookupAll :: (C.Coll h a,Ord a,S.Sequence s) => a -> Min h a -> s a
+ lookupWithDefault :: (C.Coll h a,Ord a) => a -> a -> Min h a -> a
+ fold      :: (C.Coll h a) => (a -> b -> b) -> b -> Min h a -> b
+@@ -100,9 +101,9 @@ partitionLT_GE :: (C.OrdColl h a,Ord a) => a -> Min h a -> (Min h a, Min h a)
+ partitionLE_GT :: (C.OrdColl h a,Ord a) => a -> Min h a -> (Min h a, Min h a)
+ partitionLT_GT :: (C.OrdColl h a,Ord a) => a -> Min h a -> (Min h a, Min h a)
+ 
+-minView :: (C.OrdColl h a,Ord a,Monad m) => Min h a -> m (a, Min h a)
++minView :: (C.OrdColl h a, Ord a, Fail.MonadFail m) => Min h a -> m (a, Min h a)
+ minElem :: (C.OrdColl h a,Ord a) => Min h a -> a
+-maxView :: (C.OrdColl h a,Ord a,Monad m) => Min h a -> m (a, Min h a)
++maxView :: (C.OrdColl h a, Ord a, Fail.MonadFail m) => Min h a -> m (a, Min h a)
+ maxElem :: (C.OrdColl h a,Ord a) => Min h a -> a
+ foldr :: (C.OrdColl h a,Ord a) => (a -> b -> b) -> b -> Min h a -> b
+ foldl :: (C.OrdColl h a,Ord a) => (b -> a -> b) -> b -> Min h a -> b
+diff --git a/src/Data/Edison/Coll/SkewHeap.hs b/src/Data/Edison/Coll/SkewHeap.hs
+index 1a05ebe..e55ba58 100644
+--- a/src/Data/Edison/Coll/SkewHeap.hs
++++ b/src/Data/Edison/Coll/SkewHeap.hs
+@@ -47,6 +47,7 @@ import Data.Edison.Coll.Defaults
+ import Data.Monoid
+ import Data.Semigroup as SG
+ import Control.Monad
++import qualified Control.Monad.Fail as Fail
+ 
+ import Test.QuickCheck
+ 
+@@ -142,7 +143,7 @@ toSeq h = tol h S.empty
+   where tol E rest = rest
+         tol (T x a b) rest = S.lcons x (tol b (tol a rest))
+ 
+-lookupM :: (Ord a, Monad m) => a -> Heap a -> m a
++lookupM :: (Ord a, Fail.MonadFail m) => a -> Heap a -> m a
+ lookupM _ E = fail "SkewHeap.lookupM: XXX"
+ lookupM x (T y a b) =
+   case compare x y of
+@@ -267,7 +268,7 @@ partitionLT_GT y h = (h', C.unionList hs)
+                       (b', hs'') = collect b hs'
+                   in (T x a' b', hs'')
+ 
+-minView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
++minView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
+ minView E = fail "SkewHeap.minView: empty heap"
+ minView (T x a b) = return (x, union a b)
+ 
+@@ -275,7 +276,7 @@ minElem :: Ord a => Heap a -> a
+ minElem E = error "SkewHeap.minElem: empty collection"
+ minElem (T x _ _) = x
+ 
+-maxView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
++maxView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
+ maxView E = fail "SkewHeap.maxView: empty heap"
+ maxView (T x E E) = return (x, E)
+ maxView (T x a E) = return (y, T x a' E)
+diff --git a/src/Data/Edison/Coll/SplayHeap.hs b/src/Data/Edison/Coll/SplayHeap.hs
+index 4e3b061..6c950b7 100644
+--- a/src/Data/Edison/Coll/SplayHeap.hs
++++ b/src/Data/Edison/Coll/SplayHeap.hs
+@@ -50,6 +50,7 @@ import Data.Edison.Coll.Defaults
+ import Data.Monoid
+ import Data.Semigroup as SG
+ import Control.Monad
++import qualified Control.Monad.Fail as Fail
+ import Test.QuickCheck
+ 
+ moduleName :: String
+@@ -93,7 +94,7 @@ strict    :: Heap a -> Heap a
+ 
+ toSeq     :: (Ord a, S.Sequence s) => Heap a -> s a
+ lookup    :: Ord a => a -> Heap a -> a
+-lookupM   :: (Ord a,Monad m) => a -> Heap a -> m a
++lookupM   :: (Ord a, Fail.MonadFail m) => a -> Heap a -> m a
+ lookupAll :: (Ord a,S.Sequence s) => a -> Heap a -> s a
+ lookupWithDefault :: Ord a => a -> a -> Heap a -> a
+ fold      :: Ord a => (a -> b -> b) -> b -> Heap a -> b
+@@ -118,9 +119,9 @@ partitionLT_GE   :: Ord a => a -> Heap a -> (Heap a, Heap a)
+ partitionLE_GT   :: Ord a => a -> Heap a -> (Heap a, Heap a)
+ partitionLT_GT   :: Ord a => a -> Heap a -> (Heap a, Heap a)
+ 
+-minView  :: (Ord a,Monad m) => Heap a -> m (a, Heap a)
++minView  :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
+ minElem  :: Ord a => Heap a -> a
+-maxView  :: (Ord a,Monad m) => Heap a -> m (a, Heap a)
++maxView  :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
+ maxElem  :: Ord a => Heap a -> a
+ foldr    :: Ord a => (a -> b -> b) -> b -> Heap a -> b
+ foldl    :: Ord a => (b -> a -> b) -> b -> Heap a -> b
+diff --git a/src/Data/Edison/Coll/StandardSet.hs b/src/Data/Edison/Coll/StandardSet.hs
+index fcaf715..56df4bf 100644
+--- a/src/Data/Edison/Coll/StandardSet.hs
++++ b/src/Data/Edison/Coll/StandardSet.hs
+@@ -43,6 +43,7 @@ module Data.Edison.Coll.StandardSet (
+ 
+ import Prelude hiding (null,foldr,foldl,foldr1,foldl1,lookup,filter)
+ import qualified Prelude
++import qualified Control.Monad.Fail as Fail
+ import qualified Data.List
+ 
+ import qualified Data.Edison.Coll as C
+@@ -73,7 +74,7 @@ strict     :: Ord a => Set a -> Set a
+ 
+ toSeq      :: (Ord a,S.Sequence seq) => Set a -> seq a
+ lookup     :: Ord a => a -> Set a -> a
+-lookupM    :: (Ord a,Monad m) => a -> Set a -> m a
++lookupM    :: (Ord a, Monad m, Fail.MonadFail m) => a -> Set a -> m a
+ lookupAll  :: (Ord a,S.Sequence seq) => a -> Set a -> seq a
+ lookupWithDefault :: Ord a => a -> a -> Set a  -> a
+ fold       :: (a -> b -> b) -> b -> Set a -> b
+@@ -98,9 +99,9 @@ partitionLT_GE   :: Ord a => a -> Set a -> (Set a, Set a)
+ partitionLE_GT   :: Ord a => a -> Set a -> (Set a, Set a)
+ partitionLT_GT   :: Ord a => a -> Set a -> (Set a, Set a)
+ 
+-minView       :: (Ord a,Monad m) => Set a -> m (a, Set a)
++minView       :: (Ord a, Monad m, Fail.MonadFail m) => Set a -> m (a, Set a)
+ minElem       :: Set a -> a
+-maxView       :: (Ord a,Monad m) => Set a -> m (a, Set a)
++maxView       :: (Ord a, Monad m, Fail.MonadFail m) => Set a -> m (a, Set a)
+ maxElem       :: Set a -> a
+ foldr         :: (a -> b -> b) -> b -> Set a -> b
+ foldl         :: (b -> a -> b) -> b -> Set a -> b
+diff --git a/src/Data/Edison/Coll/UnbalancedSet.hs b/src/Data/Edison/Coll/UnbalancedSet.hs
+index 03cb856..d7975d0 100644
+--- a/src/Data/Edison/Coll/UnbalancedSet.hs
++++ b/src/Data/Edison/Coll/UnbalancedSet.hs
+@@ -43,6 +43,7 @@ module Data.Edison.Coll.UnbalancedSet (
+ 
+ import Prelude hiding (null,foldr,foldl,foldr1,foldl1,lookup,filter)
+ import qualified Prelude
++import qualified Control.Monad.Fail as Fail
+ import qualified Data.Edison.Coll as C
+ import qualified Data.Edison.Seq as S
+ import Data.Edison.Coll.Defaults
+@@ -70,7 +71,7 @@ strict     :: Set a -> Set a
+ 
+ toSeq      :: (Ord a,S.Sequence seq) => Set a -> seq a
+ lookup     :: Ord a => a -> Set a -> a
+-lookupM    :: (Ord a,Monad m) => a -> Set a -> m a
++lookupM    :: (Ord a, Fail.MonadFail m) => a -> Set a -> m a
+ lookupAll  :: (Ord a,S.Sequence seq) => a -> Set a -> seq a
+ lookupWithDefault :: Ord a => a -> a -> Set a -> a
+ fold       :: (a -> b -> b) -> b -> Set a -> b
+@@ -95,9 +96,9 @@ partitionLT_GE   :: Ord a => a -> Set a -> (Set a, Set a)
+ partitionLE_GT   :: Ord a => a -> Set a -> (Set a, Set a)
+ partitionLT_GT   :: Ord a => a -> Set a -> (Set a, Set a)
+ 
+-minView       :: (Monad m) => Set a -> m (a, Set a)
++minView       :: (Fail.MonadFail m) => Set a -> m (a, Set a)
+ minElem       :: Set a -> a
+-maxView       :: (Monad m) => Set a -> m (a, Set a)
++maxView       :: (Fail.MonadFail m) => Set a -> m (a, Set a)
+ maxElem       :: Set a -> a
+ foldr         :: (a -> b -> b) -> b -> Set a -> b
+ foldl         :: (b -> a -> b) -> b -> Set a -> b
+diff --git a/src/Data/Edison/Concrete/FingerTree.hs b/src/Data/Edison/Concrete/FingerTree.hs
+index 47f766c..c6a2ac0 100644
+--- a/src/Data/Edison/Concrete/FingerTree.hs
++++ b/src/Data/Edison/Concrete/FingerTree.hs
+@@ -81,6 +81,7 @@ import Test.QuickCheck
+ import Data.Edison.Prelude
+ 
+ import Control.Monad (liftM2, liftM3, liftM4)
++import qualified Control.Monad.Fail as Fail
+ 
+ 
+ infixr 5 `lcons`
+@@ -334,7 +335,7 @@ null Empty = True
+ null _ = False
+ 
+ -- | /O(1)/. Analyse the left end of a sequence.
+-lview :: (Measured v a, Monad m) => FingerTree v a -> m (a,FingerTree v a)
++lview :: (Measured v a, Fail.MonadFail m) => FingerTree v a -> m (a,FingerTree v a)
+ lview Empty                 =  fail "FingerTree.lview: empty tree"
+ lview (Single x)            =  return (x, Empty)
+ lview (Deep _ (One x) m sf) =  return . (,) x $
+@@ -357,7 +358,7 @@ ltailDigit (Four _ b c d) = Three b c d
+ ltailDigit _ = error "FingerTree.ltailDigit: bug!"
+ 
+ -- | /O(1)/. Analyse the right end of a sequence.
+-rview :: (Measured v a, Monad m) => FingerTree v a -> m (a, FingerTree v a)
++rview :: (Measured v a, Fail.MonadFail m) => FingerTree v a -> m (a, FingerTree v a)
+ rview Empty                  = fail "FingerTree.rview: empty tree"
+ rview (Single x)             = return (x, Empty)
+ rview (Deep _ pr m (One x))  = return . (,) x $
+diff --git a/src/Data/Edison/Seq/BankersQueue.hs b/src/Data/Edison/Seq/BankersQueue.hs
+index 6dac746..0ab24c9 100644
+--- a/src/Data/Edison/Seq/BankersQueue.hs
++++ b/src/Data/Edison/Seq/BankersQueue.hs
+@@ -51,11 +51,13 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
+ 
+ import qualified Control.Applicative as App
+ 
++import Data.Edison.Prelude ( runFail_ )
+ import qualified Data.Edison.Seq as S ( Sequence(..) )
+ import Data.Edison.Seq.Defaults
+ import qualified Data.Edison.Seq.ListSeq as L
+ import Data.Monoid
+ import Data.Semigroup as SG
++import qualified Control.Monad.Fail as Fail
+ import Control.Monad.Identity
+ import Test.QuickCheck
+ 
+@@ -66,16 +68,16 @@ singleton      :: a -> Seq a
+ lcons          :: a -> Seq a -> Seq a
+ rcons          :: a -> Seq a -> Seq a
+ append         :: Seq a -> Seq a -> Seq a
+-lview          :: (Monad m) => Seq a -> m (a, Seq a)
++lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ lhead          :: Seq a -> a
+-lheadM         :: (Monad m) => Seq a -> m a
++lheadM         :: (Fail.MonadFail m) => Seq a -> m a
+ ltail          :: Seq a -> Seq a
+-ltailM         :: (Monad m) => Seq a -> m (Seq a)
+-rview          :: (Monad m) => Seq a -> m (a, Seq a)
++ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
++rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ rhead          :: Seq a -> a
+-rheadM         :: (Monad m) => Seq a -> m a
++rheadM         :: (Fail.MonadFail m) => Seq a -> m a
+ rtail          :: Seq a -> Seq a
+-rtailM         :: (Monad m) => Seq a -> m (Seq a)
++rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
+ null           :: Seq a -> Bool
+ size           :: Seq a -> Int
+ concat         :: Seq (Seq a) -> Seq a
+@@ -106,7 +108,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
+ copy           :: Int -> a -> Seq a
+ inBounds       :: Int -> Seq a -> Bool
+ lookup         :: Int -> Seq a -> a
+-lookupM        :: (Monad m) => Int -> Seq a -> m a
++lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
+ lookupWithDefault :: a -> Int -> Seq a -> a
+ update         :: Int -> a -> Seq a -> Seq a
+ adjust         :: (a -> a) -> Int -> Seq a -> Seq a
+@@ -263,7 +265,7 @@ copy n x
+ 
+ -- reduce1: given sizes could do more effective job of dividing evenly!
+ 
+-lookup idx q = runIdentity (lookupM idx q)
++lookup idx q = runFail_ (lookupM idx q)
+ 
+ lookupM idx (Q i xs ys j)
+   | idx < i   = L.lookupM idx xs
+diff --git a/src/Data/Edison/Seq/BinaryRandList.hs b/src/Data/Edison/Seq/BinaryRandList.hs
+index b01b9b8..e772b65 100644
+--- a/src/Data/Edison/Seq/BinaryRandList.hs
++++ b/src/Data/Edison/Seq/BinaryRandList.hs
+@@ -55,14 +55,15 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
+                        zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
+ 
+ import qualified Control.Applicative as App
+-import Control.Monad.Identity
+ import Data.Maybe
+ 
++import Data.Edison.Prelude ( runFail_ )
+ import qualified Data.Edison.Seq as S ( Sequence(..) )
+ import Data.Edison.Seq.Defaults
+ import Data.Monoid
+ import Data.Semigroup as SG
+ import Control.Monad
++import qualified Control.Monad.Fail as Fail
+ import Test.QuickCheck
+ 
+ -- signatures for exported functions
+@@ -72,16 +73,16 @@ singleton      :: a -> Seq a
+ lcons          :: a -> Seq a -> Seq a
+ rcons          :: a -> Seq a -> Seq a
+ append         :: Seq a -> Seq a -> Seq a
+-lview          :: (Monad m) => Seq a -> m (a, Seq a)
++lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ lhead          :: Seq a -> a
+-lheadM         :: (Monad m) => Seq a -> m a
++lheadM         :: (Fail.MonadFail m) => Seq a -> m a
+ ltail          :: Seq a -> Seq a
+-ltailM         :: (Monad m) => Seq a -> m (Seq a)
+-rview          :: (Monad m) => Seq a -> m (a, Seq a)
++ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
++rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ rhead          :: Seq a -> a
+-rheadM         :: (Monad m) => Seq a -> m a
++rheadM         :: (Fail.MonadFail m) => Seq a -> m a
+ rtail          :: Seq a -> Seq a
+-rtailM         :: (Monad m) => Seq a -> m (Seq a)
++rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
+ null           :: Seq a -> Bool
+ size           :: Seq a -> Int
+ concat         :: Seq (Seq a) -> Seq a
+@@ -112,7 +113,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
+ copy           :: Int -> a -> Seq a
+ inBounds       :: Int -> Seq a -> Bool
+ lookup         :: Int -> Seq a -> a
+-lookupM        :: (Monad m) => Int -> Seq a -> m a
++lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
+ lookupWithDefault :: a -> Int -> Seq a -> a
+ update         :: Int -> a -> Seq a -> Seq a
+ adjust         :: (a -> a) -> Int -> Seq a -> Seq a
+@@ -267,7 +268,7 @@ inBounds i xs = (i >= 0) && inb xs i
+         inb (Even ps) i = inb ps (half i)
+         inb (Odd _ ps) i = (i == 0) || inb ps (half (i-1))
+ 
+-lookup i xs = runIdentity (lookupM i xs)
++lookup i xs = runFail_ (lookupM i xs)
+ 
+ lookupM i xs
+     | i < 0     = fail "BinaryRandList.lookup: bad subscript"
+diff --git a/src/Data/Edison/Seq/BraunSeq.hs b/src/Data/Edison/Seq/BraunSeq.hs
+index 7f6f33b..11236e3 100644
+--- a/src/Data/Edison/Seq/BraunSeq.hs
++++ b/src/Data/Edison/Seq/BraunSeq.hs
+@@ -72,6 +72,7 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
+                        zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
+ 
+ import qualified Control.Applicative as App
++import qualified Control.Monad.Fail as Fail
+ import Control.Monad.Identity
+ import Data.Maybe
+ import Data.Monoid
+@@ -79,6 +80,7 @@ import Data.Semigroup as SG
+ import Test.QuickCheck
+ 
+ 
++import Data.Edison.Prelude ( runFail_ )
+ import qualified Data.Edison.Seq as S ( Sequence(..) )
+ import Data.Edison.Seq.Defaults
+ import qualified Data.Edison.Seq.ListSeq as L
+@@ -91,16 +93,16 @@ singleton      :: a -> Seq a
+ lcons          :: a -> Seq a -> Seq a
+ rcons          :: a -> Seq a -> Seq a
+ append         :: Seq a -> Seq a -> Seq a
+-lview          :: (Monad m) => Seq a -> m (a, Seq a)
++lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ lhead          :: Seq a -> a
+-lheadM         :: (Monad m) => Seq a -> m a
++lheadM         :: (Fail.MonadFail m) => Seq a -> m a
+ ltail          :: Seq a -> Seq a
+-ltailM         :: (Monad m) => Seq a -> m (Seq a)
+-rview          :: (Monad m) => Seq a -> m (a, Seq a)
++ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
++rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ rhead          :: Seq a -> a
+-rheadM         :: (Monad m) => Seq a -> m a
++rheadM         :: (Fail.MonadFail m) => Seq a -> m a
+ rtail          :: Seq a -> Seq a
+-rtailM         :: (Monad m) => Seq a -> m (Seq a)
++rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
+ null           :: Seq a -> Bool
+ size           :: Seq a -> Int
+ concat         :: Seq (Seq a) -> Seq a
+@@ -131,7 +133,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
+ copy           :: Int -> a -> Seq a
+ inBounds       :: Int -> Seq a -> Bool
+ lookup         :: Int -> Seq a -> a
+-lookupM        :: (Monad m) => Int -> Seq a -> m a
++lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
+ lookupWithDefault :: a -> Int -> Seq a -> a
+ update         :: Int -> a -> Seq a -> Seq a
+ adjust         :: (a -> a) -> Int -> Seq a -> Seq a
+@@ -344,7 +346,7 @@ inBounds i xs = (i >= 0) && inb xs i
+           | i == 0    = True
+           | otherwise = inb b (half i - 1)
+ 
+-lookup i xs = runIdentity (lookupM i xs)
++lookup i xs = runFail_ (lookupM i xs)
+ 
+ lookupM i xs
+   | i < 0     = fail "BraunSeq.lookupM: bad subscript"
+diff --git a/src/Data/Edison/Seq/Defaults.hs b/src/Data/Edison/Seq/Defaults.hs
+index ed593dc..eae6a09 100644
+--- a/src/Data/Edison/Seq/Defaults.hs
++++ b/src/Data/Edison/Seq/Defaults.hs
+@@ -17,9 +17,11 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
+                        filter,takeWhile,dropWhile,lookup,take,drop,splitAt,
+                        zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
+ 
++import qualified Control.Monad.Fail as Fail
+ import Control.Monad.Identity
+ import Data.Char (isSpace)
+ 
++import Data.Edison.Prelude ( runFail_ )
+ import Data.Edison.Seq
+ import qualified Data.Edison.Seq.ListSeq as L
+ 
+@@ -33,7 +35,7 @@ appendUsingFoldr :: Sequence s => s a -> s a -> s a
+ appendUsingFoldr s t | null t = s
+                             | otherwise = foldr lcons t s
+ 
+-rviewDefault :: (Monad m, Sequence s) => s a -> m (a, s a)
++rviewDefault :: (Fail.MonadFail m, Sequence s) => s a -> m (a, s a)
+ rviewDefault xs
+   | null xs   = fail $ instanceName xs ++ ".rview: empty sequence"
+   | otherwise = return (rhead xs, rtail xs)
+@@ -49,7 +51,7 @@ rtailUsingLview xs =
+             Nothing      -> empty
+             Just (y, ys) -> lcons x (rt y ys)
+ 
+-rtailMUsingLview :: (Monad m,Sequence s) => s a -> m (s a)
++rtailMUsingLview :: (Fail.MonadFail m, Sequence s) => s a -> m (s a)
+ rtailMUsingLview xs =
+     case lview xs of
+       Nothing      -> fail $ instanceName xs ++ ".rtailM: empty sequence"
+@@ -200,7 +202,7 @@ inBoundsUsingSize :: Sequence s => Int -> s a -> Bool
+ inBoundsUsingSize i s = i >= 0 && i < size s
+ 
+ lookupUsingLookupM :: Sequence s => Int -> s a -> a
+-lookupUsingLookupM i s = runIdentity (lookupM i s)
++lookupUsingLookupM i s = runFail_ (lookupM i s)
+ 
+ lookupUsingDrop :: Sequence s => Int -> s a -> a
+ lookupUsingDrop i s
+@@ -220,7 +222,7 @@ lookupWithDefaultUsingDrop d i s
+   | otherwise = lhead s'
+   where s' = drop i s
+ 
+-lookupMUsingDrop :: (Monad m, Sequence s) => Int -> s a -> m a
++lookupMUsingDrop :: (Fail.MonadFail m, Sequence s) => Int -> s a -> m a
+ lookupMUsingDrop i s
+   -- XXX better error message!
+   | i < 0 || null s' = fail $ instanceName s
+diff --git a/src/Data/Edison/Seq/FingerSeq.hs b/src/Data/Edison/Seq/FingerSeq.hs
+index c74c70b..a34254c 100644
+--- a/src/Data/Edison/Seq/FingerSeq.hs
++++ b/src/Data/Edison/Seq/FingerSeq.hs
+@@ -37,9 +37,10 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
+                        zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
+ 
+ import qualified Control.Applicative as App
+-import Data.Edison.Prelude (measure, Measured())
++import Data.Edison.Prelude (measure, Measured(), runFail_)
+ import qualified Data.Edison.Seq as S
+ import Data.Edison.Seq.Defaults
++import qualified Control.Monad.Fail as Fail
+ import Control.Monad.Identity
+ import Data.Monoid
+ import Data.Semigroup as SG
+@@ -87,16 +88,16 @@ singleton      :: a -> Seq a
+ lcons          :: a -> Seq a -> Seq a
+ rcons          :: a -> Seq a -> Seq a
+ append         :: Seq a -> Seq a -> Seq a
+-lview          :: (Monad m) => Seq a -> m (a, Seq a)
++lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ lhead          :: Seq a -> a
+-lheadM         :: (Monad m) => Seq a -> m a
++lheadM         :: (Fail.MonadFail m) => Seq a -> m a
+ ltail          :: Seq a -> Seq a
+-ltailM         :: (Monad m) => Seq a -> m (Seq a)
+-rview          :: (Monad m) => Seq a -> m (a, Seq a)
++ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
++rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ rhead          :: Seq a -> a
+-rheadM         :: (Monad m) => Seq a -> m a
++rheadM         :: (Fail.MonadFail m) => Seq a -> m a
+ rtail          :: Seq a -> Seq a
+-rtailM         :: (Monad m) => Seq a -> m (Seq a)
++rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
+ null           :: Seq a -> Bool
+ size           :: Seq a -> Int
+ concat         :: Seq (Seq a) -> Seq a
+@@ -127,7 +128,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
+ copy           :: Int -> a -> Seq a
+ inBounds       :: Int -> Seq a -> Bool
+ lookup         :: Int -> Seq a -> a
+-lookupM        :: (Monad m) => Int -> Seq a -> m a
++lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
+ lookupWithDefault :: a -> Int -> Seq a -> a
+ update         :: Int -> a -> Seq a -> Seq a
+ adjust         :: (a -> a) -> Int -> Seq a -> Seq a
+@@ -206,10 +207,10 @@ lheadM xs = lview xs >>= return . fst
+ ltailM xs = lview xs >>= return . snd
+ rheadM xs = rview xs >>= return . fst
+ rtailM xs = rview xs >>= return . snd
+-lhead = runIdentity . lheadM
+-ltail = runIdentity . ltailM
+-rhead = runIdentity . rheadM
+-rtail = runIdentity . rtailM
++lhead = runFail_ . lheadM
++ltail = runFail_ . ltailM
++rhead = runFail_ . rheadM
++rtail = runFail_ . rtailM
+ 
+ fold     = foldr
+ fold'    = foldr'
+diff --git a/src/Data/Edison/Seq/JoinList.hs b/src/Data/Edison/Seq/JoinList.hs
+index 6922023..05855ba 100644
+--- a/src/Data/Edison/Seq/JoinList.hs
++++ b/src/Data/Edison/Seq/JoinList.hs
+@@ -57,6 +57,7 @@ import qualified Control.Applicative as App
+ 
+ import Data.Edison.Seq.Defaults
+ import Control.Monad
++import qualified Control.Monad.Fail as Fail
+ import Data.Monoid
+ import Data.Semigroup as SG
+ import Test.QuickCheck
+@@ -68,16 +69,16 @@ singleton      :: a -> Seq a
+ lcons          :: a -> Seq a -> Seq a
+ rcons          :: a -> Seq a -> Seq a
+ append         :: Seq a -> Seq a -> Seq a
+-lview          :: (Monad m) => Seq a -> m (a, Seq a)
++lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ lhead          :: Seq a -> a
+-lheadM         :: (Monad m) => Seq a -> m a
++lheadM         :: (Fail.MonadFail m) => Seq a -> m a
+ ltail          :: Seq a -> Seq a
+-ltailM         :: (Monad m) => Seq a -> m (Seq a)
+-rview          :: (Monad m) => Seq a -> m (a, Seq a)
++ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
++rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ rhead          :: Seq a -> a
+-rheadM         :: (Monad m) => Seq a -> m a
++rheadM         :: (Fail.MonadFail m) => Seq a -> m a
+ rtail          :: Seq a -> Seq a
+-rtailM         :: (Monad m) => Seq a -> m (Seq a)
++rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
+ null           :: Seq a -> Bool
+ size           :: Seq a -> Int
+ concat         :: Seq (Seq a) -> Seq a
+@@ -108,7 +109,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
+ copy           :: Int -> a -> Seq a
+ inBounds       :: Int -> Seq a -> Bool
+ lookup         :: Int -> Seq a -> a
+-lookupM        :: (Monad m) => Int -> Seq a -> m a
++lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
+ lookupWithDefault :: a -> Int -> Seq a -> a
+ update         :: Int -> a -> Seq a -> Seq a
+ adjust         :: (a -> a) -> Int -> Seq a -> Seq a
+diff --git a/src/Data/Edison/Seq/MyersStack.hs b/src/Data/Edison/Seq/MyersStack.hs
+index 30eb197..eca46a5 100644
+--- a/src/Data/Edison/Seq/MyersStack.hs
++++ b/src/Data/Edison/Seq/MyersStack.hs
+@@ -49,8 +49,10 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
+                        zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
+ 
+ import qualified Control.Applicative as App
++import Data.Edison.Prelude ( runFail_ )
+ import qualified Data.Edison.Seq as S ( Sequence(..) )
+ import Data.Edison.Seq.Defaults
++import qualified Control.Monad.Fail as Fail
+ import Control.Monad.Identity
+ import Data.Monoid
+ import Data.Semigroup as SG
+@@ -63,16 +65,16 @@ singleton      :: a -> Seq a
+ lcons          :: a -> Seq a -> Seq a
+ rcons          :: a -> Seq a -> Seq a
+ append         :: Seq a -> Seq a -> Seq a
+-lview          :: (Monad m) => Seq a -> m (a, Seq a)
++lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ lhead          :: Seq a -> a
+-lheadM         :: (Monad m) => Seq a -> m a
++lheadM         :: (Fail.MonadFail m) => Seq a -> m a
+ ltail          :: Seq a -> Seq a
+-ltailM         :: (Monad m) => Seq a -> m (Seq a)
+-rview          :: (Monad m) => Seq a -> m (a, Seq a)
++ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
++rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ rhead          :: Seq a -> a
+-rheadM         :: (Monad m) => Seq a -> m a
++rheadM         :: (Fail.MonadFail m) => Seq a -> m a
+ rtail          :: Seq a -> Seq a
+-rtailM         :: (Monad m) => Seq a -> m (Seq a)
++rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
+ null           :: Seq a -> Bool
+ size           :: Seq a -> Int
+ concat         :: Seq (Seq a) -> Seq a
+@@ -103,7 +105,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
+ copy           :: Int -> a -> Seq a
+ inBounds       :: Int -> Seq a -> Bool
+ lookup         :: Int -> Seq a -> a
+-lookupM        :: (Monad m) => Int -> Seq a -> m a
++lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
+ lookupWithDefault :: a -> Int -> Seq a -> a
+ update         :: Int -> a -> Seq a -> Seq a
+ adjust         :: (a -> a) -> Int -> Seq a -> Seq a
+@@ -246,7 +248,7 @@ inBounds i xs = inb xs i
+           | i < j     = (i >= 0)
+           | otherwise = inb xs' (i - j)
+ 
+-lookup i xs = runIdentity (lookupM i xs)
++lookup i xs = runFail_ (lookupM i xs)
+ 
+ lookupM i xs = look xs i
+   where look E _ = fail "MyersStack.lookup: bad subscript"
+diff --git a/src/Data/Edison/Seq/RandList.hs b/src/Data/Edison/Seq/RandList.hs
+index 8fe97bd..8d2d38b 100644
+--- a/src/Data/Edison/Seq/RandList.hs
++++ b/src/Data/Edison/Seq/RandList.hs
+@@ -55,8 +55,10 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
+ 
+ import qualified Control.Applicative as App
+ 
++import Data.Edison.Prelude ( runFail_ )
+ import qualified Data.Edison.Seq as S( Sequence(..) )
+ import Data.Edison.Seq.Defaults
++import qualified Control.Monad.Fail as Fail
+ import Control.Monad.Identity
+ import Data.Monoid
+ import Data.Semigroup as SG
+@@ -69,16 +71,16 @@ singleton      :: a -> Seq a
+ lcons          :: a -> Seq a -> Seq a
+ rcons          :: a -> Seq a -> Seq a
+ append         :: Seq a -> Seq a -> Seq a
+-lview          :: (Monad m) => Seq a -> m (a, Seq a)
++lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ lhead          :: Seq a -> a
+-lheadM         :: (Monad m) => Seq a -> m a
++lheadM         :: (Fail.MonadFail m) => Seq a -> m a
+ ltail          :: Seq a -> Seq a
+-ltailM         :: (Monad m) => Seq a -> m (Seq a)
+-rview          :: (Monad m) => Seq a -> m (a, Seq a)
++ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
++rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ rhead          :: Seq a -> a
+-rheadM         :: (Monad m) => Seq a -> m a
++rheadM         :: (Fail.MonadFail m) => Seq a -> m a
+ rtail          :: Seq a -> Seq a
+-rtailM         :: (Monad m) => Seq a -> m (Seq a)
++rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
+ null           :: Seq a -> Bool
+ size           :: Seq a -> Int
+ concat         :: Seq (Seq a) -> Seq a
+@@ -109,7 +111,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
+ copy           :: Int -> a -> Seq a
+ inBounds       :: Int -> Seq a -> Bool
+ lookup         :: Int -> Seq a -> a
+-lookupM        :: (Monad m) => Int -> Seq a -> m a
++lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
+ lookupWithDefault :: a -> Int -> Seq a -> a
+ update         :: Int -> a -> Seq a -> Seq a
+ adjust         :: (a -> a) -> Int -> Seq a -> Seq a
+@@ -269,7 +271,7 @@ inBounds i xs = inb xs i
+           | i < j     = (i >= 0)
+           | otherwise = inb xs (i - j)
+ 
+-lookup i xs = runIdentity (lookupM i xs)
++lookup i xs = runFail_ (lookupM i xs)
+ 
+ lookupM i xs = look xs i
+   where look E _ = fail "RandList.lookup bad subscript"
+diff --git a/src/Data/Edison/Seq/RevSeq.hs b/src/Data/Edison/Seq/RevSeq.hs
+index 3652c7b..87deea6 100644
+--- a/src/Data/Edison/Seq/RevSeq.hs
++++ b/src/Data/Edison/Seq/RevSeq.hs
+@@ -62,6 +62,7 @@ import qualified Data.Edison.Seq as S
+ import qualified Data.Edison.Seq.ListSeq as L
+ import Data.Edison.Seq.Defaults -- only used by concatMap
+ import Control.Monad
++import qualified Control.Monad.Fail as Fail
+ import Data.Monoid
+ import Data.Semigroup as SG
+ import Test.QuickCheck
+@@ -75,16 +76,16 @@ singleton      :: S.Sequence s => a -> Rev s a
+ lcons          :: S.Sequence s => a -> Rev s a -> Rev s a
+ rcons          :: S.Sequence s => a -> Rev s a -> Rev s a
+ append         :: S.Sequence s => Rev s a -> Rev s a -> Rev s a
+-lview          :: (S.Sequence s, Monad m) => Rev s a -> m (a, Rev s a)
++lview          :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m (a, Rev s a)
+ lhead          :: S.Sequence s => Rev s a -> a
+-lheadM         :: (S.Sequence s, Monad m) => Rev s a -> m a
++lheadM         :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m a
+ ltail          :: S.Sequence s => Rev s a -> Rev s a
+-ltailM         :: (S.Sequence s, Monad m) => Rev s a -> m (Rev s a)
+-rview          :: (S.Sequence s, Monad m) => Rev s a -> m (a, Rev s a)
++ltailM         :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m (Rev s a)
++rview          :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m (a, Rev s a)
+ rhead          :: S.Sequence s => Rev s a -> a
+-rheadM         :: (S.Sequence s, Monad m) => Rev s a -> m a
++rheadM         :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m a
+ rtail          :: S.Sequence s => Rev s a -> Rev s a
+-rtailM         :: (S.Sequence s, Monad m) => Rev s a -> m (Rev s a)
++rtailM         :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m (Rev s a)
+ null           :: S.Sequence s => Rev s a -> Bool
+ size           :: S.Sequence s => Rev s a -> Int
+ concat         :: S.Sequence s => Rev s (Rev s a) -> Rev s a
+@@ -115,7 +116,7 @@ reduce1'       :: S.Sequence s => (a -> a -> a) -> Rev s a -> a
+ copy           :: S.Sequence s => Int -> a -> Rev s a
+ inBounds       :: S.Sequence s => Int -> Rev s a -> Bool
+ lookup         :: S.Sequence s => Int -> Rev s a -> a
+-lookupM        :: (S.Sequence s, Monad m) => Int -> Rev s a -> m a
++lookupM        :: (S.Sequence s, Fail.MonadFail m) => Int -> Rev s a -> m a
+ lookupWithDefault :: S.Sequence s => a -> Int -> Rev s a -> a
+ update         :: S.Sequence s => Int -> a -> Rev s a -> Rev s a
+ adjust         :: S.Sequence s => (a -> a) -> Int -> Rev s a -> Rev s a
+diff --git a/src/Data/Edison/Seq/SimpleQueue.hs b/src/Data/Edison/Seq/SimpleQueue.hs
+index 64592b6..754108f 100644
+--- a/src/Data/Edison/Seq/SimpleQueue.hs
++++ b/src/Data/Edison/Seq/SimpleQueue.hs
+@@ -59,6 +59,7 @@ import qualified Data.Edison.Seq.ListSeq as L
+ import Data.Monoid
+ import Data.Semigroup as SG
+ import Control.Monad
++import qualified Control.Monad.Fail as Fail
+ import Test.QuickCheck
+ 
+ -- signatures for exported functions
+@@ -68,16 +69,16 @@ singleton      :: a -> Seq a
+ lcons          :: a -> Seq a -> Seq a
+ rcons          :: a -> Seq a -> Seq a
+ append         :: Seq a -> Seq a -> Seq a
+-lview          :: (Monad m) => Seq a -> m (a, Seq a)
++lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ lhead          :: Seq a -> a
+-lheadM         :: (Monad m) => Seq a -> m a
++lheadM         :: (Fail.MonadFail m) => Seq a -> m a
+ ltail          :: Seq a -> Seq a
+-ltailM         :: (Monad m) => Seq a -> m (Seq a)
+-rview          :: (Monad m) => Seq a -> m (a, Seq a)
++ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
++rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ rhead          :: Seq a -> a
+-rheadM         :: (Monad m) => Seq a -> m a
++rheadM         :: (Fail.MonadFail m) => Seq a -> m a
+ rtail          :: Seq a -> Seq a
+-rtailM         :: (Monad m) => Seq a -> m (Seq a)
++rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
+ null           :: Seq a -> Bool
+ size           :: Seq a -> Int
+ concat         :: Seq (Seq a) -> Seq a
+@@ -108,7 +109,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
+ copy           :: Int -> a -> Seq a
+ inBounds       :: Int -> Seq a -> Bool
+ lookup         :: Int -> Seq a -> a
+-lookupM        :: (Monad m) => Int -> Seq a -> m a
++lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
+ lookupWithDefault :: a -> Int -> Seq a -> a
+ update         :: Int -> a -> Seq a -> Seq a
+ adjust         :: (a -> a) -> Int -> Seq a -> Seq a
+diff --git a/src/Data/Edison/Seq/SizedSeq.hs b/src/Data/Edison/Seq/SizedSeq.hs
+index a50b800..65c0ee9 100644
+--- a/src/Data/Edison/Seq/SizedSeq.hs
++++ b/src/Data/Edison/Seq/SizedSeq.hs
+@@ -54,6 +54,7 @@ import Data.Edison.Seq.Defaults -- only used by concatMap
+ import Data.Monoid
+ import Data.Semigroup as SG
+ import Control.Monad
++import qualified Control.Monad.Fail as Fail
+ import Test.QuickCheck
+ 
+ 
+@@ -65,16 +66,16 @@ singleton      :: S.Sequence s => a -> Sized s a
+ lcons          :: S.Sequence s => a -> Sized s a -> Sized s a
+ rcons          :: S.Sequence s => a -> Sized s a -> Sized s a
+ append         :: S.Sequence s => Sized s a -> Sized s a -> Sized s a
+-lview          :: (S.Sequence s, Monad m) => Sized s a -> m (a, Sized s a)
++lview          :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m (a, Sized s a)
+ lhead          :: S.Sequence s => Sized s a -> a
+-lheadM         :: (S.Sequence s, Monad m) => Sized s a -> m a
++lheadM         :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m a
+ ltail          :: S.Sequence s => Sized s a -> Sized s a
+-ltailM         :: (S.Sequence s, Monad m) => Sized s a -> m (Sized s a)
+-rview          :: (S.Sequence s, Monad m) => Sized s a -> m (a, Sized s a)
++ltailM         :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m (Sized s a)
++rview          :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m (a, Sized s a)
+ rhead          :: S.Sequence s => Sized s a -> a
+-rheadM         :: (S.Sequence s, Monad m) => Sized s a -> m a
++rheadM         :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m a
+ rtail          :: S.Sequence s => Sized s a -> Sized s a
+-rtailM         :: (S.Sequence s, Monad m) => Sized s a -> m (Sized s a)
++rtailM         :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m (Sized s a)
+ null           :: S.Sequence s => Sized s a -> Bool
+ size           :: S.Sequence s => Sized s a -> Int
+ concat         :: S.Sequence s => Sized s (Sized s a) -> Sized s a
+@@ -105,7 +106,7 @@ reduce1'       :: S.Sequence s => (a -> a -> a) -> Sized s a -> a
+ copy           :: S.Sequence s => Int -> a -> Sized s a
+ inBounds       :: S.Sequence s => Int -> Sized s a -> Bool
+ lookup         :: S.Sequence s => Int -> Sized s a -> a
+-lookupM        :: (S.Sequence s, Monad m) => Int -> Sized s a -> m a
++lookupM        :: (S.Sequence s, Fail.MonadFail m) => Int -> Sized s a -> m a
+ lookupWithDefault :: S.Sequence s => a -> Int -> Sized s a -> a
+ update         :: S.Sequence s => Int -> a -> Sized s a -> Sized s a
+ adjust         :: S.Sequence s => (a -> a) -> Int -> Sized s a -> Sized s a
+
diff --git a/dev-haskell/ekg-core/Manifest b/dev-haskell/ekg-core/Manifest
index d6eac411a90c..6260b8e362a1 100644
--- a/dev-haskell/ekg-core/Manifest
+++ b/dev-haskell/ekg-core/Manifest
@@ -1,5 +1,7 @@
 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
+DIST ekg-core-0.1.1.6.tar.gz 13454 BLAKE2B 994e8e6395a9a298dcd6b48a4a122e449fc23fb6944f0565632308d3445825beb1f5177ea2debc4ca409e0d957b1cbfa3190347ed2e973e306a7c1637703f789 SHA512 5a654b6a036300234fc2a65acfee05703772581e0cb646f5462196ce8f30695f7838c34f01b6d840aa1999babe4d9d9b01c3d9b7cc199a1a9112b1792b08927d
 EBUILD ekg-core-0.1.1.0.ebuild 612 BLAKE2B d9dcd4600be2ee82f4d5bb288e9d94b824299dccaa8d8fffcc16d2b7bb8997848ec6f935d60126e44984a136e65f4aca2d0b7406b7a62701be2e53f488a8f564 SHA512 56b1df24deab6ddef6cdeb46974773620b92cf5514f64a4220f311eba62d6c854f3e7a8083219514410d6617143af82ac1a570bfb131afef931d6c358aa5507e
 EBUILD ekg-core-0.1.1.1.ebuild 610 BLAKE2B 8c63bdeebece6b047cc1689a4f61f7dbcd909a51593c36fdcf58745be05d5b899325acd92968aa316debbe78df4a56e83861e308a701744034f59dcda4db818a SHA512 24a2ea84825f3c1313581400c5fb634453b6c1473f7e8fdd28c7911fca46849c51f0753a5bfed0bddbbbfc4731787372dd4994380d8fb63b27aadcc7c0610cc8
+EBUILD ekg-core-0.1.1.6.ebuild 695 BLAKE2B 131abffc9ad4848907c716123d262881079919826580f81d99c4df341e973f2e3671255ffa10d3505f27981faf77f6002179ae8b30bd1e92bccb768efdfb5766 SHA512 8e897466a337675c5146909b845e04ad7f83dbd1004bc6eac01719f193818bf43684edbc969fcc207d976f2b67047ab8c309f5882a1f97c8ae2623b7bd8f733a
 MISC metadata.xml 425 BLAKE2B 63dcd74cb6ed9b0cbf35209585e222a5d111eae82af0f5361751fb95837161c14fae818199cd4f9f06da97ab98c7b88ad85d428ffd0e5dbd4aa67cd32e612270 SHA512 5111f7b2916889e4d4d8c7aa828b628b4f0f70bb00352f1f500268c6a1d6acd11fb6d52158f42bb06a24d5943c0c2f886f4fdbb506c92c7530a36f658aba2e14
diff --git a/dev-haskell/ekg-core/ekg-core-0.1.1.6.ebuild b/dev-haskell/ekg-core/ekg-core-0.1.1.6.ebuild
new file mode 100644
index 000000000000..f81499b6f803
--- /dev/null
+++ b/dev-haskell/ekg-core/ekg-core-0.1.1.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.6.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="https://hackage.haskell.org/package/${P}/${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.18
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >= 4.6 && < 4.13' 'base >= 4.6'
+}
diff --git a/dev-haskell/ekg-json/Manifest b/dev-haskell/ekg-json/Manifest
index bd1503e157fa..a2bb3eccf7b6 100644
--- a/dev-haskell/ekg-json/Manifest
+++ b/dev-haskell/ekg-json/Manifest
@@ -1,7 +1,9 @@
 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
+DIST ekg-json-0.1.0.6.tar.gz 3094 BLAKE2B ea5755f2cabb8c898a6632fdf0cebca99a8eccc4a9ba2e3f844781d029b5c11d618c67bbcadbece93a69e092c03cfedef7e435fbed2998497ab44ab034a82a34 SHA512 c1996214f3d41202dd51a3bf335fa6c67488a3b3625acba196839bef36eff1443907c010b6887845cf759addc769b45d1bcc648554bb2a7942a13337cf40c60e
 EBUILD ekg-json-0.1.0.0.ebuild 727 BLAKE2B 8039cb268c79b1f65e8f348a45d7d89572fb19a2a399e20fb55a2b34a49aa2752a2638779db81e730026a54e3e8a2f5027e97ab81c0bbf444c4006d013c3ae6c SHA512 b8dab818048e6aa149ee9cce8d1cc8347e7f40bd0c7b5bddd94c535c46c183f3ed0ac82050c3956fe12a807bdefcc6290954d319fdea3b75dfea873a4a267104
 EBUILD ekg-json-0.1.0.1.ebuild 727 BLAKE2B 1645b2868930086c0b464755165a26c9256ef7f90f1bc1a3fe9391ea2333671c8503790c2041ea1fa65908884e7378db9636ac0dc2d709c800c040c140cb9e54 SHA512 1867df8b316119c0db05a4463fc4659cbb7d67ba96cdaecd4c0366abd99648ead984bebbef44887d4b1c377ff7283cc9d3a573909d6327b3b8e2bfc97e50afa0
 EBUILD ekg-json-0.1.0.3.ebuild 760 BLAKE2B 0872effeb12fae48af1ff75c98047ba96b7bd28d7e1858e6fa04d620d1ffe25048c4aeeee7f3d5d97c381ea409ac4b00221ce38c6389ec1f0680729b0583c0f4 SHA512 c4d70f5bc956af1e2092b543ecb0508710dabb83a3053d4f680d73de1392ea89e06bfa5ccf1403e0362e1737d250e9a4c2e07cf115c395f978bd10ea038191c9
+EBUILD ekg-json-0.1.0.6-r1.ebuild 853 BLAKE2B cb1d0e3e1bb35e5d92a8f4bc355b6dd2d40effbfefa44836942423556fc3bde1c00f55e770c5ff7c767be330e081d250d5697066e91238c6cf9a79b3d6932167 SHA512 a55e956aeca183d59c0289bd80585c245081fce9f2070b87f22250324ad9fec77acab2d842439f2c8e2a0515529e8ecd7280917fc66fa95a0385b444a590af9f
 MISC metadata.xml 553 BLAKE2B 37267e45c49b74117cebe6da3f2e18e26a1326339e91c420b0650ad05483f6c6c2fe6b694be9177de8e533cb04f967eaaf83ee5658b4127bcf184afee6e1e3b0 SHA512 82cf11540942ca0bb5a8ae7dd6ea26eedd91376d4250c42fa54b130b9fd55826781f8ffea89a70e33b7bda67f2fb9a20782e566927a4184aedef86ab4e665254
diff --git a/dev-haskell/ekg-json/ekg-json-0.1.0.6-r1.ebuild b/dev-haskell/ekg-json/ekg-json-0.1.0.6-r1.ebuild
new file mode 100644
index 000000000000..058d32387d91
--- /dev/null
+++ b/dev-haskell/ekg-json/ekg-json-0.1.0.6-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="JSON encoding of ekg metrics"
+HOMEPAGE="https://github.com/tibbe/ekg-json"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.4:=[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
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >= 4.5 && < 4.11' 'base >= 4.5' \
+		'aeson >=0.4 && < 1.3' 'aeson >=0.4'
+}
diff --git a/dev-haskell/enclosed-exceptions/Manifest b/dev-haskell/enclosed-exceptions/Manifest
index 5c7ad6d9783b..b555335e4955 100644
--- a/dev-haskell/enclosed-exceptions/Manifest
+++ b/dev-haskell/enclosed-exceptions/Manifest
@@ -1,5 +1,7 @@
 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
+DIST enclosed-exceptions-1.0.3.tar.gz 5748 BLAKE2B d36913444a944da19b3da2e88c9aea6832998bfb9ff33a5b14b1cdce08c13b250182bd542522f5bccea693f206da3a9377c6f5a7d204adbe5e86dd6a665b5d32 SHA512 68edb501f42f01d8b4bbce374e49295e045650a8b19fdbf527a54458728e61f53c6c6bcfd1613a7169b013a34bd51cbd2ab2c457cf616fbc8c052b98533bde6c
 EBUILD enclosed-exceptions-1.0.1.1.ebuild 841 BLAKE2B c3c61ec7664ef785e5909765c0237e6f5c682ae90af0901c79d2c71f8c65e3959f825ee9766f7031ad792dd1d2ca349c777bc98c12748f8ecb9e072c04f7adb7 SHA512 d89f638a77a6711cc81fca9d7e60b4c8d7e4d8df5cae082f395c2e90187bf933bacc76b75e94cb79237039cb553e24553d71583132b208e271a2b4c233e60682
 EBUILD enclosed-exceptions-1.0.2.ebuild 848 BLAKE2B 7ddcfbc1e3ea8444259af3e57f505cf7dd658d914341ecdcda95d421e0c432b9df72ba667ad88709c22ce48aaf9e3ef1b62723613c500f1a5b31b7ae96edc37b SHA512 695a8c3d7808dd715493a81a8498dad1e2b9da988a08a9cf296c9fc8cf1fa32694bbc85e8606e437d47836b580e4662234f870bd4cdfbfdf854bb7bbf7c8b949
+EBUILD enclosed-exceptions-1.0.3.ebuild 817 BLAKE2B 9fcc8de4b5077b7cee2c8e6c1836141f5a68fe5aa2d87d485894c292f58580b5ca9a80b5675eb56274798dae22966c80fbc32f01ed4364164320589e0fc70e40 SHA512 8c014721fc8f07506e23e197d244d5f7f58d14b487f86949000da0147068b79e79fb62cb4063f7b24aa1ffc6e7ac940ab5e7b8c04a63c95b8cf03b81774ae0af
 MISC metadata.xml 516 BLAKE2B 2897b7c07776e5cead2638e88182e45b840fc354b705c597496d5fc53776b0b9b4cbf33ab39f76c6e61513755d21064a1534906d7328e99ce31b294a0b0e806e SHA512 6d3c62ab0e7e8114808fd2d4a84d9423f6dfe60f96e7de0da401f75d096eb03e91d9b17c1c7df1daf21ac7267a050225a33ea6d837c816c120a1b0c33b057b80
diff --git a/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.3.ebuild b/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.3.ebuild
new file mode 100644
index 000000000000..fccc544f7eea
--- /dev/null
+++ b/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.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="https://hackage.haskell.org/package/${P}/${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-base:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/async-2.0
+		>=dev-haskell/hspec-1.3
+		dev-haskell/quickcheck
+		dev-haskell/stm )
+"
diff --git a/dev-haskell/encoding/Manifest b/dev-haskell/encoding/Manifest
index eb9a93fed3c2..905c5ad405af 100644
--- a/dev-haskell/encoding/Manifest
+++ b/dev-haskell/encoding/Manifest
@@ -1,9 +1,12 @@
+AUX encoding-0.8.2-cabal22.patch 914 BLAKE2B d80455cd8477ad38ec5ab8653f64553b70e181e4fec824e16203e8bcdd8740bd05200a5071061cbe127931164c4f3319615c304ec5264908b08054d28f116103 SHA512 aca99c6fe58d5f33797f11026d82eecce241440c3643be22eedf0b28a6caa68d42cc669e53ea9ab8d5bdb3537432adcfe73700e14b949b4ac5114ac72305b6ab
 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.2.tar.gz 412630 BLAKE2B 2e6fd3599d4c1062c85389a1d12d332e982beecfb4f98b92ee8b1618e50ed1f91ec65b94273a325995bcbaa8fc6f41878870069c6400365e899b946592b740da SHA512 e8cbb1b64f3555945c185485688bfb7e73ca7104cbbbf5bec8ec55937656df1e3b99bae24aa1513c0c690d3521bca9c111f0258f2245637c7c8d706709cdcd62
 DIST encoding-0.8.tar.gz 321410 BLAKE2B ee87c14457c3474c571ebe25b5f98d50713b85666aeb5e099767d787bfaa9b10d03feb0e596c6c93ddf68bfc583285971f30d8e526cdc12d7570ae63b9b80f77 SHA512 c1f05333fa34eb0dc9ed1e1c82bc4d84e9fb3d0252a45519998a199ef1eafd49e9dea7ad60e8ae855b4efdaf4977f8a9aa6324d7b73bfd122bdef60341dea1e0
 EBUILD encoding-0.6.7.2-r2.ebuild 995 BLAKE2B f7ce8fe394ebb9d5ad3c37b2fa64239e0163696760c8b93724b2411ad209fae4d78a9223569d2a8fe646616ca6f305ef6daa5e919ed0e73304270bd5d5c351b3 SHA512 8162145271b843c95a3fd94bd219496ac46ce50c6beb7478762dc12ad283c03be628453606f1ebd339841e8a59525044fac430ce7112b875d9cb09789033eaab
 EBUILD encoding-0.7.0.2-r1.ebuild 919 BLAKE2B 24ce2fb6b01d147e720b83ec22165258bc1c035990170a89a38aeaabd6262d43985518a70c4f81a54a3568859e4cb8f1a4daab884f4e1ae1c7c794ea652da777 SHA512 bc2c866da05e7f67e913ac802d6c2bef0e9eeec953bffd498ecdfeb832c2320443c8b99c9055c2eb87c69adb705344a0d8684fe72b84e630178584b0f5d37e09
 EBUILD encoding-0.8.1.ebuild 940 BLAKE2B 996af11245528fdaf98c1ef207d7142534806032e5a40045d6cc763588d454c21803c169e56ebe81750195a5ae28dd18b6a89b8e7a6dd098f260983e65c5bbfe SHA512 d2aba8c6406b67823ad4ff72096c0e15e4eea14231e3096551308234e2cf0e066c54111d6449b5b1fe5b19b2c4240e9c23c353f782806ec31e5911ad3859f484
+EBUILD encoding-0.8.2.ebuild 1189 BLAKE2B b6e3d1b24d1144936c268ff61603f568368cf665127d821a43f403f95199016bbaf0c14435af94f4b0681c355d851b7237d19533ad47a6d9cccee6dfc3daa316 SHA512 be1b535c4f78b3e7d6c74ad99a190be4649a2950dc02d1c105d1dde665b26e6ca7bd5e0c11c729171680ac58f3ca232f1bd3bb12697d1177c5bfc202580e900f
 EBUILD encoding-0.8.ebuild 874 BLAKE2B 7914dda85b6b4b4757b06ede65a7ca0a02e87ddcdb8230e0b0972872c13495fdfa0e6694bad665e612be6bd43f97c0e37eb99f5e6eb99d4062f4d98296030776 SHA512 b2bd1f5c75645156daa1ece7929b1fd8348fcb649a26916a6e78fb3ad0b8f9ae175891fefec3a97e32105ec4b4dad1a5dba368308462f67454a757c6d1b63403
 MISC metadata.xml 676 BLAKE2B e2bfda2c8e81fdbb369a7a99d555ab71d7cdd93517bc54a4f399d3ae9dafc384d1921a0f0e78f9b738bb0d72cbb9814ea75613b4ffaec0ff2615141b5f795014 SHA512 86d83b18876390cb974df3ea61782f32b5e8c893877664e7e9722e6ad5d596c2b6454c60fe6537c2c2492f9fa28d614fe0c473a5bc702a21632210f516328d3c
diff --git a/dev-haskell/encoding/encoding-0.8.2.ebuild b/dev-haskell/encoding/encoding-0.8.2.ebuild
new file mode 100644
index 000000000000..695bd93c4395
--- /dev/null
+++ b/dev-haskell/encoding/encoding-0.8.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="A library for various character encodings"
+HOMEPAGE="http://code.haskell.org/encoding/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+systemencoding"
+
+RDEPEND=">=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
+	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/regex-compat-0.71:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24
+	>=dev-haskell/haxml-1.22 <dev-haskell/haxml-1.26
+	test? ( dev-haskell/hunit
+		dev-haskell/quickcheck )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cabal22.patch
+)
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'regex-compat >=0.71 && <0.95' 'regex-compat >=0.71' \
+		'containers >=0.4 && <0.6' 'containers >=0.4 && <0.7'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag systemencoding systemencoding)
+}
diff --git a/dev-haskell/encoding/files/encoding-0.8.2-cabal22.patch b/dev-haskell/encoding/files/encoding-0.8.2-cabal22.patch
new file mode 100644
index 000000000000..bc1614deb71e
--- /dev/null
+++ b/dev-haskell/encoding/files/encoding-0.8.2-cabal22.patch
@@ -0,0 +1,22 @@
+diff --git a/Setup.hs b/Setup.hs
+index de719e6..e58a316 100644
+--- a/Setup.hs
++++ b/Setup.hs
+@@ -1 +1,2 @@
++{-# LANGUAGE CPP #-}
+ module Main where
+@@ -6,2 +7,11 @@ import Data.Encoding.Preprocessor.XMLMappingBuilder
+ 
++#if MIN_VERSION_Cabal(2,2,0)
++main = defaultMainWithHooks (simpleUserHooks
++                             {hookedPreProcessors = (("mapping",\_ _ _ -> mappingPreprocessor)
++                                                     :("mapping2",\_ _ _ -> mappingPreprocessor)
++                                                     :("xml",\_ _ _ -> xmlPreprocessor)
++                                                     :(hookedPreProcessors simpleUserHooks)
++                                                    )
++                             })
++#else
+ main = defaultMainWithHooks (simpleUserHooks
+@@ -13 +23,2 @@ main = defaultMainWithHooks (simpleUserHooks
+                              })
++#endif
diff --git a/dev-haskell/executable-path/Manifest b/dev-haskell/executable-path/Manifest
index 52146c41e16e..d4cb6b4c2186 100644
--- a/dev-haskell/executable-path/Manifest
+++ b/dev-haskell/executable-path/Manifest
@@ -1,3 +1,5 @@
+DIST executable-path-0.0.3.1.tar.gz 6658 BLAKE2B 2671aa3b98c019785501ad853ed883e8f8a9572b6c5d847a5f0684d5203e07807562c6feb97085ccaec17ab5ff54d320b430e8c4e55bd99d55916653be2d6328 SHA512 e11e3a1fcc8a987c8720b80e6bc61eb9f61a6319d9d0cc88c841ef293aa9e51f7fbcbad2aa4beb52d50fed5148545591dc0627cc82c9b78b9990e038c9c3d020
 DIST executable-path-0.0.3.tar.gz 6619 BLAKE2B 2b452d57c6b9aa64b8ebfd98e19c816afd377ba8a7bda5a23f9e346395bed326775682922d1fcfdf2350cad73cd6ac1f2c21df515d912138985768e1f00d2fb9 SHA512 96be7d997648226d549f80bac2bf49ffb2cf4043cf6ed9a9b175520df9d851599ec1b5f5c60a6ff8d12dadc1037193cebb2d5e0c956433e90cb3d023a46fa987
 EBUILD executable-path-0.0.3-r1.ebuild 549 BLAKE2B 1008b9bb5306455fe0a5dc16ff8d697f998994f00d1113aed112caebf8addc389c0bad4ad00d029d592bc5a357ac74a8feacf3c7249fb21b19f64a24cf8534fb SHA512 45c4b6185da580be2a6f03a51d7f7e8e4e5ba2fa42abcc04e4263e2a0c0f5f4f463b44f4c29a93914762c70b1f1522188edc69c9930ec2490c908b67f2f4cc6d
+EBUILD executable-path-0.0.3.1.ebuild 551 BLAKE2B a90dc62a61863863b06d83392067433772dc3d927fafdd7cc70003c36fa2c794abed4451bf0ab785c830cf805a0fa6ca442afd649e3ccfee8a9b7a2b6c2b8aa3 SHA512 400da5907f37f50067e20816083a9b294888660f36b41474704f3a9c1c1f00058d3b4f2476823b25fcec3b778af5b3a441acbd3d699f991c588eefc3985471af
 MISC metadata.xml 578 BLAKE2B 0f95917754165bea918f57494a849d5bbda9cc0cc7bc5dd74d470f278be4690b83f1bdb07ba95e05b89651bb0dbda51a6ca0651fbb3b5cf957b9c5e68ff1238b SHA512 6d8221ddefc24a31f9989c921ec7da9009f8a3259c12ffa7e1262e2030ba3db3007dccbd1a9fce4f0b6ffed7061fbb0eb7e1c348d0c8ce1062a893ce7aaa50d7
diff --git a/dev-haskell/executable-path/executable-path-0.0.3.1.ebuild b/dev-haskell/executable-path/executable-path-0.0.3.1.ebuild
new file mode 100644
index 000000000000..316dc45be5f7
--- /dev/null
+++ b/dev-haskell/executable-path/executable-path-0.0.3.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="Finding out the full path of the executable"
+HOMEPAGE="http://code.haskell.org/~bkomuves/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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/fclabels/Manifest b/dev-haskell/fclabels/Manifest
index dae7e13b8050..ef2946bcd41a 100644
--- a/dev-haskell/fclabels/Manifest
+++ b/dev-haskell/fclabels/Manifest
@@ -1,7 +1,9 @@
 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.3.tar.gz 24714 BLAKE2B 2bba8892bdacd87fda89106b60752714edd8d2bf15abffe0f1e8cd0b6d17f18f4313e1adbb8c1307de71927936208e65225f9a49b73389f15f1ea9cfccbe82a4 SHA512 0c0f7ed886b65a80aea4e19b5763d7b91ce948b63f86d507ecf0b6874716a190752e0806957c71e0ed0ed97422ba3d09a2be0c82588c8dabfd647474c1a33cff
 DIST fclabels-2.0.3.tar.gz 24475 BLAKE2B cb7455c9d3a55e0d3902b176d4b156fb34e40516d853591d2da1538675c7b6a99245da82ebc83692d40fc38e13e62cf7fa2b2605d3bcebe90a16b79e0f79ef44 SHA512 efc203a90eae0e3ff23b977c642009281fc46724735c646638a312788df5edd1adc9f62d1199fe5b4260cf4dce2e55b6eb3999d8f31aec8b2e952e8fbfea1b90
 EBUILD fclabels-2.0.2.3.ebuild 780 BLAKE2B 9c5810316f2d31a2f6caad745eb60e2b879c5010f4f4288ad6af42d3b68ba67aec5bc4aacb1c5ba5bfb12c238a66a4e1c35aec047ed39aec8dcd77369b5e5285 SHA512 aa45e3e7b9bbb35663023a4f9fdb11b2d4648d35a09636bd657c6da4978fbaccf1f0caa161b1947e9a43d6f9f30b09b249be603b6e8dfa077114a3a9859749d7
 EBUILD fclabels-2.0.3.1.ebuild 697 BLAKE2B 37de0c1e94c5fd5c073ad66533230ad3623176881587122c50619921f2216aafc4137974df253f3aa8d16ab4b9bcca378946d937bfe81f0c6f1a12b20a81319c SHA512 9745e9e5e16c20606b206dc60d9e60037d1e870f2b34165e1e39c5d1001d5325dfd6b09361c7d5322eb0c89e9c70901f3789bffd8e2466d24e9f973c5a01a57c
+EBUILD fclabels-2.0.3.3.ebuild 916 BLAKE2B 7a2f665bd125cb46fcfd8b64702352b6cfd70e4da5f5f4e150fe7d6060e9a8245548ce643cd7a3657ea7338c83b15cea7eee4ece1f3dc78861d67ea977184d14 SHA512 34f7772a6b17826d7dff9ff7b0b5a58dd763a7a1e3b70e2a3385636293e47935b66f3ec3c74926dee3a7139baac7b1d43b2bc1f1db73d5471c27b0b0bc960980
 EBUILD fclabels-2.0.3.ebuild 783 BLAKE2B a457f3aac203ab73cca290e9830754922e6a6908cf98fe8d5f84cc432ad168ef0c09fb8b20924b928587c5a73d2d9f6aa0e786bda9337bf9f84c97426fb19bb6 SHA512 93085ea8f08f2e88e600005262b270857708e97d22db266b63a3b8b0b14711f1cdd968a80ba45e10a7486f2225543142022cd8e3d61e64818b4391f37c470a43
 MISC metadata.xml 1246 BLAKE2B 094973c2bd67ad69c84e3eb85c74bf4a1a5411f48a57a5b5c066da7ad2bc9b0d59282a8ecc06ddf857621e2ae381511717b7de552be637be1a5c6b5b86282424 SHA512 6000016c8b6806cc9352e0cd76a2655c9c9d09f36a3264a8451a235b2f877d74fe403984d187d3477ed744de562a6493459bc54aec0fe588a23e5ee7e6ce236c
diff --git a/dev-haskell/fclabels/fclabels-2.0.3.3.ebuild b/dev-haskell/fclabels/fclabels-2.0.3.3.ebuild
new file mode 100644
index 000000000000..f9cd7dee05f4
--- /dev/null
+++ b/dev-haskell/fclabels/fclabels-2.0.3.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="First class accessor labels implemented as lenses"
+HOMEPAGE="https://github.com/sebastiaanvisser/fclabels"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base             >= 4.5 && < 4.12' 'base             >= 4.5' \
+		'HUnit            >= 1.2 && < 1.7' 'HUnit            >= 1.2' \
+		'template-haskell >= 2.2 && < 2.14' 'template-haskell >= 2.2'
+}
diff --git a/dev-haskell/fgl-arbitrary/Manifest b/dev-haskell/fgl-arbitrary/Manifest
index e42a4612fac7..58f5a07cee78 100644
--- a/dev-haskell/fgl-arbitrary/Manifest
+++ b/dev-haskell/fgl-arbitrary/Manifest
@@ -1,5 +1,7 @@
 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
+DIST fgl-arbitrary-0.2.0.3.tar.gz 6079 BLAKE2B 13fadb149568115d8a31138d9c92c039a369e8e4cbce68156434ecc5ed6ed1ed86cd1ada17567103b57073ff402a5f768bd54779593bfda6d776853a7cc94349 SHA512 d944f9c6ec7e116cec9df84d7b0ef2750e3aa255bed74f6450d9d6fa9786c50de20cf37b4f8725e1303b465583a7a6c3f3d4fd48517ddbb2b7354f01d728d830
 EBUILD fgl-arbitrary-0.2.0.1.ebuild 760 BLAKE2B 46a94a7cec1f1c05cdaadc5b6dc38fbc1927eef01c64be2f624f037f33441847f8ecfec2b0d375c80575793c6517fc634c6f25e83c228ee75152463dc2721ef1 SHA512 5baf839d76280880e84776d79720d7a133b8b7d783dbe3051a5b32c05a2f660d7d3782072c3a507c1f1847aff897c04223b8757003ea782142b5fd22e41d1523
 EBUILD fgl-arbitrary-0.2.0.2.ebuild 759 BLAKE2B 3bf2113c7c95565c056eaa1aa7fc72a89b421b8896d9cd55b86f7c1e1b1216186cabd6f734ee9a13ba1d487c23a13efd70843c16f27c1a6be10f1353ec73b814 SHA512 a68248128aa013e67ca41d975d806a265bc94e46008e6aabfb3bb7500bf03846dd00b62f6d516e3f7fcb7f94e0ddd6fcd47ded9925797c756987ef2bd3644437
+EBUILD fgl-arbitrary-0.2.0.3-r1.ebuild 838 BLAKE2B e58c3e78b41fdede669342ba5d5a5ad51b23008a8d45ef61ef018cb7d9dcc5b0269661c95e3dc5936afeb83fc5aa82d5d17c93beca645948275c5f263230a4a0 SHA512 037490a0a1b288b9abb8be326f6e04855325fad4fb387a088108ae4c41c69be231bd71449763d75c8c8e801209cdb59db412a324d62d4b0c756586f110849730
 MISC metadata.xml 539 BLAKE2B 4a70ec7a93f29d3e1252bac145520da2a2c02c3041e795801364455f29a2d3659d16435c93b3d779e177a2625631c42c24d546303d1643558b0177882374ee1d SHA512 09430ba886d3f58c1e428ac092d89a96806bc449e01c59d43324552d92a76ea62c6b31c30319ae5ebfc769099291642495815f1bc618e97eb9c416c95b1d4475
diff --git a/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.3-r1.ebuild b/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.3-r1.ebuild
new file mode 100644
index 000000000000..fac31c1559cb
--- /dev/null
+++ b/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.3-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="QuickCheck support for fgl"
+HOMEPAGE="http://hackage.haskell.org/package/fgl-arbitrary"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/hspec-2.1 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'QuickCheck >= 2.3 && < 2.10' 'QuickCheck >= 2.3' \
+		'hspec >= 2.1 && < 2.5' 'hspec >= 2.1'
+}
diff --git a/dev-haskell/fgl/Manifest b/dev-haskell/fgl/Manifest
index b5c4f04a0a83..11fd7affe38d 100644
--- a/dev-haskell/fgl/Manifest
+++ b/dev-haskell/fgl/Manifest
@@ -3,7 +3,6 @@ DIST fgl-5.5.0.1.tar.gz 35963 BLAKE2B bcc8864184d7020405d918c626734bee636a01713b
 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 615 BLAKE2B b9ec19bc72f2417089ad93ac0f039ac8321f80a46ba328f6ada90840a2158d99634aed5ad5ed2a3a4b6716231a068c87510d7b5e45e69de3394299a108a308b3 SHA512 73c96cfd19ce6f222c8c7886640d46d339747cdb1c530969dbaca2a3cd7074b7fa526a354985d032cefdb1bb4f693d571646cc658ac269f5be2dfcb2b4a6b160
-EBUILD fgl-5.4.2.4.ebuild 600 BLAKE2B e5441e0f8339294a9ff4f5221a38d64ae037f0388b54a4ee958125289d83143c63bb443e042a441efaed518f82a0acb373e2f1f053c1546db8d5b350b897c87d SHA512 6df4061b55e9d704a820557fb5e4196057f545fbc6803160c0d4ff52b10c6f2592391fc8026220d376dce305fd8eca79a43b2ff1fa3d329c35c7340f62a3ae6d
 EBUILD fgl-5.5.0.1.ebuild 605 BLAKE2B 2902752ba9a457a0389bccd29de83ebe1651bb2544d1f5842b9e49ad30d735e6d4841f453da2c5e2c492a59c62eafc95e0e223900bb1dee9024df9696c0d0d03 SHA512 4160ce17d533ebe5cda397b0cefa48b971c43d26c86b6edc9b9fe0053edc798b99ba2cca8785997ae30fadbd5b25851c4aa66932d36688a5961de079c4193d8a
 EBUILD fgl-5.5.2.3.ebuild 707 BLAKE2B 57572e869dc10dfd7cb0b846299a2136f5bf6206d133abb5fd291c1e716a4b607e0f7a50aca33a70dcf02cb047545150bde03fa2574fdd7bdd989175e813185f SHA512 6ccde493663c59d37c48dcb6bbcd945073fc815cc278871194544ff276dcfa3e16358fc44c96d3e56db0cbf60822b2ac54cd99b3a17190f3efa2f9f983dfd5e0
 EBUILD fgl-5.5.3.0.ebuild 730 BLAKE2B 349ac28a19ad9623dcbdb9a3202bd77f8c7a665c675e597d2b058dd78ee99adb0bcfe2fe734361fc49a8034d608790fb72981129f723032933bf07592eb92e71 SHA512 819f946c2653e489e20b5d1c3b3336fe84095125afe776f96bc9f4fabc08828ed52dc6d16bffa9a7d32319dffc1a9415cd9c2e9ab67cd5e92c5ec6c987954a48
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 b79846bf01b1..000000000000
--- a/dev-haskell/fgl/fgl-5.4.2.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl[profile?]
-		>=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/file-embed/Manifest b/dev-haskell/file-embed/Manifest
index 4988fad01474..932c2bb67770 100644
--- a/dev-haskell/file-embed/Manifest
+++ b/dev-haskell/file-embed/Manifest
@@ -1,7 +1,9 @@
 DIST file-embed-0.0.10.tar.gz 6247 BLAKE2B b8ab7590d0ac8ad9539b07732b589053a98b4ef87feaf2fc816ea81a2b87a9a41bcac9ef44d7180dcec52ea3a266eca7ba01236b3c5699c77685a9119582ba00 SHA512 aa0ef37987b9f84685e064411de080d608d5b9a8c839a332fc163eb218c1a8fcb1fb9dc6bfba0033717f10252e07bb5f72183c3b64bb83488553e9b97bdf3111
+DIST file-embed-0.0.11.tar.gz 6469 BLAKE2B c1d8071b765c8709435f86b9985feccf2e46f3bfefb25a73cb7032e2a059a0a3fd0b405a0a552de89923b9f8331a045476fb472da9504c24d5f27310a7fd23c3 SHA512 2c6ac6bdf951706a6d2cfe317bb6c50e3fb166acd746ff9af0420212bfc8f298cf4dea08b2e38cb4615b98cbc15954e1b7d46918970234e4ab91012e34bf7b41
 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 565 BLAKE2B 800f1a09b39e87981213122c560887d713d25f87d2667d6e34f1b76577a686ec541f66acd7a9d73669bffbc81da9941b4b4576c5150c68afef29eb1be577f110 SHA512 0cd27a0967ee437e7421f9afb71937aabfec29e942e94f1d64044f257bfe8f7aa69c4dce42af31c2ad7ccc6f82de871e7a7f71c746d8dd3067518986628e954c
+EBUILD file-embed-0.0.11.ebuild 560 BLAKE2B 19a2d037657e1c389ebfcc463f592db35a3cdcfd79d3542d641669831866573a91b1b8e04b29e91144b79c03452d71d3b0f64e3092dc3168da872b187a7289d0 SHA512 6bc990d8e68c55e538d424b7a16175ad1b061b2633804e14394520814e0fb05ffe37b30660f0e6704c1b838b9e8a84489e08540c459b160cd96308e3d1f71d99
 EBUILD file-embed-0.0.7.ebuild 590 BLAKE2B 37c1f3706651a29ce296e07102dadd210135350c19f01e6fc707447bd5411c2bf1da530b56f1e4e6f3f758af80a1526e6a6c9a5bfee3035c33812d14ca2fd784 SHA512 6945b21519ca937070b79a448fdca2c96b6696bbbe1d54bca0651153c0026c4dbe5ff6e5aa50ebce325f5204fe373375a4489b129ee4d9d0980ad8536af0798b
 EBUILD file-embed-0.0.9.ebuild 594 BLAKE2B 532d7fac2ef740b3eee0bae3e1db77c7b9175ac61202b9a22a0f91e90fd5e2acedfa65fce30acb2c15c4f37cdcdd5c035814bc35913d1d2674e29c599f00f365 SHA512 bdb568663ab4eeffa43fb190f2b99454938203b2a1382bcb625cbecfae0051316308aea17e5284616448d6908a097b7e5597816fc30218688f57d9a129150481
 MISC metadata.xml 428 BLAKE2B d7afe344d7499a8994b67e7a660e157796948d97e098e469bac498fa4305054d5bcb9f59b16093e975cfd6f08a1a5ca01d39d26142e8958e17bb68870e9c4254 SHA512 f55712fbd177f3d40cba95e8c61fc794917c2196d81f1c6bce8bbbf8d284d27c61c92faf8f525786e17a0e9cf371f22bc4f79587f445b6758862be118dab07a2
diff --git a/dev-haskell/file-embed/file-embed-0.0.11.ebuild b/dev-haskell/file-embed/file-embed-0.0.11.ebuild
new file mode 100644
index 000000000000..5b824b772182
--- /dev/null
+++ b/dev-haskell/file-embed/file-embed-0.0.11.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+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="https://hackage.haskell.org/package/${P}/${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-location/Manifest b/dev-haskell/file-location/Manifest
index 87290f435f1f..a3f52d9e0af8 100644
--- a/dev-haskell/file-location/Manifest
+++ b/dev-haskell/file-location/Manifest
@@ -1,4 +1,6 @@
+DIST file-location-0.4.9.1.tar.gz 6961 BLAKE2B 5b3248db2a03ad699ba1354a88b6d0aa4e124e607be6692e7be7a9cec403d42dcb2e304a60c85e879855a9e5e3e49309d8aa112edaa12986f79b8408fa49b781 SHA512 a84a6ed3ff1a786331e202ae505df3981e81b3ce085e588632868357626b82a559dc649aa1623a09462741c5133ee0e5d5deb10713d94cc8286b82aa2e706d94
 DIST file-location-0.4.9.tar.gz 6959 BLAKE2B 1cc083a9fb71fb80a11b56e27d8fc468f806d1417efbaf618ea07a4f68df5addf7c479bf5490d50bf07b34ff6babdaefc11536068c15bff274b07bbf4189be74 SHA512 cbea7ef5a6797efd242219a32c7d46b5a0fe2b20d4c93e7ab758cf27519b021c2e2c34ab91d4eedfba8a61a51f81312346d575f8c83296b87b1f7bea8985d40f
 EBUILD file-location-0.4.9-r1.ebuild 873 BLAKE2B a7b4997740d46c27f332c42a0cd5ab26a7288fef9324ce506de09264a9711bce15f8ab884cee14f4dcc77c849e1d35cefa635a1779928d17cc43da3b5d384b3f SHA512 47774ccb23fbca0b63db9bbfff670050a6af2d951e75fea0bdb9c49b95fc9da6ecfd559976038139c398fc99176ca544ca7b1f7bfd23676ce0a530002bff0a47
+EBUILD file-location-0.4.9.1.ebuild 736 BLAKE2B fa64097a733d1268b7d17fec1403f0b3c3e81c5e2d94228ed03657fd3b0ffa42ce5e28f3e671b101281b047804f36f60ed90ae2decb92a3eaf619f70497dc836 SHA512 5ae0894d7df5ea71f91061ae15e9d5c31c29b4c4aedb4fe71ef2db9d00a47e64cf8b4c67f5b91c63b3983ec51b2166d4d5de5897c60d4bbb1a64b605aa1238eb
 EBUILD file-location-0.4.9.ebuild 766 BLAKE2B 202cdf78790777150a58c24f90224af61d598ec66c27c4284d7d0f36740b04e4a82620a31f275a35e1d331c0727f43c46086a1d971491f72c3bc66e925c4662d SHA512 716ffbf3f8caffaab8670d6562ca07eb88f6e6b10dff549c01c83618133829148ec11c63a54657022ed7d47b0e5802f958fc148aa8c803d7b8f2b78eaf9eb191
 MISC metadata.xml 1438 BLAKE2B 7790bc6d1bab559c7961458b3fee13af2861c8bda34d39045044179e973892fbe01471c53faa9bcf32f3a4bec902f1590bead1b9bed2e6d653b52ad9438be230 SHA512 becf41f547c76f329ae69bd5518a96cffcdf3161c05d9ffaecf3f6ba91d9a20855e3aefba473c37d4e7d004fc5d923459f50fd8a7a4f657ccfb52482d15c753e
diff --git a/dev-haskell/file-location/file-location-0.4.9.1.ebuild b/dev-haskell/file-location/file-location-0.4.9.1.ebuild
new file mode 100644
index 000000000000..f284847d7468
--- /dev/null
+++ b/dev-haskell/file-location/file-location-0.4.9.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="common functions that show file location information"
+HOMEPAGE="https://github.com/gregwebs/FileLocation.hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/filelock/Manifest b/dev-haskell/filelock/Manifest
index f3d32a23c26c..0fdd2a5c24b8 100644
--- a/dev-haskell/filelock/Manifest
+++ b/dev-haskell/filelock/Manifest
@@ -1,3 +1,5 @@
 DIST filelock-0.1.0.1.tar.gz 5884 BLAKE2B 27596191c70ca71f11fdcd3bd66362d51407774dcda2e9f31220981af5e259edbf7cac8db87fb7899741c937caf240e7e1af210f569b33600c3407956c1fa975 SHA512 73cc119bcca61b040692738aefcc779debef8815182a9f74e9e0700d9b1e5de0e12812f573f9daa8a127d99269f69e3cfc572cd5cd104d1fddb04ec8d4bf0c97
+DIST filelock-0.1.1.3.tar.gz 7187 BLAKE2B d56f23a9e590417a70586c934de4f189696e61f24799992124cd24bee10091e789e4c393bbc7ea96873d6704eadcb205aa14846e54dd6c30fcc4ce99c64f3e9f SHA512 2fc95f33311d43501daaed8472cffd198a0b9146325a9cfded5952c9a43b550fab6e89b722c2453034ee233480778bf2af9fb6089f111d168ebec1ececbaa895
 EBUILD filelock-0.1.0.1.ebuild 571 BLAKE2B 0116129ebb2b8cd623fa97d38d1aba6bb4881ea5533727a92b11d7d841aef3d94e90d393e91b1d03ab6f5f108b60f7dab843ec4c7e0ebea31647d27f498ea9a0 SHA512 dc16dabfaf7989af19f667dbdb5d794f0d6c5bc7ac03955cf8ffe8a7d91344d703fd2a173823a3a01b2d1c1188e8863e96408533887acf3851b8e1f03d5c4a49
+EBUILD filelock-0.1.1.3.ebuild 609 BLAKE2B 11e69426b6824e62cbf6ec3d15813cac33a5ecfe9122ae328991eb8196f038b86ebcf49e4b0dcf15889e9ef8731f9453e48d8d5a34820397e834259cc6747b3a SHA512 b3aca77bc3100bf007d9410b7c267cd011fba082bba0be8f9930faad48fe8271ac9a0c83e6772cb2e21d2c9c1c9f2af95d992a1ef6f1a509fbf2cbca07d7e48d
 MISC metadata.xml 377 BLAKE2B 752a7f7145365ceb57f3e07d726843acf7d62a476af56bfde35138c63e79171aa8d4b0af5209d28c69d13e2d8e597d80137e44218f72615f8d495b2cb615da02 SHA512 82aa6e68e477c7332df560e453c6ca40d97872f0dfe1bc29a28c00df29aed3b1c9329fbd6c40b009318e1675d23f2eadbc84b9fc5434044dc99605bf520e4b60
diff --git a/dev-haskell/filelock/filelock-0.1.1.3.ebuild b/dev-haskell/filelock/filelock-0.1.1.3.ebuild
new file mode 100644
index 000000000000..87391957179d
--- /dev/null
+++ b/dev-haskell/filelock/filelock-0.1.1.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Portable interface to file locking (flock / LockFileEx)"
+HOMEPAGE="https://github.com/takano-akio/filelock"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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
+	test? ( dev-haskell/async )
+"
diff --git a/dev-haskell/filestore/Manifest b/dev-haskell/filestore/Manifest
index f1ebd9f44a44..c9e75922b1d1 100644
--- a/dev-haskell/filestore/Manifest
+++ b/dev-haskell/filestore/Manifest
@@ -1,6 +1,8 @@
 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
+DIST filestore-0.6.3.4.tar.gz 32070 BLAKE2B a4096d31aa1382eab3c41eb55c58c19171de67caea3078f5383dea61fb13b51adb71bbdae0b8d670c61b72be9394494d776c0dc797c4d2b71d3d49a13851f8c8 SHA512 d5a7cf4ca3bc3fbc8d8f066fad5e3913d8fef4c13d894f3df604fab91ad2c4e1bb585c5c067220055e9356dc99a860b03b281e46c3b16517bce130a8bc57eda7
 EBUILD filestore-0.6.1.ebuild 1604 BLAKE2B 0bde552a173b9412b62c111b203774fea7599f452ab18da42154f8a57423fd601fe98d39fa5a4a6a8cd8001c898c4f9f7ed7059d0aab815a07b1acad2fabc24e SHA512 f37b8c7bd2a8ad8159816d5ecb6eaa372ea2865dc0d9cae9b1a668664f7963273f7ae5c5afdc45a3a01fc0aa56b4011a522756ab46e7656544bbb3f2ef1ad374
 EBUILD filestore-0.6.2.ebuild 1356 BLAKE2B 813190794543fd01b425bcaffcb91f2f8b9a0ed56e60564a6f256f1c982d6e5201f4f652798e1067f04cc23b3717ea04892c41e5bc6101b6c1641ff8a3607656 SHA512 c5707f1d6834069b9d17f4c1446aad6a433d7c7864ef39e224188221f7c29cb99f7d42621676b16959a178490c47bd27eed83ca2decd76d381732f5a0e92d3e8
+EBUILD filestore-0.6.3.4.ebuild 1173 BLAKE2B 48f340a5a2b9534f09a5b932c746d9a046ce9a098425cfa201ab008b67cf24ee69cb4ab7378b2dcd859825a5dc10c94362f84a29311f4ff13b8e5d5098233554 SHA512 19b3f937e3c84d60edae1417cb4697870c6dd3e86fa6955c0a9fd7764777c0d0388b2eb355e02a9c6efe3b61ab09f25763c5addcca33ad281959e04763449bb1
 MISC metadata.xml 796 BLAKE2B 375f217f68beae2145186476ace228a86b22bc18296934a7a811d0a54847a73d730c3dfa93483947f6f87c4a7e6ffcfa3afe68fe4b9b2bb7314c7f1a7724fc43 SHA512 8f45afc127a379b15396f639424cd31b9e241b547ccf743c5509eb80d07dc74dc7cbf3a0edc17f62e9a4202ed2fd420c6a055f0bc1325d09c36662bd695891d9
diff --git a/dev-haskell/filestore/filestore-0.6.3.4.ebuild b/dev-haskell/filestore/filestore-0.6.3.4.ebuild
new file mode 100644
index 000000000000..c35fb8e3c6f9
--- /dev/null
+++ b/dev-haskell/filestore/filestore-0.6.3.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+maxcount"
+
+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.7
+		dev-haskell/mtl )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag maxcount maxcount)
+}
diff --git a/dev-haskell/fingertree/Manifest b/dev-haskell/fingertree/Manifest
index 11682adde06e..e769fe046184 100644
--- a/dev-haskell/fingertree/Manifest
+++ b/dev-haskell/fingertree/Manifest
@@ -1,3 +1,5 @@
 DIST fingertree-0.1.1.0.tar.gz 14415 BLAKE2B b05ce26d0275ac9910607927914759008ed1c7e8ceeeeebbe6200ec5a96e39efc10372a69edc71cde01bbd8f5ba8600e7dd7ec7e31e676225127a133607e5edb SHA512 47d7387e11cf05a2df323c6af76a12e6cf02a857f7131203400cbc6ba9ee4c3c9e2c721a8423e6456a385f5ea0c4aedd0e9a2600d2d33609c0457cd259337016
+DIST fingertree-0.1.4.2.tar.gz 18978 BLAKE2B 25eafe2e25ac00121c29bf6e54d6dd754e3672bb321451dcbc89594123b4f71b263fa8584bfeaaa63362d9901af7263c8028ea2f75684e2f2f960f31feecbb9a SHA512 016a772830c0bb27ec15fa99c9dff280c210f288a1f2dc15828224a6a8cdad87ade816191320aa59c876eba6b33cdb47a778572e66a8f3c989984cea2f4970ac
 EBUILD fingertree-0.1.1.0.ebuild 732 BLAKE2B 19dedd2c97faab3e9e8a403b9ca1732678120e2201dae15d7ee3cdbe7e976bfb5ffd8283f1846e5350520adad60c3a72fb12d6514d2dca2c1bf9e8ee317a12c1 SHA512 9b20fc521304b4d5f6efcbf8798ca1e989e036d00e08bd28796aed73173b827de63b0a322416b95e288aed7287a9487e6a0b0e7d9e526669109f945df03a8344
+EBUILD fingertree-0.1.4.2.ebuild 731 BLAKE2B b81b6b93e489a816b01dd1734d92bc016cf5524ef7b665fd60e00378f6ae0735812354d0c5558620bbad44cf01013a600ade3c162dd176e17c389bf0ea6138f7 SHA512 34a120907f8a76708de060afdd991a9e31f151474b72cde5269bb995395b7d38a774d124e153e1cc494d62562cb62c83bd3fd5395f35a9566a46559e96f04ee3
 MISC metadata.xml 824 BLAKE2B 282a5af4cf2bdb333afd0079c4c845bf6dc5d09574828dcd74742a18e3ef6c09578199f6117f0d7bd707ab23e16f9dd44a30e8b0d3b2f2d54f78807e934b805a SHA512 94278f3b50b18615d69752ef69012cf4996f4bbc90e2195688a47510290fff8d6a1bdb32cb04ec0a5b728d01221d5e15250bcf4dbddac6e05a3619e90ed60c8d
diff --git a/dev-haskell/fingertree/fingertree-0.1.4.2.ebuild b/dev-haskell/fingertree/fingertree-0.1.4.2.ebuild
new file mode 100644
index 000000000000..b7ccc62538ad
--- /dev/null
+++ b/dev-haskell/fingertree/fingertree-0.1.4.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${P}/${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.18
+	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/fmlist/Manifest b/dev-haskell/fmlist/Manifest
index 763368910287..9a250b06ed45 100644
--- a/dev-haskell/fmlist/Manifest
+++ b/dev-haskell/fmlist/Manifest
@@ -1,3 +1,5 @@
+DIST fmlist-0.9.3.tar.gz 4428 BLAKE2B 818911f2e670e7b371e0dd58bb9ee661a7f0fd4130e611606d393aeea7b5c4d0eddb8ce04babb2d85cac54a4d3511457c2291eeb5b548967a4409291e18990a9 SHA512 1dba120af3c06d22b41269b22aad7950dd1d567daee213eeaa316f8dcd9e97a2f4499372b310561bb3a25909c38060c0aefacfe640d85ec3c90c5f5503db8915
 DIST fmlist-0.9.tar.gz 4256 BLAKE2B b6dff5a18f3e13c16c7aed41eb4b22d6fa01ee0a8fe8250fab706a0d07b38cf50bf09b40f0b794aae304c6c4e93fd30ede2ab1765cbbdede2a08e9b12b5d07ea SHA512 ddead2f2742e91365381ac9c003f59ea57441c4e9a32b01f3d1aa989120d954b01bb6b19f148a4d89c0cb7332093c39f17567d8c479d47133a0568b8abc757d4
+EBUILD fmlist-0.9.3.ebuild 546 BLAKE2B 37edaf7578e3522ed924b7f4b6ab4fa20d6e365873df7eac31aadbbb8e11266e9e875247dc35b7b65dc4d473ede255b56396793a84c7f5e47b880c1c434b9dc2 SHA512 6740a6710b6014a2e0d92d6301775dbc9cf0dd02d5ba11a442da344a6ba20bb884d83d8e6743f98513cba1828e3448ae48ea8196a427f147f8eeeb71ce00c196
 EBUILD fmlist-0.9.ebuild 518 BLAKE2B ecf38b422e372994f09cee9d5152e7a6675331d45f07b0bc79ed262ecb9e06e171e8b31c60aebe626971038d0cfd0def73451fbb53756e621aa256cc96bf0378 SHA512 2a517f5c4a4acf47d83e906f44a0315adcd919193f6636931aca9372001412a016208cff2bc8d0d9fc013e556495a83f0e6159285bafbb27d67a41cf0a6ec795
 MISC metadata.xml 649 BLAKE2B edaee174f4fae81ec0428208341edc01ae2b99148f4393e498c39aea47152a1cfdef44f9cfd68f3a7313172e565620b0645e187c0ab1b4e3570f0aaea16bb7a2 SHA512 338f1edee5049def417c74b8b5e30db76b34525ea6c5a308b80ab3bf9a64f34799e98a8b617b4715b488d864a92a16aa2642c57ce4322dedea0a5477fef69b9d
diff --git a/dev-haskell/fmlist/fmlist-0.9.3.ebuild b/dev-haskell/fmlist/fmlist-0.9.3.ebuild
new file mode 100644
index 000000000000..0ff4a019eb12
--- /dev/null
+++ b/dev-haskell/fmlist/fmlist-0.9.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="FoldMap lists"
+HOMEPAGE="https://github.com/sjoerdvisscher/fmlist"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/fail:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/getopt-generics/Manifest b/dev-haskell/getopt-generics/Manifest
index 55a0536f3003..afe752e34874 100644
--- a/dev-haskell/getopt-generics/Manifest
+++ b/dev-haskell/getopt-generics/Manifest
@@ -1,3 +1,5 @@
 DIST getopt-generics-0.13.0.1.tar.gz 27772 BLAKE2B abe9dc94069dbc3cca4296290f2ca4d34a5088443cdcae018da36854963948ca7758c3622ad243f1284e39d08f420d3e9f885557d23c785520325dea11d4d278 SHA512 df27c67bd92047b5213404220389200cf72c79d20a761c390120d13a82fb126aa38ef5afbb826ae2be0fe65941f4fe5be42bb49301fabd6343e8b0c8a7f3e707
+DIST getopt-generics-0.13.0.4.tar.gz 19194 BLAKE2B 2c091df40c0c39f5e314367f2eb76aad296b8ead1fd26e84b1f578c1b3347c6961931dbc709a7c5c4374e16b965a573e4fb9c5c7c10f870b75e132ae1c84ff51 SHA512 f053dcd59126932745a98c955eca70dc3f50eda7e5a390bf7e5d7c639d89df9d714a6b449166a5b288a77e69f203207e8d8480ad86484b68c7a609e5f1a03fca
 EBUILD getopt-generics-0.13.0.1.ebuild 871 BLAKE2B c8a2a0941cbbae82b5fd630bd82744e24eb7accb42bcb85f9e55f441d59528fb99ccc367a66f036a8071d91b5b0dfaf8157853f6a42966c8adcfb5768e12dc75 SHA512 1567309bfaf26cdf02b09bb67b36415544e5560007760d48e18952b4bcb5d89e0b2d862f6fd7dd4dc152a842ab253af31aa088faada8de2023c25d30446d4b86
+EBUILD getopt-generics-0.13.0.4.ebuild 871 BLAKE2B 5d18974c968d3b4e80cc33996b2c3f3c905a702d3a322bf6eaa58e57b8b645a6690f483339f7c37fce856188902b13fd15a7b32df3117348f2dd5831b4c6eb8d SHA512 afed1111796423f3cc06f26358797a876949abd9f0c6e275056c39beedd911a0fde26269bcc27831812135999ddb767eae716f4d891aab8a9e1be0218702f0e0
 MISC metadata.xml 331 BLAKE2B 90de0cc495a27588aa77cbdc836f145d77610be2726f494636f2e414f3cadd1ca1dcd3fa647b869af5f122458bc730663495a5c32fb86e97917f6e1d0bb7a1ed SHA512 8d3aef20869df87f4d7522bb24eb031a35c7713e86d3281911ef6097a689fdaba5cfe6b73421202a1f532548f139586956ca4d2ab416a066ed91ac8700b52680
diff --git a/dev-haskell/getopt-generics/getopt-generics-0.13.0.4.ebuild b/dev-haskell/getopt-generics/getopt-generics-0.13.0.4.ebuild
new file mode 100644
index 000000000000..4b16299b9e02
--- /dev/null
+++ b/dev-haskell/getopt-generics/getopt-generics-0.13.0.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${P}/${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.2.3:=[profile?] <dev-haskell/generics-sop-0.6:=[profile?]
+	dev-haskell/tagged:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+	test? ( >=dev-haskell/hspec-2.1.8
+		dev-haskell/quickcheck
+		dev-haskell/safe
+		dev-haskell/silently )
+"
diff --git a/dev-haskell/gio/Manifest b/dev-haskell/gio/Manifest
index c53c804857de..435cc437555b 100644
--- a/dev-haskell/gio/Manifest
+++ b/dev-haskell/gio/Manifest
@@ -1,7 +1,9 @@
 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
+DIST gio-0.13.6.0.tar.gz 70094 BLAKE2B 5c114db1ca43def45f2deea628e6d20343c3f27f5337b8f266e1a7c32e7d1300404d21543fa082db05d8e55527bb47d9abba14a6bccca0a8202b317dc8cfe13c SHA512 d9bd77f887d7112d878b7349b7c79dcaf483ac5567d9fea0e902c161700eeb9be9b574584b440ccd580c504b1b76b0bc2b4d6d30de2c3b1a05c72c8f67790de9
 EBUILD gio-0.12.5.3.ebuild 794 BLAKE2B 6e0396cc3c58b6f98b13a00e7aafa7ea936e9e1b0684c8313a6011669086a4eeb3ebf983d09997f73007a6bdd39fafa61dd0808c66356ebbb787a53b188388d4 SHA512 ca913f343a67b8546f8c53a97b9ba560dc2286d7a4beba751927419209757b357b1d8611dd0722c3a3236cf207b0115645782fa7e2a37d9b176d6b8dcf01f1e7
 EBUILD gio-0.13.1.1.ebuild 721 BLAKE2B a0a9080e8babf8c12df224691e31cd49b20a0a0d36eb6e7c3df54037fb04ac76f68e096115bb0ef8db5cee90adebd5f21767ce6f0f83ccb22cda923d45a6af25 SHA512 9953b076a7b91b7c3b8ab3c9d81700d7336ac50c842c628f4dac3c556795eb43920034af6253159e393219069e2e73aeec29a6011cac06d94a3ca8f36c36dc64
 EBUILD gio-0.13.3.1.ebuild 688 BLAKE2B a9b9f568daa2a317421da783272f98705b99eeeb62833ef671354f3dc766e97c06f197fa11c2e55d2fd6f5bcecbe63aa2a22e0f63a35ad6ffb3e45846df13bf5 SHA512 dbd4654f469f4c99275fddf32d3ebde29a3caeb3592ac6e477eeecfc0099c8eb57f38a39e289be47edeb7756014aad67b581b1a791416b470b1b7189ce400cbd
+EBUILD gio-0.13.6.0.ebuild 890 BLAKE2B 302d8ce64f8d87b86ac59aa5acb4c6866fd9ec6f0ef002a1d6c0148ad56e2a15453b06fc42b6bb82ac34c006d7cec42fdab5267c9141b30f00cec64a9b159d39 SHA512 58fe31fa5fdd51470fbad0303083eb141dc8f6c08e6d6df776952ab3d29c78d855fbc5e13dc603da3b5c927ec98c7eb87f1b4a9c711d7fb075c2e472d348c8ef
 MISC metadata.xml 685 BLAKE2B 900dd8aca993e34ee8693a4eb16114630ad3fd4bb832842054c8eda6639fc8a9c3cc6196a95c124c9f17320860794f9af442736a60c4d2dea8babb25f7bee05b SHA512 043977788c4a55bd9ff47a7429b2b2ffc2862713540d7076e346d1637ea48083ba4e00bcc2f0929568da82df1cdfa51773393c1f4c17351853d0ee7601af7c5a
diff --git a/dev-haskell/gio/gio-0.13.6.0.ebuild b/dev-haskell/gio/gio-0.13.6.0.ebuild
new file mode 100644
index 000000000000..01e2e153bf6b
--- /dev/null
+++ b/dev-haskell/gio/gio-0.13.6.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Binding to GIO"
+HOMEPAGE="http://projects.haskell.org/gtk2hs/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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 <dev-haskell/cabal-3.1
+	>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'Cabal >= 1.24 && < 2.5' 'Cabal >= 1.24 && < 3.1'
+}
diff --git a/dev-haskell/glib/Manifest b/dev-haskell/glib/Manifest
index 5876a3e90119..e8862b17f2a6 100644
--- a/dev-haskell/glib/Manifest
+++ b/dev-haskell/glib/Manifest
@@ -1,7 +1,9 @@
 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
+DIST glib-0.13.7.0.tar.gz 39518 BLAKE2B 85dd85a491f0263715cd6633282a2028cec2ccd7f12e49ac6029aa7420468f52777760cb339b35ce8123c8c0feb5947324bcb0084e8214b7c8c6919169b42ab7 SHA512 507fdcc6d686ea25b46d9d6f112aa29ebf751b3db99a19c9938ebd8675a8c167aafe151c96fe115662d15696c79aada93a0b197450159e8f45bc329e3de4455a
 EBUILD glib-0.12.5.4.ebuild 851 BLAKE2B 37eecf7c6822a9460f6baf68c947c5877527a301b8c7687f81c08e997af97722a254df4ebdeff2acb630144aacec18039dfc5d3b235e93e31a1d9b78c13fec66 SHA512 1ed2b66195f91bd09515fc9ecccd2154c4bc00267c7bd222f729ba052769d0318793d6c83a703b6242e743bdf73f32311dd110ead8fb51f4bc7d53f25f3cc916
 EBUILD glib-0.13.2.2.ebuild 914 BLAKE2B 12d3989baf2c5dc8d09f548f890491bd6377315c4d570655365f5b0923716fa1ce517f33844186e0c7fb3f1108ddaca790e01f04be818f1d3eda251f5b867e99 SHA512 0c6a3b53f56da01cef16076bd310197b83ba0540918b492d068f63922e947e6c07857c2bb82725f7b503587a378b55b0278cdb1b58f33b16260a8b4a32817995
 EBUILD glib-0.13.4.1.ebuild 985 BLAKE2B f25c4a9f030d0ab7000bffbf87496e9eb60ff3cca8445052ae515834a11e96286502b541e701f695b8d86800d45950c77699bc86b1463d081ac24b5b3166de02 SHA512 7122fa7c09509e3479168d6b29891a0e12466a00c152127da132bcc74d708326c1af75e53b2fbde336ae1f170f7c52b333f27e10b89ad153302acabb21e17fcd
+EBUILD glib-0.13.7.0.ebuild 1083 BLAKE2B 657994401c3c3436c5236b6085cf503013129aa65f586900c7fb87d869964ba38d8756de433097c91f723f93e36530bed9f9e3604ab420b8ec6b78154233ffe3 SHA512 d1e64f3e41afbbda00f83f8799fd1417b9a5357392241a6833e3b05d8fb423a1a5327f9a6dd712e5cd79f5c269856e2537364b6f186b4fd78d5e7466ab2e1b39
 MISC metadata.xml 637 BLAKE2B 6b5577c783a0faf583cee6b9f4eddf0a3a0272fec0ee4387f6f47b608f15a6f6e969d0b1ba68b81b9f96b1438fb0a0c2196f8353b7b50f311786a532e965bf42 SHA512 3f9826ebc796b7813932f9c58515f4c3ef45f3dea759653ceeded736b09e8b272e95c1ed9245ca5f7cabbf0fcdc41a0b60701383f1e04a50c839d39d02c02905
diff --git a/dev-haskell/glib/glib-0.13.7.0.ebuild b/dev-haskell/glib/glib-0.13.7.0.ebuild
new file mode 100644
index 000000000000..5ea50c20e5bf
--- /dev/null
+++ b/dev-haskell/glib/glib-0.13.7.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.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="https://hackage.haskell.org/package/${P}/${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-3.1
+	>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'Cabal >= 1.24 && < 2.5' 'Cabal >= 1.24 && < 3.1'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag closure-signals closure_signals)
+}
diff --git a/dev-haskell/gluraw/Manifest b/dev-haskell/gluraw/Manifest
index 2af351aa294b..7b8fb261091b 100644
--- a/dev-haskell/gluraw/Manifest
+++ b/dev-haskell/gluraw/Manifest
@@ -1,11 +1,11 @@
-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 670 BLAKE2B 318e8861cb664d912d4f8e68c0e90b6df120d5e596dd9b6e47c94fd96f2aa7e3cdcd3ffeaf1222a85f3995dbfcb1481566d656a7d2023929496dc272b7128289 SHA512 678c83be675e14300a751f112d2ee07c659e6d4d06c21ac38e31b12fd97387a140c3fd451f181deedae7e2ac4e6f56621717826a43f75287cc61dc33a9adb6c1
+DIST GLURaw-2.0.0.4.tar.gz 10557 BLAKE2B 6e25f2167bf4fd9307a07c1081966cd2072d145317752a53d104a0dcc9ad282f83c9d98ba2a0ccab14d900d2f1ab0b0e0d381aef651baf4f077d830de8ef0803 SHA512 971402ed5fd84e8f0e6abca27fd78bee298750930901e66cc782b53d79d28093085120c3fc373a38d5a1354d55f69e1ec1c5ede5a0b1f9a019cf705f11ffcfcc
 EBUILD gluraw-1.3.0.0.ebuild 671 BLAKE2B 6079d513605f6ee8cd5e265a62d90cf28cff19cf5c50d20f84c668d05d2a3de61685b785392c9626608b950a2c250ed4f6fedbdaa2e3c8b7d89e7a5163fa9d3f SHA512 3610fdbb5d829a977de6f6b2a92dc4646e0b3a8ed3f9ddfc6faf109da55f088e13110f60811d709d22e0306d7a4f0ecb22bed611e1d66e403fc2eead46240728
 EBUILD gluraw-1.4.0.1.ebuild 811 BLAKE2B 7d823f221db8abc582c49159f598fe71071cc664299ccb55b0934c99696473b621f0ac65f78ceb42fb7c2069a5298affd01914305e19a01e9bbb111e9f7a9880 SHA512 31427f2b2010df52e0d70ab2124367d2e152f25825831f37a5fb2c20bed7d36f4725f9705d51c4aa6443f2306bd706f820840034f96ba428c6185785ebc2036f
 EBUILD gluraw-1.5.0.1.ebuild 937 BLAKE2B d0e37e05775c19a65c344310619a7f179605faccc09ebc86607ec4f9233c5f1505af0eb72a7b635ec04443212ed13f3acea1596d8d7a00fe623f8a9c423fb6f3 SHA512 ec407a7aaafe65eb793b3b52715a4218189e9d7e8d8cabcfa2f6c950ed3f948c7f99102511298019380f71ab38f0b1480bd3b823cee3bc5d4ba5e042b748ef78
 EBUILD gluraw-2.0.0.3.ebuild 848 BLAKE2B 98b7974e254187d8d4360e08c353bde3b1f3d8bd87593eff61d404d2f30100fec02f4723c4cd480c62c55162c60dc1a6c51ea68d20930ff44539e1556bc5854f SHA512 43a46d4c63fd8ad1b0eff0d859fbef9cc44cf2d4ca1d783fb9e4ffff07fa2201e5f3e311e5e96adf3227d90cb677d4acabb5ce8e6980e5eb4dc75a6dfb05c8e8
+EBUILD gluraw-2.0.0.4.ebuild 848 BLAKE2B 2552b9f847363968406713268685194fee5142365aed957845427f9dc3b1ef989d1e3fd111b83b39879044d92bf849e015d472e8d49351e1162cb3f619d3f0cc SHA512 0920241efc6e593a7126126f83bb056b55f7a723424d9c29d7156f1e135d818c636c9de49b3de3ef541b88679916e639ec7b87882649b6651b0e17473b9e6acd
 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-2.0.0.4.ebuild
index 89f8871ebbfd..f13939c1cdcd 100644
--- a/dev-haskell/gluraw/gluraw-1.2.0.0.ebuild
+++ b/dev-haskell/gluraw/gluraw-2.0.0.4.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
-# ebuild generated by hackport 0.2.18.9999
+# ebuild generated by hackport 0.5.6.9999
+#hackport: flags: -usenativewindowslibraries
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -16,14 +17,21 @@ HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
 SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="=dev-haskell/openglraw-1.2*[profile?]
-		>=dev-lang/ghc-6.8.2
-		virtual/glu"
+RDEPEND=">=dev-haskell/openglraw-3.0:=[profile?] <dev-haskell/openglraw-3.4:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	virtual/glu
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
+	>=dev-haskell/cabal-1.18.1.3
+"
 
 S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-usenativewindowslibraries
+}
diff --git a/dev-haskell/glut/Manifest b/dev-haskell/glut/Manifest
index 2e112aad212f..79490cf014c5 100644
--- a/dev-haskell/glut/Manifest
+++ b/dev-haskell/glut/Manifest
@@ -1,5 +1,7 @@
 DIST GLUT-2.5.1.1.tar.gz 655292 BLAKE2B 49347d5ffdb887388cd862902bd548dfdb1a4a024d98f0a5de64cd2e6cb7cf7021956ee170439d6cea145c65a5f3ebf9f4e9f2b6e7e38f10be3cb92c276fc8f4 SHA512 79895fea8b49178a93f59efa094a9eca26d23c2bb4b07902d83c8403e8c45c3a10a1961177bfc272339be279d012a0e8ff273881bcc54128fc40ff11f5f8bdd9
 DIST GLUT-2.7.0.11.tar.gz 656855 BLAKE2B cb45b6207a2af626c251d8c3abe64fbf295db5f7c396cb99bedb6326ed9a16e416c5e8de1f402926edf0109f52e79be1a7c7087adb388f27e07394e53b6e95c3 SHA512 aa9977f2d2141dc4fbc38915ffe8bfd6cf5a5c93502d3b813a41195556ada91644774869a6daa33f44964c517370e006830578b9b1b5cb59b7b49abedb1dcc66
+DIST GLUT-2.7.0.15.tar.gz 654907 BLAKE2B c955d2942ffa2ac8d8370726cc32a67772dba2e343f2ad0a10e24134ae9bf5762bb108292e17275db3665572379bbaab55f605b79973bf90b066818934501aeb SHA512 d4ee183f7a9600e86ddea7783e3236ab33510217b6c1e815fb46936e95db851ea35c6b504142595779665b74912fcc312cbee8462e4719e78e9d5c99913692de
 EBUILD glut-2.5.1.1.ebuild 848 BLAKE2B 057c442e636bcd41e4c7f33a5b63c69479d544c9c843e002106cd9c767670c4a4a963cded04921292e6a3a7d6bf685670bda01c9d14df3274053b0500e8e517b SHA512 76ef14114e5a3c1b3560821465241c2989ebc4a2cfb159fa50119ed8781bec18109b5c7ee75f9a5942173cbe88001adda08b0da9b410a46dc95c668835eda602
 EBUILD glut-2.7.0.11.ebuild 1144 BLAKE2B b42b2afcbcd2299030875d64a512891f728711a6a415fff01e0ebefd3f2e1b83b28d7a8c4b963141a0841c8071d45689d4e9bbecfaacddc4d93bed7ac2f32e9d SHA512 0fee587b52c620597684b57b00c3fa2a3954928682da5f780f4507ddc3142d8ee5d4323f629ffc4ad4046c30fb80d8f59e62120d715c39569c8841368695935d
+EBUILD glut-2.7.0.15.ebuild 1142 BLAKE2B e53881b64e36923ef09c2f25eb9027d25bc9a7fc457f592c20f8ed94d080ff76872b0a844558fadc801f74a87a8943b1695d739fb139f0888c3b797bbab0fbdd SHA512 57798aa28a336230f840242704068bc9b36f49664a4bb17b878b3cd11fc7dd69242106f3d73fcd63593224591d7a3feb8a2a4fca03fec375e2625c2a2654bfdb
 MISC metadata.xml 553 BLAKE2B 7250bf1b06b8856d775daddc98fe91d618ee5e2ba14dcdde71598a4fef338f5062caa2505ee6e419f7b71a44e44e9be8346c0e4dc7ba88c9c30438961dee9e45 SHA512 3ae07ac62ea4bc8f7e9050c7069acf902602ea863b52317ecc2a9435c4e7c7b501c598fc39ac723efdb91232f4d31c150d9f457c2b6ed54d81ec5bc730c7988d
diff --git a/dev-haskell/glut/glut-2.7.0.15.ebuild b/dev-haskell/glut/glut-2.7.0.15.ebuild
new file mode 100644
index 000000000000..a02bf667d8b7
--- /dev/null
+++ b/dev-haskell/glut/glut-2.7.0.15.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${MY_P}/${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.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	examples? ( >=dev-haskell/openglraw-1.0:=[profile?] <dev-haskell/openglraw-3.4:=[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/gnuidn/Manifest b/dev-haskell/gnuidn/Manifest
index 49ba57a35b4a..1555f8519bf5 100644
--- a/dev-haskell/gnuidn/Manifest
+++ b/dev-haskell/gnuidn/Manifest
@@ -1,5 +1,6 @@
 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 622 BLAKE2B 85f1d26251be0af89a121a8f5970642ded1bb10343ea05f4022df38b1ed259259afdc44f5f6b0437439a05f8255535df7207afb7250030bbef3031a042e68e22 SHA512 93ac7fe17438d0e0070eee8ce4bc35a153d43a544f541e4ccbc1d95066183bcd7a85185a5c420ea1d8c720512d65006647cab9f7b0666843ad8b34faa76b36e2
+EBUILD gnuidn-0.2.2-r1.ebuild 690 BLAKE2B 8cce1bef6ecde7a623e482fc48ddc072c60058fd12efcd3db91093c068dfd1b25184ef8593a206a948c0139704017bf6fe04685212e654879f70b917c96a3f24 SHA512 742e880f6bcb12e0a7e23a878d402cfb88af5bc3b5f46791541544a008606487e89cfc5df79887c72a82a8184eeed8e99c01984ce5c9eaf799ccc64bda6a86de
 EBUILD gnuidn-0.2.2.ebuild 790 BLAKE2B 0d02b3cb26abb3e500c273e76dcdb67942e02eaec7d6917a97dc23a7fccf8a18643041285c2e7f8e5e3d8403330ef9707383a31047bc249153aef4e79e4649b1 SHA512 6646bef00d05d83ef9852680deb12f4f53f23143bd6bbe133cafc1b806f94f059f43e4a2468b3effad201cb9d75cfb7ee43ac825a0d745d49f72707ea83ca39d
 MISC metadata.xml 311 BLAKE2B 942486c345c7aea099c48d651929a982e90b4df3498d70b4a711e014f556981784a96e8daa84391a870ae1adc3d8866c881cc188b9e5227a3eebe585f561d25d SHA512 a28d19884005a4438b07de1d14a1e5eca59c76c9242d9cf6f8a2b16b19e74cc2a8fdda2b4a6683c8000915e757d11b2e630b2978118b06275709b481eb992f16
diff --git a/dev-haskell/gnuidn/gnuidn-0.2.2-r1.ebuild b/dev-haskell/gnuidn/gnuidn-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..d5bd3de599cc
--- /dev/null
+++ b/dev-haskell/gnuidn/gnuidn-0.2.2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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" # Drop test-suite: uses dev-haskell/chell-quickcheck
+inherit haskell-cabal
+
+DESCRIPTION="Bindings for GNU IDN"
+HOMEPAGE="https://john-millikin.com/software/haskell-gnuidn/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test
+
+RDEPEND="dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	net-dns/libidn:0=
+"
+DEPEND="${RDEPEND}
+	dev-haskell/c2hs
+	>=dev-haskell/cabal-1.8
+	virtual/pkgconfig
+"
diff --git a/dev-haskell/gtk/Manifest b/dev-haskell/gtk/Manifest
index 98a38feca8e7..477dc2d024a6 100644
--- a/dev-haskell/gtk/Manifest
+++ b/dev-haskell/gtk/Manifest
@@ -1,7 +1,9 @@
 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.10.tar.gz 677787 BLAKE2B 536b4ce1bdbb17c662342bd8cb8086354a31842e1fc39e4bb2e4c2e505fb03f4e1ad0b689fb48dcf24d61c280cf659d8f30ac0fe77083e9887054cc8ed5feb75 SHA512 857fa71391e4bc8d884f5bb5e4f072ebd35b6bbcdc3901b6e28e03e79f4732d56430cf395aabc6007d3f7b1e991dcf0c6e21c9b84ccde96b1943d26ad37243eb
 DIST gtk-0.14.6.tar.gz 679274 BLAKE2B 4554cfd990abb8ad189b11baf6f38525e72c1989f762f091a7e7fcde159d5516ad9fee71bdb6e7983b1b4293280f59e6a4db34fb4944b14e209e2660fbf95334 SHA512 f6f12fb0b07129b313858134d7dd1844a75f1ceaae27b14172891c281949822c222841665cdea62e3bb27c7b47e7fd3e0370721ebc520a0335b512ddf66f9428
 EBUILD gtk-0.12.5.7.2.ebuild 2136 BLAKE2B a1a37be8c61fe2d384a740f91e30abc198286b3d9a81e722554f11e49daf3cd99d26f02cf72a1914880465357b4bd7847558c74fca0739f226b69760eb356a11 SHA512 109d795c12a64639e213d13a5d8cb115b8978512400a5d39371113e1da8a57f9c5fc9d69999cd516240825c31585b537165c1083512c7fbd38c2ad186520cc2f
 EBUILD gtk-0.13.9.ebuild 1359 BLAKE2B 937e2c0f4dc17f846d6c0ea3231397356f811fb3c2a3cbc7d38dfefce421bcff8ff454a751a5897ce39f85d9fd659bdbd954cf5149201931a61d947825bfaec5 SHA512 4c04feb3c355d087ab9731fba834efab5cb5d1c9bd2328dffd830db37f5fb60486a938a9f39edbf73540d07a1812be6981553d2aa2217d489d0d0edcf6479517
+EBUILD gtk-0.14.10-r2.ebuild 1528 BLAKE2B bc8fdfe73693f7f0b604f77562ff42ed3524a91b23cf2997d2254255fd98f87628ca7fbd246d039a7ea1ef6406792c2c673005a7ad2e50a10a4759bfc627f397 SHA512 73903b48cdcbae913ae3fa5f33676adddcdad6ea188982e4d00a4cc2604e64ceca01e759f3de455f8e0c01288a7169336edb66e660b378dc9a97fdbb3a26404b
 EBUILD gtk-0.14.6.ebuild 1357 BLAKE2B 56ef891ea22651b780cef843e007aeb7a45a49e2fce0b2c5252a4cc52408c630e613c7089aeb3a37645fe0aa1327822a39bac0ff6c5bf9b0cef2ad414e25ce8a SHA512 8a798d8439a495b3cead6243e92efbdc2932d2c38e222f7a7cafc3ebef747ef27cfe557b570376f8892277ccbb8ebe4bff4e625c9cb8e334e6575c4b123b8d8f
 MISC metadata.xml 783 BLAKE2B 03cf02ef8216abd88b601f79acf0301d104c8c788c63138378cf7cd19a5adcd6a50a4d9dcd2ea95032acd9466a7be7e81123a35c60dcd5e0b5a41457f18801f6 SHA512 9da50d73780cdfb09196111d6abc5ad9b58ac08a7e2a0ace9b55626209512b4df2812b8de969c4d3b16b4d00b82f1be5c0bf1152050d77285a2dbda09e0240b1
diff --git a/dev-haskell/gtk/gtk-0.14.10-r2.ebuild b/dev-haskell/gtk/gtk-0.14.10-r2.ebuild
new file mode 100644
index 000000000000..c3723ffeddfc
--- /dev/null
+++ b/dev-haskell/gtk/gtk-0.14.10-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.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="https://hackage.haskell.org/package/${P}/${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/cabal-3.1
+	>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'Cabal >= 1.24 && < 2.3' 'Cabal >= 1.24 && < 3.1'
+}
+
+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/gtk2hs-buildtools/Manifest b/dev-haskell/gtk2hs-buildtools/Manifest
index a4bc3570d42d..6fa14cf26e1a 100644
--- a/dev-haskell/gtk2hs-buildtools/Manifest
+++ b/dev-haskell/gtk2hs-buildtools/Manifest
@@ -4,7 +4,9 @@ AUX gtk2hs-buildtools-0.13.1.0-ia64.patch 1864 BLAKE2B 3c0ba7b61e0294d4922ccd676
 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
+DIST gtk2hs-buildtools-0.13.5.1.tar.gz 178132 BLAKE2B b89696a0a0b1fc3f43413e78993133250f1a5850ee14cf4a8f10adc85135d3822ace8f3eaa8a9d2a9ff7276c202991d72c2ef866fe4b9032fcc45b2d4c5e4b0e SHA512 ddce2ae75756086b89032e3e15654e235432fdf843ef14c0833d371b3912d9489727a711cd92afc9ba96abc543c102a428b78db39cb56a35d81be6f54398b68f
 EBUILD gtk2hs-buildtools-0.12.5.1-r1.ebuild 749 BLAKE2B b6ef7aa958bfd73d9114f6f13f9629401683b309fcaa0ab864dc2ff1ea02d257ab0c411d9a1c454ee796ef06e1517b1bcbead85f62ef97e1e8475b6da8c45a49 SHA512 961fc404890f726a548ded4e431695ab195172d79855ecf75a1a11dd28f79eac4761c196a27334b026916331b1a81c8025fb218cf5f8e266798f8ebb1928c543
 EBUILD gtk2hs-buildtools-0.13.0.4-r3.ebuild 851 BLAKE2B b72f62f8f97268773e3ff062beeae9bb934497612db7d0dba00bd8b0e3d310d773660a0d6bcdc7ec49f0d312d337519193f3978559eb810c2ba64c59c9eaf740 SHA512 4162ae17433eb0808ff62b96ff3f288326095320a1b8e928f43e0fc0620c6b6eefd6ca4a4f250119d031cf6468f5ecb96713c11dbac7bda66fcd5efd29af93a4
 EBUILD gtk2hs-buildtools-0.13.2.2.ebuild 966 BLAKE2B 4f8b0be8bbd1da5f3ff10ee33c67dff35dcff6ba2377dc6bcb31261501cd4b074292ec9ba39e1ef79ecee6115d4bdf9c16f36073efcb3290ecb024994fefa70b SHA512 6a8ab45a8b4e08d16af752924fcd0467d58b8ee8e316f61c4b3d9b1bb6b3a5f7d75bbd578b1e4da1c23aa778891496ca0ab701c4adf6be35d310d49886bf74d3
+EBUILD gtk2hs-buildtools-0.13.5.1.ebuild 1476 BLAKE2B e1a843354106aa59f97dd90dc2d237970088c8925222174619bbc186428063f3326b0490ad376c929949c075fef32251c27a634b98f4987a5ff49e20be6193ef SHA512 99a42485b7f29e35ad7eaf46511881bce40ce251ab7f5519763130df738b51581f1809fedd607a8ab43bc9949d8cc5dfdcc41f743a5287dafe4d5c4cafccec50
 MISC metadata.xml 838 BLAKE2B d807057f72ce471a31e5eda4e4c26d8c2e7a6e5c6a932dc577c293d5f52704ce64b055a2dc194fbce71d8028ee7d5dca05f863fa2519fc841f585400d05849de SHA512 81b67b9c4d461b291561a2ee3873c80c257fc0e3e8641724381567d378aafae21f8056b60b00d432a0db60f5795d6b7a78a74cce9e10722b809f46c6701e7feb
diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.5.1.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.5.1.ebuild
new file mode 100644
index 000000000000..1e71ee3e2c27
--- /dev/null
+++ b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.5.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile 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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="+closuresignals"
+
+RDEPEND=">=dev-haskell/cabal-1.24.0.0:=[profile?]
+	dev-haskell/fail:=[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
+"
+# These patches are available in -r1. Disabled here
+# due to incompatibility with <dev-haskell/cabal-3
+# PATCHES=("${FILESDIR}"/${PN}-0.13.1.0-ia64.patch
+# 		 "${FILESDIR}"/${PN}-0.13.5.1-p1-cabal-3.patch
+# 		 "${FILESDIR}"/${PN}-0.13.5.1-p2-cabal-3.patch
+# 		 "${FILESDIR}"/${PN}-0.13.5.1-p3-cabal-3.patch
+# 		 "${FILESDIR}"/${PN}-0.13.5.1-p4-cabal-3.patch
+# 		 "${FILESDIR}"/${PN}-0.13.5.1-p5-cabal-3.patch
+# 		 "${FILESDIR}"/${PN}-0.13.5.1-p6-cabal-3.patch
+# 		 "${FILESDIR}"/${PN}-0.13.5.1-p7-cabal-3.patch
+# 		 "${FILESDIR}"/${PN}-0.13.5.1-p8-cabal-3.patch
+# 		 "${FILESDIR}"/${PN}-0.13.5.1-p9-cabal-3.patch)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag closuresignals closuresignals)
+}
diff --git a/dev-haskell/gtk3/Manifest b/dev-haskell/gtk3/Manifest
index 81d69804e582..bd4a77749d1e 100644
--- a/dev-haskell/gtk3/Manifest
+++ b/dev-haskell/gtk3/Manifest
@@ -1,5 +1,7 @@
 DIST gtk3-0.13.7.tar.gz 673031 BLAKE2B 4a99b1c430cad1d940b9c30cbf4ab2bcddf64d2bdcc645b2ad37c86069a4817c677ccc3552007c9aeb41755125650cea19c70786dd4a64d348bf483bd08a3073 SHA512 c350ae55a7044684e6f2d94592decfcd01d3e96900a468cd417bad52713502c89c328f96cd4ff29647169a76287b8dada9654d46c4dc884c0dab0590ad57762e
 DIST gtk3-0.14.6.tar.gz 675439 BLAKE2B 7b5699db78f68e763ba972c2a82aa4044d2b97e60137443732b199afb2b611758130b9dcc8240da7492d0853c8bbdc88aa9e18884798eb1c33d7f6af7fbd9409 SHA512 d03930164fa117ebd6bcc79b79a9cfc0449c5ed0b3de6999f26ad63673a67a146f989245efa68b4e1484091689b350a5df95ed49bbbe9d4a30fbe418cbb37209
+DIST gtk3-0.14.9.tar.gz 676542 BLAKE2B d2aeec5fd59dfe71e6c62e6abf60370f12ca8d7a3d3716593151a2f7697e8b53bbf4e8c094df1a2162703422cfb390407c8a83b564fed78c16f94d3d07036122 SHA512 aaf2a257c74f5b0a569d0e61aef535e2f0c8158feb34bed523c7aff31cf155098f93d3a88ba49bea906ae669bf63fb0486f4c747a620c2199c2e7859486e7270
 EBUILD gtk3-0.13.7.ebuild 1700 BLAKE2B af599048a0a61e600d0b1236aac34398119c1db76dff5498d57b6a20d29c043de868adba87b6dc43ab3d256ee2f85cb4781dd4d64c5b38022cbae7627bb43136 SHA512 0c2b09a2cb16e11f9cad633b854048c5be46866a18be809fd51d9ec904305f9a43d5289c1a322764e713bad4959cbd20c8eaf19b8514956a145d9d70c9571b3c
 EBUILD gtk3-0.14.6.ebuild 1252 BLAKE2B ad7164ce92fb0993d4a0263830a36b338c5b25222a3885d0b7bd519e8ce43dcc2a597ac212d397ee93950db95039bc868252ce3fe151a27f34b242e12eb03a7a SHA512 e5ed9904d9969c990311a7e29ea365f847ad492a8f98cf95701c1109fa1792f661c888801984a33d2b063b40239bea70c64fd52c803aab1ec92f1008615a2d27
+EBUILD gtk3-0.14.9-r2.ebuild 1454 BLAKE2B 02880f9c4929ec216f84c352528bded41a6b0a0ecb5d0f7c20ec6ea3f7bc2fd5d76d00c0537de627d63d93b09789e520f31b120a59dba4f0362cbb53d00cf69d SHA512 b365f5583d7ea2790820c7774001fcd8250fc43b0e9b72a2aeee15fdbcf765759c8cd22e1f56e687bf77995421909601e703df579a860c333d2b5fd091006051
 MISC metadata.xml 684 BLAKE2B 73d54f823aeec358194a2890de13039ae184f4eb480ffa2b2c48891348b293330cad0e54bdc2ae4f1631017e5cddb4e7cce200c5835938b8cfaeb6aaf05891d6 SHA512 ea4adf337f95bf29283b9bf86c871e34f48e955fab90cafef7a8fa0804e4cdead514b54a7f3f0f6d8c10384d30285309545962fc059d78b36b357a985105c0fa
diff --git a/dev-haskell/gtk3/gtk3-0.14.9-r2.ebuild b/dev-haskell/gtk3/gtk3-0.14.9-r2.ebuild
new file mode 100644
index 000000000000..17c84fb68921
--- /dev/null
+++ b/dev-haskell/gtk3/gtk3-0.14.9-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.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="https://hackage.haskell.org/package/${P}/${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 <dev-haskell/cabal-3.1
+	>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'Cabal >= 1.24 && < 2.3' 'Cabal >= 1.24 && < 3.1'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag fmode-binary fmode-binary) \
+		$(cabal_flag gio have-gio)
+}
diff --git a/dev-haskell/happstack-server/Manifest b/dev-haskell/happstack-server/Manifest
index bffa33262435..efac4ffeb8a1 100644
--- a/dev-haskell/happstack-server/Manifest
+++ b/dev-haskell/happstack-server/Manifest
@@ -3,9 +3,11 @@ DIST happstack-server-7.3.9.tar.gz 79473 BLAKE2B d32a9882b8570b8871cd2b3e0060577
 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
+DIST happstack-server-7.5.3.tar.gz 81971 BLAKE2B 33a59e695bf1ec3944b6565cce05cb6b87c2ba3ca56e22fa9e29c7def4a7e561e7935e1fcb979db4a09beb5f58482ac293025970372c684af86b0884416a7f38 SHA512 61edd4474e1476d85dc3ab6e4675d544029bf088babac9615b1fc5d582be0af2326497e7a33b44cd5cd9a097b23b20f5817a3d500555f3ec70ef464f3c2a7591
 EBUILD happstack-server-7.1.7.1.ebuild 1751 BLAKE2B 104c05aa4debd9fbd6f34c9dbf6860bede76afc920ccc753cfcd0ff5460e74a1c9f341e83dbfc0ad529b9cfc372be08e5b153bd6578521adad6f887ea90390e5 SHA512 a92af1638ed1398fab158ecdc627784c4a928c42c267cdc856502a335b3b0158a4b75e8aa573fbe438b39fed8c7f29b543dcee7bfcc2871c9b44abdb0b480a93
 EBUILD happstack-server-7.3.9.ebuild 2142 BLAKE2B 8c429fb3f54b2a42f479137b9d61982bce660e3ae4eee85ba63e1a02c54a4d7953f5b090e6953d4808af0dfd79f4336bff79bb5202349cda42a5c75102697ce5 SHA512 abb4faef18b1d82d726e272d8c5e6c28807b5207ced91bdaee3d214a482c63da7cf89efb42ecb90874ff22aa1c5fec01a42c4617e16896b69f9bc3449935422e
 EBUILD happstack-server-7.4.5.ebuild 2314 BLAKE2B 156785ab7464710db13145f4483edeca159a90f06bac284481f232d6e17084d67f07250f7f36c08147a2e12175e873eb343c315ac2d653599c7ae6a15f23baa2 SHA512 23c21302e795daffd7f88c177086bd831afdb7004484b22974a0ef9b6e4d5f76ba147e808df95439ca4f8e18b550004b9b090d7d60ac901cf7a694671c7c26fa
 EBUILD happstack-server-7.4.6.1.ebuild 2314 BLAKE2B 8921b0b8b4882684661c4ee983d78f9e6f7d0c88f0f469450a2d216722ebbc5269b3f941459a4878fb4da3fae65ee22c7560e860a81b2016dbd99fb1839e9bd0 SHA512 bb3c9bdb9dcf2199a87f7d8159c696647ef1410651b682034b5ef8229f07558cd4e1d282687d904786a4a840921c82fd3b56c1245f26b92b6295c232745ea196
 EBUILD happstack-server-7.4.6.2.ebuild 2312 BLAKE2B 36da2ef9f5426a102233eebf605642ba8c8e59b5662a1843346c84047020d29987037e07971e5c34b676e136435969602ffd15322030365796e159b18d14a871 SHA512 d0847696d5a9ab34556a84b43bc53f5322bf1a4ecb0eb22cd3dc25779cdb040b4df19dab5bd4911a2c5358d19f54a18da42174cf11128fdaef980793da47d099
+EBUILD happstack-server-7.5.3.ebuild 2236 BLAKE2B 120280c6f8d71343692fb21594e88de4c039a2b7705a6b8d364e07be528002c05fec8fc11bc55d9c08834a2efb30164d6684c9e035c0432ef265f887ea07971a SHA512 0797b8ef8fdc203e8ec936690ed84de7e520904953adff47a750117c0db56cb477f97d22ab5aba160d0ed9c62ed016e7219565c18ec8081dca4c9c95792d48a6
 MISC metadata.xml 783 BLAKE2B 51a13d512979778ff2fbfdad3eaf90e5ec64aaf086aef3e7a65f4ad544e718b5d08e68505b3446ba3c3fcec76a00e957ea9d534c85ab2f31d1f02088391eb7c8 SHA512 c85819776184a2a11e2ee9f4217000cafcd1c8f357f8875829483aa5ca16796cac2ccb113a392dde6b1653eb1478498320f931551e48fb59468bdcccf5a2248c
diff --git a/dev-haskell/happstack-server/happstack-server-7.5.3.ebuild b/dev-haskell/happstack-server/happstack-server-7.5.3.ebuild
new file mode 100644
index 000000000000..70766b403fee
--- /dev/null
+++ b/dev-haskell/happstack-server/happstack-server-7.5.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.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="https://hackage.haskell.org/package/${P}/${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.10:=[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/semigroups-0.16:=[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/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[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.8.2:=
+	network-uri? ( >dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.9:=[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.18.1.3
+	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/happy/Manifest b/dev-haskell/happy/Manifest
index dce1eb9471f6..5e3dee0b50f2 100644
--- a/dev-haskell/happy/Manifest
+++ b/dev-haskell/happy/Manifest
@@ -1,6 +1,8 @@
 AUX happy-1.19.5-ghc-7.10.2.patch 940 BLAKE2B c3c87413be01ad73b33ee7cda3e95063c94dd901045491b3ec6a7b78a05447cc7f917c76c9f8497fa7887ec0315893566af3d0d13a0c6a5fff194b917695da65 SHA512 8866180fc18c7390132cef311b40b890f2d768296302f3a85cba2fcfc6abb523de6280dd6046da3fbc45915a7d866df5ec6725fe229c168482854d00cbe66d65
+DIST happy-1.19.12.tar.gz 183254 BLAKE2B 17b0d30f4aaf194a0e36c06bd6349665c704b5ab61dce16cae47f0ca6bfef0a0e2d4bbf3456f47cebf0f71f1a0b4a59ff6b581cb4ff76a26d82573eb0e7b056a SHA512 20f36b17adf7330852fd4c05335adbf31e6f19907b4ec247c85a40ee1f8496c6dc432055026696906b149cec7f982b88c9a2eeedf14a11d34b1f6f73272e5208
 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.12.ebuild 1256 BLAKE2B 3432cbe372f5507bf4d4e0fc434e7a1976fb95e0011f469090561c1e85bd3e80eb9c5169eb984a81400f6d821a032fe8d7b6322cede70485d9f8b3db181b02b2 SHA512 bb2564875a155722c2f69bbf0bbcfc91019596b6259bdbfa1c00ed73eca917fb257f50a1b7b2abdfd68a5c9a27df8e9c6a8b4ba56460cf5b3790b6f441fa4811
 EBUILD happy-1.19.4.ebuild 1393 BLAKE2B d56160986a56bd9cee2ad663d2e7d3d1199d9fb8649bd01ce18c96e7c29ebc3e211e015bb57b16bb0781eef2b7085a18c5e5da3586765901cd92bb46afe6a122 SHA512 35e6ee9ae442b25f165a6cbd8f8a074e894d6db8f172077154227c4553ef49348a294a02fbcf73aff3feb8c40e9ad0d44a35660b3cfcc108c6e0ccd54b5e32a0
-EBUILD happy-1.19.5.ebuild 1556 BLAKE2B 059d34aff1e7f4a0438563e044cd57a77aef0438b27101440ea8d485f0af9d713f1b7ba93bb76c4ce639089c89932d947b9aac1a1c22b3a6dcf32d9643f60cbd SHA512 6e8b121157a814c55270f4dadb17759ac15a3fe10d645791579fc2117027853886343c0f6716b2103e3eae1c485020a451e23761a2afe428fca446c9143aca6f
+EBUILD happy-1.19.5.ebuild 1549 BLAKE2B 707033e5205cfcb8a86deb23d483f4ca471fe360b258762e27b9024906f01c3e34188cb6bf1cc4a94cb0bb750cddbb3908989b24e69c946f74c2bb9e756593bd SHA512 3e6203b3e95cc16d1759c789d3048626622550aef9bc634e898ca9be8580e7047e924e91a90a8d77fd36e0b2119f8d58cf49422a90fa78745ee4b7a0d85e19c4
 MISC metadata.xml 330 BLAKE2B 12dc311da8b192ead3d26e96a70e56d8aaed9ca86162993d1277f5738c0929cd058cde3a47e72ea0e0bbf268bf404b88cf602738f8dd34f0bb95fbd66afdeb78 SHA512 505782103d2814ce34e9e6e7ad91cd466c3f6593e636f9e38eb70e5c89892c2231e24feb310ebd4a33af0d15cc0cc58bd083da6573f65a1604fdbc3dd9380889
diff --git a/dev-haskell/happy/happy-1.19.12.ebuild b/dev-haskell/happy/happy-1.19.12.ebuild
new file mode 100644
index 000000000000..cfeff40b81cd
--- /dev/null
+++ b/dev-haskell/happy/happy-1.19.12.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: +small_base
+
+CABAL_FEATURES="test-suite"
+inherit haskell-cabal autotools
+
+DESCRIPTION="Happy is a parser generator for Haskell"
+HOMEPAGE="https://www.haskell.org/happy/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-haskell/mtl-2.2.1:=
+	>=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 )
+"
+
+src_prepare() {
+	default
+
+	if use doc; then
+		cd doc || die
+		eautoconf
+	fi
+}
+
+src_configure() {
+	# '--with-happy=false' allows detecting circular
+	# depends even when 'happy' is installed in system
+	haskell-cabal_src_configure \
+		--with-happy=false\
+		--flag=small_base
+
+	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
+		docinto html
+		dodoc -r doc/happy/.
+		doman doc/happy.1
+	fi
+}
diff --git a/dev-haskell/happy/happy-1.19.5.ebuild b/dev-haskell/happy/happy-1.19.5.ebuild
index eeda02741f94..7f2455f1cbeb 100644
--- a/dev-haskell/happy/happy-1.19.5.ebuild
+++ b/dev-haskell/happy/happy-1.19.5.ebuild
@@ -60,7 +60,7 @@ src_compile() {
 
 src_test() {
 	# workaround https://github.com/haskell/cabal/issues/2398
-	emake -k -C tests all || die
+	emake -k -C tests all
 }
 
 src_install() {
diff --git a/dev-haskell/harp/Manifest b/dev-haskell/harp/Manifest
index 01a4afa4f746..7fa537821587 100644
--- a/dev-haskell/harp/Manifest
+++ b/dev-haskell/harp/Manifest
@@ -1,5 +1,7 @@
 DIST harp-0.4.1.tar.gz 2831 BLAKE2B 1f160a15ef8c94d01d77ec9d571d649f3acfd123c1375a2678259b5ffd74b69aa3839acae0b0ae1697cf03fa310d74137fb8bf51a2fb641f823960eaa5775895 SHA512 f0e185df070301aa57ed3f2be1d9eaad65920de36404b4db81172565e87ddf152714e24fa57ad7d8519e464d8e6287d3a0b23c9242d759f4538033f239f061a9
 DIST harp-0.4.2.tar.gz 2900 BLAKE2B e849a5efc3e9e7274e3890e2e5cce5266e6cf3e1acfe023619696754a3c108263c59a4ec5f1069b9459e0348e0bdd02fa6b9f3120bbc8a65b11b340b81004a42 SHA512 2af06f0ccc138ba781edce6040fd4a88cace808990dc01cce4832414e2b4e29930c3493b320bd5d9a150823a9dcdce3a74bda82a078ded8afcce76edbdac1c13
+DIST harp-0.4.3.2.tar.gz 2908 BLAKE2B 70ce7ab8d4ea89700412bf78cced290ae7d4a0b880f4814c2cdae57f64e8e5a8cd3684dd5a8cae19589a520514ee71b75697bd36cb93a03458c31da235ef919b SHA512 912e4a79eea4fa5ee1b989b2b073676874303aa68fdb91dda24e2e87b7445f1fc0db92bc01159021cdfe64a3875477985fcbe5cc6a9b698e6604da978c265020
 EBUILD harp-0.4.1.ebuild 563 BLAKE2B 912a271d5fb91ed02e69c76ea2475f8c79ea7d0c061c1275bd7ed11d6bd1a5928ecfa5d163fbfabe180fa04e387c8b423dbafaaa1091815be63213a648262d33 SHA512 1bc384f42049976f19aaecc03f47e1408e5b680c995c59d84864e92ace97f068a2169f222bc23545ba730d97dfb0f0ce42c3931dcf5e5a7c5dd55614c9cbb98f
 EBUILD harp-0.4.2.ebuild 567 BLAKE2B 5bc68768fb594e36866ec287a43eee561ac121b828db506a244370ebaefed6836be738dfbe3b38fbf09317538e318dce799db0215d61f4c71098e98241de60b6 SHA512 23c3da25b46e1a88d1518e36e0fe5b885da2e218b73c2f4e2ce6bfd279b6ed086c86f62c0971987814bcb3196e26a6617efe21bfdecf3f219701321a55c83eda
+EBUILD harp-0.4.3.2.ebuild 635 BLAKE2B f9a5cb35335dde13ad5eabff1bb8d67266765241e9519e20aee2d00a84bfa35f20af72fafa90ac5c5dcdd75ab250d2d00dea5b059611b14129c52d28e0c8106d SHA512 c2178095444f7c640674f1e2beefb44a62b656277c08f40d39ba816b50158d01490b5bbe1d0141457d3615f646e6081672219f8fa6ac94db7b8e5dd652e1c5b9
 MISC metadata.xml 791 BLAKE2B 222b9485281e5bbf2ebfa972f8b71c2e46b9aa269605d7d909645507debf6d633cafba0cb52723b14a3411e0e9b78a4c7d8f0f6b70681385b5a95a887e9b7198 SHA512 acb1e367a23883961e8c1a05d6903c8caafd3aa15cb33629325e5f07cd0a26f0655c112c4fe057a9fa9caee7f7f2b39c21d14331236166d20777e7dec440c6c6
diff --git a/dev-haskell/harp/harp-0.4.3.2.ebuild b/dev-haskell/harp/harp-0.4.3.2.ebuild
new file mode 100644
index 000000000000..75937d0ed8e3
--- /dev/null
+++ b/dev-haskell/harp/harp-0.4.3.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${P}/${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
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base < 4.13' 'base'
+}
diff --git a/dev-haskell/hashable-time/Manifest b/dev-haskell/hashable-time/Manifest
index 334e530dbb87..bb65b1475b77 100644
--- a/dev-haskell/hashable-time/Manifest
+++ b/dev-haskell/hashable-time/Manifest
@@ -1,3 +1,5 @@
+DIST hashable-time-0.2.0.2.tar.gz 2180 BLAKE2B 194e3d4e9bcf7c9b0d8a97a210bebee91e0f22ccf76e8726b563baa2380751447a655b12eadb63a29f191e093925ebe9bf9c31c29ae01077f6e9e287f61847ad SHA512 38ade3c808072cc1488e0f68d054891576c781d33f7151721dae9f994833723b7b30e92cc77750e91929ce9cd47753a8b1d8157845d7c972f1bdbd44b3094c0a
 DIST hashable-time-0.2.tar.gz 2111 BLAKE2B cf4dec1e99e2d76a2137b121cfdc109cb527d7733f893b5d74530bfac8708aa1246168c6439b2da157e15384fdce26f203070fe3151b5bb65676c1a08604a3be SHA512 0a05707019f2cc19c26a4dac955c5f31f334589074b7ecff15ae60654dea1376205b897d674fa4b1369dec62ca4f93a061250baabccf30f877ea984495df1211
+EBUILD hashable-time-0.2.0.2.ebuild 714 BLAKE2B 34e17e579ac3e6c3fe935a53ae2d673e4995fe77da21c628bf75607698d3baef969542ed8799608f598d54140789a6fabec68dc0a559a4cd761b8149bfd30ca7 SHA512 ba7618a6b1a1d64456b0be827e3eb36e20ad8262e10c4c533fdf8d3a8c15a68d29adb0536c978e163375c24d5b4a4561084c33e8c263d3d903ffdfe38a219e8a
 EBUILD hashable-time-0.2.ebuild 807 BLAKE2B 97ea9699b4fa7b6f3f6d83905a9d133c96a4fd78f94e290878c42f6d90b5fe809167c93ae62623b0175fd8a982001393cdc1592dc9d19a631b7ca6753823601c SHA512 365094e2a22f8c45420fff341af5dd183e725e7ef01fc197d227a96e5e18c9f639f31f13b020db029560f10ce9f9a84b2cca09269bad77e28b70291fbe72b370
 MISC metadata.xml 332 BLAKE2B 037093d6fb99f66788bf24fc26ec14eddea9e7451975a90bfe3ac662d3de01fe4a2e253a3651485e103709104358237f03cccc91d582229847fb58c537cec4bc SHA512 84562d5e5861a05e4920fdab8511b6d0be31ff1415daf7233141d961812c9e919f2a1ea51ccbd2f68a8cddfdcd74008c427a44460fddbb957c5165af3134bc46
diff --git a/dev-haskell/hashable-time/hashable-time-0.2.0.2.ebuild b/dev-haskell/hashable-time/hashable-time-0.2.0.2.ebuild
new file mode 100644
index 000000000000..e539e44b17b7
--- /dev/null
+++ b/dev-haskell/hashable-time/hashable-time-0.2.0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.6.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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/hashable-1.2.3.3:=[profile?] <=dev-haskell/hashable-1.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
+"
diff --git a/dev-haskell/hashable/Manifest b/dev-haskell/hashable/Manifest
index 7aca31a39ff1..83e32638c2d6 100644
--- a/dev-haskell/hashable/Manifest
+++ b/dev-haskell/hashable/Manifest
@@ -1,5 +1,7 @@
 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
+DIST hashable-1.2.7.0.tar.gz 30182 BLAKE2B 7dee78e531fb396c51531f7b239f45a316bad3494590684b13814894a606ab8ddf7ef85a2027f26eeddad0a38f2c06a8a16d03b1b67ce009f9e8aed6cc872232 SHA512 41accac8fa38ab5c243caa058deaf31644d4df670520010d0d593e84fd42970f3fe2d4e945a31ac5491050467e843c7bdb299283a4c6d1446dfcbc2dbc58eec7
 EBUILD hashable-1.2.1.0.ebuild 1145 BLAKE2B edb3dbd04a50fc51a95cff908e446ac47e20f2f82e168701803843ce90d852598d5beee080e5d1cdb9ff172dbce046cca604d05e992a22d8d812337214012724 SHA512 d2fa0757bbd65f0d0b0cd48877a6fbee33639a5816f625a0bb8ad89dffd7c1c8584e82c43d9a7e456b460366f75438319a189da2d9641edf00748257c59b794d
 EBUILD hashable-1.2.4.0.ebuild 1156 BLAKE2B 1da072b678a7776d1a27d26bb3387fc6d3807e0a1dfe836b9d49f97428828602e8928f14a82147c2e3dae3ced77420b8ee6ca7963eb1b2e7d59f0cfa73d2029f SHA512 d4fb41045bf482803dac935572cb32cbd14a483d46285e0f95dd6fd81c2725854533ebe73f0229bdaba43d9187d513893226e667cbd787d10cd7173e25b7d820
+EBUILD hashable-1.2.7.0.ebuild 1269 BLAKE2B 940153a9b025c97902262d43d64c6f6f2b31213c723f3d81f585c14991a3f29a69fa1b835458caf435fc275f93ef7509d09eca2f0b2adde8f88574b9e52b6582 SHA512 9f5941195416654882ac12ef0f542d63c843f5f9ceec77dc32acbf2b546cefc7f6f7d0e2da18873b715ced507d850847ed866b14f4c030b0ab99a7e3333791b8
 MISC metadata.xml 619 BLAKE2B 0c13ff65442edc8bf2e0234b9eb861f11ed9e678062aa2823ee52c9f6be5e0ae671efef678af09481e3fceb07107b4d8c366f1e7f4d5ec873dbad5a03a5bda86 SHA512 d87a8b83ce7d1ffe5024aef8d884b8c6dcd1a01b8c8ae255ddc42848a6f37130853b13bd9a21d8dce2352c6fbf4406fc8286ebaa25d9986764fc668ddb7be050
diff --git a/dev-haskell/hashable/hashable-1.2.7.0.ebuild b/dev-haskell/hashable/hashable-1.2.7.0.ebuild
new file mode 100644
index 000000000000..6ccc1e3185a3
--- /dev/null
+++ b/dev-haskell/hashable/hashable-1.2.7.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5.9999
+#hackport: flags: sse41:cpu_flags_x86_sse4_1,sse2:cpu_flags_x86_sse2,integer-gmp:gmp
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop test-suite: circular depend
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="A class for types that can be converted to a hash value"
+HOMEPAGE="https://github.com/tibbe/hashable"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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 examples +gmp"
+
+RESTRICT=test # circular deps: hashable[test]->quickcheck->semigroups->hashable
+
+RDEPEND=">=dev-haskell/text-0.11.0.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >= 4.4 && < 4.12' 'base >= 4.4'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag examples examples) \
+		$(cabal_flag gmp integer-gmp) \
+		$(cabal_flag cpu_flags_x86_sse2 sse2) \
+		$(cabal_flag cpu_flags_x86_sse4_1 sse41)
+}
diff --git a/dev-haskell/hashed-storage/Manifest b/dev-haskell/hashed-storage/Manifest
index 8a80065df778..4a1ca10027f5 100644
--- a/dev-haskell/hashed-storage/Manifest
+++ b/dev-haskell/hashed-storage/Manifest
@@ -1,5 +1,5 @@
 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 1498 BLAKE2B 85f707606c850c687adf3c4ed9b7b84241db2dff00c73f58e9f0ea0b6cbf75c2ea7136ddb7d6e32dd6f9ae085d75b10f721beffffc3374c0d65e803573d17745 SHA512 0bd8e637bcb5665f661ed224823f548180605fe1948aad89ac88c8c393c64a13d443a327275109f2edbd1c27eeea53460b74864385cfceaf9f96f8c5f13518a9
+EBUILD hashed-storage-0.5.11.ebuild 1525 BLAKE2B 8027d79488f37b85c8bbc21bd65941df338d98cab98da1f1f996d1cc7e19260d883a91389fbdb5f5cfd81e4672f444ca32f54eb910d117fd1bc9e45e87b8f3eb SHA512 b51013bc76fcb03831f48305c5db39820da85e94be2aeae2aaf05ae4800a08b12f05210be08217a46bf8d3cdaab29e3aab8e5c574a461a7c6eac9b4ccda58ada
 MISC metadata.xml 828 BLAKE2B 533f7903dbedce03eb8a87c0c9cf2fa6303a8d4f35e4e6d24f7f76b365ee2f87536185673c225d489bb868501e3baf175b52273adc549313f8e0ade62ec52f09 SHA512 772db545db082c105a75a491cc735c9f5fff87816f48c6b9433926a8b23431e2dfc8cf2e99c27ce4989e0b7da505a2281a8bc34f519623ab6e15f3636348bd0e
diff --git a/dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild b/dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild
index c8ca012d11f8..bc92121a9bd4 100644
--- a/dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild
+++ b/dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos"
 IUSE="diff hpc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-haskell/binary:=[profile?]
 	dev-haskell/dataenc:=[profile?]
diff --git a/dev-haskell/haskell-lexer/Manifest b/dev-haskell/haskell-lexer/Manifest
index bbf4a4fc3a84..328394d5d602 100644
--- a/dev-haskell/haskell-lexer/Manifest
+++ b/dev-haskell/haskell-lexer/Manifest
@@ -1,5 +1,7 @@
 DIST haskell-lexer-1.0.1.tar.gz 12380 BLAKE2B 807228188c28ea08cee15bff092bd7f9fd3ec21deaf5701f84ac0c17f33936e37be5294b41459d69bc70b6364240f615c7c13e5da4950da3016e48765f3f0ff3 SHA512 591aa5a1ffcd984127cd730a0ebc01129fa0a6486ca16b03c9462e2123f1ce4d10063b7bb3debc6d2a6b8ba51692b0e34d694adeca9dad47707ecbabacfb4740
+DIST haskell-lexer-1.0.2.tar.gz 12202 BLAKE2B d4171347eac2f9ea58368dfa76e6e1a82fbaba8c9cd0ada13497579e3e9dff25675d461cbde3fac2c90a0f9d9733a3c6bd3a49797f9cc5f6fbb1d14d2b593643 SHA512 7f5942bf159936488894649e4b5cd7b33b6cf018685299b9cfc2f807ba1b08061deae287e613c88345842183bfb6f177b8538d2dc01badb0c94fc259f110255f
 DIST haskell-lexer-1.0.tar.gz 12455 BLAKE2B adb8f62934e3ac70361ed7a1b3f5def75c40f4582e08b505d161d163d88b0e982e53a76a47638d68111e6383aede1b05ba5a83fdf4271ea118d0d7119dbaf586 SHA512 30cfd69a6c102d8baa3e14a0497e00feb6cb6fb93777ec45b8ad3ff39bd1942ecbb8653f72181a5a00b60dbd22c5fc33061869ad86063328a44ef1893dc1f827
 EBUILD haskell-lexer-1.0-r1.ebuild 542 BLAKE2B a2b0a8d832154f91c2e200043045e66801a20f60ba650c24ab27aa0be0ee8e04754257e0a2d6ae6fab82e2947a1a2dcf4deb5095ce052dbede916ade44d71180 SHA512 61f468cb1be77786f91c220df719073011d1913ec55ed5e2efd292f61a1c6f49cca5c6a5d848fec223e4a7addd932a1164a82e737fdc1c17c3ef2df121f651b5
 EBUILD haskell-lexer-1.0.1.ebuild 538 BLAKE2B 830ae9f2af5444943f3394fa39cafc1f9e138b37ae444ff20df6af4c23463941b27011929916f6a364257e8f27a4079015602356d1ef20e332d80d3273117107 SHA512 cbaf7e96d0d29e5d571b29442958ffd37c05837ba67996f753e8ef2e7179fe8dc3e65f5761dadbb447ca40fa5d694907042a2597b41c2c7c0e44a6d5ad9101b7
+EBUILD haskell-lexer-1.0.2.ebuild 532 BLAKE2B 8982ab92c2ced21f21982694647de1aee2edcd35a7b35650ddb352d9493c3047ff728e9ef9d6857eb5aa176c22599b69117e1bccd92caca4f51679ced6c30b70 SHA512 5d9a2acca362d8a8db0d54fe4302c497dbd6c6c6da4b6332f4ff49e7237230ea4c34703e1a933146dfdc3573082da24f129b5a600a29148ee88a5f8f269df5db
 MISC metadata.xml 326 BLAKE2B 0622a30d9c3f0abf6c292bab23595e135f254994def278d9253aca27bbfaeb8b26e2fdb5bf5bdfbeca4e06dd5e746bf45a8ead7345fea1e44d71575bfa0536a1 SHA512 b37ef7ed33ca35fb56e2662d3a7c7023ea480891f232261e1bccfbf3c1f6c4f2791d815d618b2736fc95a00cf4f052b3d7983d442868fe31e92b7bdb453119c6
diff --git a/dev-haskell/haskell-lexer/haskell-lexer-1.0.2.ebuild b/dev-haskell/haskell-lexer/haskell-lexer-1.0.2.ebuild
new file mode 100644
index 000000000000..d4c2c7acfd7f
--- /dev/null
+++ b/dev-haskell/haskell-lexer/haskell-lexer-1.0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A fully compliant Haskell 98 lexer"
+HOMEPAGE="https://github.com/yav/haskell-lexer"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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/haskell-src/Manifest b/dev-haskell/haskell-src/Manifest
index 1a3c93f8dd04..105791547aba 100644
--- a/dev-haskell/haskell-src/Manifest
+++ b/dev-haskell/haskell-src/Manifest
@@ -1,5 +1,8 @@
+AUX haskell-src-1.0.3.0-ghc-8.8.patch 1204 BLAKE2B 4435acd543148e120c39c94db4678bd0f4bb5ddb8e1c486a652e55bbe72ae72a0a994e4e5b841d6c19b4620acf281c5c0e044a708109eebf0ff7ed73344d9cd7 SHA512 d70c9a9e8a6066c834e634e877b6644b6d4ad0c6dee30b1f1d828ccdb81efd7860e93f7503dc6df12684996c7906dfb4d4c274e6a8f3e8f588d030bd41004784
 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
+DIST haskell-src-1.0.3.0.tar.gz 29863 BLAKE2B a75a52f6df1da50a8509db495a9dde56c1b0edf4b0934deb24822940dc7a0a1e252994a55342175e8e08894aa86c540b5cb8437c190d5e2aeeb19f62eb43b602 SHA512 6426f1602b2e9165c44efc4d10cdc8bdbc0b4291b7255d8ed223f1e5f474f6c41830cdd39af154290d2e972f9699269a67279baaf63f0e4c4321c96b37f0f5a5
 EBUILD haskell-src-1.0.1.6.ebuild 606 BLAKE2B 2c5a25008d1b3fd0689fb467bbd1ceb261e290ef361def3d22b123ee7bf48f367b49d1333ed331de7acdbf9e9b7fd6bf9ffdd362d7b93cc072b785d76ba1b1c7 SHA512 f5748f8610edcd6bcf6f5a6ccb570dbced93ff0510138e0654e4d0d5f333ce411809ca7e785a30ceedeb7ae9c8ba6b45df67b8f2b3d1912b409f23e44837199a
 EBUILD haskell-src-1.0.2.0.ebuild 627 BLAKE2B f4ccde43fac21b2906a8f97e5ff54fd56920ba8954a8e54c8141b5a464dbb29893d73d97466e9b278344c2606e4b5dfd0cee95be279eb859aa241493384e5a74 SHA512 547f0f807f4f0670201394b8ab49bf9783150d76e4c4a5fa80e9895c3703b8094c6f99025a92673ce5330ece14d7f4a6c7f594b44c6ee83b7690be50a79cb162
+EBUILD haskell-src-1.0.3.0.ebuild 859 BLAKE2B 52d37d26bf082c844e9a3ad6c5d394f1e913cca32bd612cde5e3a70e8c64a5bd5ac83b3a29f6ed2565e7498d52b8a9a280803ee1c0e5c0f8180d408e2d0ba37e SHA512 ccc7f6d0220ca74585cce8d8614f44fe7b3ef4ec7beb568e8093ac974cd3f15ffe03d90589ebe026087215aba37a1101a533af4336893540792052478894783e
 MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/haskell-src/files/haskell-src-1.0.3.0-ghc-8.8.patch b/dev-haskell/haskell-src/files/haskell-src-1.0.3.0-ghc-8.8.patch
new file mode 100644
index 000000000000..84342b0d6847
--- /dev/null
+++ b/dev-haskell/haskell-src/files/haskell-src-1.0.3.0-ghc-8.8.patch
@@ -0,0 +1,39 @@
+commit bd0a8199252f4cd7f5d93ee862a919646f85a06f
+Author: Ollie Charles <ollie@ocharles.org.uk>
+Date:   Wed Sep 18 12:36:15 2019 +0100
+
+    Build with GHC 8.8
+
+diff --git a/Language/Haskell/ParseMonad.hs b/Language/Haskell/ParseMonad.hs
+index 1ed9b7a..f9bea5e 100644
+--- a/Language/Haskell/ParseMonad.hs
++++ b/Language/Haskell/ParseMonad.hs
+@@ -12,6 +12,8 @@
+ --
+ -----------------------------------------------------------------------------
+ 
++{-# LANGUAGE CPP #-}
++
+ module Language.Haskell.ParseMonad(
+                 -- * Parsing
+                 P, ParseResult(..), atSrcLoc, LexContext(..),
+@@ -134,7 +136,9 @@ instance Monad P where
+                 case m i x y l s mode of
+                     Failed loc msg -> Failed loc msg
+                     Ok s' a        -> runP (k a) i x y l s' mode
++#if !(MIN_VERSION_base(4,13,0))
+         fail = Fail.fail
++#endif
+ 
+ -- | @since 1.0.3.0
+ instance Fail.MonadFail P where
+@@ -191,7 +195,9 @@ instance Monad (Lex r) where
+         return = pure
+         Lex v >>= f = Lex $ \k -> v (\a -> runL (f a) k)
+         (>>) = (*>)
++#if !(MIN_VERSION_base(4,13,0))
+         fail = Fail.fail
++#endif
+ 
+ -- | @since 1.0.3.0
+ instance Fail.MonadFail (Lex r) where
diff --git a/dev-haskell/haskell-src/haskell-src-1.0.3.0.ebuild b/dev-haskell/haskell-src/haskell-src-1.0.3.0.ebuild
new file mode 100644
index 000000000000..430a13692d3a
--- /dev/null
+++ b/dev-haskell/haskell-src/haskell-src-1.0.3.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.5.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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	dev-haskell/happy
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.3.0-ghc-8.8.patch )
diff --git a/dev-haskell/hcodecs/Manifest b/dev-haskell/hcodecs/Manifest
index 477ac9cbe759..7fbb9b9064de 100644
--- a/dev-haskell/hcodecs/Manifest
+++ b/dev-haskell/hcodecs/Manifest
@@ -1,3 +1,5 @@
+DIST HCodecs-0.5.1.tar.gz 24209 BLAKE2B f466bff90fafd4ecc26d21eee26749ef5fc92d97849eea5a5aa88b0b2882f6b9b575bc38ca599d2c33bd9a2b9ec839577b12b42d665cea7eab239e65eb64576e SHA512 470d3fbbb096b0a5e40e9c529d0b7c738ec905237bd43acec9c8b5676e0e214a864684e09614af16678a48883f670cc52e691fe93e3db14815028408cd96b3a0
 DIST HCodecs-0.5.tar.gz 24232 BLAKE2B 0af06721ba03658c421fc3ec66370736fc439bce403307148174363179d08586a93fbde6bb957c68909cc0e876c93b828a715b9fdb872786ca533947a630d02b SHA512 40ee73995c06b34b799f1e8bd310faadc6ab267735313bdb62c0fb7ea95c13e3b443fc230cd529eb5f8ce02685d0506c80bcab3e802f2c407ef7584f6abdbe1d
+EBUILD hcodecs-0.5.1.ebuild 825 BLAKE2B 5e23a5e01ee80067e42c7e2b7a1c8e18bc41547804b04818fe67d5c1c03ae48362129b3fb076ab92bf47bfb16786f83951cc58207bd65aefef7e91d237e0f94f SHA512 3044d26eed5e07c2d260d90261d91a081e0b1d10819e86a9d8459d5b02bb409097c5b07d31fc1fd8f5b731c17aa614e363ecb9c66bc7906dd98220a1238e0c4f
 EBUILD hcodecs-0.5.ebuild 770 BLAKE2B e2fb57ebb6c82cba322d362eff777a1ff4a98aed007835f94a7034fa44d647913b8c6e22d70aec8f9f27b43b700578ea44e8e590c48a0f7047cfdf867c480970 SHA512 2dbc62c8a239a84d00fe84769bde9798996206e57bbd2ae56db6ee679620372fdcf00f3972e35b99e95b6c6c43973b95bd9675f402d4b7ee2bbd966f6a3bcff9
 MISC metadata.xml 712 BLAKE2B e462f9070ae0f8484125a29c6a0f18954eac0d4079d115c69eae6203d0d72daef968e636f195e3e871535cff1b610a222a271cf6aecd250ea3ab77bb90df29ae SHA512 f5043f2281f63be8f6293f1accb48bff651c342a879f6ed722ef3d2a2fdbf95709ca7d36d44eb52ff0658dd34d7952b22e8dd94f0e19dd31fde013d3793b5e31
diff --git a/dev-haskell/hcodecs/hcodecs-0.5.1.ebuild b/dev-haskell/hcodecs/hcodecs-0.5.1.ebuild
new file mode 100644
index 000000000000..87755879d76f
--- /dev/null
+++ b/dev-haskell/hcodecs/hcodecs-0.5.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.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="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # QC finds counterexamples
+
+RDEPEND=">=dev-haskell/quickcheck-2.0:2=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/semigroups:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hdbc-postgresql/Manifest b/dev-haskell/hdbc-postgresql/Manifest
index 6d0b8716bbee..da8722905c2c 100644
--- a/dev-haskell/hdbc-postgresql/Manifest
+++ b/dev-haskell/hdbc-postgresql/Manifest
@@ -1,5 +1,7 @@
 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
+DIST HDBC-postgresql-2.3.2.7.tar.gz 25606 BLAKE2B 0991686424f5912258fd1a9bdd40ef84d04a069a2ba14ce93678cce8f8fc1a73a10ed4c9fdf31a372e52a9833007e6469bcb9632d3f80022f240a3bac8aaca28 SHA512 0e4b27d5c18335e47b9782adcb09702654d9f8d04053110576a8a7ce68dc90810e35977886e2cbde0d4ef337aad5b36a4217dbfe07e1f64753f0cc34892d006e
 EBUILD hdbc-postgresql-2.3.2.3.ebuild 1555 BLAKE2B dd1648bc5c2109049fd152049a3ce1fd9138edec4cc2c26e50ebb8d21bbf9859d235c7d419038d6bad74e5c36016919606d2b4f01df8a55c1818253211723575 SHA512 9f438163a36a2781c01363413f99004a39234d847bce6ef9c8c8c7b24bbaf6f141e7b57096e341ef99a78b7a721ec96a5800b77d0d4093f55d89ad71e8d10f07
 EBUILD hdbc-postgresql-2.3.2.4-r1.ebuild 975 BLAKE2B f99142ad75069d4ec2f3c2484e19a780725e127280a73281b4a23692406301d368edd57afdceeb2d4f02c97c241959b50777134767589ebb67e3fbf270220167 SHA512 a2ee6c6592e8bb08e2dabf2ca6a5e2e5c15b0c78e9636d9ec76345096e6f720db97107f7e452d7e12ed223927bc92ec4264d58f1bb3c4d04cce5bbcaee377acd
+EBUILD hdbc-postgresql-2.3.2.7.ebuild 998 BLAKE2B 8b5d956ed14830239fddc0f84058a6e3ce66790ed73a17e731897e5de2310305392fe994d061b8eed8ba325da87d9f4617204b3b87d71ed35bc12942439b2ffb SHA512 2a987bbe708965158d40e33e405ec61e6a23cde4d08b1b9d75a8d0264ff9a4ecbb1b2a438441544736a927ffbc72d5196bdb269582185a90fbb2c06bc314a507
 MISC metadata.xml 312 BLAKE2B 31b0d561388d9aa98ec655f39ec34ae2feec6f3c4083e0bf49a058b54552ef1f06e65d472f7d5a3a6f343a53b83902a00383bfeb1a2e86d34286a5c19858341c SHA512 334d957cf43df9cde23341a942662697f9cc1cf568956d6e01ac8cb8bee488e37719a48f87dd6d6b30478742e4023fd7af104d6f7bfd50aa57efb66d9e9f5a88
diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.7.ebuild b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.7.ebuild
new file mode 100644
index 000000000000..2942d5b03486
--- /dev/null
+++ b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${MY_P}/${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 <dev-haskell/cabal-3.1
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=splitbase
+}
diff --git a/dev-haskell/hdbc/Manifest b/dev-haskell/hdbc/Manifest
index b3c95ced4551..835c6032e355 100644
--- a/dev-haskell/hdbc/Manifest
+++ b/dev-haskell/hdbc/Manifest
@@ -1,5 +1,7 @@
 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 1539 BLAKE2B efaf30808c582c2e93ed96a61adbb38bd474a658127e7d3babec959fc8d997c552b62dee582a993290d5e76274673cbe56b261d12ca7be443f5a32fba2c56ec4 SHA512 66ea84ff96d5d91595c6eabce7efd625c7d907bdd91033bef2b60b354961882f8c3da92ba8959255832f9b7c70023510aee1fab60554507bebf4fee63117e291
+DIST HDBC-2.4.0.3.tar.gz 23489 BLAKE2B 23de627666bc4a03c5f3ec93607641c539c1652a4fa9b798dbfd1f9c09ebcffc562bda88e45a522e38753177d69ee0585c9536ab6b6c353747373b751ead7f2a SHA512 394a74e69ff854e657f66f1fe25ff4d2de33bf4410d560454ec7a2cd3e383586acc34eb694a7d1d70005871240417ee32d4163af9e33978921bfbcfcfe23fe43
+EBUILD hdbc-2.3.1.2.ebuild 1566 BLAKE2B 8cebe14fce70c90aa1cf30ab495f6c2a1a956b4e4934fbf661a7076f94ec14edc78beec594592b98822eea08ec1231dafaaabbc55f61b4edc9ee9b50d9b1ddfb SHA512 faa5efa3f6edb001d36d6fb2a405b1936196f0ae131b03b211ffd3632c6d2b3e12dd3a94db03e1657b3e27a66416654c8a5510726c98f4a434129bd673c222d6
 EBUILD hdbc-2.4.0.1.ebuild 1419 BLAKE2B 083a67cdfd0d1327de84c876581741a3e3aa80f29fec2f395fc9019b99480a205f20c49bd1a5296401f7f8367f3110d6860c4fcf25bac762f1b7d513db61de0d SHA512 d632f8f3f27cdf2eb6114671756bd3901ba18aa65651a2cc3d0940672b6eb94dd0f9642b5ab7020f3711e0e7e765ce0a701ae34e5d2b0084745b562f8edd89ba
+EBUILD hdbc-2.4.0.3.ebuild 1444 BLAKE2B 3704afdf7b1794a674d3833c591e9e6c321073ad12a821a37dfe4d2389956f1ca40163340fa9f64583a8b66aa53877477b095a46e446441f6accba883c27e2f0 SHA512 51ed77b4db222948d6f9c4a07ebf26e09c2ee6c7d438ceafa4c9fa3a671df2a58d1cedfc2456eca5457f2821e6e865e0796a4d65bbd02beaead0fdfb75162d6e
 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
index 21bf97f587fb..c346de331f61 100644
--- a/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild
+++ b/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild
@@ -19,6 +19,7 @@ LICENSE="BSD"
 SLOT="2/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="mysql odbc postgres sqlite test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-haskell/convertible-1.0.10.0:=[profile?] <dev-haskell/convertible-1.1.0.0:=[profile?]
 		dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
new file mode 100644
index 000000000000..fb05e030b9da
--- /dev/null
+++ b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+#hackport: flags: buildtests:test
+
+CABAL_FEATURES="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="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="test" # Requires dev-haskell/testpack (deprecated), and this is a problem.
+
+RDEPEND=">=dev-haskell/convertible-1.1.0.0:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/old-locale:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	test? ( dev-haskell/hunit:=[profile?]
+		>=dev-haskell/quickcheck-2.0:2=[profile?]
+		>=dev-haskell/testpack-2.0:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+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/highlighting-kate/Manifest b/dev-haskell/highlighting-kate/Manifest
index e8d0b8562deb..ebfad965b561 100644
--- a/dev-haskell/highlighting-kate/Manifest
+++ b/dev-haskell/highlighting-kate/Manifest
@@ -3,11 +3,13 @@ DIST highlighting-kate-0.5.5.tar.gz 668017 BLAKE2B 7c57c27495aab3125325a35b38499
 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.4.tar.gz 913575 BLAKE2B d38ec3618e6703dddd5e6f568942d72749e93b56ea92bf64eabf3159c2d1b8b17f5607bcb0acda6fbe7918bf4a785207a422d74db7d3e392de3fb3b8a5924c62 SHA512 19b0c81f2465c499f3fed6a7124382ee01820bcd2f4073a374b92ae3f7e5ab5f247d8d676183e0eda2c8bb7edffde3561e19bb8a395c230658c93146e8f0d544
 DIST highlighting-kate-0.6.tar.gz 922847 BLAKE2B b523ba1ef469845bcd8d45994e40552ff672cf701bca3be63cb9c98d46b3c867d464f7f2a421102cf91ce3e483527b9d892194eb43aeaed97bbcc4dfda8891e5 SHA512 2042e22299735e49e45cb34f2807f883da91c98ca3fd37cd1698f5d1cfea49df79cfb8da6ac9664aba0629c5500e6cd9e9c812d897f59b9bd75b2a5cd5c12933
 EBUILD highlighting-kate-0.5.14.ebuild 1077 BLAKE2B 12e75c5b303c7cf98b7f1617d4d189c5eaaca79885842522e384958c04fb9b0fc8e98850d9dd45b54a185748c4b5b539bc86f552833f5dac9e7521ff704e4aff SHA512 af566f62a571a42f536e61d0105cfc9dc8a23ebf80dc5e4f3ccf054478050a2c91ca1ef80352395a49873e6a7503d86547592478dfc549f6db393b2fa15e2683
 EBUILD highlighting-kate-0.5.5.ebuild 954 BLAKE2B 4e54c8bea2e79705547d71c500b8c67552ac39e1e67d62da762b405876f145432f7eb6769805c19553910098a7d80b453438bd7d0e7d9cdbd6c0d6144264e79d SHA512 9b138bec7c13c19605fe425b11e0a346d8dfa7ef29e7f306297939c0654a8fce43e7b7bb6ab45a527a7723fd4ec09afa6224c9c77162cb488d1f70b620ad1600
 EBUILD highlighting-kate-0.6.1.ebuild 1077 BLAKE2B d1c9556a89792e3d2f744fb9fd0de6f58ed923e0a1b98d445e644cd3462aaf5bad9324c94ea9157966b0d823e73d58fef04f6724284472ad0ad155a8ebaca942 SHA512 e2abb668c9d1cec2c696870904d61e8663cbe5fb9aae9f81b61534d47ebef0b8d1d9e973156d6b55db5f2abc38dc3b36629f6ef81819ee8831d1a831d1c0e0ef
 EBUILD highlighting-kate-0.6.2.ebuild 1077 BLAKE2B 5684580c369d754783cfbd1d0eec4d9fa1740329baa1540e73c792e788a498f0c0c5d676024f7d14007f4a1ad2ff160a861aad76402f501de93dd8ca0655b7f3 SHA512 de64362d0960cf381fdadd8765a3dc756fe70edc89df021ff4714fdccf89b4eef234802d50864707ac90f247ab75ee0668800c3482e082b465b92d73914859b8
 EBUILD highlighting-kate-0.6.3.ebuild 1071 BLAKE2B fc15c282f00f33c4c7e018928aa4d81918945a9600e2e40f4300435e7a297cbad4d9de21feafaa9d85efa417b4711ef43ae4dbbd218540f3e543aec8b028d0d6 SHA512 6241b488e9493452da19c2d3a250c58c0f733aff180917169dd6bc3e0a8705aa9977765686d0cce882116eff2457d4b2d946bc48bc8545ac0f9c1b5863258c39
+EBUILD highlighting-kate-0.6.4.ebuild 1074 BLAKE2B 94c2ff6ff7a092eb9ceb4e994c55bd5edc9369391cba4f924087833eb6f000f6c0b09ad7b5407ec5eefe3f56086e444a3bba97479d1ab39919bd454e21f80633 SHA512 009f9d235693c6666b23061ef38ba0e6c3dcc66544191daae28c1227c248b42565b9692bae5904c0b116aa5922c22ba99bd47b3cfede89fd47dc1a305d13adfa
 EBUILD highlighting-kate-0.6.ebuild 1075 BLAKE2B e8796ada8bca0d99734bd2b0657f5db4267d31a69f730dc000c0f377967eb68383bf895c8e5cd14cc4d8ed7bec4ddebe8df8ab944d5e09795f3847120286cf52 SHA512 566d1f2a93575b164362a8b89636e84d81bfa1285dccd2af6533dceaa245c6ad5f7aad3e60f3bef228e767d80840b39e13b1d1e1c0e527f7008cac7e265697e3
 MISC metadata.xml 948 BLAKE2B 9524a77a83d911547f79794d84651b82f8bb96b988de701504183dd89258b3590c0ec1159bee2b1227f146c11918835cc96eedb2c4e6ab2068d702d40b850af0 SHA512 6f3c1d7ba5507213d394caeb2c535c9249a18cc40c29100b3b5fba7a25ad372f8447d4da47596f5ced0dcc231297e44f0f67aadcc05ab3ae2135e54c5aee0cb3
diff --git a/dev-haskell/highlighting-kate/highlighting-kate-0.6.4.ebuild b/dev-haskell/highlighting-kate/highlighting-kate-0.6.4.ebuild
new file mode 100644
index 000000000000..9ba7c8ba3cf7
--- /dev/null
+++ b/dev-haskell/highlighting-kate/highlighting-kate-0.6.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="Syntax highlighting"
+HOMEPAGE="https://github.com/jgm/highlighting-kate"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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.10:=[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/hjsmin/Manifest b/dev-haskell/hjsmin/Manifest
index 56ec3ada4463..04c0e6109cb8 100644
--- a/dev-haskell/hjsmin/Manifest
+++ b/dev-haskell/hjsmin/Manifest
@@ -1,5 +1,7 @@
 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
+DIST hjsmin-0.2.0.4.tar.gz 5233 BLAKE2B 839cc956a7dad0b958a12f9e9ca45dfeb2c64ef35f6e746747a01d1bba771edc229b9822c9274a67c1fa483da64f94e500644b77b9d90283e1feb56975d0badb SHA512 11534fd3f351cb1b73e9f166ee42737eb31c10f8f49b2b8d593f9a5a07d08d6b070f71204ec41257d02f38b0dc1172f48bd95d59b553b9f602b90018a795b07c
 EBUILD hjsmin-0.1.5.1.ebuild 917 BLAKE2B e52066691435fab65d7ef14fe27bbd946a71a36ded78b9f4709d5aa74ea1d36e3eebff094a37f5e46cc71927a351a254c517bd353c196b7938e00b58f29b8b94 SHA512 3e6c1f278de25ffc39256fcd894c9b81814edc206929f6e2224e6f8f1b9cc19391b0cc11e30b34b0984b59cd09ac2aac9c33ac4d5e7b6fbc63eab47dc78020e5
 EBUILD hjsmin-0.2.0.2.ebuild 779 BLAKE2B d0547e07c263cc0074abb5423d0551b800c151c7182263b8d90bb5a0c920e9a847e88bbc88762f457cd5b9e4d12c8e994d0c522e731e2bf6a862e9cbe1640df2 SHA512 6a626e060eb7676119fa4db491da10d0fa3f21bf3eb83792de84ec78cf5801f740da5248241525adef53e313f65611031c4f1ae8b78108a072dce09f99cd1477
+EBUILD hjsmin-0.2.0.4.ebuild 847 BLAKE2B ceb384ee937b3c32f803a101e069f48fca31aaf477395dc5e5ef1d9d25bf27e17be795dcbaad87692c9a167e58c7effc8838b21d1b8635010dcfd3c335280840 SHA512 1f6815430f952ea34c62457af9c2f230102716e0c783fe3ec54d8f92c51507dbcd6402344f4f3a84db0d2ca4f1a8d74079dcf7db323739d926571f5cc7c7b794
 MISC metadata.xml 503 BLAKE2B 9e214f7e6d156005d13a0f4b0fb341b237716e97c0f0122e3ef153ebaa41900428343d762b2adaaed81cd414bcbf3ef7ead89d3c7a159c08237c28f7f05181fc SHA512 1b03f37ba387cc9b8f448827a192ea2a02f45d757c82937756c6dc52eeaeabaa6bddcf9e1e50ae46698d55fae44b77d897e287a9426c1363bf0248331338e0c5
diff --git a/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild b/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild
new file mode 100644
index 000000000000..e74f3c315fb3
--- /dev/null
+++ b/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # Requires network access?
+
+RDEPEND=">=dev-haskell/language-javascript-0.6:=[profile?] <dev-haskell/language-javascript-0.8:=[profile?]
+	>=dev-haskell/optparse-applicative-0.7:=[profile?]
+	>=dev-haskell/text-1.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/extra )
+"
diff --git a/dev-haskell/hourglass/Manifest b/dev-haskell/hourglass/Manifest
index 50b69bada67f..5317fc7c8b10 100644
--- a/dev-haskell/hourglass/Manifest
+++ b/dev-haskell/hourglass/Manifest
@@ -1,3 +1,5 @@
+DIST hourglass-0.2.12.tar.gz 25797 BLAKE2B c833a2cfd1686f43a9ed101570a962255d813e6f169ce23d8dabd59f405c4ea091d8d9d08b118fe191cece215457bc034c419ebb6bc1d45fc684e43ea113d921 SHA512 c748d7f875ca0b1ea9034dba1a5cfa3fc4e51613ce24c90b54856fdc385d9ccc5eda3559f1674abf3ea966cc7851891dfee86bad897062a97a79db8408574bdc
 DIST hourglass-0.2.9.tar.gz 24919 BLAKE2B f4b1332a72a887c3c72eaf41086059a6156a609e3386d66a475191ef5d864fb53499b05713deec751f991f110e24d0dce51de1314cc846a145b356c18cee613b SHA512 ba6ee78b900139e8267a4bd9676abc2189e6c581225c5718c6f753515b1b7037ee4f8197f6910cc8ef769110234ec1cef7b3af0d1c6c7cef93bd87c81c7f57d4
+EBUILD hourglass-0.2.12.ebuild 682 BLAKE2B 9ac678c928a96df636d204211950d663b2222354bf96d9095962d881f5edbdd88493141c4076c9d3926147513c63dec07ce185265c987b753ffff931f8000f94 SHA512 dde581e9c445cdd3b42bab25a9c356245560818a1a970275f413648c49215cc21ecf868187918f8ce08a5fa00d3b148f099b25f58a4dac39e52fce8f51d4f8fc
 EBUILD hourglass-0.2.9.ebuild 682 BLAKE2B 9d7e6b79d015c1125dd517722615b9fe6e3cb72806c449738874dccae95dd378e2336932f4fd05c04ec38bd2738f4e8af76e8b13d0bc7755ebe8fa77a9993d76 SHA512 4093f736e8fb7ff9ffcda2c5b65b556da4f4bf2bb12faa76d0de3dbe5cc8621a60da5ceebdc241e08349215abfeac95420f18326899285cd7af5ab06de57eb29
 MISC metadata.xml 660 BLAKE2B fc66061dbbb891e1eb7e7d18e218a302cf98da733dc943e19740324c9be32124af9c1facb4a3a50ba388b7e4f3c17058d254b6e6acea70821fcca153d2dd9538 SHA512 e7158ee20ead18c600918b0b5051e4e8ec3dafec9829007a065d4d7ee9114eff48ae14895eaae3b654e12466dcda884c27c4f39b026ca231e3078eaf2858b603
diff --git a/dev-haskell/hourglass/hourglass-0.2.12.ebuild b/dev-haskell/hourglass/hourglass-0.2.12.ebuild
new file mode 100644
index 000000000000..60cfa4cc7cfe
--- /dev/null
+++ b/dev-haskell/hourglass/hourglass-0.2.12.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${P}/${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/hscolour/Manifest b/dev-haskell/hscolour/Manifest
index 65279f2a2212..1a9dfb6bb664 100644
--- a/dev-haskell/hscolour/Manifest
+++ b/dev-haskell/hscolour/Manifest
@@ -1,12 +1,12 @@
 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.4.tar.gz 28729 BLAKE2B fdda7f784e35ff165981de53df5535b3294f5dbd5d1f484bcd34a20bfde014ddc9a916f20fae639420eca8cd4577f683d0e799459e846aabcc7cb4290b7035d2 SHA512 39b631c0a8346beff1c2e02ca8e72c1b1e3f7dafcedad7dc9de274e6750501de2bc553fe72a7d3459d4f9797e916f27e28ff96f705c2c0f9d3e0eec0ac6182c7
 DIST hscolour-1.24.tar.gz 26057 BLAKE2B b11a4b8506ee49e845519cc44ee19b5fbc196fd07132cb6999f361870a58991c0f22e288696cbfdcfbaee95dba9e2580e8f878fda3122a5bfe0f1b46c7818fa9 SHA512 c191375ccbda80d6f7271cff69648151fe6142e72d9a47cfba71176ab89cb9740a008020e1a48a106d5f10516eec03ed68ca7610736f6ab6fba84f85fedb0fb7
-EBUILD hscolour-1.19.ebuild 628 BLAKE2B f85085dd02bef6f42d87dec888a1533654c997a6d3aa902e276910cbd88c79023ea245f38f36482e44123236c95957fec3dd45504d3d4c61b4976a4cd91b596e SHA512 f1015802461cd67cd86a0b0a80f52e695b63bf2a58493ce8e5c5b4b3e840e03779e9e0bc2f8fbab99e49f608834973b5e3a9693943cc948781ea14707aa965ea
 EBUILD hscolour-1.20.3-r1.ebuild 768 BLAKE2B 42f495edffb5d4fbb285169d1297c8af804c3f8ed9ef7de1033248d28784168063d7518f2c2f0c9adc1180a1cd2782572858a458ffec0758caaae34a432df09f SHA512 539c97b92b7a5b0756036a4ffafda39a8d5b4d0b9215d51ee2ec5c1bb155950ef586c8bd05b61093dad3fa40c0815df631de6ae612fa71c3070cd829798ea6e6
 EBUILD hscolour-1.22.ebuild 775 BLAKE2B 85f2b6e625ebfea93320ee717cddbf04efbb72b9d3e67cb5ffa96f7928ca2a2dfdb7ac584481737cae89e003cd26343893e814c1728e7e43fffc7e83bb2b913d SHA512 0b101bd46466e1127697d3342408cdfb3c40362384916a012d8c5656c63bd1175c490c6a9b3ffddd6a4ee1e4061944c2a544840638492788cc2f1935992d3d6a
 EBUILD hscolour-1.23-r1.ebuild 746 BLAKE2B 5af32337ee3e2547718734582180e4e26e9778d1091a97b625546ea1608807f9fb4b33cc7934386aadeff662e52889bc216dfc96dbe48df641081434aacbaec1 SHA512 a3ea97576c6e1eb0e2cc9ff80d5411c2e0eabe9b592b2fa042dc071dd47364a6da510fa4a32e3ad0da4f8a17534c5a2dc4e5810049d69ccd6c9418027ede5f97
+EBUILD hscolour-1.24.4.ebuild 841 BLAKE2B 1039701d7defb3c24c4087e3e9fb8434f2ac6d788e08f28d52ff485ee550b0574312d78bb3f4b8daa830229f43c19fcaae20dac3bca1dfc1bf4139df0c1e9ec9 SHA512 02123fb7bb72bda2d67f895b3643516f268fa85df0977cd2d5fa1679aaa4d307d206d18dc79ecd40aa6dc223ce95fb44760d5fdbc73dff8f015b9cf379fa2df1
 EBUILD hscolour-1.24.ebuild 748 BLAKE2B 1036bdde26baa51b73151816406f9f9542e49a0fb7a296ca7490949ea576ad79439e81339d90d32d8f9dad990fd6b81a980c1204a0cd383bf87c02d676bf3fea SHA512 e36caf800412ff42e2806fb50ffc93954f851c66b5e48c5597c4c2da0de47969fd3b94e8c5f6c27d2d78e340b6121df9d4d4c01d6c92d64cebe42d6d48f2b766
 MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/hscolour/hscolour-1.19.ebuild b/dev-haskell/hscolour/hscolour-1.19.ebuild
deleted file mode 100644
index 82c5a14bf84c..000000000000
--- a/dev-haskell/hscolour/hscolour-1.19.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-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.24.4.ebuild b/dev-haskell/hscolour/hscolour-1.24.4.ebuild
new file mode 100644
index 000000000000..b5a0e294aa72
--- /dev/null
+++ b/dev-haskell/hscolour/hscolour-1.24.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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"
+# avoid Cabal dependency as it's a dependency of most packages
+# including cabal depends.
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Colourise Haskell code"
+HOMEPAGE="http://code.haskell.org/~malcolm/hscolour/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}"
+
+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/hsopenssl/Manifest b/dev-haskell/hsopenssl/Manifest
index 243eb059d418..f5aad11bc733 100644
--- a/dev-haskell/hsopenssl/Manifest
+++ b/dev-haskell/hsopenssl/Manifest
@@ -1,7 +1,9 @@
 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.17.tar.gz 80235 BLAKE2B c8229b96e5d079a46255010dd44ca9caed292c974dfe5d815130696d798263c493bc8825be9ff1e360a2e0c86919842883d9125f26166184d002c619fab03649 SHA512 fe7be85a6e9690f4c7a5d79c0bab56efd42e183415c5b92b589c5bd380f2646877e0d4b1208f5583d3223a602118c9a3d74688e02f9d24a1ea20aea64a625eb6
 DIST HsOpenSSL-0.11.4.tar.gz 77764 BLAKE2B 883d38142f1c93c7fb02de59bf993433c2accf49750bdfb0dd1e1d948ed4bb964b9ef3e9d473f1904acc8954336daca176bad3b0f477a834a39a4b8ea93c68d7 SHA512 be67eec8af517bec360618883bdce1ed195bf11361ae7cad372a50cc135f0e1825a86cc581a5e94375ad85cc163553270d5c431e2a03a6a4b80dc03b027fdcac
 EBUILD hsopenssl-0.10.4.ebuild 791 BLAKE2B 089616325b8da682a1ea0851b96c444065e0bf4d7450f4e0006c137deac51b6b560d8f355f5d886b69d2ba01c79da779bf8af6c93d44b7f2780b2aa042116d58 SHA512 b8fdc38754c5a2e938934fd63e0aa04fc46fcf0a611715d37a11c53f2baf7a9bd91247aed1524a14fe895f21b835d4e28d304cc04c5ff43ca235af4d378225ac
 EBUILD hsopenssl-0.11.1.1-r1.ebuild 1473 BLAKE2B 1640969df6ad4c54eb49c1653d34f0ad498d38f931af5e54681957b5ad9dca158b4ab8e8ffa007e0f0e05328e33f6124ebb90b44e75fd26baa0590aaaa74389a SHA512 78810ac47714f1b8738d7f7beaaef4c2bbc68d6888139d4a18a5aaf2342392707ba03e9683814aa52c877a2a5b23f505bdd6b52911079da1ccb2f7f1e5790749
+EBUILD hsopenssl-0.11.4.17.ebuild 1023 BLAKE2B e263faa164303fcd2c77b16d31091202f003626c4484209e0af8831b8bbfbcc26881b581327b241d094c9d552c0df2d22465c4585b165047f74881c0d36e0c01 SHA512 97100f865e8f3cf1593ba7e6a02a99ad848e8ff56a5452d869519283bf357d112aae5f7449c460ace64adcdb16ca317a7bf783bc3e9d27d0801025a6e87e1f7e
 EBUILD hsopenssl-0.11.4.ebuild 984 BLAKE2B 4a3d42f822ac31f80d5b309bf253b4dbac1ceda488a598341f84044d17b9f0fc1beb52262920f1e668aded9d01f8ab90e52023fc08f7a94fa753f7631ceeabe1 SHA512 12a70c7c771dacf4ad86a91a9ae52e9d7e9cdabe372773296528a58da2fc3672e10ce4fdec3de1b513de24439fa271d0bace3007b80a073af0113ed069d630e3
 MISC metadata.xml 1174 BLAKE2B 26b5c812f3c01512d1f0c6b754a9c9742dd62d91be4097bda649e01b17fee3c4aff921cc3b63e6c4e90c370e94625c5718e269022791d6883f81f517cc5b0d92 SHA512 3de12003fe30d1d183838d2ee19f898a2ec58807c13745d264f30be21d655b7fa40a8dc7163763dc3d72070125c81f4fabd20bc2422e2704cf060d29fb55d2db
diff --git a/dev-haskell/hsopenssl/hsopenssl-0.11.4.17.ebuild b/dev-haskell/hsopenssl/hsopenssl-0.11.4.17.ebuild
new file mode 100644
index 000000000000..f594c57b4345
--- /dev/null
+++ b/dev-haskell/hsopenssl/hsopenssl-0.11.4.17.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="fast-bignum"
+
+RDEPEND=">=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	dev-libs/openssl
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag fast-bignum fast-bignum) \
+		--flag=-homebrew-openssl \
+		--flag=-macports-openssl
+}
diff --git a/dev-haskell/hsql-postgresql/Manifest b/dev-haskell/hsql-postgresql/Manifest
deleted file mode 100644
index 351492e2fcce..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 662 BLAKE2B be82ff4ff8dbc6cac46d22c460a8d6ef8f0056955764d831bb1fd7eaeb627f0a3b29a0521532f60b94b72110c0a07e59eff4a88a434c5b749f32536fcb1c373f SHA512 274fbe83972625f6f0cf906a3d0af15700bd2047908ebb8dda4aa9d36b754f931084422eab1d2c9e93327b0c266b26110ef6cfa99481d0c87c522ae71c2546fa
-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 5d7f784f7704..000000000000
--- a/dev-haskell/hsql-postgresql/hsql-postgresql-1.8.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="https://hackage.haskell.org/package/${P}/${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/hstringtemplate/Manifest b/dev-haskell/hstringtemplate/Manifest
index a4088ffb0488..1f222b094dba 100644
--- a/dev-haskell/hstringtemplate/Manifest
+++ b/dev-haskell/hstringtemplate/Manifest
@@ -1,7 +1,9 @@
 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
+DIST HStringTemplate-0.8.7.tar.gz 15903 BLAKE2B c030b287893e908e2e8b70f8b8f06750978d2109daa86a26c8c08abe2e00112f7fdbb8c8da1c45c689803e7bfc2027fda87c44b24d6d3f31c129b0803c42f324 SHA512 a00552a104231aa44e06c558f200a36430774351de2e7c55b0f25fd064d29aa25e62e48185d79184d916fe7440ad2a6d20dd54a5b4ad4bb635e58fc259185e5b
 EBUILD hstringtemplate-0.7.3.ebuild 858 BLAKE2B 6980b452b1183937856b5ec62d7140feb5cde01f2f46cdcf5bd4f5ae66fb9cbeb3341d84a12a856cad409de3578be9557f9a71f033d6469d3cc6e19b6eb40a29 SHA512 9f7d464a8fc6eddf438257ae16969ea2a7ba62b9de1a0ad65fe163b367d125dd5c55673eb1b312566791d36b35883de852ab4c21f0cc37fb98b225007c6f793b
 EBUILD hstringtemplate-0.8.3.ebuild 864 BLAKE2B 0c48e1c379a88b8e90f4d99569af2988a4377c8fb3277143ffa18a84b05c6596f258f7df3bf11d9cc0a87a8ad0c53efe00b96953a218d50599aefd1e07d6400e SHA512 b6daa3ceb1147d15112c8d35198c937ae9fcae977e3d09a9eae8f7dc465ea9a9a9e29d2bf1843afdeb0448989ce1f545239c4e92c7f824b0fa38905ed8d0d646
 EBUILD hstringtemplate-0.8.5.ebuild 864 BLAKE2B 74d350e908300c2f4f2ccfd873fccb175623fe5e7f2e5c0b7ae606f85b2e8433eabbc8df4b222177086a3df5b50933d80daeaa1838fac30604f2296e614c04ef SHA512 bf6dc6fa3e3b5364919e2b2754a2af02ed9e404b3f5dc9b7d14d1b4ac9847a6a9a8f16f5de8f288bbbc1b7fb5b73a010809937528e592add6209cbc887b61518
+EBUILD hstringtemplate-0.8.7.ebuild 995 BLAKE2B 58be03f9f2c4a5e516d72ddef60f1f7e306b8f1e61b94095f1432b82de3751027ae8813374e9ebdcb35b33460e51e29c047b3e57a204d8df86e719390dac506f SHA512 e11e4b6683cbb385f913d0ecb4d82e8c56045b75a609282c1107d14a3a8153c74f67853e78bd8f329d2ff866d6616ddeeb5906e11c355424ff48f1effb15730c
 MISC metadata.xml 335 BLAKE2B 5daa9c8eed8c54c4d3c53936da7f9f260598daeed4af59ffcf8d5676ef5b54c3ab3718186c6462cfdcc6f2127764d9ed61b172db1ad67d9e6a758de7e34210f8 SHA512 17244d55739dbeb542275ce7c0f57ea8c017e0277be42b69fe57a1c3db37ffeebd165cf44be5e7363b3aaf7e5f78555f27e3f0373baab4b268b12ef2740e7910
diff --git a/dev-haskell/hstringtemplate/hstringtemplate-0.8.7.ebuild b/dev-haskell/hstringtemplate/hstringtemplate-0.8.7.ebuild
new file mode 100644
index 000000000000..7a6bd9bd9bfc
--- /dev/null
+++ b/dev-haskell/hstringtemplate/hstringtemplate-0.8.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.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="https://hackage.haskell.org/package/${MY_P}/${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/semigroups-0.16:=[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}"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'time >= 1.4.2 && < 1.9' 'time >= 1.4.2'
+}
diff --git a/dev-haskell/htf/Manifest b/dev-haskell/htf/Manifest
index 7acbfa071e53..82d2d04f7d41 100644
--- a/dev-haskell/htf/Manifest
+++ b/dev-haskell/htf/Manifest
@@ -1,4 +1,6 @@
 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
+DIST HTF-0.13.2.5.tar.gz 79761 BLAKE2B 2caf1ea1192087fd614f097a45508d290cfb2a7f7633f262c7b3b37d1f1bf23d7a3cb0b7746a6b2f619b41e08500f6ce1d1a4700ae216a0641e4edd1c5db5b03 SHA512 2c68a74c6492343d21405965776d3ee7c2930677c626c5353953d53274213bee0cf803c1b6f14600759c89eb0a66db4d248af75263e6c5f1bb5a39f569b6af78
 EBUILD htf-0.13.1.0.ebuild 1413 BLAKE2B 98b03ac448b64fcc866fdccf8811550014f065b31da562f9cd44bf063aeab9e633bacfd5ea986be56a0dfa735fd0e00b04425fc49f861f06a2fe9f28bfb3aee1 SHA512 981c67cfe6e829a403bfd57e713e1cf56047ceb489df39fa249b63ce59a618e972f60f6c7920cbc616e92303da754126666294b8ffdf20d0861e58938c3d6407
+EBUILD htf-0.13.2.5.ebuild 1325 BLAKE2B f0e9a22998496036835fe5c5f47c735e26ded5f7754e2aa44520213130177a890828cb07dc3331899f86b1c85e8a3b1034827e6e1c3914a095180643d791ca34 SHA512 19709ce73fd92b08a25aab1af1a7fb2b0902459d31d1e30df27c2c874219a94f943e62ff70e97afa6b7ddcf5b071ca2d7159c2bb0bd0f47857dc67de3c6e8acd
 MISC metadata.xml 923 BLAKE2B 690bbf2765309647e8029490cd2c7ba9055f00e8f4ccfd45ae8ef826deac43a13bf919b73607fc0241e9f60d6cda44bba1ae95de8031f76744d3eb5fefe7138b SHA512 1bcdd3551b19f09f600b050f84ab81de6e99133b29a8a94942ff068ef354a9bb31226395cb221c416a65466a96973a92521d3aa3b13c94b557bdedf011e28164
diff --git a/dev-haskell/htf/htf-0.13.2.5.ebuild b/dev-haskell/htf/htf-0.13.2.5.ebuild
new file mode 100644
index 000000000000..d69d9e380af8
--- /dev/null
+++ b/dev-haskell/htf/htf-0.13.2.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite: needs htfpp already installed
+inherit haskell-cabal
+
+MY_PN="HTF"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="The Haskell Test Framework"
+HOMEPAGE="https://github.com/skogsbaer/HTF/"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # needs stack, needs htfpp already installed
+
+RDEPEND=">=dev-haskell/aeson-0.11:=[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
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/http-date/Manifest b/dev-haskell/http-date/Manifest
index 57da811d9ccb..628bd843b449 100644
--- a/dev-haskell/http-date/Manifest
+++ b/dev-haskell/http-date/Manifest
@@ -1,3 +1,5 @@
 DIST http-date-0.0.6.1.tar.gz 4989 BLAKE2B f1dd2f10a7ee01591d970e10128ef381b6764a121785a8b90608d486b2e5370ef0d529c3cc4995d661ca1aeccf698357b21433c8ba11baf8f667d97488c65ca8 SHA512 456d59bc9405578526ea458772ba8b01d1fe85607bc0e201efd6f0f080525205cbf8eba19dfd5f64ff520510a9a7ae3b7008fe43fee0e312b792476b965ba739
+DIST http-date-0.0.8.tar.gz 5322 BLAKE2B a88ee8ff31e5356aefa095d5c700e77554657a1102ab12091debbe173dc8b8886b3468795117b81ac745c08511b5b856ee49f6754db265226bd375926a68413c SHA512 7ad48dc20c62fea21aad0d15251cca333b56a59ca13c45be61fd9fcd938e28f5cb82701b7a394c256e1487679d0bbfcf994de90d7c8b57888e3bac8809e97114
 EBUILD http-date-0.0.6.1.ebuild 661 BLAKE2B 207760675608c2cc8d9ca67a37de35e4a113361ae17bf9c1f62f9386e091c2da77442c6404d75d4fe99010ead5a9bd91989a5681df23b351f1c57660525caf95 SHA512 ea1857bbdf882fdb5245a68644468647ca193b55a5fd464b4926d2ff1ad20765f46a83503d87c856c6037e178376e416048fafeb18482d85d9ab1c10db0cd6b8
+EBUILD http-date-0.0.8.ebuild 784 BLAKE2B 7ba59cca847f623476dc634b757775e1bc49dd3c70095fc774065d18462c95e01be06408dcea054d4aea38a7bd0829610fc8771f04ce9c5784818403bd253d6e SHA512 f3063d859f58ca3e3d615ab0fef5f79d948c7fb8f2ccda97461d747a7064407e8d3e3d2b46a25cf422d9953914f4f772b21092c14fcc6d4cd94be8bc9b9c1378
 MISC metadata.xml 330 BLAKE2B 73ad89816b1c0c397c7be7ce3856776ab760ea8e1060907cedb5ee84fd2c2e4d925ef5ed5c934b75c0b62bfd3e2ed04725ebc02cb3c31176b973cd71a6615cfd SHA512 c9fdae694c19062e357717219a209dd12b94f4d2c381b0dbca58382382275a6dd99bfac7a8e4c13fe9155b585e7ad59e1864cc33fd270eec14906ab6e5342805
diff --git a/dev-haskell/http-date/http-date-0.0.8.ebuild b/dev-haskell/http-date/http-date-0.0.8.ebuild
new file mode 100644
index 000000000000..fedf86cc4edc
--- /dev/null
+++ b/dev-haskell/http-date/http-date-0.0.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # Ambiguous module name ‘Data.Time’: it was found in multiple packages: pulseaudio-0.0.2.1 time-1.8.0.2
+
+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/Manifest b/dev-haskell/http/Manifest
index 1f774561a690..216dba4c7f1f 100644
--- a/dev-haskell/http/Manifest
+++ b/dev-haskell/http/Manifest
@@ -2,10 +2,12 @@ DIST HTTP-4000.2.17.tar.gz 69706 BLAKE2B a4fa206ceb7742b3f6420d880fa2938d90b8501
 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.14.tar.gz 72938 BLAKE2B d1e24a693d5a63d6ff493766e959447e29c6371854360645f398e4b17f807de3d1ffc4716136fcaeb60f4157bd7622b3d8c30269a98ad7ebecf5f3521e292c03 SHA512 bcc9107412f3ff5806369675ae6cfd87c4ecc36490eab6d62c697f47e62ff8b0d1d6a25f9bfb9d8ef1f037492820eb732cb9cbec7ea9e7e4b20699573077b064
 DIST HTTP-4000.3.5.tar.gz 71718 BLAKE2B 3838c286001bef88fe4b1834bf9e924ab84057fdef1906735e5049123c3694fded687099c7c4e6cd1ad71a1193f301ee0ffec59141ee7a6997abe8efacc9ae35 SHA512 9abfbac7796c21a01828c686500ec0fa81d0ad23b8139e3f64a41dfd62a3ecf345573831f5a304390dab057687d73e5cd49507a4efeb4bc9371558e8c1676653
 EBUILD http-4000.2.17.ebuild 1587 BLAKE2B e68e0d5c5c56d224644862bddde3b6a10ce06758c3131f4c562f42a16ebf8367053a66d1b7770b2751e04f15fbd776a026ae3458d89baab1caece8d090388414 SHA512 c30c48f066834d292ebd7334a9e5c5a44885d66d94f6ab7373f2b0be1f240be9bf2369e8c18d71acc20d790631c3e25e59a553204944b4a22d6d66a5f9f51b6a
 EBUILD http-4000.2.20.ebuild 1821 BLAKE2B e416124654133a4cafc129f391f1fc4ac2550ebf8c6206c448ac4c71ce11e4110ccfa7305d41975e2bee2774e3811ba3fc681a649ef9d8d6e6ce3403c21d2040 SHA512 e5f119f6986b92d3a30acf98472c10418d0a1e1d47fd539146db13cda05ee87dbb279fe01e39283f253e2e159fdefd9fe161acadd66cf2ab00159435a3267e9a
 EBUILD http-4000.2.22.ebuild 1827 BLAKE2B 044313e1a09269974c809292d9591fd0027c1d0368aa22b8b7e106cee6a3e2391e5b5ef780b25e36c4e401b95f299184910f972eafdfe686bb9cdf089a8d06ac SHA512 c2210d20ba75d36eba64bef7b0b33a6ea769b6fe5556648ccfd33e4ea8c8ee09d19e83b559d3e9ee4b94e5ed1d7d6594bd4bba9d05814a6fd7ccc7c07801b482
 EBUILD http-4000.2.8.ebuild 1610 BLAKE2B 97a122a3ba4d990a1094102a2c78f9ccbd47c28f65760af5ae7f6466afff1cf474954cd6a8b4c540ed571a1a4c316217415684786cc4b1c2755eebe243d6ebdb SHA512 d0bbc269711bc121ad0f34f0ee5496b52b899e179213c3348824df4f11dc3c168bd22218fbbf479b9d01f1773fb31b5e133a765828d2c35ce72e5b4c4722beed
+EBUILD http-4000.3.14.ebuild 1725 BLAKE2B c776222548580cd98fccae313fd7f51120ccffc1cbad34d5c96a8e3c04c6b1df80c7ea3292291a5b1f81d029147354063557103ad7e0f44310c32ffdad1b0022 SHA512 0f5a0b5f4261e1f4fe6a8c5ae8229b0fc1cea0e3ab3ddd421b74ad791d98e29e5007ba70bf7081c8d38f8479f91bfc29c4ae3a42f4dc8736efea767bc66cd325
 EBUILD http-4000.3.5.ebuild 1753 BLAKE2B 4609e3374f8e709de6835908c76c635732fe3512e9b564095aa5dd26bd65eaa44abd83378c8eebf7872680d4c91d2c61a6ad1f46075f1daa83b39d275b9d5f4b SHA512 98728e20978246c3f351265827d27791ae835675154fc9a224f67091e3f38c258aa38a8537e159a57ebaa1fd48c6beb427ba9af3e522ca2dc8f511271e35b31d
 MISC metadata.xml 2129 BLAKE2B fcca60629e838303b2e2a690253d81709730e1b2db996f983e083079aa7beec30d0885d2b1066c335e5ed1032f9c11bddfd1d0de11014a9f1958a0c6b1d4c714 SHA512 f9571e122a4ba9ca247f51c7900621dae1831fe15f6dd298b8592291c53fbe4dab61caf975b3c4ff7d0e12991904d5eb298c5c5f3e1d2294a80ade4e93455af3
diff --git a/dev-haskell/http/http-4000.3.14.ebuild b/dev-haskell/http/http-4000.3.14.ebuild
new file mode 100644
index 000000000000..3d0ac020959f
--- /dev/null
+++ b/dev-haskell/http/http-4000.3.14.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.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="https://hackage.haskell.org/package/${MY_P}/${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-3.2:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2.4:=[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.7
+		>=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/hxt-regex-xmlschema/Manifest b/dev-haskell/hxt-regex-xmlschema/Manifest
index 78ab49118a7b..5f4f376dd5fd 100644
--- a/dev-haskell/hxt-regex-xmlschema/Manifest
+++ b/dev-haskell/hxt-regex-xmlschema/Manifest
@@ -1,8 +1,6 @@
-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 711 BLAKE2B 2fbf2b9e21ffbeb1d673f87dd81d636385d4ad31280995556e2100e1940ab1a2bb1a7347528238d9d7dd93f81643d62a9f9f4f2ee66f0f45647be300ff3d8fb4 SHA512 2f1ae723b6a8e6eedebb0008c41d159b5d0adb904fd23cf55590b6aad3824ac77fb39fb96b4617483a4dc336fcba6b6d4bc77aacfac89b7935c42beee2f3736b
 EBUILD hxt-regex-xmlschema-9.1.0.ebuild 722 BLAKE2B cc38084d748a86e063498e78a8064935e6aedf5c292c3a26142fe6e3a966325e23379ca896513460c834635d2dc6c80d5eb92e8f63250b0d47639d81d647d93e SHA512 dd9c6b9acf855d4deb4d230a9daad29ef3f5b1d31821cf89b6fb498952ec88845e62159e57ffebfd38951c856c5f7fa7823a17d58aa955bdb4a981a3fd2cd724
 EBUILD hxt-regex-xmlschema-9.2.0.2.ebuild 873 BLAKE2B fe346035d79e286eaad68174f8d8449978dedc61fc160c5cfe3539fea7a62e459854821edf0bbcbe19f7fda534e581458ee0351463a0b6128c4310009058d1d4 SHA512 f690c253e8b6a5acbf9c507702c14b555b3d16b05b675a2fbc84e7f93fecfa1f98387c573da8c762bfc2f313c3d93763d9f0f89d07798d18cb5a012b5f793495
 EBUILD hxt-regex-xmlschema-9.2.0.3.ebuild 936 BLAKE2B b00d359b0b1a3c5f90bd01a70f43950a7ee95d259ef3ff74d8e234fc8cbd35e9b10100004367577e52fbb799ebb849579fc14a8109f4d7b468dc5feea3f53e6d SHA512 4b94263fd51759be7a6d43fd9a0f286e8f49e7d1c813f6a9ed7e6b5730115dd5421c195981665880f9b38c2fd102894ae118ddc814f26cc9b66f0892bf9c5019
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 8d05083a09de..000000000000
--- a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.0.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="https://hackage.haskell.org/package/${P}/${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/Manifest b/dev-haskell/hxt/Manifest
index 490492dcdb7c..0683bd7e52e8 100644
--- a/dev-haskell/hxt/Manifest
+++ b/dev-haskell/hxt/Manifest
@@ -1,5 +1,7 @@
 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
+DIST hxt-9.3.1.18.tar.gz 223887 BLAKE2B 35d48b60496fc365b4ba493a8cec186fd379ee360fcf311b4529c617f4a7cf825c6547edf3ba3c7b7f5cfff14e05a0fceff71ccab8a45609f445c5c4fd29c468 SHA512 4b7c57486fe02357a45b5f835dd9f05333ce39578ec84c3c920fdcaa2df8ae1067da3650d3948559ddaf2e6f77f14291e1ddaa28a12ea9dfb62a797d296ec118
 EBUILD hxt-9.3.1.15.ebuild 1364 BLAKE2B ce46a5cff1eb0d6eb93200899f3ee749852c31c7e497a86684aa9553613fdaba000e7c81d6e3d965ca08e822c1ce97b0f687ac272dc46beae8f0282b89b39cd4 SHA512 174da962b297d89fb04b472c363f635403684d5897cb89c393dbe263d776650d20d3ecca6f3c9fa07a3336b3d1838f8d2c273a10f8db814fd488bbe96aae217d
 EBUILD hxt-9.3.1.16.ebuild 1092 BLAKE2B 9b66542d14d4e3930573f1e659f9f635558866c0c570473cad4e343d97d291a5a64bf4f859d24fcf414571da677db19b20c2c3d02d64dc0391bf4fbcb23f8b3f SHA512 91d5728a9ea84dd244b565724f42e69fe86e4dedcb03589116f7ee2c066bd00553ae016d04a8c835c4af2975e1933f99c0733ff11489b6724d5fe4043bf54ec1
+EBUILD hxt-9.3.1.18.ebuild 1092 BLAKE2B 8f31fdb26e5f4aa4810adee73d1490b64e9f71a37407a03c7efd00ac0c55214b2202cfc21b99e563ebddbd514b03646d4e82a211e6471089c22caa392f8c5e44 SHA512 410e13de1722b2da36b4dcfde6b2386fe622942f386884611e281c2c33c58344c2bbda6b98dc26764ec510f5e3b28cc41288c48dfe5f215918c47bd06fb0ee45
 MISC metadata.xml 1388 BLAKE2B 7931219c94c280c4d205630f0fdfd0bcc6b41b74fa48ae4545878a19ba026ded8e5d41a7dda91a0cc5e2d8aa4bf114c2f434e42809c0950385a17660a6966662 SHA512 76f78e92e34cf2431c3c676ded65098f2be331cbd6aaf91c23314c9c037bd6d5981c39c41d47e82c47e709a3e7adaf475a1efac26e27f1022d2ea2815ffb236e
diff --git a/dev-haskell/hxt/hxt-9.3.1.18.ebuild b/dev-haskell/hxt/hxt-9.3.1.18.ebuild
new file mode 100644
index 000000000000..1902e81622f6
--- /dev/null
+++ b/dev-haskell/hxt/hxt-9.3.1.18.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${P}/${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/icalendar/Manifest b/dev-haskell/icalendar/Manifest
index 8e271544b281..e498476ce493 100644
--- a/dev-haskell/icalendar/Manifest
+++ b/dev-haskell/icalendar/Manifest
@@ -1,3 +1,5 @@
 DIST iCalendar-0.4.0.3.tar.gz 29889 BLAKE2B 8cd635e5677b98b5aa2b96605a21407a9443c92a31b963aece597a1acb5d248764189fd277789c7a4d39a81760f4e5f00ec98992bbf1628086766775efb38346 SHA512 504c562a8213a899071941fc3ebce59354885a4d5b680950eb9eee8a0b1704475e91fbbffb8773d6ae5f9c124dd1fd3c39aae369f7305bf4d7ca9430984070c8
+DIST iCalendar-0.4.0.5.tar.gz 29978 BLAKE2B 36a442f83eabec17629ffb38b160e5d17c3d76f4ed54855427d6fa475c0d8d3e0201a08d8b9ed87eaafb37e30625c2d513da8f3dd234c6b8c66264ae64335e48 SHA512 31c58c275d4a4c74adba790a4f32ce368c0dc4a96ac7728111dd4ef71dbc29152786d23d8b25dc3abe064da931a0e11029c0090bf71cf90d22bb5e7a3451e093
 EBUILD icalendar-0.4.0.3.ebuild 1321 BLAKE2B 26c3900f94f1700444dae337ea3807b379363cd73dd1ac5b178994a707e2df52e604c00ccd883cf3c579c07a78c3ef7ef279f1e08222e9f0f1d2db436657b70b SHA512 95f4d18d528353a6e651a673cb22392d01c600e03d58cade32ea1f57b1b162ed22045f5dbcc73641b821bc5df8a0bd7cd5cde04cfdd29502c80e9bfc0d7b26ec
+EBUILD icalendar-0.4.0.5.ebuild 1566 BLAKE2B ed103e1171a69bbd2a7a611c04e6f56f39499c050794909abf65788a9765e05ce626096e49b8a9b935185aaf6e54166d914432b326bb93da0668cd07e4092e74 SHA512 81993a221912fbcae1811946d38c6a9f81073c51edd86b67cd29ee9e531baacccfe33d90c06637f263a65c485f8d250502e4515f7ffcfe224426e34f086a5374
 MISC metadata.xml 519 BLAKE2B 8011b4fd4c19e3aab29a03f1503cd5dbe5e8c93d4c9a9f770c8555a8ffc2ce5f80eee1a55bc7427d17520d462e2665dff43b2a626136664a1692eba667f04405 SHA512 0b2ad70f6f48a2d4041fa9575e93fa067777eaddb401bea31a2106a76c539370d514a25f0dda7c26f55900ddead6a2e194fc4a6d65d85568724ab0c9fedfccb5
diff --git a/dev-haskell/icalendar/icalendar-0.4.0.5.ebuild b/dev-haskell/icalendar/icalendar-0.4.0.5.ebuild
new file mode 100644
index 000000000000..5683640c698a
--- /dev/null
+++ b/dev-haskell/icalendar/icalendar-0.4.0.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.6.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="https://hackage.haskell.org/package/${MY_P}/${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/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.9:=[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_prepare() {
+	default
+
+	cabal_chdeps\
+		'containers >= 0.5 && < 0.6' 'containers >= 0.5 && < 0.7'\
+		'network >= 2.6 && < 2.7' 'network >= 2.6 && < 2.9'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri)
+}
diff --git a/dev-haskell/ifelse/Manifest b/dev-haskell/ifelse/Manifest
index 154274500f20..0c7099454435 100644
--- a/dev-haskell/ifelse/Manifest
+++ b/dev-haskell/ifelse/Manifest
@@ -1,3 +1,4 @@
 DIST IfElse-0.85.tar.gz 2865 BLAKE2B 620522dd255b30d28dd1ffe93591ceff0191845731e4a717bcd92dbf746f363fa37b1eb6694af55fc9f4fe56add4fb9b82bdb17d0b0263cf82feb2bf76cc4c39 SHA512 5378b0f98d3a14dbc5b297a01a5c48aed4825f4ab2192e35b3a6aee932cce5b740e5ea44cbbd69dc3e74ff38415d77df43136e2a8ddf9bc6fd9fe1497a6dcd1c
+EBUILD ifelse-0.85-r1.ebuild 657 BLAKE2B fd03d383ed8fbaea9d62afce9b9d97dfa106da56ed4b099915735052f65a0504b9d751955c8589aac218e8a6de3f0643ac74e0b9e8a9cec1ad2582522c44c0e2 SHA512 c4406c83358fb05e08d273e6c58d81a4e749841a39011c8e2ce1c2f53c867a376c166d73dbceadaa405db59eb9247dc62ed079e00b660da67586a308e18aa3a1
 EBUILD ifelse-0.85.ebuild 653 BLAKE2B 8927c96bb0cd4440bce7f0ba3f3d08f9ae157018ea00c1604f186a00c4bb5d74003d20b318bfe7e88492a0aaf89cfa84e327878304ce23356f6248c4ced5711e SHA512 6d942ffd00f5a0b360c4ba7fa8d17b1b629e823f354267dcc235d6d0fdd6d7b74f51669222d00f48590d8e09166a5cd04da778dec06fe094383685a47479e936
 MISC metadata.xml 338 BLAKE2B b967eb99be919c60c3849806900de1b7cd5aa4c4c9e546169054fc6e3f868e608af33851b3fe7a462fe15c8c3d8a68182cab1a16723bedfaf70ad99e578e9bc6 SHA512 3d3ba29cee849c5df537b91d74061ee101f6db16b8efd79ab8fc81ef0599023b0b21fd2cdac7633c8ffaea2614989edc2fbbf4e539afffe7cff74ddb3c67a8df
diff --git a/dev-haskell/ifelse/ifelse-0.85-r1.ebuild b/dev-haskell/ifelse/ifelse-0.85-r1.ebuild
new file mode 100644
index 000000000000..893e81433e72
--- /dev/null
+++ b/dev-haskell/ifelse/ifelse-0.85-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+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="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.2
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/js-jquery/Manifest b/dev-haskell/js-jquery/Manifest
index 2f77ac2e6b21..68ab19bad898 100644
--- a/dev-haskell/js-jquery/Manifest
+++ b/dev-haskell/js-jquery/Manifest
@@ -1,5 +1,7 @@
 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
+DIST js-jquery-3.3.1.tar.gz 114431 BLAKE2B 861251a15aa7b486202be7476366ebb584278ec6a5f5d58e132f2c4aaf086367e9952facf63ab8cc74eec8a9914182c18d66d2d4c76a59d627c887c3ca5e4792 SHA512 3222259a4342bc5156d5360385a478e235def04db0381cc48f342baac5018e91350dce760adb9b9ada796bc6341d5629f807672f629ee127faefe521801d62bb
 EBUILD js-jquery-3.1.1.ebuild 577 BLAKE2B fa4500accd2fa57a3bfac322195dda335fcb8c181c71e6b9e7f1dd27b12175992b80547a393f31b0a73a744bfe3fd57ccffe48ae5f057588790b1cdff227f775 SHA512 534ae36ca2f93a1f3a045c512fb3b82678377866f27795c961c0b6f31263ff507efad78e50df372eddedecbcabaea69e82d36fe8611da1b47e59d513611b2f54
 EBUILD js-jquery-3.2.1.ebuild 615 BLAKE2B 57fc52e118a8bee6df2d5440b13dd369cb621fd830c6b9579477cc49e946344ee694844233becc75ca69f23bdd70766c42d2a1351a9e1cfb198eb86c3e88acde SHA512 3be0db588e4ed0509e7de2c5e358ebfa1bab965b0e16ba51b3c29fa9a50fdcfdfbcc8b995f512c497bd9f2edf90588da7788c995635c02968ec170d343adea36
+EBUILD js-jquery-3.3.1.ebuild 613 BLAKE2B 21d410960a74975bcc701e25acd66cb1798cdb7f30e1e917c386adcc3ffd13b6c51248b1dd576ee20aa110e86d08a10b116db3ce59183f31e448ce0c46f0083b SHA512 fea11d941775d6f734e9847de98d611da383252e0091c87a727563fd5804c486b2342d046315e84e4062d5b89548ef62d5724d0699706d9880b1379bb76abb6c
 MISC metadata.xml 707 BLAKE2B f3570e08e6209e6fdb6be46fc28cbafe316632654ada344598c47c73a02c43f5ec9d1094927bbb27f585de95ad6b4dce360d1883a3064e07c5600ea12f2b2dc0 SHA512 d316dd0a71dce3c8085510d8fb7eb55ea3e323fe0b484ae1b90301412eb7fcc49aa29f3f3d4b94f33fa4468985cad3fd456bfe89eafdcdc14b02e31bb59c4990
diff --git a/dev-haskell/js-jquery/js-jquery-3.3.1.ebuild b/dev-haskell/js-jquery/js-jquery-3.3.1.ebuild
new file mode 100644
index 000000000000..9487166647fc
--- /dev/null
+++ b/dev-haskell/js-jquery/js-jquery-3.3.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${P}/${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/json/Manifest b/dev-haskell/json/Manifest
index 866adbda1508..d48eb237b368 100644
--- a/dev-haskell/json/Manifest
+++ b/dev-haskell/json/Manifest
@@ -1,3 +1,6 @@
+AUX json-0.9.3-ghc-8.8.patch 5054 BLAKE2B ed3b6efe93cb37697379e5c0b0953ead8cd270000f7c87b0db58861d834d0b8edbd6039b7de0b3d376c4b5cd5152d9982e60f93c81c31abf97879654ed644bd6 SHA512 0cdaa654826c2baecdcf1771090b58440ef4177d8fac76da774eecf7599526bed142ee6f58cf2b67fba57ed1b3c0b22b7140425712551dc8e41a99014534c206
 DIST json-0.9.1.tar.gz 22568 BLAKE2B b1c73771e24ccafb2019ffff61e392f2eec18768c4bdd09f1a5ee8275c92d8982cda3fab4d91222f726fae65324776c9e79ccd602dbd4ac9c435749d61a1015e SHA512 537257fed476683d0657c6474e465ca437e43e36b60ab132c0f584cece99a18d222ef9a33171543689ba5589434bc78cf2e0e5ff550804ff8969052d09430d57
+DIST json-0.9.3.tar.gz 22562 BLAKE2B 8947d2b4bea1ee86eea19e25b73b991d186274c7a6beaff09e8f346756e870d440c4511c599d6ee5f82df08975076e47f0f528cc03cabb5063fb768506b9a660 SHA512 836ae920ef19e0cff5b617a579090ea1d760e253513d3fb28c56650a1fa413c0bd852165be487c211a52be6246eac3241a97f729342223be10275917a34230a6
 EBUILD json-0.9.1.ebuild 936 BLAKE2B d33dedc76e18960da60c04b94d5f6022011b94640a47e8afa615e12a7c20527eecac124987ee0d758e536299e0dfd6649e5f7ec77b8129d6e425db279b296dea SHA512 f2c6fdfebfa8f81529e9238e554eeb899ff0637f482eb6ce1bf123e56afc43f4781cec74604b9901ea4fe557c978962512b53d41d8fcf7bb26404b7dadc21594
+EBUILD json-0.9.3.ebuild 933 BLAKE2B 1e154716ed3ac580e765ca16541387fd692fb8c320ec46b3b5798d58092bdf7df4de98d7393abd11aa05436d61c9b947042ec1327e4676c47367d54641397865 SHA512 0aa75bfe23dabf76e470de10d1d1b362833cc31a71c464951084afa0f924e7da3e8aaec8883fa61eae797aab0f7c8361f217d74989f436538a1c610cdced9ba9
 MISC metadata.xml 993 BLAKE2B 6cb77b20e36e3fb4aa09ed7f55f13b5199b4b152a2c7c625e7267b94016a2929b5064b6e38c3d0f6802cf5400dc802b4adc4e37d6de4823b2d02eea81459edbc SHA512 19724eb01ade1dac4b6e12271bfa698aab1ad16d4abc250114a4e17908ddf2bbbd788509ff5123745926bf229d0836e0046c3aa43b2ab6997088222c84a0b0a2
diff --git a/dev-haskell/json/files/json-0.9.3-ghc-8.8.patch b/dev-haskell/json/files/json-0.9.3-ghc-8.8.patch
new file mode 100644
index 000000000000..d8dc402ae19b
--- /dev/null
+++ b/dev-haskell/json/files/json-0.9.3-ghc-8.8.patch
@@ -0,0 +1,172 @@
+commit a0d8bcde5ab5329d11be8cd89c407e6aa0db83a4
+Author: Fumiaki Kinoshita <fumiexcel@gmail.com>
+Date:   Tue Apr 30 18:37:40 2019 +0900
+
+    Support GHC 8.8
+
+diff --git a/Text/JSON.hs b/Text/JSON.hs
+index f2e2618..6f80949 100644
+--- a/Text/JSON.hs
++++ b/Text/JSON.hs
+@@ -37,7 +37,7 @@ module Text.JSON (
+     -- ** Instance helpers
+   , makeObj, valFromObj
+   , JSKey(..), encJSDict, decJSDict
+-  
++
+   ) where
+ 
+ import Text.JSON.Types
+@@ -60,7 +60,7 @@ import qualified Data.Text as T
+ 
+ ------------------------------------------------------------------------
+ 
+--- | Decode a String representing a JSON value 
++-- | Decode a String representing a JSON value
+ -- (either an object, array, bool, number, null)
+ --
+ -- This is a superset of JSON, as types other than
+@@ -137,7 +137,9 @@ instance MonadPlus Result where
+ 
+ instance Monad Result where
+   return x      = Ok x
++#if !MIN_VERSION_base(4,13,0)
+   fail x        = Error x
++#endif
+   Ok a >>= f    = f a
+   Error x >>= _ = Error x
+ 
+@@ -199,7 +201,7 @@ instance JSON Ordering where
+   showJSON = encJSString show
+   readJSON = decJSString "Ordering" readOrd
+     where
+-     readOrd x = 
++     readOrd x =
+        case x of
+          "LT" -> return Prelude.LT
+          "EQ" -> return Prelude.EQ
+@@ -460,7 +462,7 @@ instance JSKey Int where
+ instance JSKey String where
+   toJSKey   = id
+   fromJSKey = Just
+-  
++
+ -- | Encode an association list as 'JSObject' value.
+ encJSDict :: (JSKey a, JSON b) => [(a,b)] -> JSValue
+ encJSDict v = makeObj [ (toJSKey x, showJSON y) | (x,y) <- v ]
+@@ -477,5 +479,3 @@ decJSDict l (JSObject o) = mapM rd (fromJSObject o)
+                                     "unable to read dict; invalid object key")
+ 
+ decJSDict l _ = mkError ("readJSON{"++l ++ "}: unable to read dict; expected JSON object")
+-
+-
+diff --git a/Text/JSON/String.hs b/Text/JSON/String.hs
+index 51463cd..67fdca8 100644
+--- a/Text/JSON/String.hs
++++ b/Text/JSON/String.hs
+@@ -1,7 +1,8 @@
++{-# LANGUAGE CPP #-}
+ -- | Basic support for working with JSON values.
+ 
+-module Text.JSON.String 
+-     ( 
++module Text.JSON.String
++     (
+        -- * Parsing
+        --
+        GetJSON
+@@ -35,6 +36,7 @@ import Text.JSON.Types (JSValue(..),
+                         JSObject, toJSObject, fromJSObject)
+ 
+ import Control.Monad (liftM, ap)
++import qualified Control.Monad.Fail as Fail
+ import Control.Applicative((<$>))
+ import qualified Control.Applicative as A
+ import Data.Char (isSpace, isDigit, digitToInt)
+@@ -52,9 +54,14 @@ instance A.Applicative GetJSON where
+   pure  = return
+   (<*>) = ap
+ 
++instance Fail.MonadFail GetJSON where
++  fail x          = GetJSON (\_ -> Left x)
++
+ instance Monad GetJSON where
+   return x        = GetJSON (\s -> Right (x,s))
+-  fail x          = GetJSON (\_ -> Left x)
++#if !MIN_VERSION_base(4,13,0)
++  fail = Fail.fail
++#endif
+   GetJSON m >>= f = GetJSON (\s -> case m s of
+                                      Left err -> Left err
+                                      Right (a,s1) -> un (f a) s1)
+@@ -93,7 +100,7 @@ tryJSNull k = do
+   xs <- getInput
+   case xs of
+     'n':'u':'l':'l':xs1 -> setInput xs1 >> return JSNull
+-    _ -> k 
++    _ -> k
+ 
+ -- | Read the JSON Bool type
+ readJSBool :: GetJSON JSValue
+@@ -111,8 +118,8 @@ readJSString = do
+   case x of
+        '"' : cs -> parse [] cs
+        _        -> fail $ "Malformed JSON: expecting string: " ++ context x
+- where 
+-  parse rs cs = 
++ where
++  parse rs cs =
+     case cs of
+       '\\' : c : ds -> esc rs c ds
+       '"'  : ds     -> do setInput ds
+@@ -153,22 +160,22 @@ readJSRational = do
+     '-' : ds -> negate <$> pos ds
+     _        -> pos cs
+ 
+-  where 
++  where
+    pos []     = fail $ "Unable to parse JSON Rational: " ++ context []
+    pos (c:cs) =
+      case c of
+        '0' -> frac 0 cs
+-       _ 
++       _
+         | not (isDigit c) -> fail $ "Unable to parse JSON Rational: " ++ context cs
+         | otherwise -> readDigits (digitToIntI c) cs
+ 
+    readDigits acc [] = frac (fromInteger acc) []
+    readDigits acc (x:xs)
+-    | isDigit x = let acc' = 10*acc + digitToIntI x in 
++    | isDigit x = let acc' = 10*acc + digitToIntI x in
+                       acc' `seq` readDigits acc' xs
+     | otherwise = frac (fromInteger acc) (x:xs)
+ 
+-   frac n ('.' : ds) = 
++   frac n ('.' : ds) =
+        case span isDigit ds of
+          ([],_) -> setInput ds >> return n
+          (as,bs) -> let x = read as :: Integer
+@@ -320,15 +327,15 @@ showJSRational :: Rational -> ShowS
+ showJSRational r = showJSRational' False r
+ 
+ showJSRational' :: Bool -> Rational -> ShowS
+-showJSRational' asFloat r 
++showJSRational' asFloat r
+  | denominator r == 1      = shows $ numerator r
+  | isInfinite x || isNaN x = showJSNull
+  | asFloat                 = shows xf
+  | otherwise               = shows x
+- where 
++ where
+    x :: Double
+    x = realToFrac r
+-   
++
+    xf :: Float
+    xf = realToFrac r
+ 
+@@ -382,4 +389,3 @@ encJSString jss ss = go (fromJSString jss)
+       | x < '\x1000' -> 'u' : '0' : hexxs
+       | otherwise    -> 'u' : hexxs
+       where hexxs = showHex (fromEnum x) xs
+-
diff --git a/dev-haskell/json/json-0.9.3.ebuild b/dev-haskell/json/json-0.9.3.ebuild
new file mode 100644
index 000000000000..ce29d2693235
--- /dev/null
+++ b/dev-haskell/json/json-0.9.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
+IUSE="mapdict +parsec +pretty"
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+	>=dev-haskell/syb-0.3.3:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	parsec? ( dev-haskell/parsec:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.9.3-ghc-8.8.patch )
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag mapdict mapdict) \
+		$(cabal_flag parsec parsec) \
+		$(cabal_flag pretty pretty)
+}
diff --git a/dev-haskell/language-ecmascript/Manifest b/dev-haskell/language-ecmascript/Manifest
index 88b76a86906e..306e9a088b94 100644
--- a/dev-haskell/language-ecmascript/Manifest
+++ b/dev-haskell/language-ecmascript/Manifest
@@ -1,3 +1,4 @@
 DIST language-ecmascript-0.17.1.0.tar.gz 55540 BLAKE2B 82589728b0b219759314326aa36053fa42f7465a475efd15bbdc6ef2c027c2159b932e970e9fee66c179ee7525eb99f2764aecc68c58a55ae102bc79d07662aa SHA512 20a007e2934fc1778cdc5cac123a08b534ec36bec0b6f789f7c4b68c46b548b1e898f123ff1b7512905e28a1dc78e19d6bf517ced28ffcfbafb539f82f073f91
 EBUILD language-ecmascript-0.17.1.0-r1.ebuild 1563 BLAKE2B 6da65e0dedf4443dd74eda1bb0de0f9538bda2405451560128453777b07f7e09a7e9628d04865e37b8b3dd4264db21fb71ccf5535c7f20c41ec4040fa77921a1 SHA512 c0b09decb32a10ebdb0b02fbc4d013ff14ecaaf44a4b70e3416272a6b7368b18a64f49a792e7366442c73dcdc389e562410a614c6735285af29087674fdcbb17
+EBUILD language-ecmascript-0.17.1.0-r2.ebuild 1667 BLAKE2B 53cb558d0e8d5623fea2765fe3a7e9deb2a874bf5230f68ff9d8776bfc6889057c3a7b0fede30d9c887395d5a79c138f151a2a8370ee674107de5247107902cd SHA512 12f32527635319e918553c24fb365a69b9a67d68aab9b9e5dfcc4bcfdbe74dcb68f5db87077cbae38dde2f18dc5e072987b7c4fc035d324b13d57adc497f28ce
 MISC metadata.xml 596 BLAKE2B fc85e0172510fa01a8ff9ad7bc507031e82f71483535dc295f47bd041943b410e8fdaa104c3c3f765f19c5dc314689dd491c486f5feff9e202aa6799e0cd66ad SHA512 47cdb2d3fe83cb1e12a403aa455ff575169c2200b526cd0c04982b4e24f2e91b01c83ff7450e9c48c26f37c5f187478f1a0872b632aabf6be2d50627b44c7485
diff --git a/dev-haskell/language-ecmascript/language-ecmascript-0.17.1.0-r2.ebuild b/dev-haskell/language-ecmascript/language-ecmascript-0.17.1.0-r2.ebuild
new file mode 100644
index 000000000000..66fda2b0b0a2
--- /dev/null
+++ b/dev-haskell/language-ecmascript/language-ecmascript-0.17.1.0-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="JavaScript parser and pretty-printer library"
+HOMEPAGE="https://github.com/jswebtools/language-ecmascript"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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/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/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() {
+	default
+
+	cabal_chdeps \
+		'data-default-class >= 0.0.1 && < 0.1' 'data-default-class >= 0.0.1' \
+		'directory >= 1.2 && < 1.3' 'directory >= 1.2' \
+		'HUnit >= 1.2 && < 1.4' 'HUnit >= 1.2' \
+		'testing-feat >= 0.4.0.2 && < 0.5' 'testing-feat >= 0.4.0.2'
+}
diff --git a/dev-haskell/language-javascript/Manifest b/dev-haskell/language-javascript/Manifest
index d15bd34fb2be..c0b3737e5630 100644
--- a/dev-haskell/language-javascript/Manifest
+++ b/dev-haskell/language-javascript/Manifest
@@ -1,5 +1,7 @@
 DIST language-javascript-0.5.14.2.tar.gz 48466 BLAKE2B 16fa3dd229634230e30f7bd1eea73a7c4d321699553c5008b2050ddc925eb48e5e923c09f080c3858f71a16197dfa2d6ae8ce03bf434547c971745d8fb25112f SHA512 f493572c33baa7f5632f211999dd367b4fa2801a9b99f52796935927493d49a81e215b6847fd6bb36078c527d872b6637362ce0c3998627e5ddcd8abc07f5c81
+DIST language-javascript-0.6.0.14.tar.gz 75969 BLAKE2B ca286024545ae1b6ceb84150865c9b4768fd7ba3e783b86c01a977793cee868b55c1bec2daaa498ecc6b672be01358f76df9bcc8196c73d7463ed3213c9e6e42 SHA512 e51dc2d94339583cea58dafc5092571d54ea170a11dd1b38068f656af63ede76cc914dbbe2c18d3743c68108e3d143c8b153ecfb39410f8a4cbe108cea26fa56
 DIST language-javascript-0.6.0.9.tar.gz 103168 BLAKE2B 80b7e95a9db9e1ee474a492dabb3423664bfcf22b5cdc4957e4834dc351e8825ae9e744b96a081e97cd6ea276e31deebd8d0a70e3c659a0b2bc20d66438c0f44 SHA512 ca5fc4f541ed2834ce492417f858593e2bb42677e787e8d91055e53a400f563ad940757bf2b341d490cd6d1c1feb07a304dacc79acbf5f731f20996acd1418f9
 EBUILD language-javascript-0.5.14.2.ebuild 896 BLAKE2B 0da6007608a6499b77ef45278a81a6734fe51931fe5cb762444ddd3fd14d1ea1af07f261ea14a1d9c3c494bc633356878d39f5d4cd721a33a354bdeaac553a75 SHA512 de499e6a4cbe6c7f2154c6a1bd94c684a6eaaa2749d16cae49159689d84e53ea9a67e4431873a3f3f859adae03f05c1ba13cc6148bc64ef0217b634ac0095d24
+EBUILD language-javascript-0.6.0.14.ebuild 911 BLAKE2B 22ad726ed175ce584bcfb31398771aacbbae78cb4c4f6b7d8b3750c0110868c2359a86445e51dd8fcb74fff8f74f0fd3a1fe77938ecd63174636b5763e6dae89 SHA512 a3aa0c62347180455a339637c38506e58dcf02ae6a6aed4b6a8f723f4a8c0f626a92950d97d28a0cfedb48eded40054e77045fc7d343025dcde2819aca2ddd6b
 EBUILD language-javascript-0.6.0.9.ebuild 866 BLAKE2B ee01fdd875931b925c80276d63cd5d37455ceb29db109f2b2f57223521852b83a9bee279f911a2472cdec222fe2411e3d8484def3617f269b4e08314856da3a2 SHA512 b9d3d23d6b287f125672ce9b3ee4bad80ca620c7556f6fa06652ca0b26a5a54448b89cf00d55c3d769aefdd2fc4901ff778d1e20500d9034cc12b7fc1435bb3a
 MISC metadata.xml 477 BLAKE2B 881b6ca7702a8337971936193008870d6c8d0d39b9f30f12bdedaae28834c4ea73977b4c2379ea27a843e403260848c3059b4665209ccec992c9c38b45ade1a3 SHA512 3037f1e027cba2227010814d743afda935197fc1878411a9d9c8c116152377baca93cbafcf22ce33a6d719c1fce9f2928d31bcca6644f39dae796500ee4b9007
diff --git a/dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild b/dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild
new file mode 100644
index 000000000000..3ace9a1a08e5
--- /dev/null
+++ b/dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${P}/${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/semigroups-0.16.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/lens/Manifest b/dev-haskell/lens/Manifest
index 10286271df57..d04966514662 100644
--- a/dev-haskell/lens/Manifest
+++ b/dev-haskell/lens/Manifest
@@ -5,11 +5,11 @@ DIST lens-4.14.tar.gz 972873 BLAKE2B 4fdea38830b8d1c4b08f5818ef5a81e7534dc31e3a0
 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 4019 BLAKE2B f44aecf39ec99f3d0de1f18f173ce50c947ccadf514000cd6936746f400e49e3c1fb1de66e480c96fb6b6076ced72944fa6dd7e4408c059ae060ff6064caee73 SHA512 b35910aec0a93ebb4fc1c9d91d8283a2976a9b7f2992b3d10994f1876cdd509cf7b8a76fff531133021776e986e4c27c0832580bc1e0d08fb1d38a3821cc59db
-EBUILD lens-3.9.2.ebuild 4298 BLAKE2B 71d8f21ab9b68c0e53cc43b5985d712782356a54014ef8d2af65a9c5c5acbeec7a1d77d37a80c1df35821abdd318a42c1b96c445e89f6033eaacba65b6b3659d SHA512 9598f2a3a19378a7f4e4debb43e7585245712ef2fb6717a1a343d902da1cfb1c39868d837928e526944b8ffca543d6fe68774c1eb8e485bbb6d1b97cb59076be
-EBUILD lens-4.11.ebuild 4298 BLAKE2B b1f35819e14e9412b25b5ef8b289f4ea00af44f72cd68589d1c4f4fef4b3164acf6fd1434714efca18df7170f10cda2e2bc24217f2707b6b528d3c8e0ecae84f SHA512 9dc6bbe6f3665cfdb2cf2d84ff3190a22c5d6b096135f7d83f58580651b323e89782a63dd07f9808880eda145f0c8b2fd2a79b8fe1226ee6eeb15905a816794a
-EBUILD lens-4.14.ebuild 3380 BLAKE2B b73865308ec1cc2ddc1eb717c203403e89fd1ac86f0b025b776c14143e78a0c5b69d9711e3afe24739bac6b8e807bcf1df958b63b8fb863ca8a572ff3bfd031e SHA512 3e001fe3f83b08565dcaa20963b5cc70e7d99c4d80f7ed17dce73196a5fd266733a926161d396161d79c48393c1feda7900ba0612bb4635fe150d31287bb4da3
+EBUILD lens-3.10.0.1.ebuild 4046 BLAKE2B 8f620168be0c48ead8aaab519c4b0671e7dc4445fc452c329bb85afc17f3a1f2fa793b876618ee7e14c536ac6295d77f0842e5991d6608f6457e13b74a2b0b63 SHA512 4e6c384e2a9544d04b43312a794153d1b8d5b8c7425c968e325043f99a3e3ab1674e0a20077d0e21cd697d75476cb200c9c5d3d02a75914360153755930e533b
+EBUILD lens-3.9.2.ebuild 4325 BLAKE2B 424fdb8e8d3f5819ddac761acaa8db0c16ead618bb80797d9530ce099757da185a7dec2fbb03a914b7943df18680b854a7313150f478fef5fdfedb0a69bfb7ac SHA512 356b6269cc6a8d47782afd80d88985aa32da3c9ccef7d6f5a9d0505cb324b50e332f049a80cd1f7ad067e05b67c9619d0cc6f9e18810a829865e31cd6c3e0169
+EBUILD lens-4.11.ebuild 4325 BLAKE2B eadd63346cf4c0c18db524989591b6c8933138bcb7964ff35d89e12d714159d27d84a7af1609641e813dd8e57ec368d062e40eadd2539ac8880d9d2b236243cf SHA512 9a8a88fc4675443abc61e7187a81f81c641a7b921868a823effce5f307d8416ac6ae37b5d1f5a672f55bd75bf54a6479dff09769d19b6645969e891b33aa8c4f
+EBUILD lens-4.14.ebuild 3407 BLAKE2B d5c889b81f3d4d720420d1555edcf40dc2017eb36b77bb78a9aca2c723c3d549c2fd80626901ec956f4a1b6ed07b753b7064779eb6693f27ed1a487908731679 SHA512 7a42db8cbe8b2710d90fed95ceab5214959c0bbe9ac900b86084412e50ee38fbadfa89ac914c79dd8c50e4014f8d819f76747681f398574707f215c7276fcec9
 EBUILD lens-4.2.ebuild 4697 BLAKE2B 71759c879bda8b7ce3a57ccbf94c05e19d9e391d3cb9428b899e4f78e83d36607e385d41ee523a76ec565bef8b3db19a97ee90f68adb641794aaff8f713f21b2 SHA512 50a37a77dfa8dcae665cd412ac0c7b23297f3c5c8a99806b4ecf8d7c5857d2795399440ee355c6c69cac24f99af57cd0398521e9c36d5b8e2c6f2d14f817e718
-EBUILD lens-4.6.0.1.ebuild 4369 BLAKE2B b05746ba3523a9a972b947793e24b8cf35f96ff6803aa9da2fe80d29912731df1bceb873b85ac1b9e5ca36736eb6b1411b0ed751101b248b20c481111ae89967 SHA512 8e00ed3902772f808e09e224a929e3ee162219705193ade8b654982272d0c1f044c86b6bc6de3c3bb9e892a63470a1f5d94b55b221b3aee9f114da3ba3c8a758
+EBUILD lens-4.6.0.1.ebuild 4396 BLAKE2B bdd2e17b6bc44f33310ab3d688ee19c4f86dfed9ddad1259a837b9387947b0c5bb65700365a166ac89cdda090bd37b764b4e036833158e072becc9f2d296899e SHA512 62b194a2b88d0f044b8dfe265d81414c1465307bd8789e7a73bf4666cc130b9cde3239297c598cf19475f9beaf4876d6f9a6554fa3a4b20add728b07ff67ff17
 EBUILD lens-4.9.1.ebuild 4337 BLAKE2B 089157379a489ae88be495d33ca2e5bb7082141de065724a9386d2639472852f321afdf15116dfc495db9326fd861c8dc2ad4fbbde540e36e66d663622a15f3e SHA512 2e9bf72439b29468268a6912569a6db96d9a0a9a3b07efbe1717b76b2230800bc25be46e6b19eba967a4c2935917aab95c4c34393b660e4c55eec0c7ffeb584c
 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
index eef1125fc918..609f9849d663 100644
--- a/dev-haskell/lens/lens-3.10.0.1.ebuild
+++ b/dev-haskell/lens/lens-3.10.0.1.ebuild
@@ -16,6 +16,7 @@ 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"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?]
 	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
diff --git a/dev-haskell/lens/lens-3.9.2.ebuild b/dev-haskell/lens/lens-3.9.2.ebuild
index 55dade3d7877..e94fe831a83e 100644
--- a/dev-haskell/lens/lens-3.9.2.ebuild
+++ b/dev-haskell/lens/lens-3.9.2.ebuild
@@ -16,6 +16,7 @@ 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"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-haskell/bifunctors-3:=[profile?] <dev-haskell/bifunctors-4:=[profile?]
 	>=dev-haskell/comonad-3:=[profile?] <dev-haskell/comonad-4:=[profile?]
diff --git a/dev-haskell/lens/lens-4.11.ebuild b/dev-haskell/lens/lens-4.11.ebuild
index 3b69a8486295..52018405253d 100644
--- a/dev-haskell/lens/lens-4.11.ebuild
+++ b/dev-haskell/lens/lens-4.11.ebuild
@@ -17,6 +17,7 @@ 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? ( test )"
 
 RDEPEND=">=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
 	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
diff --git a/dev-haskell/lens/lens-4.14.ebuild b/dev-haskell/lens/lens-4.14.ebuild
index 9fb4d2b39e88..5cd6d4e13869 100644
--- a/dev-haskell/lens/lens-4.14.ebuild
+++ b/dev-haskell/lens/lens-4.14.ebuild
@@ -17,6 +17,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="amd64 x86"
 IUSE="benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-templates +trustworthy"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
 	>=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
diff --git a/dev-haskell/lens/lens-4.6.0.1.ebuild b/dev-haskell/lens/lens-4.6.0.1.ebuild
index 7bb480c4d471..65c51397c391 100644
--- a/dev-haskell/lens/lens-4.6.0.1.ebuild
+++ b/dev-haskell/lens/lens-4.6.0.1.ebuild
@@ -17,6 +17,7 @@ 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? ( test )"
 
 RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?]
 	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
diff --git a/dev-haskell/lifted-base/Manifest b/dev-haskell/lifted-base/Manifest
index 3199c12d489a..d98d4bbdd88a 100644
--- a/dev-haskell/lifted-base/Manifest
+++ b/dev-haskell/lifted-base/Manifest
@@ -1,5 +1,7 @@
 DIST lifted-base-0.2.3.10.tar.gz 11779 BLAKE2B 786abee9094b999472586b01025d3fb72149f1dff3cea2b495d3e6e95e4edf0a30bf6b688d76320e511d5f77079b74b1f2aeca767d58ec34e1f9af1cf1628d94 SHA512 f4251e0322b2802c6eebf7ee2f1d7b0bc8cb89464e710373ef66868c657bcdf9a5ca9a1c0f0b1c9d397c60fa25dbfe78e925820acdd2520633877dadea9c6370
+DIST lifted-base-0.2.3.12.tar.gz 11700 BLAKE2B 27fd9728c6523185390b13fa1a53578d7210f79a5cfd8a2f1461dbb83d57ea8f94180d3bd77bd34dfad7e78042084616228a618515f2c9f33c7f43fa717cd73c SHA512 8bdd69686cdcd8841304341282f9b32a7d1c095da276bfb877017f12400f0f62018fda47fb41f36b817a91093856d8a02f0b8c7b8fe397fd9a839f20e64b8a32
 DIST lifted-base-0.2.3.6.tar.gz 11613 BLAKE2B d013fd232fbb4afc1a335e775c14d5e7f258540643e14e221ac9a679c02fbc464b5ed511f8cb465416f144001e454481e0ebe262747cee857e7b15ff333315ef SHA512 7fee2208c9043cdeccbea87d0ad44bff82505c10f55a539220484fe09792cd61562a94c9f6fbc2c6f360dd25e8d39ed139972432dbdb748fc2e1f2d47be8a658
 EBUILD lifted-base-0.2.3.10.ebuild 1260 BLAKE2B e3976d775da33e2e2135f9e6422d7497ac40c167dce88f6a5c7e59e0da069e72d154fa1d8bebc416da58ea5d6d1c836625d9b18f421c1b4cf81e9fcc1c042e50 SHA512 fc2a12f53b28035def172fea1428700c3578d10f6071ef76fbcb0bc4dcf64df81dbcb829be1287ab7558c86f685cbc24fa9548602e0f9099480cf6ab662262b3
+EBUILD lifted-base-0.2.3.12.ebuild 933 BLAKE2B 2012abd6e269b795a385775739c74e7717360f2103f70806fd43a1ea9b67d73eab93a5948f22f3c88a81ab53ad7cb57e9425a63f5770b94b01ec583d5f136aa4 SHA512 1204b3e75ccdf41650a7b751b6f7621eb364817d11183255ce3457c896716b1ad15735c159c1acda4207daec4c237f52b2ea82a74c8363cdf86072705f6b3f5e
 EBUILD lifted-base-0.2.3.6-r2.ebuild 1482 BLAKE2B e38fb7802500458fcbf58129343d68418e6ae4746792f139025a6f8664c5924beca78d4b3bdf585cdced1dd259160d5a64cb440e10ab538d8363417d658aacda SHA512 20161f5620e5f41f1acbd8818c6048115c1454403386c4490de495159a7c42f419070a8dc3eec6b738461d4b86eb6dc4ce9becf74e95859a41b3602bd27b101e
 MISC metadata.xml 800 BLAKE2B 14585201ea8e30f102afbadbb0ed16cdd7a744e86e8c9e3e98cae7931da75d0e129226a95128d0fd6fa9774a4516c67a66c04a02371a1cbf53fad7b41d5cdcd1 SHA512 5f2f2b72b93eac28f68a672504de3ed30d0c0499618961963b8a45813b2bef2cd0d8e93e3f14c813fbee465b96900c0e6653b4da0111e55fb96b829b6f0af699
diff --git a/dev-haskell/lifted-base/lifted-base-0.2.3.12.ebuild b/dev-haskell/lifted-base/lifted-base-0.2.3.12.ebuild
new file mode 100644
index 000000000000..9bb5a3e8a30d
--- /dev/null
+++ b/dev-haskell/lifted-base/lifted-base-0.2.3.12.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="lifted IO operations from the base library"
+HOMEPAGE="https://github.com/basvandijk/lifted-base"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND=">=dev-haskell/monad-control-0.3:=[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-1.2.2
+		>=dev-haskell/monad-control-1.0.0.3
+		>=dev-haskell/test-framework-0.2.4
+		>=dev-haskell/test-framework-hunit-0.2.4
+		>=dev-haskell/transformers-0.3
+		>=dev-haskell/transformers-base-0.4.4
+		>=dev-haskell/transformers-compat-0.3 )
+"
diff --git a/dev-haskell/logict-state/Manifest b/dev-haskell/logict-state/Manifest
index a306a73a7c43..fd4d23429f52 100644
--- a/dev-haskell/logict-state/Manifest
+++ b/dev-haskell/logict-state/Manifest
@@ -1,3 +1,5 @@
 DIST logict-state-0.1.0.2.tar.gz 5669 BLAKE2B 4596ac415c48c14f7d1c74f6f8613756582405467779a1a185111861f3374842c02a56b6665311b6b6c0c7ce12d908682572dcaaf37a5c61e8f937d01996b5bc SHA512 b3e113c3f124ee6716a0532060e7ca9a5c4dcac2a4de565562f3aeff8884310bb84c2631c555c881e2cdf02ab73afb6323b1a5d33bc743eaece7e382c74298d6
+DIST logict-state-0.1.0.5.tar.gz 4525 BLAKE2B 9dbd41d4b1f1f9023082836a852bc3f2d273f920db6caa4383fc23c967e588dcb2e94b053a5c7a3fb3c28afbd714f7006583a65dd87c3eb3b535202caf2223fc SHA512 f641907213c23de22a779f1dd065aa3c02de5686dae0fac86403d958ba6d2cba23d86d6a43b8c78fff0963f7ed62837d704243eeac006163eb6fa2ab26fe9ad4
 EBUILD logict-state-0.1.0.2.ebuild 696 BLAKE2B 4f7bc4d93093afa393242339351aa55ed25a96a1ede87c8c874e57b4dbef3f214bda06a631a4c8e57cb1cfc0da53f1d5564e937d46f0e7fb78e295a4ce85a9d9 SHA512 23e27bd9bf46aa737e905007ed96612fea914923e340abdc9218fa241863e65883a9d70ef81642fa120ca611d8f4c1309aaab505cb6c8c88b4cd16588739566c
+EBUILD logict-state-0.1.0.5.ebuild 652 BLAKE2B b7296de9f4ad475a6895f2bf0bc4711fdeec05512ebf9713c561045465fb34935dca0fb10add770f388eeace6bcad8fd41b526d87d5e162d0168c75cc0968283 SHA512 f06bb68fcaca8e9c4f2c963c754595797840f329f6bef7bdb0c86e9d965a12e9c7d5e17d033c86c54a4d35be9b0026b7061e6d7cc7e9a2e07f44d87925c81880
 MISC metadata.xml 489 BLAKE2B 7155624f2570bd9e09434734cf702db4785da809af5f1a37d71c831109aeb4eb1d60db8fb9e12043fc7b564deb6255e076a47126d9bf5c82c1a73c14ffc71349 SHA512 a240b1ef1ef72e87f57d27217359e2f5e6494cc0884b25b605b66ba9ab06182be8e8f815e73fa49a44961b958e8d00e0d4daf3cf58f20e7210ea531f6ab848fa
diff --git a/dev-haskell/logict-state/logict-state-0.1.0.5.ebuild b/dev-haskell/logict-state/logict-state-0.1.0.5.ebuild
new file mode 100644
index 000000000000..86cad39395b7
--- /dev/null
+++ b/dev-haskell/logict-state/logict-state-0.1.0.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.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="https://hackage.haskell.org/package/${P}/${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-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+"
diff --git a/dev-haskell/logict/Manifest b/dev-haskell/logict/Manifest
index 0bf9eaebd6e1..ee57aec36e8c 100644
--- a/dev-haskell/logict/Manifest
+++ b/dev-haskell/logict/Manifest
@@ -1,3 +1,5 @@
 DIST logict-0.6.0.2.tar.gz 5370 BLAKE2B c66d17f4595a27c83d9b2fddfb3c9e824d838ab353a8a71d6a78f436e20f529d7f408cf818b7034500bbfb5a14da7c6b8b2b067d36e4820898379f870922a3c7 SHA512 dfb72d006d9b7a5f0d7447d956ea0c3d083e200a616efc4b34fafa0582c2dc7e9369156cf4f51a472b97f7afb6167030edeb84e77c7bc410bfe58a44f0ac4fc4
+DIST logict-0.7.0.2.tar.gz 5892 BLAKE2B 13f521f69c2c3453d54ccfd87bb4ffde9dc7b222e8989757567bd91bb1c3e20c8fa85a37b078675bbc25c906acde1b4651381ac348180583f03b4214cc81afc1 SHA512 f7019533ed1ccd7e2c87b6f78aaece5d4062b378c75ff52ffb3d618a27e23ec1d8fdd823904fc94df017f682b49aef2b0549b91c7c45e395eb79ed2772c107b5
 EBUILD logict-0.6.0.2.ebuild 622 BLAKE2B a083a1ca5ea48c1feae587039237639e223f554815a5c82de3a312b2ce6f9c7c4f8e13c439e37808a2c85952ccc04f88cef2f713d5408fa2f8235c5af69ecd37 SHA512 3f0b05e488dbad7219bf6a89cadf1a48f2e4fcedf1f070ce56061466bc7e5d0758eded3d842184ba94a9489e55d253c984ed3ccbd710149f0ca6c229f30f83ee
+EBUILD logict-0.7.0.2.ebuild 707 BLAKE2B 7a040032b815b56792c680038f292cc8469f3a9cf8eec69c1662c61b1155ec704150bcb07b4928d53e0a499c3bef6f119cbf8ce9be8165c0262c13b8c64c0b49 SHA512 630c36e6a7cb41173f039c5d3a1b7ce9a46524ca8ddf2bc7d5e7c787d8db2823270bc2e42a20b3441121518dd24c84ae1ee273ee006edb647dce10639fb5698d
 MISC metadata.xml 639 BLAKE2B 3230f1fbd426ece61b20dfaf9941948b1dbab928b0a346ae1e169147879e606cd1516984f2c5db2f238a81d77f5a709d259110c8bc9be25ba86f7198ce152bb1 SHA512 f73942e60af15017476d75dbc89ae2e3f15e0f4f6dc95a63ca8e86e4f785f6cd4a672c4ab6f5e47f4779e7644ea10ec19d8de4a55c815a606489bbcf5a611b18
diff --git a/dev-haskell/logict/logict-0.7.0.2.ebuild b/dev-haskell/logict/logict-0.7.0.2.ebuild
new file mode 100644
index 000000000000..fda9f35cc82f
--- /dev/null
+++ b/dev-haskell/logict/logict-0.7.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A backtracking logic-programming monad"
+HOMEPAGE="https://github.com/Bodigrim/logict#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/fail:=[profile?]
+	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.9.2
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/microlens/Manifest b/dev-haskell/microlens/Manifest
index 678e88491762..5e0a06412aa7 100644
--- a/dev-haskell/microlens/Manifest
+++ b/dev-haskell/microlens/Manifest
@@ -1,3 +1,5 @@
+DIST microlens-0.4.11.2.tar.gz 26549 BLAKE2B 7b4eb026ed937f5b710fbdaca6154c9f4e37a494d4b01b7ff141a8446b80c1c9eb707076f743d9916adb33de4d30e003c66e235c4ec95ef59c43293713389d2d SHA512 16a70dc5b524dc5165faa6502bb74c7eb48a6eaa3ec9bd4bb16c6cbd6eccf5ab365e2e0e2e10e9e60b65e604de78dd62789b53a7c7d2ccd0da93bce5b09fadc8
 DIST microlens-0.4.8.0.tar.gz 24766 BLAKE2B d033f58cd378d3c0c2274536b50ddcafa19f726a1eb7303032077bd232491b90eac0d277cdc6a73ee0fb06288c19aa2dd63dfc10acdec280baad01b9743f718f SHA512 472b4ef43161a21c2864d87d53e2e4138d4ee16d64cc9e96f43c2cdc11894df178189525be1c6e5c8e0db582f878d1d603696f0ace82986fcb42d888aee99ae2
+EBUILD microlens-0.4.11.2.ebuild 541 BLAKE2B 0d80f5327f741943d182797b8de30e7e9fe17f112262292a53eae666a0303c036bd7d9a24385e9f7f73c71d7e09d4757c845fa033e610cd7979e69be4a6eb323 SHA512 d498f1c80b981ffef17802c0888d66540c4a3f2ee91fbab21ee8fbb6bd8d32668703c0bde2b2af440fdfbfa9cba496b2e7f42e22a2aa8c17df7140b1a0b237ef
 EBUILD microlens-0.4.8.0.ebuild 543 BLAKE2B 72ec10ab4c794d7e7fbe4ca2df168ab88831c82230d7c23b335464144128f22fadb1b30779dbf1b11b846dd83d0e16b00e3907a2a66c150d457ad5bb97016286 SHA512 1e825ea6a34e7c435f702d00ee92ec813f0d86d51da4e9c84e7083c21990a1b996def8c04a79e58dd99e27b97ef6cb0964be7688de34d6a8fa648854e21f57a9
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/microlens/microlens-0.4.11.2.ebuild b/dev-haskell/microlens/microlens-0.4.11.2.ebuild
new file mode 100644
index 000000000000..c01efa466b75
--- /dev/null
+++ b/dev-haskell/microlens/microlens-0.4.11.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A tiny lens library with no dependencies"
+HOMEPAGE="https://github.com/monadfix/microlens"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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-types/Manifest b/dev-haskell/mime-types/Manifest
index 0ea605f330fe..739d8ec7d4a9 100644
--- a/dev-haskell/mime-types/Manifest
+++ b/dev-haskell/mime-types/Manifest
@@ -1,7 +1,9 @@
 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
+DIST mime-types-0.1.0.9.tar.gz 11384 BLAKE2B 610604f93b5225589478f87b710c32793c07685b4b009cea146399bf68655188f2771d36b82baee6b09ba331441687b270373c22bdc080a803d2bf133fe293a0 SHA512 cffc9d4d808d52b35bf6b5bdd6c069411ec8746bb3951e7c1a6200eecb2ae0617ede9891aa3e077e9ea5fc6f08bc2a1c44547971ed2a66108c96fd9dda30e6db
 EBUILD mime-types-0.1.0.3.ebuild 563 BLAKE2B 0d6353d3983809ad24dbbd33aa51b8f7dbaf6a37f19038bef0c54b070ed8f48a04618d3f669d9a7d3b5fee7313078183321aab9466e695ba8d2369766a73c341 SHA512 c4caf58990e6345ae12fd435276c31e44cfb18dfa6cae04b6939187db9bc363309fe02a8ded5c0ea07da60f25647e511b5161971c6c788a718d32eb9eb0010a0
 EBUILD mime-types-0.1.0.6.ebuild 564 BLAKE2B 768c0136530203ea910e8db7c6e18e61dfdf19f53f37c0cc4976547ebec30590e0676ec7e591e5c2daa5e6f8fb55077bc10b7acec71c0b30195bdf90ad774c3e SHA512 693624d7c74054200041629d51834cb0355f0a0bb1e580313925e38d1a5abc8664f58657a36065bc65ed11c641b80791e6e750b3fbef503278b9153c27fdd8d7
 EBUILD mime-types-0.1.0.7.ebuild 569 BLAKE2B 8294da6e309f7269a8137598b436dc0887036565b98fe953b945f0ae4a7f24808237bd07e77a4d4a5f0b6534109901f1816aa6ee5cff2c29a98226049ab13770 SHA512 487f5c7413e8731f92c38492a2fef61f165618f79d472144bd4cadf97179f1132f239d30187ed887dfb1aa21935ec95e24fcd153f5f18c71a515406e6925491a
+EBUILD mime-types-0.1.0.9.ebuild 567 BLAKE2B a042618036693e57e0df6b2bc85d30018801e8db76802d6e301ea703f23ef5d82e7fd980c4f562e2c0f4beb9857bab30d378ef8b22bf7a7c40f57b669e1e12d4 SHA512 74745eb054a990aaffd467883cd2c1ea3adc6f4a5e15c8e9daf991c902bd36e7b7ff75ec1c6c4980c057b469b6c6f142191dc21dc0759e18559e7e677ac86971
 MISC metadata.xml 412 BLAKE2B 93de8562b6afb74cb4b6f18ba574331a71c7a946809a2c28dac6437cad9d9975c09e866079a91fa5665446e15015af36c37fda988dc56d78a9a664f4a83fe5c4 SHA512 e04aa666daa52214c60f6e9515c15a0d8458d20fcd0f584c4ee230334892bff2292a0f655222d3a396703610aa6fb6b6f422ec9912c37fe6275db9b4ef2f3ea7
diff --git a/dev-haskell/mime-types/mime-types-0.1.0.9.ebuild b/dev-haskell/mime-types/mime-types-0.1.0.9.ebuild
new file mode 100644
index 000000000000..7348ee13f728
--- /dev/null
+++ b/dev-haskell/mime-types/mime-types-0.1.0.9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${P}/${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/mockery/Manifest b/dev-haskell/mockery/Manifest
index 4cb53cd30986..557e0591cb87 100644
--- a/dev-haskell/mockery/Manifest
+++ b/dev-haskell/mockery/Manifest
@@ -1,5 +1,7 @@
 DIST mockery-0.3.2.tar.gz 3421 BLAKE2B 3f0a3a8f8dddc1b607e38922048abfa82bf77d1a96945f1ceb795d74c93aec5af6fcc61656c001be9ad99087b8689de8ab0cca7b90a415ce6e2ac8fb044626a4 SHA512 f9b94c205a1fa6c0da93b4859d0e541fdb887470213a1ef3e38468c7d2561803389b3497718936a3b79d20c78708b49d2f8941be4dde95d62ef335752c6f3626
 DIST mockery-0.3.3.tar.gz 3952 BLAKE2B 6bc93493b19e4b2a24c8a6ea4b75503ebc8c435d082f7805feb0f004e65ba7654bc4c12324c4b935272bfed082faa52f8b9a424495c07bf6eb7a813cce5ed5d1 SHA512 090f2a9400c958b6ae89a8ebfceff156da16588ad20e4da1c155db281bc40bbafc0335607ca3ab888d87b0da820cc5a3a1ba8bd7e231ab19d6ff3adf519b6be1
+DIST mockery-0.3.5.tar.gz 4040 BLAKE2B ca8b761639822947f030bad0dcdd227aa188c568404c2b3f30602d85bd03544e773dfa9ada57be369c8a1e9fa93417bd80b379b51578e7f118270b6694d1bf30 SHA512 bcb9bef083749028ec27ba879feca7c7a8f966f50b31fe1df3e82b3ac206b634b961755e4ee90ebc72ba8c17be3bbab6acf1b01776bca9497cc5cbc1ccb58850
 EBUILD mockery-0.3.2.ebuild 686 BLAKE2B 5659320ce756f5f5a34125eae393c5e4cf850f4237b25ebdaff26b5fa6e228948219f5e5569d471b21958bf731013d8617edee55c88c98dadd0f17090931c5ba SHA512 3b5468250c0303a99e7e60b2adec0243984804f7017f0cd887510db5e9f949132640d5720c3ec5abf797e6226110996724cf175cbe3d29eadc9f3941581145dc
 EBUILD mockery-0.3.3.ebuild 723 BLAKE2B 9a536fcfc611fc95bc082fdeec54b6bc46836c3b37a714b7b3b8e0bc0d5950c4fe06e8db80fa4d57fe1a8b97ef756dc21e7ca1d6c65afea4d1fc80839dd931c9 SHA512 e60427b8f26dc1bc3c1c15fc84c3b993fc226535eeb0ce3e8a06dc3cd18b7caa01f69b13f9f0ab24bb359559080c69824e9f0abac6d4fc3373da2bf7075b172e
+EBUILD mockery-0.3.5.ebuild 723 BLAKE2B f5578067ce365c83fe76e97a53fd4a8f3676a0d468cbad3896deacef934faad6fe9c6fa35776906152fb41d7eab99b4d9d2ed7979bc7b311b34cc1cccc0cf03a SHA512 3f93d5b8a42c63de61a81538f269f7aa3beb240ecdd6899bdcf3a4a2d3a43055d6198dcbff9112ed2dc9635b8a96d75c9730bb904447095a6526b3deaaf18961
 MISC metadata.xml 330 BLAKE2B 6872f7c8818f3ff436da2d868f0785a352dc50b5da4e8cca738faf03bb6812c244420d04bdfcc3ff6a380931f990ee2f6ec142c470c6e186121bd7e2db95d0cf SHA512 c9599dc4a60a7e49a19d3aec97808a4838153afbe0c614cbdb7b9d78334c1535465b1f52de538f7e4abecf8518b801f90abd984a42e84a0a011c3546b3e37c23
diff --git a/dev-haskell/mockery/mockery-0.3.5.ebuild b/dev-haskell/mockery/mockery-0.3.5.ebuild
new file mode 100644
index 000000000000..9f34565ae2fa
--- /dev/null
+++ b/dev-haskell/mockery/mockery-0.3.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="Support functions for automated testing"
+HOMEPAGE="http://hackage.haskell.org/package/mockery"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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/Manifest b/dev-haskell/monad-control/Manifest
index 8de71955cb58..80d1d2218419 100644
--- a/dev-haskell/monad-control/Manifest
+++ b/dev-haskell/monad-control/Manifest
@@ -2,8 +2,10 @@ DIST monad-control-0.3.2.2.tar.gz 10684 BLAKE2B 4bb1e101a24f3d1209698dc99d53beae
 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
+DIST monad-control-1.0.2.3.tar.gz 13864 BLAKE2B c150338e8a585dc045fd23404719fe61a2367f7308e15344f81549fd7f0808ef8fa2238a35b0a7c7984d26885352186bd6bf43359dec68b2df93581b021dd794 SHA512 59837326ec9f25220cb6c7329c91a5806b0ec7412d6af24c0f0d52c4fd93b084e92edd4f5f61a4f9c4248034fa540c23b65d2aacdfca737ece98bb132b8f08d4
 EBUILD monad-control-0.3.2.2.ebuild 988 BLAKE2B 6d0d883adbf4fc5b0c5e51a6931228230c9f99b0d5c7709b9e81c11b8a236ef9594a1e96cafe10c28cd56a90a4c412ff3f5128f273af8e6bc8aa8f1b38fb12ec SHA512 238566db4429ed796e8ace63955830df537e50a2291858770cf521c65437c48b0a3b90c83c7a768afe04500d7902d4b5a0ba4b0a3ad7055bd52d9b7d84c90704
 EBUILD monad-control-0.3.3.0.ebuild 886 BLAKE2B f3a39a6f818deee8f02aea8d3c9fbab822b1788cefaab696846ae69cf16824f3e149b991de39d3fd86fb5cadcc66cbe563149502c39e2ade0eef7dc7966584ea SHA512 35c8a173ba6cbccfb0532d30c3027dae5b89fc7033b72badb4ed96d1149d78bd11bd74cebd4417fe3935e1885c491ee313ad0bfa12d7ae29b84adfa20aa596ef
 EBUILD monad-control-1.0.0.4.ebuild 946 BLAKE2B 0cb1505a8f7af339df984e14f56594616fde4a672970e3849d96b545cbfe50c91a5bbf1b4aae5cbc5bd0a9dc0a3f9b77d98031f73ebf8779d206d54ad08f728b SHA512 0042c44230eb80eb7d998a7aa623f6e9c818ae1f9c42572f76f282b6e8dc6b4b8c5e6e244cba3ab987da8a8bd330532d367b116a422fdd3e5df62444c7797de0
 EBUILD monad-control-1.0.1.0.ebuild 955 BLAKE2B b45125c4ed25c2801895210458663523f69d61acfa6dcc1dc12987bcb92abaf26943d7054b45680ce5cd08d34f436ccee1eb41acc7defb22e82eedd8ec74d6c9 SHA512 de62067b3a3b7bb98b93222f6c20338bcd9bb50a47bfc437ae4050b3785c80b8fa70d503569afaf4c75bdc7bea1280b8416c8e0fa6391bcb44177082d97ffb6b
+EBUILD monad-control-1.0.2.3.ebuild 865 BLAKE2B 5f01b415022e01840ae31d1aafc92320c48cbfddbba8a577bbf8f4cc09d094f13bb3ebbb8f6c42ceb41966aaf80c5543023fb3c4b57fcd5cbaf20423da1a8581 SHA512 c7c0fd25b36eaa0bbaa4a4ff759a48ee2190b54495b54e89061fc0256e532040966d3065db450d26eeccca9d478c015981671c99fa253115314a89b5187328a8
 MISC metadata.xml 1773 BLAKE2B c4bfe6f561321644ba050f51897b3034f5fa6220327de82658ebee603965eb420cfb47180f89a512762f91e208da004813032125cfe1478a8b510cef3cb97b60 SHA512 40ad4d1ec82c40f655a3962b48bc53de5e2429102d5cfa2daf435a38e81a17f2e2d1a97b46cb1102ffe9f6c3799c232ffb0f758f0cdbafbab639a3a696dce373
diff --git a/dev-haskell/monad-control/monad-control-1.0.2.3.ebuild b/dev-haskell/monad-control/monad-control-1.0.2.3.ebuild
new file mode 100644
index 000000000000..6619429ed548
--- /dev/null
+++ b/dev-haskell/monad-control/monad-control-1.0.2.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="Lift control operations, like exception catching, through monad transformers"
+HOMEPAGE="https://github.com/basvandijk/monad-control"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[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
+"
diff --git a/dev-haskell/monad-par/Manifest b/dev-haskell/monad-par/Manifest
index d894475a865d..c38868a9f8f4 100644
--- a/dev-haskell/monad-par/Manifest
+++ b/dev-haskell/monad-par/Manifest
@@ -1,5 +1,7 @@
 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
+DIST monad-par-0.3.5.tar.gz 31675 BLAKE2B 02299d3a6813618e43d2786bb6963d1fda74fe50f84f2ada86890e87b38803ef1a1042dddc83c8e813cd9b1461710991a37900ee059222ecf65dc7706ed99450 SHA512 0843753f5a1465f46ade4c60b0707a07e996f12b13f8248e4c3dc6eeb5f0b8b4a321acb4dff685d17ef52d36db32cec5564e6492f7027c9d93f03c5780895b9c
 EBUILD monad-par-0.3.4.7.ebuild 1217 BLAKE2B 3bed2a1230d295ef364807496e5ad6bad3ddd019dbfccfc69a4eba04d91483e52acf70660029a41482826290109ac8ed0635808887386af58b03946792d19ddd SHA512 adb4db91625efcdb5bc0f851274875c15dc7fcb1cc73b3787a3350a1adb277d4c7cfa3306cde8073ea177d6622bbb21c1a1d463328c1771befede75a0b2bfc4f
 EBUILD monad-par-0.3.4.8.ebuild 1215 BLAKE2B 0911abd6e927989c99ac3b695b29ec23c4a9bbb03069fc21a8b42c7ad377279ba7e1208397cfa529c62b7f1ffbe69670c46e7fe127f75f9aaf04a5ae7f826c81 SHA512 327721802809c3baa3ed1d109eeab165c3205d8f9846d215df2d306e7443123d302955c61ed1ff0e3800415ca38ce1c9a1501c4a40ae68f56e7c15f783ea0dd3
+EBUILD monad-par-0.3.5.ebuild 1217 BLAKE2B ba3e9128b44b444bf3c7dae996df8b524f49462f45998492a5d2ec3f00a8ad5e0ab93a5ab591ccd18a28089a432238490ca3ec40822a45f10816a7f8409a9412 SHA512 f546dd5cca4fb62d30959577a46fb189d2d0afe0a3c7c2f104266bc4e3469f9277141266a2580e617581ce2f0eedd009133dab230ab0bad6119d64216564dcd1
 MISC metadata.xml 1071 BLAKE2B bd9d53b00250f7af1fdb89c4853a3f06c09be12014bc887bbfb5d5d24984b992765b109833f350664bca345d16b7a1295c5f44513e11f86aaf5f28abb88a17ae SHA512 45e21f883fd57087d030acd80b6ef45538cc357f9b1572c2cfc080330e8a6a59226af9c3e8bd40a7a5ca3839aa427b03e5d7df88fdbd75daf928379531d88729
diff --git a/dev-haskell/monad-par/monad-par-0.3.5.ebuild b/dev-haskell/monad-par/monad-par-0.3.5.ebuild
new file mode 100644
index 000000000000..a82a39857566
--- /dev/null
+++ b/dev-haskell/monad-par/monad-par-0.3.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+#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="https://hackage.haskell.org/package/${P}/${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-8.0.1:=
+	chaselev? ( dev-haskell/chaselev-deque:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	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/monadplus/Manifest b/dev-haskell/monadplus/Manifest
index aea5ddba5f5a..decb1599d130 100644
--- a/dev-haskell/monadplus/Manifest
+++ b/dev-haskell/monadplus/Manifest
@@ -1,3 +1,5 @@
+AUX monadplus-1.4.2-ghc-8.4.patch 1034 BLAKE2B a004625fb88ad02eed904a598ef8943ad6d6319b98acddc8911e5b689ac518ff6491cdc6c6ed612c0af6dd4c7bd59f0f571b2663fec2d26754aaa1140472e2cc SHA512 12fa58624304138593b3877ca77ce60eaa3b2c049889c2b7ed8cb5b115355c67ff7c99553d242024fea5e57c91df0e5dbe995b835ac59e8faad90a0a4a04f738
 DIST monadplus-1.4.2.tar.gz 3671 BLAKE2B b256d49436933b446d3aa74e23ea778a6cf092cb858eb8ad1024adc370caeec6a1153a7cba7a25507213f758c3393c9040f354ca5238f8950b3bab6153d8416e SHA512 839a35b3de1226e177c07e30b86e841ddd19075d3ce29fa7154fefb371d9bef8aa85847d7c139faad93713d5b7889979498097f69c6e3bccfcee2fbbf7bf6539
+EBUILD monadplus-1.4.2-r1.ebuild 602 BLAKE2B 241d035969cd2ab633edd78e98aeaa7a4628075c42b265b5fd02ad6a342d930ee66b58871dc486e74c988df4696ff2b50cc93527d2c54fd3513e5d19ee318e28 SHA512 2c7f3f8912ae6e80d7489daaaba9bd20bcffd83172250016cc0ef7813de55677d6dec1a5e5d0ab5a383983e5835c88866a1cc6ad79bd48d36eec8b1cdc7d5644
 EBUILD monadplus-1.4.2.ebuild 558 BLAKE2B 4810ff648de9dc07ddf0c05303d4acfccf6e754b9ccdca9f12811b28f22cf5556e2169be7e440deb0af0bf6223a3844b58f2f94afeeaa04823418a5983e93ba2 SHA512 21a04b0c99195a582cf70481f16536b0d3f8ff1c0c948a0bdbbcf40c7c86bf0f7a0f3b3fa142dd01a42df15a5d472c49837d16c5a736cdf7603eb2e0c2770681
 MISC metadata.xml 444 BLAKE2B 354899572a25bfc7a82bbb961b49723aa03a185ca5085c1d0d9c5171494863ef2ac71728fbe726e106fb62a7b7b2c647b3874e31f1b2dee0126814d9e97c8aa6 SHA512 157161275158f6defcfaafe8da19e18ee8a7b045e96f11c0d82e7431f4398b9187bc3152c9d8e58736aa340530bd09acfd7227e0d2aebc917f8fee7e0ef6c60b
diff --git a/dev-haskell/monadplus/files/monadplus-1.4.2-ghc-8.4.patch b/dev-haskell/monadplus/files/monadplus-1.4.2-ghc-8.4.patch
new file mode 100644
index 000000000000..feebd15b06b0
--- /dev/null
+++ b/dev-haskell/monadplus/files/monadplus-1.4.2-ghc-8.4.patch
@@ -0,0 +1,33 @@
+From 63978a11cc1a512e564237e83060e9aa29ebce73 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9s=20Sicard-Ram=C3=ADrez?= <asr@eafit.edu.co>
+Date: Sun, 7 Jan 2018 23:52:32 -0500
+Subject: [PATCH] Added Semigroup instance.
+
+The instance was required by GHC 8.4.1-alpha1.
+---
+ src/Control/Monad/Plus.hs | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/Control/Monad/Plus.hs b/src/Control/Monad/Plus.hs
+index 25f4782..654d133 100644
+--- a/src/Control/Monad/Plus.hs
++++ b/src/Control/Monad/Plus.hs
+@@ -1,5 +1,5 @@
+
+-{-# LANGUAGE DeriveFunctor, DeriveFoldable, GeneralizedNewtypeDeriving #-}
++{-# LANGUAGE CPP, DeriveFunctor, DeriveFoldable, GeneralizedNewtypeDeriving #-}
+
+ -------------------------------------------------------------------------------------
+ -- |
+@@ -263,6 +263,9 @@ instance Category Partial where
+
+ instance Monoid (Partial a b) where
+     mempty  = mzero
++#if !MIN_VERSION_base(4,11,0)
+     mappend = mplus
+-
+-
++#else
++instance Semigroup (Partial a b) where
++  (<>) = mappend
++#endif
diff --git a/dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild b/dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..b5dbfd5ad984
--- /dev/null
+++ b/dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell98 partial maps and filters over MonadPlus"
+HOMEPAGE="http://hackage.haskell.org/package/monadplus"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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
+"
+
+PATCHES=("${FILESDIR}"/${P}-ghc-8.4.patch)
diff --git a/dev-haskell/mtl-compat/Manifest b/dev-haskell/mtl-compat/Manifest
index 0b9462667f54..478e5d236e88 100644
--- a/dev-haskell/mtl-compat/Manifest
+++ b/dev-haskell/mtl-compat/Manifest
@@ -1,3 +1,5 @@
 DIST mtl-compat-0.2.1.3.tar.gz 4584 BLAKE2B 47cfbaf9f60f586318a0aa838e64d0ae13fe69386b738e3c45eb393acb77176c85a9e99f7c81384704d177bf7c895f866813880ba0f2285116a566f24114645c SHA512 c9afa97eb5dc1bddcbf0e088352141d56b603562f80fcbde6811610a4e71e1496dd5f07e4338644930bf06b403bc08d35799f7063ae845ecdb71e619b2342a18
+DIST mtl-compat-0.2.2.tar.gz 5128 BLAKE2B e1066f61c8087ffd6c8afc9545dd73402b01e9995fcbe226094777f93623f93209c7afdcd01fe2a5fdae4fc4aa2d39eeb821772ce9d542c80f7d0714d25dc79f SHA512 78a93e9e59d01bf0ffeb32f1322decd65d87cba8912d00f77347f0fc2f7190a755297953ac363ca3342c83822d36101b43ef044dc1f3b2ffef7c7710afda9d0d
 EBUILD mtl-compat-0.2.1.3.ebuild 996 BLAKE2B a41334581276a81739d8b600065c22f7b54514db352c3c2de39bab799d58029e332ac64ea3a7a74f11fde26674f478f386b99bf385f1c3ce04c0e5dc2ffc2e8a SHA512 5426cf3cbba87f15766407f15b6fdec373a70872abd0da0b69fe3953ce2160e943699aa6439544e13c9d9b0018c231441a722e8fa3e3fe8496387de096a19cfa
+EBUILD mtl-compat-0.2.2.ebuild 1006 BLAKE2B 0cd6482beab5c0660702be3cd471b25688e5e53327018e2f66679f88e41708a4e235a71bd72fd26ecef65480382f7367339f3fe9212d97b0ebb6f8a4efc40aa6 SHA512 e2cdc62de13dc26918e822a88aae27b45d546f96121bff148a8fe2bb350ca664e2731553e5a0f4fda25fc6c516f8121199f8f8f7448cbb951f289dc45dc43a09
 MISC metadata.xml 1161 BLAKE2B 1ad804c5c754f337f5a046fe2b386d10149d9f05f8afbd5beb4a6a8bb4ddcc0a2e8e5c44f6c0b3f422ad93e3a59f80633210592681faea074a0e03a150d9332e SHA512 3a51b3c6dd7b62ef720aa1fcefd0bd810c36b8ac0322e83ca0d1552ace59bea71f55e4e77fc97a9aafd304b833ab8b3c11dee0ccac29b46418b99d367510cdbd
diff --git a/dev-haskell/mtl-compat/mtl-compat-0.2.2.ebuild b/dev-haskell/mtl-compat/mtl-compat-0.2.2.ebuild
new file mode 100644
index 000000000000..544821d4286f
--- /dev/null
+++ b/dev-haskell/mtl-compat/mtl-compat-0.2.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile" # haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Backported Control.Monad.Except module from mtl"
+HOMEPAGE="https://github.com/haskell-compat/mtl-compat"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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/mutable-containers/Manifest b/dev-haskell/mutable-containers/Manifest
index 644912f6f308..79a19206171b 100644
--- a/dev-haskell/mutable-containers/Manifest
+++ b/dev-haskell/mutable-containers/Manifest
@@ -1,7 +1,9 @@
 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
+DIST mutable-containers-0.3.4.tar.gz 12286 BLAKE2B f782c4b7a80699317814ae57c867314cbb374f90a84e9647010d29c6a5ca58a6812febd07cbff07572d6a76f2df89dd9056186adada25989ea86bdb4c263013a SHA512 1731380fd57c8c79a77cea781fb7630f90e11cfa977ca836695981bcecf10b7d2d5f3e89e8a6de5fd3fb32ac441b0512c7a6fd356107e6efa47b0d5fd491157c
 EBUILD mutable-containers-0.3.2.1.ebuild 757 BLAKE2B 1a4bb565cb46186b96bc10f4dac390d2e0f3a8a821c56b24967f71dea813c543524617ced159e985ff2556aa8c42de35c9aec3836097ae25bc603e10a6aa571e SHA512 456ad3b0166abde9b34221f1eb1a0176e2ae902babd74f249e5e4058dc58a0a53852e1bb0dfe53282b77944612b085dd601fd3590f183804ae63b042437e3ee5
 EBUILD mutable-containers-0.3.2.ebuild 757 BLAKE2B 7cfe9e21b2967a00b5471e9c9d5e605c9750d2471ca3fe0a58a6c6ae669b045076f9591cad6c6db395fd65e5b236ba48e9cd3682cecab509168dc8b19156f1ef SHA512 d87fd026c9006204781f51657a260cf958edddf6199ce78005c135b87730ab5fd17baed907b0a20c8862a6780c241e5a29ad977eacff2f8ba9751ac56658e47b
 EBUILD mutable-containers-0.3.3.ebuild 757 BLAKE2B 71245742709ffbac6f017b3d6041bc05bfb2e9d88631dfab0d437e0e02b153c9e9d74f3de687a4aa51b80667f72edccfbfa35d4b794fa9b77c7121978348ed65 SHA512 1fe7d9147b6c9f4ef72070c4f9c970a6725b86699d991000dc37974c6de2bcbe662af6b61f66df3ce4192ac68e8796d9a5cea1e6ade6dfcb6d099ebb608a10ed
+EBUILD mutable-containers-0.3.4.ebuild 761 BLAKE2B c29dfad338343133ebab9be2f1697e52534615164fcbc23163aeb472b69777d6c21fd5765f57e15dac10fbd26b42242cc46b4fa81d76d1badbc91e912d05e57e SHA512 f365c1e69f98cc7a92fb944f5cc2d4fb4a9ec9a5daeb5219bb5872a78b0eb0b72552e7b1c5c4af6999391094b0ce4d87e5ab2cc14cdca54098e9aa5905605ed6
 MISC metadata.xml 460 BLAKE2B e2c954f63ea0de78e36c50a6009786ba959e4bc97c00bb382ec50d4025c1c3024f9cb24bea111b8aee202db80fc8a6afc5f0eab7a4f98c5444e12f12ad4de0b4 SHA512 3db09c6dac33579c0402cd1ac9eb3554b54a41463612995f5003d983971faa1c5acfae71934d083f46233cbf6b53e54e4072b7fa4a2e54fff944d9aeebb89acd
diff --git a/dev-haskell/mutable-containers/mutable-containers-0.3.4.ebuild b/dev-haskell/mutable-containers/mutable-containers-0.3.4.ebuild
new file mode 100644
index 000000000000..e3852e48097f
--- /dev/null
+++ b/dev-haskell/mutable-containers/mutable-containers-0.3.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6
+
+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#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( dev-haskell/hspec
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/nanospec/Manifest b/dev-haskell/nanospec/Manifest
index b78e829aece7..ad63e5639684 100644
--- a/dev-haskell/nanospec/Manifest
+++ b/dev-haskell/nanospec/Manifest
@@ -1,7 +1,9 @@
 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
+DIST nanospec-0.2.2.tar.gz 3698 BLAKE2B 38351f999a2e71b598734b75aff06486f44166ed8df80956d2486d99687cda6f4b4b0f12f44db17f6b0c43ddfdf5bd13b788967e18caccafddfe27f27af27f86 SHA512 6161b5cc1797a3fdcd07cad14deaa3edd6faa87309b5e8a31834d7c1dda23737fe4f2e763b13da7f5ef6f6ee3a9414f88b9ae01e5403320ba23d76404324a3b0
 EBUILD nanospec-0.1.0.ebuild 633 BLAKE2B 99a0e09a44288b132891edb5803a8e5f888d09772e185cac0ebd5d7077a412011df8d1e0666ed2365c391de7e7d569d50e7936ace31ba21d22cb9c2b686f5a21 SHA512 ca324132d92b5f85650aa88f9f389be4adbc023d05f36a2dc60db90ae25bcd0694750504eca0e604b9e36dc64dbe5cd4164c4463c950a4488fb182490a517254
 EBUILD nanospec-0.2.0.ebuild 710 BLAKE2B e8254c9c4e0230d92f6e5fdbfa2e40df4c983d2f815c402340921012ac7d886f07c24e0317fd5940d7e6f857e0483825e1b219ec8a520031fbae02909d2e6725 SHA512 9f547f90cd2911d9976e23a687726844991048fec1516ab1cc6a2a504793c18450b051fc447717cfd3046d6b3918d933f472529dd22410a226c9aba5123ab671
 EBUILD nanospec-0.2.1.ebuild 668 BLAKE2B 6a3e586a700fdc378ddb46e2fa32d5e89713f6f45a7d87654eda977d1340f24dc43c9b9b1ebe3c2cf82f9bb07fd5bf0ccd49ac3f43c39a2e3e546d1bad69e8ad SHA512 dbb96309376d3a262283b1f4c8eff77820af30514c62b27cf940e5bdbe04a20e9b0e81bf29734b3160664b06eb25de745961842ca70cf63a43213c8a8ff8f0f5
+EBUILD nanospec-0.2.2.ebuild 650 BLAKE2B d13f0ec3cd0313fb3071a7b042bad79be8b201117516e87edee409f2dcb0f35fcd6f4803ccb844cd3efcd84077d6e21acd952e0f7bdfc3873ecd5f1fff9d334d SHA512 920c44f7432a8bf220a988688f526c3fa359472e558219daef86677d4636fa830d12f41f9e64fded2ac73b1e2187648310dbe3d5b24e5c4aed3d0656adadc231
 MISC metadata.xml 375 BLAKE2B d4fec83f694238cc866e7c263166bcfcb6d1e988528d32c1276348273a6af67c25b8a9a92b7ef408e408fc6b7e874dc0fa552e3cfb8e1bed0ff9c1bc21216cbe SHA512 70735952a27c99222b87bc5662f69c32f3f96595e7db04c4726d192256d98b4169367669359b9e5aa3b0c84b5495583a36c334de65de93b84b38df6a5a3a89fe
diff --git a/dev-haskell/nanospec/nanospec-0.2.2.ebuild b/dev-haskell/nanospec/nanospec-0.2.2.ebuild
new file mode 100644
index 000000000000..da4c12d5cc29
--- /dev/null
+++ b/dev-haskell/nanospec/nanospec-0.2.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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" # drop test-suite: cyclic depend
+inherit haskell-cabal
+
+DESCRIPTION="A lightweight implementation of a subset of Hspec's API"
+HOMEPAGE="https://github.com/hspec/nanospec#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # cyclic depend: silently[test]->nanospec
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/newtype/Manifest b/dev-haskell/newtype/Manifest
index 25e36ebebc4d..7f50cc1ae505 100644
--- a/dev-haskell/newtype/Manifest
+++ b/dev-haskell/newtype/Manifest
@@ -1,3 +1,5 @@
+DIST newtype-0.2.2.0.tar.gz 4853 BLAKE2B 7b4b14b3ff158b6ceba22465421933fdadeddf20a6309cb107078f792087c63a614eb8df99f5ad515cbedd0897342252929ab34aa1694013d95d2e165c2a02e8 SHA512 9d8b344ac5f6ff62d8100b95dd879715639af2d8d1f63a8cb17a18fa7c4f427eade49aa3d6b47034351ac0f2cb5061013f6321038bff1053eb3aa84faf157a5b
 DIST newtype-0.2.tar.gz 3476 BLAKE2B 2c1dc7f78966680b927c7fb30bb76469b0fd5043e4d3a5917bf0de53e67f6bd7e9eb080a566d732e55afc4116dc3ad3d7eef511468adc67ff7a9076449c98d08 SHA512 9f5115df618223b5acf81ef7d15dc95db5930b39863ee89e2613500bd5a5b4cf421510a4330bbe77d7c456b56f4e93072b53fe31aec2f4dbebd966b80f667958
+EBUILD newtype-0.2.2.0.ebuild 567 BLAKE2B e33ce633bdc75dea4809e7edd5f875892e0c2f2d4857f300295944a20a4343c389706e2f05c011afff11597e0626818237297f904e26a3398debfa1a65e29fce SHA512 d7d6d3ff93a809b9085277c5b320dd4370046426cb5a4f030c8371d8311d15fe4a0c0b93ee462f671f3afb4e90a4e2058799a7e7e9e03c0f6bd253179d34f601
 EBUILD newtype-0.2.ebuild 549 BLAKE2B 3a1feb342899b24eb0a4f5dc44b858e7a968c44c040708a13cb9ae4559326043453d961122df30adef39684d841ed37ab2b29a1166e8d9c9e2042e7bd0c1a6e4 SHA512 00659e9eede8ec9be4d3f8b86c0d9380f69aa569dff6d2cf8a642d26aa13d1c980ead48ef16a0df310e4d2b6ba9390dbdee10c6748e8ca0907361a7c4abb1c39
 MISC metadata.xml 457 BLAKE2B 91199f5831c7431f71b4851e9ef19b0be90d604ad18087201febd2402e7839cc343dbffdc0904f0b43d31b2900037fc63d9f036d8daab713e4dcce80edbdc6b9 SHA512 75b00c69ad2b24cee918d3ae93f9bf4d8f66bb4a8e977af215c88b712dbbb235586add1750647215896544bfe79ac073fc50d588de267a4df2cdbcf2d7c53075
diff --git a/dev-haskell/newtype/newtype-0.2.2.0.ebuild b/dev-haskell/newtype/newtype-0.2.2.0.ebuild
new file mode 100644
index 000000000000..2a004fa682de
--- /dev/null
+++ b/dev-haskell/newtype/newtype-0.2.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+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="https://hackage.haskell.org/package/${P}/${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/openal/Manifest b/dev-haskell/openal/Manifest
index 3b373f1808a4..95236f1d5e5b 100644
--- a/dev-haskell/openal/Manifest
+++ b/dev-haskell/openal/Manifest
@@ -2,8 +2,10 @@ DIST OpenAL-1.4.0.2.tar.gz 116835 BLAKE2B ffc833fa7fb69ec52ca2a6ae05c8971eab1b90
 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
+DIST OpenAL-1.7.0.5.tar.gz 40744 BLAKE2B 44c5a0e9ba3bc336cc63fbf4efc743d8403ce448ad84ecaad476ec0e9c0c8fdeea1fe0b42e7e950dc6606736c69cd59d90bb1c9557277dc4aa2b3a89b567a3f8 SHA512 b8c9fb4227fd55dbd173301c4960bc7bbaa3d460a9892366ffe20ad9e5c6a85b7b5f2c740d9ff2aaf70a3a91956daf339813d93d46ee01407a86f3b6bfb0df57
 EBUILD openal-1.4.0.2.ebuild 740 BLAKE2B 306af8424e66922840915f85341c114211826ca35c9a7f0e417031e121b61d85febbda4eabd5ccfab9febf75930c73ce3d6c3b70d8a15d9f483d573e3c923f13 SHA512 9ee06023b78931021fe946b662b90cfc06bcf191572ce0c67ecaf0b9d09c0afbaafb5ce4ed0a51f4db90a91aa3f8a729666b59c9a38d18e9ded6c0987cb250d9
 EBUILD openal-1.6.0.0.ebuild 821 BLAKE2B 1ef499b097647043ea3a36331052ae8e7e7d720719e7a358bb70b360a29ed026ca2d95d41ba32c734f7d4408f9c544307f3170ee103e528be6a505b1feb68d0a SHA512 b42b1d97856c9cd788705202ea2bd7dc7ed77a746e41d85b035b2be685b8558657c0421a88b4a547946a3e94ad9babc822e895909fca37b7e70004009d5ddca2
 EBUILD openal-1.7.0.0.ebuild 1103 BLAKE2B 0e9cc63e8ac0bd4dd305ed52a3021f7d42cbfacfc232e56e4d75087f2bc487cdb41f379e4de700b960410004f7755b67d6123f55f90932b8b5dca6a3704f16f1 SHA512 c6b5a768c60850c3e99af8227cd9976534726769d9c168b6f861105e9f93d6b89da2e73c901ee44782b9a6f09bd6a39c4e34d04a74086e117cfa5ebf2a9394d4
 EBUILD openal-1.7.0.4.ebuild 1174 BLAKE2B b2a2d3b9631f88686be29d1fa61dbde35dbb354a2def866856fe06845de8652f4c43130fb51c0514ca9c920fd415625446beb7a9235cbb499a8f1357ad8fd18f SHA512 2c551d22dc0294f7e63c12331ef49efbbebd3d0bcd01bc90fafe4913768a732afff141b6e07a86709baa030c76575b89e309a38c6be26ff65ada86224bb0dde9
+EBUILD openal-1.7.0.5.ebuild 1090 BLAKE2B cafcc9ba1e78d8d51f220dde9a8bd31833100a31956680f44513be2ad55362cea1a678b9c637307f8ff604cfe4fb25c89dde69ca456d90e2d964bf9587cc1d9f SHA512 7cc0a903766b89decb64426874543c0164d9244c1b3a0a824ba96c7a0e98678d3180f9b06634eccb4ddd06ef863496285f224bf0b54912fed25dc94c707654da
 MISC metadata.xml 311 BLAKE2B d1edbd170f8774a220b1750e05390e0f6693a81de85b49b6d54df3ca8502adb7faf0aa99b66bd0374209433d91c1697216780b9de70d3a173b16256a72b6fba7 SHA512 41a19ed33057a3d03f99c30fe71898900cf0d5a15fa90c23de4bac7313872ceef0aa0f0d59f50d24ecb58bac144b46264812fa107137c187b67f084d3a307ee4
diff --git a/dev-haskell/openal/openal-1.7.0.5.ebuild b/dev-haskell/openal/openal-1.7.0.5.ebuild
new file mode 100644
index 000000000000..328cff915bde
--- /dev/null
+++ b/dev-haskell/openal/openal-1.7.0.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${MY_P}/${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.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	media-libs/openal
+"
+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/opengl/Manifest b/dev-haskell/opengl/Manifest
index 07e1b62a1ed7..9e7f035ee6b3 100644
--- a/dev-haskell/opengl/Manifest
+++ b/dev-haskell/opengl/Manifest
@@ -3,7 +3,9 @@ AUX opengl-2.9.2.0-ghc-7.10.patch 538 BLAKE2B 1d532d8a36627c389a10d341c7f887d71c
 DIST OpenGL-2.12.0.1.tar.gz 125419 BLAKE2B f6cb30335f783d9474d112159fef0d7af744c3bef54580485e1df77d58f625d4ba9a6c46120c1dc5d96fa98c89f34a6e63e91909f0f5dd1f7626460ad3f55612 SHA512 58c21efade5a8e10a78a61eaee35986e61581e3ef898f657e3f4c0479e0e35f60772bfa489bf49dfdbf3c395826df513f3f116278fb400d568babed1061e4765
 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
+DIST OpenGL-3.0.3.0.tar.gz 130752 BLAKE2B 3378cc470f68d51900d54ee3a1cdf78a01f096f5efaa0c0fdc73910fea661ebf4db8338d8563c3f593d0a1fcf947b17b65af6548276266a7bf72b6571e1b1ed9 SHA512 1ccd11095d5d36346bd22c8ebeab3b9bcb267744d6c3ddfe3c76dc2ed620493d688353a778454a053c710464db0de8228823a95f63dfae5784c2f1ca931b0ae9
 EBUILD opengl-2.12.0.1.ebuild 1091 BLAKE2B 6f32321e650052f9796f3d09995d892a4c5cf21bae3131eb3a592fc1f649d40f3be0ae95d486e9438dd05e9e74c711cf5190af55267ec5b040084392276df12f SHA512 56638618c9e86465f7307aba5936a07cabff90e2154ac8d37a785ee779f763f6cbe007c2802530388602fa9cabd4f606ebea6ee744eb626072fe84d7df7818da
 EBUILD opengl-2.9.2.0.ebuild 801 BLAKE2B 7e649730d3f329bf31cc97e73bf23104353547cefa9247c65aebec8a5c51090f0e4ea4f4c4ffe667a319b95e8ce572324855b76290ec9de86177f700a5e8b56e SHA512 bb648241a4c48a6bbaa5040e024be26b262d378c2507d131417468d37c03cf0cb63fc69bc91c3f0187198be3bd865a1b0899193302b7d5068385067061240af4
 EBUILD opengl-3.0.1.0.ebuild 1082 BLAKE2B 2ad61d302c71763d6f084c57cc3511c75e16b2408f8c66f9b3f70eec4f6089a4174cb4d706460ed9125031f34bba5c6c52bbf050d0f6bfeb11646077a03df954 SHA512 598cf703b54255257c00ea9d7b7ac8207d61fabf3b114f40479b4e63509e3d55b90989d7ba40634f964dd7ba0efdf9736b92ba2743897adc1f3e3df2f3159df8
+EBUILD opengl-3.0.3.0.ebuild 990 BLAKE2B 38ce90526ed2c14324650522ed4e74f05723139d9f2356cd34204ccc63f4563fe40505caccc366c95491c85791c524a053e8cd47b304705a86320549d222a291 SHA512 22246b89880f7b1a808408b7cd0fe777279b5727bdd56acc346ba2de08273c32d637a1eb2b25ff580eaac1a7f40de2468c4845997df562a6ea3bd8e4d2091bb8
 MISC metadata.xml 814 BLAKE2B 1fd42b44c7f720c6afed3556f087a57102dab18d4348b7b5e8c0665f9e52da441df52ca34a0c6236777918055777baf6baabfbf366c28803ed27b6bba482b767 SHA512 f56f0537d0df2c6fcd18812b99705d09a565031e909403ada47835ac343aa80b4045124c92226bdba6d0b779d8ff9ba04f21f3fc57eaf080c82f7b1aa301f64f
diff --git a/dev-haskell/opengl/opengl-3.0.3.0.ebuild b/dev-haskell/opengl/opengl-3.0.3.0.ebuild
new file mode 100644
index 000000000000..2fdc4b9aca58
--- /dev/null
+++ b/dev-haskell/opengl/opengl-3.0.3.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://wiki.haskell.org/OpenGL"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${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.4:=[profile?]
+	>=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?]
+	>=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[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/openglraw/Manifest b/dev-haskell/openglraw/Manifest
index afc5cd2fc124..030f295c8a1e 100644
--- a/dev-haskell/openglraw/Manifest
+++ b/dev-haskell/openglraw/Manifest
@@ -1,9 +1,7 @@
-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 636 BLAKE2B 1492b2ce5d6a1190518a55121e954d9b804e2013554d5ff230fa2ee5fdb8513350ee5f8690dfafa8a5a3547c21aa410b7ab78220f223dde403e5857c10871856 SHA512 a61a23550c5aa46f7c40dbd2e08aca79de4b43d056d612d2ecd28516692aa8a80ab534cc70ef6f26d568ad1385adc256263ee49dc3edd8a6b845edb2fbf1a5b6
 EBUILD openglraw-1.3.0.0.ebuild 639 BLAKE2B d3ac98a1aa4c68e4fd119c2f2dbe05bca09b2d32d2c641bd93fbee0e18eeca7530711b9f5114daeb58da50e8d6c91ed17f5547e5ad0c308fe7049e492c5acbec SHA512 fc5cd7ed582a83294060cbcea4bf2b367f1049bc9d2b49726149f888bbeb26d12751b34ea5a7e8784769fb43265240f8acb60e55f53dc9eefcdc5f1c14d94d0d
 EBUILD openglraw-1.5.0.0.ebuild 827 BLAKE2B fc4e7c0eb2c7d02a9abbd01a16022503e259e5df9408a0871b169391769f3c18d30f1b30cacbd86e538335a3e29ff531b8d155e0322c6994ad17755035eb7beb SHA512 8db33f0b02d99440a02b3e53d73d7ad983a57d03fab343f4c2efedb1aa9b4b9bd27ef0269177af45c02df32ff149448f6e140395c8b96d8ea24444b91db23ffc
 EBUILD openglraw-2.5.1.0.ebuild 982 BLAKE2B 1359fe9b5c9979a454b0de38cac50889cbbb52700d4a3132555f87d004d692e2834136b802b862a48351b525970a8e7036771343bb25ed08bfe6d689c2ace435 SHA512 729dedd2ce573630e0b88fe1e257f07ccfe423f4ea3923926f11f473dcd1fe2a558ba96b7b61489a19eb4d195419c17ce568dacde65ca11f4af94b1b93547073
diff --git a/dev-haskell/openssl-streams/Manifest b/dev-haskell/openssl-streams/Manifest
index 6181c6947712..a6300e0b6f6d 100644
--- a/dev-haskell/openssl-streams/Manifest
+++ b/dev-haskell/openssl-streams/Manifest
@@ -1,3 +1,5 @@
 DIST openssl-streams-1.2.1.0.tar.gz 6266 BLAKE2B 2d7866b7667547f5c4f2c2873471c7ff9ac60ee89e9c791d816b46185bda456d4bdd13ce5894688ff56926b337d38208719f8c3d22cfd0606529732cfcec3235 SHA512 c429bdcbb4ce893d79941eccb849f7064fb88073423b4395e0f50795ddef699934c148549f800b551914c7983cb2b8fc988dccfb4e0363f422726c0cdeaa5018
+DIST openssl-streams-1.2.2.0.tar.gz 6376 BLAKE2B f0d0684c3ed5e13de4d4745d16cf6bccc75961e57d164cc3a5620d1de0b0cbb40acdf4819266c45ceacd4473bdd831ec9ca92aa086e01eab55408e2588f9a0eb SHA512 ff1262afd26c82e97ed0a8bc7237728b47341968e8c6fe4a2351780508241f1588d12b32709d9be3b385db14b9b56eee77676cacb1c0a6bf632a8f25bdb775eb
 EBUILD openssl-streams-1.2.1.0.ebuild 1010 BLAKE2B fe86356755826b085768431d0db28cc6f850f1e0d771a41f5400b2b3816431d517fa28443e19e56ed8449cd227db486dbedc70b9c22c3199ac41a6873be2295a SHA512 f024292073f18be8b161ff771bb44fe974a0d21d716ecc7b0c99364fa1e0b29cd660e019fadbcd8b91bd0679ccda55c1cdb277013c0090bc7e32a2a862c7d012
+EBUILD openssl-streams-1.2.2.0.ebuild 1010 BLAKE2B a6d7623b6cf683a33a84ff6021510bd7b978f9125797aee640d6bf57ca0595830297e26255b54eff3f16ea49c846439bd55b523be002d3aaf9aba77d66eaa5d8 SHA512 53389d0f000b6ea5e5a166bf947946f06488ba940e512b6e3550065b64aec2478bae57115ae4885bf67c23122286e02c96e61a74996cad1a132ebb473075900b
 MISC metadata.xml 503 BLAKE2B cc36035993804b20d4025345b53ba02d1f42db25604c9a64846a724b9ce99c1f2e9857c4d22a31ad63c168b26d334c64422d15e281e1aec96c31b7499e4bf095 SHA512 7bfc0ffe8f358d7000cae786b34b009d7b18be733b4f905ced9c0d956e7f3dd9fb9ff1b6db64ba09b4188aadef49f0885532aeb581b187a26f596ac0c9cc096d
diff --git a/dev-haskell/openssl-streams/openssl-streams-1.2.2.0.ebuild b/dev-haskell/openssl-streams/openssl-streams-1.2.2.0.ebuild
new file mode 100644
index 000000000000..2b9752e02800
--- /dev/null
+++ b/dev-haskell/openssl-streams/openssl-streams-1.2.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${P}/${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.6:=[profile?]
+	>=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-3.1:=[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/pandoc-citeproc/Manifest b/dev-haskell/pandoc-citeproc/Manifest
index 218809159a71..297c6740ca25 100644
--- a/dev-haskell/pandoc-citeproc/Manifest
+++ b/dev-haskell/pandoc-citeproc/Manifest
@@ -12,7 +12,7 @@ EBUILD pandoc-citeproc-0.1.2.1.ebuild 2104 BLAKE2B 14284707a9eda2b765b5cc9d5c5d1
 EBUILD pandoc-citeproc-0.10.4.1.ebuild 2345 BLAKE2B 7692be4f7b5d0ccee00eca27c026ded2fd4b1f96c1d12ab4ad897f70ea8747c6f83a7302beebd768ea49431b8b615434e77f3e57e12da707322ee84cb0729566 SHA512 100b2dabe578ac8a7694ee70f8b691775310d937958d18d900f690fd7ec14fa6fe1bc7b0b5651facffc01a3373b81362210cbf1a6368a5e8be3bf7555c4b46ed
 EBUILD pandoc-citeproc-0.10.4.ebuild 2347 BLAKE2B 8b52391b0a1f8566be4f5564ab9c3f5c38860563068b3a3c447fa8a9ceb8167931893e241af873b8621d46ab9afef8e0632e019a51ef8e0f8514a92268b937a2 SHA512 33c80c49d270374c56d2c638bafb13207195cf5e53b1c2d73b2fde73e4af836da7443ea8eee4b9eabf82053027e9ecd1b6ea09b74a4a223801cf21ba9562333b
 EBUILD pandoc-citeproc-0.2.ebuild 2096 BLAKE2B 2f9598a55347f9c84cade82f523633d196261e0902a4e43fa9f448d87dd8964611571acbcc7722405c588d9de0d3f63d8984ffc50fe0bd6ed63a1051ffe3a03f SHA512 bf02bb80a52050109a52b115767323d72cb320a93ba43b8d47fbab9f3ac34c8e6ed89ed3873ca9a747c3dd70b2379eae5e0fa936c6a06333abd5f54e822c3430
-EBUILD pandoc-citeproc-0.3.1.ebuild 2448 BLAKE2B d2d0fe214abbd2f86062ab9e88a14417184963bd32ae31f6c62a8f9d57b326fff2fa843b83e0ea92fdcbf9c2771e654c10ec4ee19d3d4189e6affb0879662a7c SHA512 30eb7f357612ab6c54889a06eade3ce4ae440ab2ffa4ab3a9c67a274a46a83e5c809c4499c04f96f5789aeb63e4f2502d05ea47aabe18e7d122ddc37de730f4b
+EBUILD pandoc-citeproc-0.3.1.ebuild 2475 BLAKE2B 380262bcd35b92a004d1704eb5146abf713a1f309479de1f5bfff8835f18c33b3bc7fa8c2afa2861e9de7e1abee481809e7da4dbe7dab29d35b440e3311aef37 SHA512 8041190c43040d05feacc1870ef0e49cc8d806f482cbee52a9fe4a93e239ac9568831f34bc097628a6d3f44d9624f54ab8f10b35afcb23cded9e4ba3dff5c561
 EBUILD pandoc-citeproc-0.6.ebuild 2128 BLAKE2B 66f1bbd1174c8545f95beb147f9017d6ee8a98c9b118c67ce02210bb07db06bf769e81013e3c1bbfd40f6d22d40f7a72eba2671280841c8f8cac66e83983f917 SHA512 d5fdd48e4959c97b576a7b746c7b143bdcc789bc95ac63575bf5f6b4a3b02408b811fa2274e409d8fd26f9331346ed2fd0d92aa9279cda7ae0d9b640551e363f
 EBUILD pandoc-citeproc-0.7.2.ebuild 2102 BLAKE2B 153f814dfe755ff8c437151ef844496be1161865b402b23ebef783d107d6c4195754e94777c85e495331505b7fd75e1db560643eab7901f853a28265037a0a7b SHA512 0dea50bfa6baa1e7c92cea428784442e6fbda6c817f4d858ceeb41ea801bb579280bb9ad93bf4d96ee0f86d746b5efb58ff02359652098aeb2a3769afe8b0395
 EBUILD pandoc-citeproc-0.8.1.3.ebuild 2220 BLAKE2B f13e5544ef74eb20ee5c0aac4b6d1ba27f028aa51309455a8e159328871123fca070779ca9f74177e46d50df0419672e9f3da406c85dee1baa756e6be434b989 SHA512 0656d215d55913e10715b96672fb22cd636b9c79c9f23856129920356bb54cd62d45a623c0ecac0e7243484423c3fdc370d01859cbaab381ef97453ce04f03a7
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild
index 79e03fac2798..2fcb5fe15b3b 100644
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild
+++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild
@@ -17,6 +17,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="amd64 x86"
 IUSE="+bibutils embed-data-files +hexpat +network test-citeproc unicode_collation"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-text/pandoc-1.12.1:=[profile?]
 	dev-haskell/aeson:=[profile?]
diff --git a/dev-haskell/pango/Manifest b/dev-haskell/pango/Manifest
index f5424214cb76..f45e39e56f1f 100644
--- a/dev-haskell/pango/Manifest
+++ b/dev-haskell/pango/Manifest
@@ -1,7 +1,9 @@
 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
+DIST pango-0.13.6.1.tar.gz 52637 BLAKE2B 1e7febf9c60271404e49b91f06ebfcea06657b70410f4ff87fbe69427dbb9aae991ccf0980c216a933b06c3bafddab32c176f885905099415db6a09afe7426cc SHA512 44cb7af9b04dec8d6ab8256bc39f9777238d3cb22b90576f3a77c14cf0ce23ecd0926733a6ddaa96a62da13ac88f8637d4ffa82ae875b4276d7712f3a3d81a19
 EBUILD pango-0.12.5.3.ebuild 912 BLAKE2B 74ce2de01b9f2f8f7407cfe065cb47676c26de2dc7691704edb57c642ab78b7a48a07bbbe9f4ce67a5e6609787df05fcfabc409bf4c8b04627e9f25bb91897bf SHA512 4c44da62f922b4352403dfe3063f64f560bfbf810a89ca51be342cde460eb561d014d5bbb1dc1be600ea3ec3f8e4e1185ee5303d872516a0a78b4556cb1bb77e
 EBUILD pango-0.13.1.1.ebuild 917 BLAKE2B c74d0e258633b46d5f4c470c94b5742d7749cf56d48c6d147aabece7a434894658b444d383da0ea9d99a66b956a3fc35615b99be4b30e1cc6f084de00002fe20 SHA512 7f7128f050e61d03155d7f1a1e22649c929ada7a478764029407f197c9e2e398caf3b9d0f5d3d2a94330be40fed4dca0f62c1f98ccc1a5cc6bc9e8be7906bfdb
 EBUILD pango-0.13.3.1.ebuild 884 BLAKE2B 968bd1fe4d530dc93549953aeda7713a47d2a511a68a5b5b353ba640d9d577666e9d5f2de6ec2dd9e62bfe2cd8dc139654d8d1679f6423cab8cdb9b35e661b1b SHA512 73b3a0cc0e0c0fd9a97a994ad13dab60363e4f7df76023e41880fb6cd3a805312f818b12d59c15dc94122ca4fa29b0fe8bf9e7a07e6367e740a62bd8b3e48852
+EBUILD pango-0.13.6.1.ebuild 984 BLAKE2B 0183e7dfcd2dc5c647c68f92c19f7537e9fa3715641ccb3f76f1daa232681ef034809fa2de2a697aa411b64192acd52d680e4276ce33404cb18733876c26cadf SHA512 30a98d348710c00a915d1b0d9959aba80d70302f99c30fcde8449598c593c887b29e566954e6f136d670a9fe4fe1c889a81de9901d1a2a374445af5d1f556e47
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/pango/pango-0.13.6.1.ebuild b/dev-haskell/pango/pango-0.13.6.1.ebuild
new file mode 100644
index 000000000000..8f7055b24914
--- /dev/null
+++ b/dev-haskell/pango/pango-0.13.6.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+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="https://hackage.haskell.org/package/${P}/${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 <dev-haskell/cabal-3.1
+	>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
+	virtual/pkgconfig
+"
diff --git a/dev-haskell/pcre-light/Manifest b/dev-haskell/pcre-light/Manifest
index 43135a9f2735..14fe905ed55e 100644
--- a/dev-haskell/pcre-light/Manifest
+++ b/dev-haskell/pcre-light/Manifest
@@ -1,6 +1,8 @@
 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.1.0.tar.gz 28908 BLAKE2B 10b24f61d6d4a8669464d2a003fcf3a677fc34f7e0369106d3986e18c97c0cb6509620ac7a545dc0e3246c76e5221ae30e32565c02b5fbdc58b6c2524265f314 SHA512 491d9581e4c29d1a5a3b161210b83abbc135c2d0ee4018481f4101f91c95e93d7acf0764cb464a9ffe84bed9bf8fb400f4c68441ae1be03c0aa182a9be26dc39
 DIST pcre-light-0.4.tar.gz 28943 BLAKE2B 3458990cddf6361c7b67fcc66c8abfb900e6e1efd93c1eb5b8ab9d46337911e5122dc20d5ba9a1cb28a9cafbab64d06bb15e79361d64e06bb4f6c19674fe40ad SHA512 1cbb37743018e0199d3c23f5cda34a41514ecc375650f2a79935c16b12b4411e5ce1d7fc84b29fbb41458a2493998471cbefc54adbf848d59877c6be4d34b6aa
 EBUILD pcre-light-0.4-r1.ebuild 656 BLAKE2B f052294ccf78b90129fed8c14e107168ba89503f720c24256a7a5e5b9aafc40ab6b35d9f8c1f68faa3c40c336f93a5bff05dfcf5a0c850badfcd358115854770 SHA512 ba01f0dd6443e176768094cc8eeec0083189a3a9e65420ac5680d5a9314cfe12de2e3a406db6f1242335beaa7ed340776010c6a203417805b954473a620ed918
 EBUILD pcre-light-0.4.0.4.ebuild 621 BLAKE2B b900211c9e8d93f89f3b286ab115b35d1b5f6ede63c3bc6801008792aa5871e6ae1e15d32b420fa09d500fba975ba603b5ceb03dd83ba0b66231cc922bfc5463 SHA512 aa88cb9642628794bc97e3aad9ccc1fa4868149f8f607eb22477bb56cf45de18f3915d5e5769304bdbae2eea6afe7c78ed2f3a320fa4bee1860032871fba8f26
+EBUILD pcre-light-0.4.1.0.ebuild 801 BLAKE2B 1dc9acf3064fe37173da25b9adc65352438263084397be8553e42baa12f803af3792b239c6233ea7c25c1ab91ab75d21a367b0a1003b87519c56d1d5d5180e82 SHA512 21f7de050c5c1ed0c656ba26c81339c3a58a3be8ddde0ae46f428ced8259a0248f42b6d6048ca573c8ca8cbafdc0b0b0ff7d9c15b95f0aae8e40d564d4801e52
 MISC metadata.xml 742 BLAKE2B 729536ebe79ab8a3a9fd3497c1b4d51d9b0c73d5ba7848ae2466386c6b0cd2524b4c1bb61dbc7952cd2736eaf3ee718dadb9c4fcaa3923cced061ea4d43d274d SHA512 0d8f8db2294a8c2f867f93a69161cc50e8284de0e9aa632c39d4b4ae96fc7d79226ee47e6092fa1af2e925e1e8c3471a1033faea43243d78dc2d3d18c8442e2e
diff --git a/dev-haskell/pcre-light/pcre-light-0.4.1.0.ebuild b/dev-haskell/pcre-light/pcre-light-0.4.1.0.ebuild
new file mode 100644
index 000000000000..0f291f743a7c
--- /dev/null
+++ b/dev-haskell/pcre-light/pcre-light-0.4.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Portable regex library for Perl 5 compatible regular expressions"
+HOMEPAGE="https://github.com/Daniel-Diaz/pcre-light"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+#IUSE="use-pkg-config"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+	dev-libs/libpcre
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8.0
+	virtual/pkgconfig
+	test? ( >=dev-haskell/hunit-1.2.5.2
+		>=dev-haskell/mtl-2.1.3.2 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=use-pkg-config \
+		--flag=-old_base
+}
diff --git a/dev-haskell/pgp-wordlist/Manifest b/dev-haskell/pgp-wordlist/Manifest
index 01ba6a64a1db..5bf77c649e4a 100644
--- a/dev-haskell/pgp-wordlist/Manifest
+++ b/dev-haskell/pgp-wordlist/Manifest
@@ -1,3 +1,5 @@
 DIST pgp-wordlist-0.1.0.2.tar.gz 10142 BLAKE2B 6a4efe0e495a3755b19a8bf49f5fd0e44853a77bec5c9731a4fb0ba9ea2da524d737b7580baebb1aa1bd6e8df40c4584f8e5aca57b95d67e5a4936a66a8a761e SHA512 c34d565b043d6ffb3fee10258fb30596ae08e5c4d57bf8d129f49b4794daf13ae55fae7f648f218821133a824f2abb66a8b5f02b10a9e11f4529007b1a4620b3
+DIST pgp-wordlist-0.1.0.3.tar.gz 10143 BLAKE2B f6523be71399c90e6248b583f5e68a2ad51069d3ecf62609aac09e289a799c15e4f30241cc558f070fae7d68990e1dd4ddd2fd7a30e046902405c7e19189eeea SHA512 b7c6db47c1f9a0b10c5c94ea46b8eee282988e5990ef3dafa2d07a5bfc0718572b04494d23ddab063811ef2452546d6b17010c6490a89031f4b071f1a43d989b
 EBUILD pgp-wordlist-0.1.0.2.ebuild 803 BLAKE2B b13ecd20867707cbabe329ddb4a7f3442fc4bbba07550f150f9460c93e1bc8f2fa200416f239ec67ee2e086ec06f6133676b3bfd91f226dd693832255d3026eb SHA512 d168705b31e4decce587a257f09757d9bb99b1c5bca026dbdecdf924131c722cddf0b2736e8417672328db8f8bede6b0519636fa9efe43e552059bd2f78d8aa1
+EBUILD pgp-wordlist-0.1.0.3.ebuild 864 BLAKE2B 49141a8aed2e302b5949bf34a667fed914312d5dc0fa92de5df89b6084234c506e26e9d6d5dd635a7c595b5aaf965d68b57e0ab04e6dc5847c9d5d441a387cc5 SHA512 7f11b3c095e795a398357597e5fb26b96549345a88235c1d33b15a83296874fcf83a451fe211b1a0318fe8458519cf54e6a9e5dd105bc9854f44df2f17db3ad4
 MISC metadata.xml 793 BLAKE2B 31de74e5791a25f4a8166a099041b38d18fa97fd1d1cabc0d9f40bae32763076427e4a75e6077e90a17069a758ebe541a7c7b92d4cd14bf5082c91bd8db75683 SHA512 ea2360cb9f18ddb50da1be41c4b339c0dcbb21216c352835f1137ee48afb6fc4e13af3887a5bb91b5a06e05521cecd0bdeb1f25c1dc70f87e2259bc2ee5f1d45
diff --git a/dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.3.ebuild b/dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.3.ebuild
new file mode 100644
index 000000000000..38991ca8a028
--- /dev/null
+++ b/dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # ambiguous packages: AC-Vector-Fancy vector
+
+RDEPEND=">=dev-haskell/text-1.2:=[profile?]
+	>=dev-haskell/vector-0.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	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/Manifest b/dev-haskell/pid1/Manifest
index 4dc73b9d8047..4ec2a258b238 100644
--- a/dev-haskell/pid1/Manifest
+++ b/dev-haskell/pid1/Manifest
@@ -1,3 +1,5 @@
 DIST pid1-0.1.0.1.tar.gz 5677 BLAKE2B bddf32fa3c1d777a4b05977ca0ae806beddd1205998f333c958ffd57ef3bd076701d866648a45c085fe84bb8abf59cf64b879f476ccb80be66989197140586db SHA512 9cf7953d35d230162307c656351f4d552c2d137b54b0cdc8f5bcb07ab6a77aadb903cd968961fbf8b25fa7b9375e149f21e67af3d57713d3dde1d8c8d9df970f
+DIST pid1-0.1.2.0.tar.gz 7289 BLAKE2B 449f309a21c16e97e6cd7e33c91469bc27241312aeb33efe78016a62bf180490b8146a5390b308a0149d06b4bac071707a88146ecb46c17b04723e05b30adf28 SHA512 92d639637d13ad2cd4db2e4c5a0858ebd2fb6784b5826e4446b0a873e193a614e960a3fce8353742fd7439a93c9af309b254b55cf1b32f43620199a93864b729
 EBUILD pid1-0.1.0.1.ebuild 570 BLAKE2B 82f48081ef3300303f75cc2067255879bc2f084d3b3bb50df7a4badc0cd3729c5422e0675c6962ea7883dc425178e24347b8b239d9aef0ba287bec700650b975 SHA512 6c8b5936aa030ed41dffd3d71554f763112ebda941faedfeac69bfbbd5e4047edf2846cd391edbd2177c804e2ef6e56cb1da8c044c90983b77783e43262d9980
+EBUILD pid1-0.1.2.0.ebuild 570 BLAKE2B c64057836da3281347dae4dc3cc59305e5381bdd12fc237d287b13c652d5439d210c827b4a25df4f350f7e9317f8a6427e247bc740db05dc377cd5caa763d76a SHA512 2d47df2c67bcab021c9187ae4ef02737a3fa85ae660791c2631d945eceecc98cbb577d9a27fbe2721d6cff5d6a471017185464f02198205b75efafef2afcd534
 MISC metadata.xml 377 BLAKE2B 49ca9e90648e695d60488d58a3bb3e14afca2e8f81bd0f0aa6765fbabc24c58c6ff5f8a693259bf48d81126c48abed0dcbb8c901c9164f0e867239545fd0b7e7 SHA512 9d8b5bfce5c069ec1b9713e838cc65d3e14b9deb60367083ec323942660facd56f83fa46c947da59cf0dd8a446afe2e5645ca52bd2ce23973ccd755e131a5016
diff --git a/dev-haskell/pid1/pid1-0.1.2.0.ebuild b/dev-haskell/pid1/pid1-0.1.2.0.ebuild
new file mode 100644
index 000000000000..857d0309bd11
--- /dev/null
+++ b/dev-haskell/pid1/pid1-0.1.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="Do signal handling and orphan reaping for Unix PID1 init processes"
+HOMEPAGE="https://github.com/fpco/pid1#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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/pointed/Manifest b/dev-haskell/pointed/Manifest
index 9cd65313e91e..1b9ef97aca5d 100644
--- a/dev-haskell/pointed/Manifest
+++ b/dev-haskell/pointed/Manifest
@@ -1,9 +1,11 @@
 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.0.1.tar.gz 7020 BLAKE2B 33ec035004a047c3244f2444239d28a63c85f9e9f7a1c0056e589b6ce7e917a238fe0b8e3b6a41930029d978e635f7fcd5db8df42e050f2806fb6c6f2310d236 SHA512 65958628c983a2c2866b1a1a615c7a7f2f516068c667ce9b93f4214b863632b40eba4915d49e07388c52ced8868bb308b24e7b38a6f50563c68954696748c99b
 DIST pointed-5.tar.gz 4873 BLAKE2B a2dadf1f386d8751334c19a1e8a525001a9907ccce912bd0b3bef5e9fafc7d4e62139fd2e34426d995ad72eefe6843ac37959e0ff889f4c40d0bb8c0ab9ad227 SHA512 940a0c30845cb39238a0056f12da4debb488bec9bfac11a384320c79102e92dbd949526188eca46a2e543dfe612f5ee335955413e4f81eb1c1c9bc321805b598
 EBUILD pointed-4.0.ebuild 1094 BLAKE2B a5526c3afcf985018f6006601149d87b70b848ac928a85099f5c93e12872b9cd126a550cb81810d13d2910ffbe9e19c8be4166ef8b27eb31a192092732877bc6 SHA512 8d52e5ad1573f4db1ffbbb5718a25072d0de3692fb4a84f34d08615fef41cb1c5fc8ed9517f27a9af1978877c2fbb0a8ff1b44d15a0724ebbc60b99dc497fbdf
 EBUILD pointed-4.1.1.ebuild 1192 BLAKE2B 2ec9cdbf675447b358cacf1abc7d1063f43569e9ff19a502caccb3f99ff9809bf1c86302c8c7494da3e02423d0ece0fb8684c097eb07270b512e08ffdd3eeb60 SHA512 221445bee243cd1ccc30fe3433f56d78ca0fcb785a81ff4e5f6cc77503a03e739faef628a241efc5b1e09ff1663b0fc367bc3e7691cab6a82e5d097b2dce67c6
 EBUILD pointed-4.2.0.2.ebuild 1460 BLAKE2B 041d25203c34f58c9c58c5cac0ce9a15401506c1619604f3920ed581bee175d40a579a52749347c3a1e78dfd3fd970bcff2af9d34e0027f3479c5cd9456c91d3 SHA512 abb60a4c7523929e696e2fa1a97769b7344a2cdedf16a061f175f747351b2e35dfa91ef313a12b303d812d96c1aad98e15649098d84436ed1f55a2436001206f
 EBUILD pointed-5-r1.ebuild 2186 BLAKE2B dfbc3a7ca389e8b288d5fcd49a23d12f7535819f1371a2fa1073f3c9627364169d315a78fa8df7e02be152bce9ad1d70f0ad54a410379521b218ebf2e181b105 SHA512 b9ebe688662d25bb739c075a54dcfa7041605eb06458ab9eeff094d830d56a85d1750e71b12b1b7860eb6ef4c784c6184b69bec45a9104a05137621a78716b80
+EBUILD pointed-5.0.1-r1.ebuild 2155 BLAKE2B 362085f4c1629cca851c1edb95134e30060b2bda5733fda9c587d7f9262d6b2c45781b9dad5dab6392a8521c12f4a715c8b6fb15a10baeb0afde36676860dda6 SHA512 3fca5b60bd166e12c94dcd9c4a2ceb5d76bda31866d4103064c0bc00c1195aef7dc873fc006d57c042622e425725f2787a31ba4a5b7aaa60b8e54ecbd0eff803
 MISC metadata.xml 895 BLAKE2B e6dd059ba6671f2a3b8cceb95e5db17498ed44349fd04f653b70a92c8ee60e226e85ac2a90eeea925a46e787ba15bcf2ef45a6dd2e7a743f4feeb56f4d9486a7 SHA512 dec8581eaf6f554b23d6a1cb811b138f7b8b9d40936c942d958939f5814f3151dabe03036add92e72a2d93995c9031e3b087d285862b69d719aaa027775c6911
diff --git a/dev-haskell/pointed/pointed-5.0.1-r1.ebuild b/dev-haskell/pointed/pointed-5.0.1-r1.ebuild
new file mode 100644
index 000000000000..8418d1ddd1c3
--- /dev/null
+++ b/dev-haskell/pointed/pointed-5.0.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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"
+inherit haskell-cabal
+
+DESCRIPTION="Pointed and copointed data"
+HOMEPAGE="https://github.com/ekmett/pointed/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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-haskell/data-default-class-0.2:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	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?] )
+	tagged? ( >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] )
+	transformers? ( >=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.18.1.3
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'containers >= 0.4 && < 0.6' 'containers >= 0.4' \
+		'stm >= 2.1.2.1 && < 2.5' 'stm >= 2.1.2.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/primitive/Manifest b/dev-haskell/primitive/Manifest
index 41fe1767b331..a7f840433eef 100644
--- a/dev-haskell/primitive/Manifest
+++ b/dev-haskell/primitive/Manifest
@@ -1,9 +1,7 @@
-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 602 BLAKE2B 94f00341de1d34382505026bf7d3f370123e9cf97c04ad08d840575a0f74580e5dc8b6f399b7bf7b0825cdeaa1274a610aac3428ced131594bf1a5920e3b31cd SHA512 50663a2e0f875968103225281aebca254f306562eaf6cd647b5d346fe261e35b74a460e6f5fa4d1f458c6934b9aa0fc2b8b8be4d2d331bf4520a875b406afe4f
 EBUILD primitive-0.5.0.1.ebuild 614 BLAKE2B af4851b2eb84e7d66661868623b64df8fe1c8d18d897979c732f037f3200e0178c47a439e61ea3eb1fa22a936f859795355eca5847a9ae77cd13d0e5d728ff47 SHA512 a0b8e52bf7fc44493b7106b3fbea69a9788b6d4b03885cff1df3225dad893dd4ac8970381d2faeb4d9db2c72de38a913c4531dab21b975e94006ed7aa46297a6
 EBUILD primitive-0.5.1.0.ebuild 625 BLAKE2B de052798cd9e1c3651d72d9d008e08b9d29c36f0f9cd6a4075cd58a27028081a46c680daeb3fb57a5eab059a35ff9c45b5ca09e4f1915ed4aaa640b616f3e08b SHA512 d0a82c2e2b5709803f04152ec0a886ad440c0c9896c01fddaa9b8090b6f88af5cadfa769a723ce646cd4b7da8beb45dc4b1245a1c2a1a4e1c74db93996558a41
 EBUILD primitive-0.5.4.0.ebuild 729 BLAKE2B 213878e4640095bad5e8568b42169c369119eb1cb99b26ee011fa05e6b77228a3042dd0e761a4d8bba96956610a81ec0dd0b8af9fed4c4aa03c79dd9c7e41974 SHA512 286e609c04b24f534b18b8649360b2e44e36854e11b8307a38a2e8c4300f4295ef5ef155b35fce7bed3434e8a5fa09527420d202dfb2c801ddef9c1ce26db0f1
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 81891c6d9e5e..000000000000
--- a/dev-haskell/primitive/primitive-0.4.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/puremd5/Manifest b/dev-haskell/puremd5/Manifest
index fe03b964daf4..523bb39ad286 100644
--- a/dev-haskell/puremd5/Manifest
+++ b/dev-haskell/puremd5/Manifest
@@ -1,5 +1,5 @@
 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 785 BLAKE2B 66a1e73807a1e8ad44b0dea3043f6a9d2b23bab56ecd1d9921927df1fd1398a127e6770d62a05e7e60094c18d10bcea366554add77ba1d716a59e8aeb417ed51 SHA512 2874cf89cbb67ce9a271b32306c581ed9b31cd1cfe78ffff0dd3740d8f5063327139b13f0fa572eb489ab55ad45fe872f5cde7f480d3dd68a38736bdb587e996
-EBUILD puremd5-2.1.3.ebuild 1043 BLAKE2B 1cbd1b93a73951011e2f3cc07799dcaea9f39e66384a12e87fd1b5cee1ea9111c909052cbf8244a820755d9a6baea5f3ea55dcdd9b2281757b3fd648af2449bb SHA512 f64db44a4d947c44ba313688a01f8946f36a1fda8c106e8507034d1645250fbcf5798210cf6bc8567d498688824a44b176e323797e670a30f4dd70b8b54fb33d
+EBUILD puremd5-2.1.3.ebuild 1070 BLAKE2B 9d05894b6ff789cff740292de930afa305980a13b407db18fb568bc84307959d475cedb8f702ee3f3f5919bcb8111b5c7cae332fa5a4521465e702d1690794b7 SHA512 ca02ed867f1d9c7ff6c69f2287a623452771fb62d9e2917d19f83e2fc5d0eea06878d6e407f65f96d0b244553e672d2a9961df211c915f0d6d1513abd126981e
 MISC metadata.xml 409 BLAKE2B 15eb0f35211933def995d2fae75c8dc314d7631253281407c163dc4165b2150717fc5e07f26b3f372d76227a58b4363156c11f012fe3856fecc6c23210a5a8f5 SHA512 4ba01f7301f2151bebf117ee4b322debc50d0a17f16b52d14267818fc4fb3716b7981a251a7c39b13dfab45cb02fa464b24dc0afa1dc73fecddfe81341d65797
diff --git a/dev-haskell/puremd5/puremd5-2.1.3.ebuild b/dev-haskell/puremd5/puremd5-2.1.3.ebuild
index ed5a5af0db57..e65be7248e8a 100644
--- a/dev-haskell/puremd5/puremd5-2.1.3.ebuild
+++ b/dev-haskell/puremd5/puremd5-2.1.3.ebuild
@@ -19,6 +19,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-haskell/binary-0.4.0:=[profile?]
 	>=dev-haskell/cereal-0.2:=[profile?]
diff --git a/dev-haskell/quickcheck-unicode/Manifest b/dev-haskell/quickcheck-unicode/Manifest
index 5d03e923e579..9b96a50311f7 100644
--- a/dev-haskell/quickcheck-unicode/Manifest
+++ b/dev-haskell/quickcheck-unicode/Manifest
@@ -1,3 +1,5 @@
 DIST quickcheck-unicode-1.0.0.1.tar.gz 3145 BLAKE2B 04c87c9deee25a9eca10b916f0073ea91a348ba901ad0b85d6b5e82f915f003d1260d91271571f6ada077933683df8a3aec8109d4423f92fe4175f3f7e7b9ce9 SHA512 93ca26350243f509027c41279474b45679af445f19a2454ca4c4e980d0ba76f8ea5a6091197d575093af67e08461d6ca436270496d985d1a33fb6d958fcae371
+DIST quickcheck-unicode-1.0.1.0.tar.gz 3216 BLAKE2B 29a0736759a4b17b7623a14ffc13048fd7d516275918ce61d6fa5c546999b24f2a763bd4b91993f3609c32a16558f38c24c019ff13a8120982e1c02e42bee83a SHA512 4762d9cdf7624e28586ed18ad05f273b600bf664cb3f3f76d9e33dd217181f49f5835ac6276da8d5302dbf89fe65cec4e9d3c1e57dfc457ee3b3748467672c15
 EBUILD quickcheck-unicode-1.0.0.1.ebuild 613 BLAKE2B 35856e0072f751cb170f09d1832fa9cd78d37b14d4c1d582491b77e4dc47dd7d6fcc9b2ff6b4a4b1a5002b6131fa552bd531a793c23e906475f51b78248afea1 SHA512 c3041ff270aa47d805f050f51595b9773bd2a35bf4a71ffd5879e705195eba215b8122834ee13a9a564f6e68f37abf9e4d60457b6d91fb88eb0c604a46218cce
+EBUILD quickcheck-unicode-1.0.1.0.ebuild 617 BLAKE2B 0e00b9cea08da753f63173d3508309940310d30a84a34a487426c903df61b6bc50db26436f02e74c0be6d95515ce2c7040d011fb5ada6544ac4840d96f859df8 SHA512 a3fdcd4c02069c9e71c8234ea3ffbe2c4bafd5ba45c6aab83b58a0c068ce9f6926ea9022860e5f94c2da24f9a80da1c0704836aea1eac385c1607aefecf96958
 MISC metadata.xml 448 BLAKE2B 74f70c616816cd7cbe1882cc863a3a7fe2134f93cf99f01c6609c09529b72f25298cc4565cd4f357a81c838b215f70fb55c67906d8e0e26d777f9bf6b4874d8c SHA512 e318d18f4546472fae359c4ed060751a17cf307e7daad7ac1b554d7b86d924fe2ccba3cf7f46e182c696c89aeb8101419a81e533e12ba660417bde2f73697054
diff --git a/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.1.0.ebuild b/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.1.0.ebuild
new file mode 100644
index 000000000000..2b9116dc605a
--- /dev/null
+++ b/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="Generator and shrink functions for testing Unicode-related software"
+HOMEPAGE="https://github.com/bos/quickcheck-unicode"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+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/recaptcha/Manifest b/dev-haskell/recaptcha/Manifest
index 66384d67cfac..5aa9e7665e8e 100644
--- a/dev-haskell/recaptcha/Manifest
+++ b/dev-haskell/recaptcha/Manifest
@@ -1,3 +1,5 @@
 DIST recaptcha-0.1.0.3.tar.gz 2742 BLAKE2B 574c4f96fd3a1994f8aef67ebf472b49461d9231d787e5e7cc61a659fbbf9f3306147bcd89d2c371fc1ba28accb98cddc81281e1e11314ede59f9ecdaa8ea3ef SHA512 acfb3a14a48e068762fa5b6032dba298b0ac7a674753337c94f1665e6abb24a6761416a6a1cc35b6d05c71cf272e6b0f7c938678233eec33b61b4e053af17b2e
+DIST recaptcha-0.1.0.4.tar.gz 2724 BLAKE2B 21513aa79f74a8442deeb2355113cb545eef90392d1090ff1623ee094801f5d989d3d46e094c0a3af40bfb3ff294c4f0e611d5c4cb56cc4653945728d65e5a38 SHA512 e1827f03b70131dfdfe087f139c1ace6da8bd1849ea83ddf4fe7ee33e224369f9530cf6e9d93c38acdf92ff0470c42e79774ae3cddce3209210f597ddb82e41f
 EBUILD recaptcha-0.1.0.3.ebuild 988 BLAKE2B 75bf9bd03576169f0a0b5564558e0a3ef50b1c195b7335f11b38b450f2a8360a98a5b0a611e01489014e4f456ab8ea03b974f4280c32c2818f03caf61a03537a SHA512 30e2645de3c530cbc12c719285208496cc4f47ae1e1309be66f82bf9aa0ca04b0a013604bb5d5e91b782f65cb8c9b3488e88acecc45a9df269fa18fd5603c8b0
+EBUILD recaptcha-0.1.0.4.ebuild 983 BLAKE2B 2556ae952ebee20da842d16d89fcea848b6bf0fa0f53128504078abdb23da66b54e550026116f77f9ccc465dabb5a66c980c3a45c2c1d81b3d1ee8c33849b251 SHA512 f479cf754091532409909c5f6028849c43c85901197f26cae32f1fc54af3b7d7db7faa80858d780a5d88ca4694991cf9f9ec8f9d0ecb0df38eb4161e4a3dd4d0
 MISC metadata.xml 671 BLAKE2B ee3c232b493e6e3f46cecbf461b329b1d9382ee4913656ed8414544102c6f4c64715999b8896a3a3a6cb7ccc53281f8520445782d33c63eff0195a370567ec12 SHA512 985e26f885a42f0a53dd56e9e8bf1fb4cca2a94a3fc26065ef90071bb7bc9ac9e1a3166ccfa55c5039706ab0ef284033b81c96c2eef18bcaf8390f0a4072ec83
diff --git a/dev-haskell/recaptcha/recaptcha-0.1.0.4.ebuild b/dev-haskell/recaptcha/recaptcha-0.1.0.4.ebuild
new file mode 100644
index 000000000000..77661085baed
--- /dev/null
+++ b/dev-haskell/recaptcha/recaptcha-0.1.0.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6
+
+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="https://hackage.haskell.org/package/${P}/${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.8
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri)
+}
diff --git a/dev-haskell/reducers/Manifest b/dev-haskell/reducers/Manifest
index 15e6ad3a9ae9..0ee861c75db9 100644
--- a/dev-haskell/reducers/Manifest
+++ b/dev-haskell/reducers/Manifest
@@ -1,5 +1,7 @@
 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
+DIST reducers-3.12.3.tar.gz 13405 BLAKE2B 8631ac257a24958be7446ff7bdb2e02ccad4e591d4f8334baf322fc58cdbadfc7c0eaa73f6a371ebf24b263057263b3230e3ff0e1b5aced348cebe979199e7aa SHA512 7bb78ccf107d7bc6bce8d68c3766b799ce2c2a41587ee4d2b7197c2dae1d27a6ce47110f1abd655108d7fcc306e9069a25562e53b00ff97704af0b8aac9139d9
 EBUILD reducers-3.10.3.2.ebuild 1165 BLAKE2B 40accce4c345957edb6a47a612e94e97179cf43331acbf8bf8d5145aaad4744487380465f6d0d58d5fcea0bd1c197ac56a292cc3555df0eda8cf79babd968012 SHA512 b5b8e982ccb89fb99b4cf1a3481bdc9d9e11c9e49462bbb749685e7eaa1c39c68a51e51e7cb5e120fc5c25d52a51cc76201c2184c45b7594079fac700e4ef19d
 EBUILD reducers-3.12.1-r1.ebuild 1234 BLAKE2B 44330e4d815edf5d77c5b46f83007303037fcb75968559be3496064d60de812735ffa093bac0e5aea1ad1b6bbe694982ca27f74dc5fdf609dcc3206768661a3b SHA512 31e37985fed301d9ab63d8d649fc2071e8f812c6be8cf0d7c4c3def4817922398ab9b0073993634b7a0f97b08852ceb7138aef8c11aeff7ec5cbcbbaebb5decc
+EBUILD reducers-3.12.3.ebuild 1078 BLAKE2B eaa759ed1d15fa9e3209a4f5d75745acd4c12c8a18dfd0f1ccc7473cc1bf97daaf7282b8a8cd013ddac0571926bdd82a690cc7202489a7afaebb21861a0d047d SHA512 167c6f0ea21ea89077cfea6d0ddb27150e5d107ef4ac6146963c1a8e30ad5cdd0c26c66f01952c58f5703ca3cb1ba70866e8ba42ad2d29dfe7b4d38a09b97d3c
 MISC metadata.xml 440 BLAKE2B 6313bbacc5c7debef61bd0e21dccbb13407e9f78367e9fd2a441fa6747fdf3aba1dc74832b1d6e58b5ffe2f814f9e23c232c7076f727a15a71a440741bd79e11 SHA512 965a145143129f1925231cba9c298a8ce978c3e1bb7af2f898039243c71258c15fb3fc07c1a2f4a04c61e7d41c69090eedd6ad9e7da096769f57b1b0d8e76df8
diff --git a/dev-haskell/reducers/reducers-3.12.3.ebuild b/dev-haskell/reducers/reducers-3.12.3.ebuild
new file mode 100644
index 000000000000..fe131aae38a7
--- /dev/null
+++ b/dev-haskell/reducers/reducers-3.12.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.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="https://hackage.haskell.org/package/${P}/${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/unordered-containers-0.2:=[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/reflection/Manifest b/dev-haskell/reflection/Manifest
index e2fe4e3c19e6..6d6b2ed3c4e5 100644
--- a/dev-haskell/reflection/Manifest
+++ b/dev-haskell/reflection/Manifest
@@ -2,8 +2,10 @@ DIST reflection-1.3.2.tar.gz 8530 BLAKE2B c9ea1c0cb948596dc11d42191cf413280c821c
 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
+DIST reflection-2.1.4.tar.gz 18364 BLAKE2B 70cf5fc742deac5555be43a24b2b74930e54a7909e68dea53d8dba7b4547b99d97dbb361ae96776a54a7305069305ea085d8d988b70b86460bd476af6392c417 SHA512 3209bb44a07fedddbb2aeb5f2f09414e6672faff6c8fbdb78eaa8f61a1af4d9fba43be193854f8978ffdd82c0ce54bd79a5d875638a41b6a738bc489bd718295
 EBUILD reflection-1.3.2.ebuild 650 BLAKE2B 7706f7926eaff1f4156a4fbb25b0109c688ab749bd4782cba5497846793f9c530464b8cb983d2f4421f331c419cac2635d454d66b2eec786a79efdf85f560960 SHA512 9bf2613c782022f38ac8759128013feb5f31bd56787dde93dd03594653c9622229248e617a0cfdee8a5bf2b7a3c67a3032ec0f7c3d4881c7fc2fb974fd970cbb
 EBUILD reflection-1.4.ebuild 739 BLAKE2B 21299778bdb282d58602a0080e6171ccb35d07425667f06e2f75be32f88620ad98ad72ad6aa3366a6f853e7efdee3a8900c9e1c00a44fe75ec4593973d535af9 SHA512 7840e7f47b1d46ed73dce4bc13a1fe831732f00fa23f61bb1c3fc6a882f54b039391595e0e2a44e48a1548bb9afa0a376e383d62d50f7849fdacf3c3e4486b19
 EBUILD reflection-1.5.2.1.ebuild 805 BLAKE2B ff135c12cbd22bcd4c4a5f65487d0e7cfc406e1754e395d12d9deb95be333efbc4d584af6462df2ff88173203ecfab389abcfef340a603252582ead8e0ece27c SHA512 8f55114562a38fc91646f1d3d3b010fb468f59ec7da17c7715104dde4f0e03dd3a56fe8f9088be7b41a2dd8e6128407d72a5b4e1f7eaf56149fdaae9508e0c6e
 EBUILD reflection-2.1.2.ebuild 805 BLAKE2B fd65ae9b8fe4514ab62d572f2c57c9c92bd6e7e1bb25dd5fa899e0edc467c90bd918809fcc142a582a8dced797ce59537fba0dc643b98e259f58c7bfd1f3f11d SHA512 85259ca1692cf44cac1d762f4db9df58c2eb43d421fed705777c0d31bd3f4418665b9f1b25f181bea7eff012d0670c523bd743ca7933866977469624659adea9
+EBUILD reflection-2.1.4.ebuild 891 BLAKE2B 432ebf3bc35c59c9365e44cf494ffbb55d5637e62349cf746a4b855683a9599bd294e01d1dd4ecff2eb6f3a080b21fa8f59adca91dee4abc61692e083437e4fc SHA512 81b7b5ddd38cfd2a6b3e39d41bff9e9486aacbcf09b7a29d0686e13e7df61dab2d04a7ad1d86b3126d7f80fe31298b094004471d93f01c97cf8f0ce7ec88512a
 MISC metadata.xml 1993 BLAKE2B 24bce26fb7fbf2494ba2e5b5ac22623d73a1852e04aaefbcd3929ad22486790d7040e90b341de8e4f38952237ed6f7b1fee98db938caa443b4efca60c1f66d39 SHA512 eff155a85567f88de01d1232814c47444757d736e8237200b3043d40fa4f67d7cdf0e09b5614ed29c04bf81ab12cc3a5be0a258bf7db51813b4d58f4d137667e
diff --git a/dev-haskell/reflection/reflection-2.1.4.ebuild b/dev-haskell/reflection/reflection-2.1.4.ebuild
new file mode 100644
index 000000000000..e8245e111f6e
--- /dev/null
+++ b/dev-haskell/reflection/reflection-2.1.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+template-haskell"
+
+RDEPEND=">=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[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.10
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-slow \
+		$(cabal_flag template-haskell template-haskell)
+}
diff --git a/dev-haskell/rfc5051/Manifest b/dev-haskell/rfc5051/Manifest
index 9537d1e02353..3d91f94ca345 100644
--- a/dev-haskell/rfc5051/Manifest
+++ b/dev-haskell/rfc5051/Manifest
@@ -1,3 +1,5 @@
 DIST rfc5051-0.1.0.3.tar.gz 217935 BLAKE2B 0957fd189a5d9560a790f9c8bc9ef7d6c839dcd2111471195c8b89ef1efbb448084b03498889e724095b5b0760138493a74d80026a478d0ba3a49cffa95be9a3 SHA512 aef601b6e42c3f4238e77452ef302f155ba7bc815d35cf680e2f260ce337644652ee4ac77ea03696a91563faaabd7c124b95a4c16661dd104ddc85be7d9dffa0
+DIST rfc5051-0.1.0.4.tar.gz 218105 BLAKE2B 456ab3fe7d1cffebaeaef0aea1b0867ef69729076af9317cdf8f0f802800552a5a1e6ce27e6684eee94457acc925ad9d7c750864b6098b687af576b5aa74d772 SHA512 5a8a3f3ccb846986242152c8c30a0069466072f2b3fb449565b7fb95615c7909be04a320b9215d313d8b8e442a01959ffead0d5076bc61ee7f33f5ff1d9dd67b
 EBUILD rfc5051-0.1.0.3.ebuild 661 BLAKE2B ce47fee92328807f05bc60b8c97eb0be2e0022c5efcb7e78d83a3b33edd109738af6c859e10e31d7bb300a0f232bf1201ff3f118ef498e1ea97becfe9ef2b754 SHA512 d2fbda70e77a72b7ad923cf7b44cdd08c2832e8eeff7a9255430e370cb63a255d3388d1c3500bdeed0dfa6d59aba55deed5c06c4cbde65fa5672306f1d5b3189
+EBUILD rfc5051-0.1.0.4.ebuild 652 BLAKE2B 5feeee39830af955de264a5390215ffe112c7e207c301386d9811dd363ebfa764427cda44670c47ab765c20a85bd2ac105b13e3832d031ead126a2c8f694acc5 SHA512 95f48d7a5530f906f38171c89dad888777bc4e081e54cde040d1b40be05bf308c561a41d162ae910c3e8cd3ce827bf74139fce7c584ab442e743bbe5ffae8774
 MISC metadata.xml 1087 BLAKE2B 57013de7ce27e188dd9392253d1db57f06ca2272a37a5ef2baa994c68c934dddabfb565f934681fa8e89be1e23d4b2de04ff242a90dee2bfaa73f4624ec50aa1 SHA512 31c69582d90831400266f9315c7ec3a6b00fad9ef76324d7ccf00af507fef5c4e13bd0047b997f7c84320ae9e083395167ee5c525adddc165fb18f5222ee58f1
diff --git a/dev-haskell/rfc5051/rfc5051-0.1.0.4.ebuild b/dev-haskell/rfc5051/rfc5051-0.1.0.4.ebuild
new file mode 100644
index 000000000000..ab23fbd27377
--- /dev/null
+++ b/dev-haskell/rfc5051/rfc5051-0.1.0.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Simple unicode collation as per RFC5051"
+HOMEPAGE="http://hackage.haskell.org/package/rfc5051"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="mkunicodedata"
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag mkunicodedata mkunicodedata)
+}
diff --git a/dev-haskell/safe-exceptions/Manifest b/dev-haskell/safe-exceptions/Manifest
index d8b487099c19..319a3ff3c16c 100644
--- a/dev-haskell/safe-exceptions/Manifest
+++ b/dev-haskell/safe-exceptions/Manifest
@@ -1,3 +1,5 @@
 DIST safe-exceptions-0.1.4.0.tar.gz 12951 BLAKE2B afa5265d9674e1a88fa61cdf4c2356ffadeec3e922a52f418f88bdc1aaa22cf4378711b11a7679c99f933a515f53ca4338513fd4f2bf41f12159279d148a3131 SHA512 377559c3b35f48bd3baef4cb7bb19927bed36f34dfa531864a3565af9f7cb5ef9fc4cc9c92dcc9bb80037cb92f27dd0ba5805cc5941b8707bbc3d4185f0f40e1
+DIST safe-exceptions-0.1.7.0.tar.gz 13533 BLAKE2B 4dbf6ebdb5dcd2d1f691cac540fe4cdaf3557bfc90f702b7120b4b6a8d1e2be7ff4e6d22851be5d2650a35e074551e48643152c25a76a2ab0ffd3c37fab663b0 SHA512 05fc32ea80ce1f733a6ea09655fecccf813ea9b7736dbd1d8ef84f54e3fb58f1017756cc9eb507d381cb73f22f100e9166bef1b7198a1d9edbda21e38626e351
 EBUILD safe-exceptions-0.1.4.0.ebuild 696 BLAKE2B a96b5e98e0a7c117eb1627c9ece94ed14f6b7100e00786b25088b61b24872ad7fc5d1fb241c94ea6399039df46a9a5c164cbe0a138d5ee53f3821171328c6a42 SHA512 e62e45b6f01d70e5f09bc94e479772cdcf0494e3580933d0af4b1eaf55ee3b8c3c773059eb4529ea4371d87259009ff34b686751fab0b34a41ffc8e04cc07cf0
+EBUILD safe-exceptions-0.1.7.0.ebuild 799 BLAKE2B 2578c2cc10174c40d35a8a1cbf50e088d6605665f4e0755833386a807b859ceee4a4026da8f7d87bd6518657aab7bc36b29a3993bde3dd39e8d4f486bb6ffe99 SHA512 6e11b077d63d2bf4d221d467416037608aa232e465fc63b8434bdfdaadeaf5ea191ce52b3f59e054f82489097d4a1bbae038f3ea15169432096206845d2d962b
 MISC metadata.xml 396 BLAKE2B c107144858612f775a87a0a786c3c640e777ab2df88a7651c4c642989c5149cc984a56d07b317892f97e86a560ea473a25483b9f53090462f1477d60c3286720 SHA512 0a5487203b949ac6e770e05ae8c6387c051ad7a91e39a20d91ca261d1bd7bc3b35d9788109457ea3689729001db73a369898e65a453c202de140dee8162f76cc
diff --git a/dev-haskell/safe-exceptions/safe-exceptions-0.1.7.0.ebuild b/dev-haskell/safe-exceptions/safe-exceptions-0.1.7.0.ebuild
new file mode 100644
index 000000000000..9d53c5e08b7a
--- /dev/null
+++ b/dev-haskell/safe-exceptions/safe-exceptions-0.1.7.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Safe, consistent, and easy exception handling"
+HOMEPAGE="https://github.com/fpco/safe-exceptions#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hspec
+		dev-haskell/void )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >= 4.7 && < 4.11' 'base >= 4.7' \
+		'exceptions >= 0.8 && < 0.9' 'exceptions >= 0.8'
+}
diff --git a/dev-haskell/safe/Manifest b/dev-haskell/safe/Manifest
index 138eb9b525c1..29f59c7da558 100644
--- a/dev-haskell/safe/Manifest
+++ b/dev-haskell/safe/Manifest
@@ -1,3 +1,5 @@
+DIST safe-0.3.17.tar.gz 10524 BLAKE2B 921f791f85ad4681c1c6a002b099699e0ca48fa3fe595734f02c3f27f812e9245dfedbb6cfa475ff6c791f2001afa979ca3c45f66dda314e8f8207072259b6f4 SHA512 7d9dc15f5694103b3734c262e893f94b6c27b8b1bf4525f2d6ea5ca73e2d66715c028259ede9e8064e3579dd63342dd088c4afa764bcaeda09434515435416ec
 DIST safe-0.3.9.tar.gz 6931 BLAKE2B 3aee0d7e8cedd0b196bb705b4a23f7679e40979f6b3b474a29fa27e4a684820707082979c5167d74fde1f763bd856659ca0c68e323c92fcfe08c1faa953bdac9 SHA512 7759ae8acf0348a3070cc47e78b224ac5a826ecf46302cbe413b52c53d8d6bb6ebd939b0fe3dbb47034e910876bd7c849609f008e44f09e5ccb99a9997d2f418
+EBUILD safe-0.3.17.ebuild 600 BLAKE2B 089c65693c0ba0a639579529fcf902a53fe0801393f1b0079fbf6bb9b2a1b9b2c0757e6bc7b6f36e5fc7b0ff2bb1076b364350fa43b1d51bf512c04f30b17cd2 SHA512 793d80d6560d0fa63adbe0826753e18e54a50a3debd278287eee0692a0b646e0b2efebb57e2b66c572418676dc30ca0c0a3aa8adf1ba394f2c5790152b61a828
 EBUILD safe-0.3.9.ebuild 552 BLAKE2B cb67cb05eeee568a4abdcd59fa932cf8f0091aff6039427137e2b2fae55ad93ee99532293cd9bf536f78eef8a34998f4d1334be9d704dd5bd7ac5146361e60e4 SHA512 0bba316173ac72078de2b4e365da287c48cb00936117d9be067d5d35c2738eafdc8a001e266521c653fd58d924703d96acdabd22082100f27515fa902d8acd1b
 MISC metadata.xml 671 BLAKE2B b2ce84efb78cfd7dc4ab81fce425ba25ac3cccf3d8cd6fab27f4b787ffbcba43d8c37842702dbfb195473597491fbc87ffbd7d6fec21fef1658233fd8d983583 SHA512 7cae1ab2eff3fe2468b6d7e10601bc1b61c90937509865e2f3487d3b66ac87f9956129ee3eeb260114a3a27e4e523e82dacbadc77e6edf2b1dc9174ba1a3ef79
diff --git a/dev-haskell/safe/safe-0.3.17.ebuild b/dev-haskell/safe/safe-0.3.17.ebuild
new file mode 100644
index 000000000000..7a1ca31f9db0
--- /dev/null
+++ b/dev-haskell/safe/safe-0.3.17.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Library of safe (exception free) functions"
+HOMEPAGE="https://github.com/ndmitchell/safe#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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.18
+	test? ( dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/scientific/Manifest b/dev-haskell/scientific/Manifest
index 756a69e3a5ce..edd502263ea4 100644
--- a/dev-haskell/scientific/Manifest
+++ b/dev-haskell/scientific/Manifest
@@ -2,8 +2,8 @@ DIST scientific-0.3.3.8.tar.gz 18543 BLAKE2B ae3a16163d830fe20f7e2705b9e99aa9156
 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 1282 BLAKE2B ca5f75ba5b165b9e1d944e5a4a7dc28a4ec5129210f648405d97a4f9c53f7996ccfffb22763c90e7b786260642d55b9b2238837ecc64c946ea98c3afe1cc4643 SHA512 cde00f29d640c5be8dbdaaf116f5df8805a32c4cfd6ab884cce8950c3448680f0435e97ffc93a28bbee873d095ac341bfb3b84f95451fb3bcd37952dcbc11add
-EBUILD scientific-0.3.4.4.ebuild 1435 BLAKE2B 28de449f4c1ebca2d03d135a4d19cbc1e307dd2544c8950ed6200fb9aca046df1d13467df266c1c7325e097d1cd9a63a114d4e9cbc5e6c03162f680368c06452 SHA512 def4aacb69e7f0a67678ba5f90887cb07ccd00d3a3db8c1b505a567b2eca01fae0e936024d2ccec806ac0ce90e3ffd132a8aba5e4bae967bcc625a5b3d8f1c85
-EBUILD scientific-0.3.4.6.ebuild 1435 BLAKE2B d35c309d6e4cd1923575e8cdc99ec8b8e1c585db5df138caabb925dce2643c3f3eb2a30dcadf8dc75abad2ff2aeaca693a5916daa2df5ec4517b8e1dc9e23fcd SHA512 413f4cc63b9101ef241098b2a256ce521d7c07e24d2acda43fcd61cfd44411cd37cbdcb5e4f29942df8a35ceb3d2d882660facb265a47fef1cd6391bec91f00c
+EBUILD scientific-0.3.3.8.ebuild 1309 BLAKE2B bd1c34ab7013be12b9ea9b4b66263ee7815123ff83acfb11cd58e43a3ad7d88716cd1c3aff8c0d6f24a0559ce6962a28cab2ed316063ad65d8f82e86fb1033e7 SHA512 0b2bca05abf61023109dfe23c23a8af0f90dfd1794bc3c048f16f3c4dcb523c06a55856c9154c0781e30dbcb3441ab2e27ec039cccde0812f789a484a8867f90
+EBUILD scientific-0.3.4.4.ebuild 1462 BLAKE2B 87f91572f9a97f0b5abe4928ce5908b5a2c4e16544ee2161e1482071d1b53fcbb94f28d951ca6a247b8b003664390f01ff533bfb146057411b58ebdb4fedc856 SHA512 40b73de4817c99dd59b47f46b1efa938b154b71a5250cb72943f98728898037ad5ae3784d6722747f751e463f64d14b026a3f0da184ca8b7cc852fa08b2db94b
+EBUILD scientific-0.3.4.6.ebuild 1462 BLAKE2B d6b96237f8ee33c081e6e29f8ced684b11af9a45e7aef1a134aaf6a9526d145f857c9e000f655b5450c6a657288e27c6430f4bfe6ba93ec7da396c3d7cc6ad5d SHA512 0ea071927c7cfc4920c23a76dec9c4fa5ca9e779b3f29c56ab55ee6cbfa996aa7071c2450db56e0027282edc49e42b8b24d44765a53c70b551776f6621e392c7
 EBUILD scientific-0.3.4.9.ebuild 1431 BLAKE2B 2e78183de48357e3abfed9aa4e87d097f37e7b578d460e355e65bb5cea54bbb3748a4c70ad8031c0326e276aeb96702fafdd167329a179984f8abe4e32602010 SHA512 ada9a263efb07daa293a2d7b6c05c0581a7b7d7bc75a05aa0d39d3dd43edfb3c8a28fdedea63af1cd1dded1db3abae72bc60ee8c812794c6730083bafda744b5
 MISC metadata.xml 1019 BLAKE2B 199c5a43e898b24760454aa88076485f8615506c4feda7df63dec16a907f1f9a645039ce7c4a5c4bd85f642cc1aca577edfc3b714c8632eae99d0f827fbaf8e5 SHA512 954d114b29202a451e82be2dea78c68db8b23c52d46a2dbc59b7cbef7d500d91edc0e23dce702f36569caa7ed3c85ee52bc3cc314d18e9249218635390252963
diff --git a/dev-haskell/scientific/scientific-0.3.3.8.ebuild b/dev-haskell/scientific/scientific-0.3.3.8.ebuild
index 3b544c4e6cda..7b5860057005 100644
--- a/dev-haskell/scientific/scientific-0.3.3.8.ebuild
+++ b/dev-haskell/scientific/scientific-0.3.3.8.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="amd64 x86"
 IUSE="+bytestring-builder"
+RESTRICT="!test? ( test )"
 
 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?]
diff --git a/dev-haskell/scientific/scientific-0.3.4.4.ebuild b/dev-haskell/scientific/scientific-0.3.4.4.ebuild
index 651786af93af..63d0143a8536 100644
--- a/dev-haskell/scientific/scientific-0.3.4.4.ebuild
+++ b/dev-haskell/scientific/scientific-0.3.4.4.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="+bytestring-builder"
+RESTRICT="!test? ( test )"
 
 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?]
diff --git a/dev-haskell/scientific/scientific-0.3.4.6.ebuild b/dev-haskell/scientific/scientific-0.3.4.6.ebuild
index fea0e594f622..e812a36edaf3 100644
--- a/dev-haskell/scientific/scientific-0.3.4.6.ebuild
+++ b/dev-haskell/scientific/scientific-0.3.4.6.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="+bytestring-builder"
+RESTRICT="!test? ( test )"
 
 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?]
diff --git a/dev-haskell/securemem/Manifest b/dev-haskell/securemem/Manifest
index ccee7b94b6f9..ebf9f63497a5 100644
--- a/dev-haskell/securemem/Manifest
+++ b/dev-haskell/securemem/Manifest
@@ -1,5 +1,7 @@
+DIST securemem-0.1.10.tar.gz 3801 BLAKE2B 726659761c4e53a5009c0539bfd07c340b72765c6cfcf946f0ac13fb5473df57eda16af7089867089cceba4f211ff7764900da5e3b176d90e5b892ccf4387102 SHA512 9f1428896a7b554244e42ac04a17c008cadce8102294b3249c172d84b20195325c48eadf15f7d26dabd766e4d45d171b0a26649e097d632a7fae596663a43096
 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.10.ebuild 649 BLAKE2B 7439f46a43e5716d1b13de32c488157eb6c8b88b4347fe09478a7703deec41776a9528418a71fc95714c315e3efe02cfc22ba383dbfe2386249b783ae8c8691d SHA512 7417bf16ea1c31141fdd176fb68a3ab330bb8833b339aa8845116d2660f77eb2c1597ee63fc03964b5c533c5b8727009e0c0fe5f67b4fc90873e92939b048451
 EBUILD securemem-0.1.3.ebuild 610 BLAKE2B 729b237a979d3c8a147da4a5e1f11bd02640fd3d6f616fb7446534c1fd0aba207aa32f106649c2f7058ba97a3b89a80b0a937289df63ec7d063b89ca82e80ba2 SHA512 a99638ffd4d5bc4dd2798a02fe49450659c5a3cea660d66f153659c906d8f70818a975132def69a7400c38dc50a2f90f99091e0a6ddb698c349d34978065c677
 EBUILD securemem-0.1.9.ebuild 649 BLAKE2B 80143c080ae2e79d8396bc2dae5fdc86455e61e623ad19609ed5c1134f0d2050907410cba47665e9302790802114140a07ca6c3d8d8f1a7e6376c365e75223a0 SHA512 66ab1f03d74801f3c419e4cd4113d47cbff7b27ed7fa309191e2af630913517ff6d37aebd1cb29cb05d7e92e04ba611f42ef3be4b7d2d18b6ff237373db50efe
 MISC metadata.xml 508 BLAKE2B abe2cb1ec464add4a8f06a615c8204e61cdc9149d8643e4a48cc2c7a9cfc40bb00849b1ae5ffe910b5d57a4cadd1ace45ea9e8cd3f28d977c62646f62596c550 SHA512 89ba6b755a9800c71f1c5e41915fe1efe1eaf521a6199bb4de558fa6a6a5a3c0bea6a29a6f969017b45c8f54db503bb8fcaf35317304a02083e96d29da12696a
diff --git a/dev-haskell/securemem/securemem-0.1.10.ebuild b/dev-haskell/securemem/securemem-0.1.10.ebuild
new file mode 100644
index 000000000000..c2c45563c85f
--- /dev/null
+++ b/dev-haskell/securemem/securemem-0.1.10.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="abstraction to an auto scrubbing and const time eq, memory chunk"
+HOMEPAGE="https://github.com/vincenthz/hs-securemem"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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/sendfile/Manifest b/dev-haskell/sendfile/Manifest
index ffe0c082b345..f01996fbf579 100644
--- a/dev-haskell/sendfile/Manifest
+++ b/dev-haskell/sendfile/Manifest
@@ -1,3 +1,5 @@
+DIST sendfile-0.7.11.1.tar.gz 10678 BLAKE2B 492c9de894bf1150eb380ac1f2013600c1c473651fb91157a9599efabb2f25ef430e5b92f29113762c26fc39e5524ce6ea58fc83a3a02f55913b2a0897c0a711 SHA512 284b26bf210f2fc5e7c9e56bdff9f296fca0367c78b7a3ac1a2d2a86a76d0a1508480d9324825cd183d7b8e72c18d24eaa603f9e284fe7ba8d7d4b614e490094
 DIST sendfile-0.7.9.tar.gz 10656 BLAKE2B dd6092d6343037d413d162266545607844bb05a6a2abd810f1369bb06f9f15e8b6ee3690af85d5b5d9195f47f2b144a60a99b84c3bd1fd9aaa244d00cfbe41a7 SHA512 a7ba2e82c30b12e5b7f317e2f5cc31c32cb7f682403c3807afc15254d86c3ebb526a645234d191d5b43adc414704caa4cdf61e8083e0a3d53e1af676619f731e
+EBUILD sendfile-0.7.11.1.ebuild 694 BLAKE2B 40aeb1fa00c7b2c05de388f91122051fea9fc4bda1e832b391aeb1b8ec90bb5b44f9985ec7a05bbbc89018f49a2b991f7b3b8cf707bf66b2cc9095d660a8ed74 SHA512 c5308e27d9df4c2eaefee68d240c4efd5730adfc808b59e21a22e90a2231a1f036c8bee234f39792afddf05c41bd27b29bb6905e6bdf7f483b4da7059e79ec69
 EBUILD sendfile-0.7.9.ebuild 661 BLAKE2B dd05b01596d025e9d4373b9d3d11dfb9470079693374fab1914dcff482eab509c492244101d844edb59fad35db50bfdc4cf4dcb0b3d9bf64e2d25bedfecac98c SHA512 eec276731f9b2375f4858536dd6e2dd73848c0ecde4a89a56174756ffb2116028b3c62f5a40519f0d5cdf548bff478bfae8096300c84507fc8eb8c28fd3d8a49
 MISC metadata.xml 733 BLAKE2B ade73c9cfdc6e9058b3d831ab81a74d6b28959165fb76a05ff406a1062bc49cd429f801d4239c6b3b213aa60fa734207cb0620ebb4bb44ed5bd806b06c61ecb6 SHA512 7a33c152ebfa91372934b19699819b41bf58ba7738fd8757d63861cd9e08da6a42de506f3d8f225167c6c9ab9aba294fca59a9080ef7657954748ba09fea16bb
diff --git a/dev-haskell/sendfile/sendfile-0.7.11.1.ebuild b/dev-haskell/sendfile/sendfile-0.7.11.1.ebuild
new file mode 100644
index 000000000000..086e2bd902c2
--- /dev/null
+++ b/dev-haskell/sendfile/sendfile-0.7.11.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A portable sendfile library"
+HOMEPAGE="http://hub.darcs.net/stepcut/sendfile"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="portable"
+
+RDEPEND=">=dev-haskell/network-2:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag portable portable)
+}
diff --git a/dev-haskell/setlocale/Manifest b/dev-haskell/setlocale/Manifest
index 9ba7a4bf88cd..458cf722ff6b 100644
--- a/dev-haskell/setlocale/Manifest
+++ b/dev-haskell/setlocale/Manifest
@@ -1,5 +1,7 @@
 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
+DIST setlocale-1.0.0.9.tar.gz 2098 BLAKE2B b12b847957807038da6fb7bb31a8a9dbeb55ce17062a3060ab66aae75d840f9fb44cfe51b3b2644361e457d21cca3f325e0bc09c6d453c5d28074efed56bd6c6 SHA512 32a0722c46b6db15b4566b78f418efe3c8a5d6e25181ebf275a47a68b12e4740479df6ef38070ec978eb109f5b1e2956262dcf4367869bec78dc41d6890632cd
 EBUILD setlocale-1.0.0.3.ebuild 650 BLAKE2B 68335df37de31237a70958ed4d97617d5fa07fb1ac786608e84168d7bc37745a1d62a8a1017a318a17fd3591d6fa575aa4a5d1fbaee543c0557b0eaecd8d19ab SHA512 d997bd66c4c4ee9e25c559e798fd33e384e4a6978f34edb916c901d7c1b169f5daca751b5c878f53bb686a25364bb85e55349222e9b3a5d3760828932b4ebf99
 EBUILD setlocale-1.0.0.4.ebuild 579 BLAKE2B a437cc1fe810493d97652e85b8eaa30bd96c42141f572b4458d19ed82e1fe070f84b3d34a4ea0928fd911c03e568129ea9e70c16f331749e280ecfc25bae1cf9 SHA512 f8511379fae3ae46198ca1ded85dff6c41684d819f6f5003672b4b7af67fb7e90b1b8b5eba310fe9b63368eb148173be084d883076f0474b86bb1e3e5415fd2e
+EBUILD setlocale-1.0.0.9.ebuild 573 BLAKE2B cb4459da5861db844d5f9d62e9b18eb956fbe6c57abbca0116cf1da309b579730a1f275c37fbfd537df7e649b2bf1a36d3d8a51d0043cd80efc02d9ca74551ef SHA512 a454731f0b5b393c438eea6d6c6abc5538796586fd3d3f1782aa44d03394026ae7f56299a579aa8c511e36abc2d68c1560aefea6dc53a41e9d13eed8d151e843
 MISC metadata.xml 427 BLAKE2B 8666b2b73cc0974f00abdb20c8217e824313647077164914ec0ae31fbad1b544a2281e213f9f8aca237e6c0bc52e7fd649291fde4777842aab7afd8c0f5a6c9a SHA512 dfcee3f28895ff1d2587e3e6f6db9322f65530b3c4c65845c0533f468c7fa33514a435e6db11cd23c8066675428309ffd223df9029876a8de12a0ae84f1b0b34
diff --git a/dev-haskell/setlocale/setlocale-1.0.0.9.ebuild b/dev-haskell/setlocale/setlocale-1.0.0.9.ebuild
new file mode 100644
index 000000000000..7ceaea02e047
--- /dev/null
+++ b/dev-haskell/setlocale/setlocale-1.0.0.9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell bindings to setlocale"
+HOMEPAGE="https://gitlab.com/Kritzefitz/haskell-setlocale"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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/Manifest b/dev-haskell/sha/Manifest
index 02402e3259f0..6d5bcf23d20a 100644
--- a/dev-haskell/sha/Manifest
+++ b/dev-haskell/sha/Manifest
@@ -1,3 +1,5 @@
 DIST SHA-1.6.4.2.tar.gz 2715266 BLAKE2B bca07ae5bcb85431cfe5af047d1fc033a00c04ca5870dd81a283b80b00ff00dc04d43a3de2decc0123cfc3d1d7be53486120b1419a680683f6695d115a9bcd4a SHA512 aa1178f08ad3364c504ee790dac9b0774b7461fa7ea0a8f2c3ad82943d109602debcf4a8a83090815fef487ceac40019f8b5594ab0043f36e019d69bc5f76853
+DIST SHA-1.6.4.4.tar.gz 2715144 BLAKE2B 7bc6574d949be761c7cd029348e890e473dd7cd2525b3ef5460b4c0c70ec4586daaf162d4cb74c0f7dd979be916698cd205397e3c05cb5339753f08e356f92b7 SHA512 77a525cb9ef45a410595a2f9c11a848a3aaeb6c7cb9b0ff11395326a259c0bea0e75689e3c7fa410e25be7d4480887830e11c891801f03c439b6ae9f55e5c125
 EBUILD sha-1.6.4.2.ebuild 1245 BLAKE2B 9c1f6d1775c7908aa11e4e7ea41839e480dae6f5e0b1d37f29c6f2b3ebe5f8238126566cb1bef8d99e0b793ffd02872f797bbae22788fa428e6114b59f333f5c SHA512 20f05bf24a997d48ff5da9c17c01af964c11fb16e1d37f2f77ad82e0db06d212ee7e8a52138db1721caa6b8bf9a0ebb439d56bd7736f32e759197656e0712262
+EBUILD sha-1.6.4.4.ebuild 1030 BLAKE2B 5cc75a964219be7b905e71e3e9c470a042582aee0567b549508ad64febaf1de293b96715d1635e994d9a4f23f879489d14d892eaeabe7d48dc0ce4cf948ffa1c SHA512 abf1148dda4d180a6c6a99a80ea4915c562c20d660d9423765af087742f66e2eefc3088806c85b95eaf18f37c58b1e4253331b7c52c9d3793d393664b7589a75
 MISC metadata.xml 799 BLAKE2B cbc613c9cdc9a4689a6e19c7bdf60ed0344c3d1a7d8421fcca6e7e1783ef730553ca8be48cacac0f116afeacf9d386d1bc41c8a22cab1b9ecf7ee70fd8ba87eb SHA512 e00b204843e7e36afd812d8ca4b65568e57e51e8f1f1eb1e86ea4ba4ae3d9a2c0f5184056f8d8a10987c8ef90cd2cb4b0867591a49030410dc844c7d36acad39
diff --git a/dev-haskell/sha/sha-1.6.4.4.ebuild b/dev-haskell/sha/sha-1.6.4.4.ebuild
new file mode 100644
index 000000000000..98ab4799ed93
--- /dev/null
+++ b/dev-haskell/sha/sha-1.6.4.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6
+#hackport: flags: +decoderinterface
+
+CABAL_FEATURES="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="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="exe"
+
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	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_configure() {
+	haskell-cabal_src_configure \
+		--flag=decoderinterface \
+		$(cabal_flag exe exe)
+}
diff --git a/dev-haskell/shakespeare-js/Manifest b/dev-haskell/shakespeare-js/Manifest
index 8bc52693879f..a256d667f9f6 100644
--- a/dev-haskell/shakespeare-js/Manifest
+++ b/dev-haskell/shakespeare-js/Manifest
@@ -2,6 +2,6 @@ DIST shakespeare-js-1.1.4.1.tar.gz 7942 BLAKE2B d7bcf9e4abf870b20fbf5e51245eecc2
 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 824 BLAKE2B 66d1b81cfc3e38bd2f94e22e6a652da09b19a193848d0c1772bcdc2c3ff46b95f9bfe3811af93a056a4c18000a728ac9c9e0fb91d6cd375c0fc713fddbf457b8 SHA512 dea02168d1ca8b0431df7fca288c7e0f510d8f8186e118612cdd031a83933d5c5df6ccb49432e4f492f60b33cb9a452d8eef7bb7af4c809aec3a869523e21073
-EBUILD shakespeare-js-1.2.0.4.ebuild 1016 BLAKE2B 26674e0bb029c31c77368460327be5aae37a4530516340a4424536d1a68ad31f579988cc7346d797b57ffa44d27a9de8e67aefe1d7f627b1d597326ef6160530 SHA512 e811c92bb3f810ae7764d3aaa76d6df7a09c59d9d55d69dbaaf2b40c0d7f7b8b0c683054fb2ba3ccc51f8da577223567ed1942f9bb360e0d20487ab250af53c2
+EBUILD shakespeare-js-1.2.0.4.ebuild 1043 BLAKE2B c106005ea35a49b38ef780fd0e165cb5c5f47cdb09f050387ae0f42653f2dfe3b7e0a6a3f6eff559dca10b4a50d342abd166c3052ea306222a3276fa3d2c41d9 SHA512 ed51028d4aba15e36b7bcf6f07f2e1d2756bdabe8378acd52c36e4c4c237dd4f28141382500f1bdd2ff0fd65645cdc0b29e46b90265034688e9c74e7b22cd8f0
 EBUILD shakespeare-js-1.3.0.ebuild 610 BLAKE2B 3ea45724c704c207eb9c25922c0572a45d526f92b831810fe099790820e92d91a7fff4d6a6b8f812dbbad4736616f5e43ba25928e4d42d12c2aee1bb113f1a5b SHA512 3a415f75aa8c1f4d5deabc6b1d9ef172ce6e934343f85c874bced0ae705a65d1efdb2c0ce2539ebd12d8491d51ff2ce843dd07a1bb59f0318141e215fbcdb2e1
 MISC metadata.xml 1199 BLAKE2B d89eca91943ab24e9e188edfe7a136e9cd8ee1034647afe47f33aaed069b7f023d712a8fa971439b447b720779c47f09613d23c862df3f05d58e7a15f7fa85a7 SHA512 e19e8189f39944266fb855c18cf16a9a56974226642c946928632a8b5f2d240e058c9eacfb39d5d919aaa061ba982b6203263588355db71bf94038667bc72e8c
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
index 607354d5040c..09db3d7dc8f2 100644
--- a/dev-haskell/shakespeare-js/shakespeare-js-1.2.0.4.ebuild
+++ b/dev-haskell/shakespeare-js/shakespeare-js-1.2.0.4.ebuild
@@ -16,6 +16,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="test-coffee test-export test-roy"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
 	>=dev-haskell/shakespeare-1.2:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?]
diff --git a/dev-haskell/shakespeare/Manifest b/dev-haskell/shakespeare/Manifest
index f21b89490c56..36e42bd57a51 100644
--- a/dev-haskell/shakespeare/Manifest
+++ b/dev-haskell/shakespeare/Manifest
@@ -1,9 +1,11 @@
 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.21.tar.gz 65752 BLAKE2B fdcaf27cc9f9346b93b3f1eb8b215ee75c4751427be279574c93929f4f5f521c01091bbff81a849bef3f98d97cf662b725ab99da709437b98ac85afc34f74d99 SHA512 ca796206aafffb5a96c75d305e90bad48f17d213b24dce8c8adcc9c94299ed78b0a2b48b5116d18b0ee26b413e845df53d387d3ca1b3d4c127e9b02b9f124af7
 DIST shakespeare-2.0.7.tar.gz 62913 BLAKE2B a1e4f7c05123ad28cec27d07e491af4a86847ca0cf9fc85cca821b3c80a246508370e7c985fd27339601a5a4b500ab2ef437852c4746481cfb00b5aa45e24946 SHA512 5d682c2a4c36b7c8b5c8b87a3d0e509eb84e9e0a0e00a691cb9687c6f335c9ad895b81115a4e6fe8f4087ac6febe3e3e26d39ec305267228b1c9f295f9cf6d16
 EBUILD shakespeare-1.0.5.1.ebuild 826 BLAKE2B 337299f2597bb23296ab7ba14e558225c84556c9fa409b47cade7874f479faa0a2bcba352293d8485bc63657c68acd2dbda96910a3fc465378823d8b212dd71c SHA512 a845f7c3d92ce22f0f98095464cd557ae7de46ad7612a0486c34ac35ba03396ebd94930b9f3884bd43e16d79be3f06eb601631ebd017f18b42fa1ffc81589508
-EBUILD shakespeare-1.2.1.1.ebuild 925 BLAKE2B 3fe02558366b2966276cd038d3de01f2f5246d978d094bec4eb11360c561e4b7bfcdfeb2592a6fc25512050eec3505827400069cc01f0deb321c85852c3165a7 SHA512 1705bba7898dee61a79119c212b52c413f783be166716183a2c99138c95b6ecefd5ae1a466b37b0442534784d536053e33cc7f8b4cbd0101bd6a11fb508a8672
-EBUILD shakespeare-2.0.12.1.ebuild 1236 BLAKE2B 42d3915b2b9d735f204cc7db05321c416b507aeb9e256f9d79516b54570ae1dedbd78b632c6e53a236a67f0779bfb67c9fbf115beb46ca2b72e7f7e806eaf6ef SHA512 5b521460a3fce0cd7255be8fd9a957c5e14faf2f46e55cec0de36b2831d95cf57baa0c9ad19292f09f66e9cb4d31700eb44408dfd2df13bf4f3b21457b1ee485
-EBUILD shakespeare-2.0.7.ebuild 1262 BLAKE2B 5f6757cac1cfee77935b5b66faeb7699a876bda438ca2e6cad89a8ef26b1f6d7837624348d98f18cff896873e46eacf4aabc516aea80d9c66e7f8aa6dafc1882 SHA512 12d33ac2abd0be4582a3f129aa93339ab47312d815b83397450f5b5bb3200de4f73ae5acf2734a42ed3bb490324fdf3e07f0a616f74975f4310ec143cab88355
+EBUILD shakespeare-1.2.1.1.ebuild 952 BLAKE2B e9d5ad696aba573f9c98cceb0425b8be64e2fc190dcbe33fc1a10dab1a440d8093f21d6bc793da0b7a9dcbdef776e6c178cfa7f37a9cf3b1b30ba59ea5e92bc6 SHA512 25c69ea051e40afabc3326d13e49a66dda6fe1eb299b5d26e2b501bf16eb0b4efb6ef018fa02f9cce3ffa837414b6bf83cc37472e5ec348fa372f3ceadfd29ad
+EBUILD shakespeare-2.0.12.1.ebuild 1263 BLAKE2B ebba6080a32f521022638edbe46b1a666e779e4439e8e70ff060d81fd0fdfc469bcdab341e43b924719491a6092cd30cb0b9f37037408d29e24516cb86848971 SHA512 82d5f56e4b7f82a4c1fb74cbf4cdce38d24408458361a1ad7366810ecc26e9386b1626ba33780acb95f4b7e7d3a38713fc428374e3ce287e07286da23950d645
+EBUILD shakespeare-2.0.21.ebuild 1233 BLAKE2B 1e79f5e5770daba0453f2efcec4dfbf482dc02c730071783c045608630b81d8e8167269979ddf534eff7d201c09863bb59dc2a099eb6b514a9de7728a5223907 SHA512 07f557234cb1f2f21afcda33e022542aa537f0c4fb91e667f8db7b8ad4f3fcd76b44f86bdb505294596018283e370b05d4c31dba0f3c52ec7a33cabff58603c3
+EBUILD shakespeare-2.0.7.ebuild 1289 BLAKE2B 48fc73bfe05bbe0827f9fb634590d952fb575a81ea69badcf89fce76f043735914b3b85c02597691130a10a6b0dc2caab349f32240aa891e1894e500e46303cd SHA512 f968bfe208ee7b575d21a46246b7275d68d807d133f60fe6f59bb7715e76e9a5ee7b4e6d1dbeb9350671125e53d2e8612e827028a5e30c0c2a0040150ff95031
 MISC metadata.xml 1034 BLAKE2B 122bdf19c088484e3cb66f4f98a7946af84a742deb782bc8bbde17add33ec4eed1f4241bada666748ff5ddd5063aa3b20997b89fbd80b6ae3a414cfa8b54677c SHA512 3ad916e35105e916a43f2ab37c30ab7a2daebf813691743a8bd88306cce96c1474056838451396b451424b5f960b168ad07f6aac3bd155a89aa6af37f89826d9
diff --git a/dev-haskell/shakespeare/shakespeare-1.2.1.1.ebuild b/dev-haskell/shakespeare/shakespeare-1.2.1.1.ebuild
index a2f710a4e83b..03a6d544135d 100644
--- a/dev-haskell/shakespeare/shakespeare-1.2.1.1.ebuild
+++ b/dev-haskell/shakespeare/shakespeare-1.2.1.1.ebuild
@@ -16,6 +16,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="test-export"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?]
 	>=dev-haskell/system-fileio-0.3:=[profile?]
diff --git a/dev-haskell/shakespeare/shakespeare-2.0.12.1.ebuild b/dev-haskell/shakespeare/shakespeare-2.0.12.1.ebuild
index 2e557a0bc710..d4caa18cff8f 100644
--- a/dev-haskell/shakespeare/shakespeare-2.0.12.1.ebuild
+++ b/dev-haskell/shakespeare/shakespeare-2.0.12.1.ebuild
@@ -16,6 +16,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="test-coffee test-export test-roy"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-haskell/aeson:=[profile?]
 	dev-haskell/blaze-html:=[profile?]
diff --git a/dev-haskell/shakespeare/shakespeare-2.0.21.ebuild b/dev-haskell/shakespeare/shakespeare-2.0.21.ebuild
new file mode 100644
index 000000000000..4909bfb0bb06
--- /dev/null
+++ b/dev-haskell/shakespeare/shakespeare-2.0.21.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A toolkit for making compile-time interpolated templates"
+HOMEPAGE="http://www.yesodweb.com/book/shakespearean-templates"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.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/shakespeare/shakespeare-2.0.7.ebuild b/dev-haskell/shakespeare/shakespeare-2.0.7.ebuild
index 06fc6879b383..f143a726ac13 100644
--- a/dev-haskell/shakespeare/shakespeare-2.0.7.ebuild
+++ b/dev-haskell/shakespeare/shakespeare-2.0.7.ebuild
@@ -16,6 +16,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="test-coffee test-export test-roy"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-haskell/aeson:=[profile?]
 	dev-haskell/blaze-html:=[profile?]
diff --git a/dev-haskell/silently/Manifest b/dev-haskell/silently/Manifest
index 34a1f77650dd..7bb563469d0a 100644
--- a/dev-haskell/silently/Manifest
+++ b/dev-haskell/silently/Manifest
@@ -1,5 +1,7 @@
 DIST silently-1.2.4.1.tar.gz 3199 BLAKE2B f3d05403e8fc9cab5b83808526cb957c0bc030d88b6c4249c61223f7dc3b5a5ccf10a8268aed492e48895e9ff4321282e8626439bcc19052cbd8904fc57dbc4a SHA512 ab8fea9c15a2061e3c3fd6970422a2cdea67aac3614991a8135f19a2f075de52f923fd0e78b5a45a91f2523f6263eb626efea2e89ed94277e03a132410862e19
+DIST silently-1.2.5.1.tar.gz 3358 BLAKE2B 2e7927bf663b015a52ef62266c07b30ad66e0bee2122b1a75faf9e13756e3e15bb2a15d16189d75fd9b46749ce0b1ffc66a76cb8e395e5639627356f9dab405c SHA512 1347a1da5082ca015ca609ef313ad04c253d12ab7b08f8f714b4c70282d3c01ba753f278bef4111fd8a0cc25bd3be37908b7e565d99d4b7c2a2fcc019febb8d6
 DIST silently-1.2.5.tar.gz 3364 BLAKE2B b5f248bc50c4a85268cf6709a8984307b40524763304cf8aacab64d0ba3949c2fccc104157a848a15841ee6cad6c56fb54d7b7003c13a300aaedc77a12fce9d7 SHA512 f28075e064561fffaa85dc88e7feef543411abc453e76d1ef90d3a7e617d9d9e8fc3ce053da391f0c8d78c7e27fb1e5dcda6a022f43f95491339366362f02acc
 EBUILD silently-1.2.4.1.ebuild 595 BLAKE2B 9d10c77bdc8d3c86345eaad48346c82b7f241912980916d61ad41ea91bc00a3ea35dda9f9a426ab70173e6016901f432074102aefc3f04478438117298c8f93d SHA512 9d577103324cbf0f1987a96dffc4f74dba9f7814047605f59c8774b4b9c59d40bb0c4014483fbca082e1fd34e4093369b15c3134766421de6f1d951763f0ca19
+EBUILD silently-1.2.5.1.ebuild 616 BLAKE2B a13febcd25acce3cbbae54f86016ec9c4ee89285c405dbd15db761cda1dccafe0c169ad04ad272af276f8c261aaf738841ece51d4136c1f2e049554f3f0a1864 SHA512 cb67a88edf9cd93b4f1206f9499747ab4e035e0490fd794da7f2618a354b3f2cabb0ba62d570828a860abaa15ffac4e24e056ee605f054826e9631fa660ed13d
 EBUILD silently-1.2.5.ebuild 618 BLAKE2B 913f924e0df9fc14f38e77e1ff61c99e527ee244b0e1d04d26ab616192d1faeb945fb6b2ed1baa57d1e8bc1bac433597f1be348ba4ab2e76e62bdd9c7d68227f SHA512 6183d36a4ecbdd4cbf9e0a2717ef33b1dee6d91b3b98c3d7b96cded4e2aff89b00e9f64242de1b0f898e338c3f2ef6513b1d762344754ef74287560faff08235
 MISC metadata.xml 427 BLAKE2B 07dc2d7f1c8f37c13135e3fb1fd4ecdd78e118fdd7ac6b568bad2657b3f9f56e096885490faedd25213d7faae9965d1ad119a304c00609f8bcf2c16a4566f75e SHA512 506248006e0c2bbe28e8a9dd9882b60c3cbedfaf254336770768ade198610de86377607e306d87f4056ad3ffedda4211cd0ce1ce45bad737d97953175927f0be
diff --git a/dev-haskell/silently/silently-1.2.5.1.ebuild b/dev-haskell/silently/silently-1.2.5.1.ebuild
new file mode 100644
index 000000000000..c987e9bc3bea
--- /dev/null
+++ b/dev-haskell/silently/silently-1.2.5.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${P}/${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/Manifest b/dev-haskell/simple-reflect/Manifest
index 95e655795f5b..142d3ee738f1 100644
--- a/dev-haskell/simple-reflect/Manifest
+++ b/dev-haskell/simple-reflect/Manifest
@@ -1,3 +1,5 @@
 DIST simple-reflect-0.3.2.tar.gz 4492 BLAKE2B 933f9d5902a18ad3e69aa8c9731c67eb4e35aec36f860d92876d8a7709f3ced259781979bf469ca5d547e21995b84e0a94aa599f4df6e3f5fa3cbc8337e0702f SHA512 0e8e9666b10fcebbb4fe421ca8a1102d2028d8a4b2b9c196400b15ceedaa0420160e1536fadf55fdc316e1a07fb11aa92e2933b2fe491d27a1f3c54b62f268a1
+DIST simple-reflect-0.3.3.tar.gz 4590 BLAKE2B a70fbf93615cad2351efb6070c78075c848541973d8b321734b5d675a4524396e81b3e3f6356bcd75c9378b5f0f328dc0057032c1b862699dadc36f71347217c SHA512 5a10c7696a6d92e5881b88d92427d5f62bb319cff69a093aa72404dd68d9bddcc2b4f5c5fb83374b5a0c71be78705053cdfce6947fc2046bb4e3bf99d85ddc3a
 EBUILD simple-reflect-0.3.2.ebuild 576 BLAKE2B 800424d3ab96e4db9070a5c5d4c74dea5b0ac1921d1d1c809baa29b3d1a4478859a61e781ce5072490c26f308783b07ec263ec7e308233048b0519a55e1699f8 SHA512 e6b9d5b686be079a46bc58d8820c7c5f47a3b45b3321210c257e6b8402cfac04521f8d13800f0dcfcbb6599bbf10894b5917b62a6bcd4db010a113acb9b9f4f8
+EBUILD simple-reflect-0.3.3.ebuild 579 BLAKE2B e797ac1a5e51dfe35dfdf3f982f9a83417a7c4f83d41acaa954c504ae1d9264d54722cf583911fe737e6156af16824f659ff8504e3c4abbe446cd22075df46af SHA512 3e83a661fce1a2882ee17ca884c4ec882e4f198e2e0c1f70c21ea800c57fa4d9cb1a5dd07ad75fe9b9e846176217a8dcd14365eb06cc5f631c251869820539af
 MISC metadata.xml 592 BLAKE2B b975899549ba9e105eecbd12481245c88e5d7d8e771e4cd33b9cbfbaefa66c1b357292b7d0e5f7d2d6d8475a9ff04ae975298747b174ec219b8e901975d9319b SHA512 7a105e85491afae1d8b82be079cadf3600daafc016ed89f60365b696d340b165fa3e65e6d457d907a0fcc4a31952666eead61cdb71d9bc7080fd50f5e4fb9690
diff --git a/dev-haskell/simple-reflect/simple-reflect-0.3.3.ebuild b/dev-haskell/simple-reflect/simple-reflect-0.3.3.ebuild
new file mode 100644
index 000000000000..ad2576dcbcf6
--- /dev/null
+++ b/dev-haskell/simple-reflect/simple-reflect-0.3.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="Simple reflection of expressions containing variables"
+HOMEPAGE="http://twanvl.nl/blog/haskell/simple-reflection-of-expressions"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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/Manifest b/dev-haskell/simple-sendfile/Manifest
index c1cddbfb3a86..67abc9d005a3 100644
--- a/dev-haskell/simple-sendfile/Manifest
+++ b/dev-haskell/simple-sendfile/Manifest
@@ -1,7 +1,9 @@
 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
+DIST simple-sendfile-0.2.28.tar.gz 343120 BLAKE2B fd6a5e083707e113fe4637ee8242b6036f813deec2ad2adf7d9e91338b4d15ef950d35e6cfc69be569601272f8beb12b823e4528d6a9933f3bc04533835f9240 SHA512 9a08d4ba26cd05b1fff3e72bd0846260d4c04921a5ca1f86258c61e51ee5ccf8e14dd2aea0bee44590572feba1832b2562b75b5f71f004c705f02cd0a0f000d1
 EBUILD simple-sendfile-0.2.13.ebuild 890 BLAKE2B 619c024c1714313d725e12ff93d8fcdb94667bc57d06d251ca162811fdc8ba394630fec0d308a4da0a3d095ae3a01d8d43a72a45fee5ec42567741f2ce16a5cc SHA512 695436d0b5fd8214d639f67acc3256cb4676777956b5f5d126574eec446b2a1e92708dc322124f2698a167711b1fbebf54948b6cf283c82a1d9f0968f3952ed1
 EBUILD simple-sendfile-0.2.21.ebuild 869 BLAKE2B 3668e5f6bd42fb19edee957447cb114d49ae4de0114a332afd39a67d9ae9421037f5eff624bda1c5c40b1e0ee9c16cbf9e7f50588cec61c8e49ddf0ef8cebf63 SHA512 dbccc9a3e886dde861c24c42ac6bcba57a05ea08c318ab88de010e12213b4d565705dfc155bff38631d3bb0661124ca1fa8bbf2333c602706e575160ec8ff28c
 EBUILD simple-sendfile-0.2.25.ebuild 835 BLAKE2B ac1db81dd9a713b32ac4a568a3132c322a1f793552ea4f0c6e6cb8ce389a04f3ae8f29bdcbdcde8d3b20876fd0a1599c142bebdd502d08ac28f976b4284504bc SHA512 f4fd10b44c2a9c610d79b651d4db8280955495399c64d1f88d68e94ec1e022215482831b8175985294e560547666aba294a43ba905f56a0861e4be54f54393a1
+EBUILD simple-sendfile-0.2.28.ebuild 835 BLAKE2B 074846efa390c41b16e5d63da042ab8afa9b2960d780ae5fe9ccb3b2ff5b1aa2336f341c1eee0a542d196ca9557d9b4324d6d8c1651edaad8916e87bc07b6601 SHA512 afafb385c97a2e2edb8f1f82efd1fe2190a2203e114ed8155eba91cefb21297d9424bc2a8d09a4c14efb0e732523254082d9db8b0f19898edf76129620cba05d
 MISC metadata.xml 537 BLAKE2B 056b9c3c9f3bafe74db9214c50f53dbff672cfbb07746be269ff1c5b4e9ea636516bdfb761d0852b7646fa5290d4dbdd8576b59261af68dd837d90cec0725d43 SHA512 e8c3e530af2d0c74996d66706b56f7a314daebacdfcf7a6fde49eef48505ecb10c10cddf4d1c8a13648f852c55acd1bc674ae00c78f62c5d3d031458d9b26a2a
diff --git a/dev-haskell/simple-sendfile/simple-sendfile-0.2.28.ebuild b/dev-haskell/simple-sendfile/simple-sendfile-0.2.28.ebuild
new file mode 100644
index 000000000000..c69d1870fcf0
--- /dev/null
+++ b/dev-haskell/simple-sendfile/simple-sendfile-0.2.28.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${P}/${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/smallcheck/Manifest b/dev-haskell/smallcheck/Manifest
index 694aa7d060ba..8f557dcd8d76 100644
--- a/dev-haskell/smallcheck/Manifest
+++ b/dev-haskell/smallcheck/Manifest
@@ -1,3 +1,5 @@
 DIST smallcheck-1.1.1.tar.gz 15202 BLAKE2B 7963a39b9a08b3c28268b88a8177df7861011baeb4ba8a5dc879c95111c9d243cbe14f36b82715e80b237d04f5acedfaa7c72cc6d0fa2bd4d770158301f3626e SHA512 09aa5dcfca2bece6ac91803d38f2591d415c6e312c76cacb33d2e93e40e949acb788bc89ba6a4beb9dc60815e1f554cda4f68195269eedbfb45228415f1bca64
+DIST smallcheck-1.1.5.tar.gz 16338 BLAKE2B 823e2ae06f082f2f377e1520bb0886acd6bc133cc443cb10e8aa468a282ec0e19e2c31b8720c798c958d228784523cebfe692d945cbbf2123cec4542684c5945 SHA512 6d97f91308146031a16a405391ec2b283ad719c0acc2a0672c22cc880d91c3d72f845f65897e36945c45746d2d705a9f9f16b1ff5fef1f39c9abb60a4e57430c
 EBUILD smallcheck-1.1.1.ebuild 618 BLAKE2B d47c99b01de81a6c0e08d953d049c069b887b4c15c81253414c4a5ae0c5c3f6c75dcaa4b426c08bfd72552c54cb5e7d53a71d20c6a76478e0798b7e790258130 SHA512 f128758bac98d9f2fad0588ca2020a011dc9c40a1aa3b351600e9c126bc70e1768b648e513ed2d1aeb4a43b251df51612471b3f4488f22119d51678e26603bc7
+EBUILD smallcheck-1.1.5.ebuild 633 BLAKE2B c4cc2ad24eec0823330c24e6676f079e49d0530520e83de38f8229425434f288aa19dcd4c0a3ebb8a13fae77b7f4d5acead36a2a97df543d2af48ff6d4ffec3d SHA512 e6bf5714d783b4a7690926ad9cf29390dd124f166c3c202422a8053102328a8ee4487cabe080992de8150f01325c661ea3111f1afc635f9fa9be972c920133b7
 MISC metadata.xml 631 BLAKE2B 4be425e8e7def047d619eef426efb5057adc1aab18c6ab7a64abbe3e1ba1ad21d3217ab4a83d9d9194b3f51b8a59e2c4b443dea385836ffcfd78d6f1b4270bc8 SHA512 8f1ffef35613622fd153b512437a1634f72e25e80378335c9912eb26e2185e95943d0d530225d628f696de7a53b908a71161bde515447506779dd7b791f26b54
diff --git a/dev-haskell/smallcheck/smallcheck-1.1.5.ebuild b/dev-haskell/smallcheck/smallcheck-1.1.5.ebuild
new file mode 100644
index 000000000000..c422d153dc72
--- /dev/null
+++ b/dev-haskell/smallcheck/smallcheck-1.1.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/logict:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/nats:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/split/Manifest b/dev-haskell/split/Manifest
index ca759b9a341d..8198271f247c 100644
--- a/dev-haskell/split/Manifest
+++ b/dev-haskell/split/Manifest
@@ -1,9 +1,9 @@
-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.3.tar.gz 15681 BLAKE2B ef395e623527b07f11d8b13d330c301870bb4e7fc96af4fd10c1708c0639b67b0d0b501962464b22371e6cdfdeeaa6ef26c299176ec20581e3518d5376fe24fd SHA512 40283ee2f5e2ab56207b05a1a7bc7de114ae0da52dc37ed32bd4e1dd3a3baa8d3346fed04af979fa5fc263b931c0b830832c0cad69e98d151f5550542af6f475
 DIST split-0.2.3.tar.gz 15545 BLAKE2B d0494d299a9d6d109bfcca3f5e2f86d80357abd68038595cb94873a1b0eb0fd11ccad5439b67dde611d11c45118168a56376ec074ee2a5080ba4257694f06ea2 SHA512 bd0181b419326219d6ebad1a45683c8ff55d5e485bd669ef76e76690ebdcceddab2b8bc98616b7034de9622d54c6825200aede99e37f376e67f71bf242b1cece
-EBUILD split-0.1.4.3.ebuild 699 BLAKE2B 2b85988c77577aa654562afe59182e7f58c4d7d282f3380726d6e22f58d8004c2b1ac53e75f354b21d0ee8ead4d85b3c6a12c7f36f25f5fd6c385cb708c3988f SHA512 0e84978dc7ddfcaf182d737050338c5ece86c81960e7240757b14ea8c1a58b675f238045f0d38a67f9fb3cbab1d4d87f9d90a4b31ec8e67615f865ba15fbf70e
 EBUILD split-0.2.2.ebuild 700 BLAKE2B 2dac75abb2c75914554feb3878060233d370830e4eb115419681885c5d40a5d7839b3bc5b98cbc3a27e1a0f88a815e1a34bee1f13f946090c0da249b2bb3f082 SHA512 cbb6872f1e06ac21bfc85edc952dad033651d8867433b9b4f7f4722ee1b2239782f4ea67fc9d97251a04f0c2bb005bf7d86dcf1960f57ab12e8bc5463eb58e1c
 EBUILD split-0.2.3.1.ebuild 646 BLAKE2B 3284f14739de07d4a3ad650b48fab9253271f42d61b4ce858d9b4501bdddfb45685aa23831ea7f3aff40253d837946cb9566efc01a18d228053d395c9cdf724e SHA512 7c922bf287c2e8fcc28f4454995785cab7756f41e48302cde8cd17638fb1456a03822624a737f5efb27808b71631518c4d3975a29337120a599530a1b68d95a6
+EBUILD split-0.2.3.3.ebuild 715 BLAKE2B c66596203f5780bd4e4610628bb23ae711319c59986047e0adc05c9fc8cf9c1d78d5f3618d7e62ee955c6530c2a033f6f55586806eb8c4e9954cd053bb3a987c SHA512 b54f4c2f4118d1041496e40122dc992c3152e5e7bcab2534a416002aef4f8abd37a07cf3cc3a551c1c41f1c5fa9d4161d5f40913d92c4327c0a36573fccc9cb1
 EBUILD split-0.2.3.ebuild 714 BLAKE2B 15ffb71e8b26aeb517db31abb1212b4d707908ce813d49168622e617886106491800cb44d0db4efe8740f2295f2f904aeb421e2038afdb31d174744f7b5c4ac5 SHA512 0d9eaa21c973db259b3d5b74d6abe809100fcb9280a27ce6df03ecda7d6688588b3623e1c3f48a37cb4fa782c2100d539a4128340ed27b4c1fc2cc8beab0adbd
 MISC metadata.xml 352 BLAKE2B d2a1a1b1ff1b2cf8270771c1fcaa662f6e89f82d167c36ba17e75969d47f802e89c71e594c2b28760fcb47c8e4a5c9f10d80c7e28d0d46a8797e1d43a23eb5d7 SHA512 6bcfd09102e3e42d6d207ccd14ec2dbd7593d9c87fd5a260bb5d0428dd87811e46ed3e30025e7a07d7d11a703092a1b04236b8f724b430bed0951e70f019a7f4
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 9148753dc120..000000000000
--- a/dev-haskell/split/split-0.1.4.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~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.3.3.ebuild b/dev-haskell/split/split-0.2.3.3.ebuild
new file mode 100644
index 000000000000..d3739857f232
--- /dev/null
+++ b/dev-haskell/split/split-0.2.3.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Combinator library for splitting lists"
+HOMEPAGE="http://hackage.haskell.org/package/split"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~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 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base <4.12' 'base'
+}
diff --git a/dev-haskell/statevar/Manifest b/dev-haskell/statevar/Manifest
index 058661ceeabd..5ba05d967f0e 100644
--- a/dev-haskell/statevar/Manifest
+++ b/dev-haskell/statevar/Manifest
@@ -2,8 +2,10 @@ DIST StateVar-1.0.0.0.tar.gz 2728 BLAKE2B 03faf18cabf2d913f41254ec7ba2cd51b8e9c1
 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
+DIST StateVar-1.1.1.1.tar.gz 4762 BLAKE2B 17148fe888eaf0fafd73812cd9ca1c1eb6b61c3a555fff63608bdff14845320c433a49ec6680dd756c65dadacb9673ffefb74eabf0d38fd2393d9c601624210d SHA512 4b4d24dee812dafce1b5d08a6a7034edd005f2128012276cb8f43a413597a1303000ab625b3458a287840ea1d331d0659fbfde81bbf83933156870f107c31610
 EBUILD statevar-1.0.0.0-r1.ebuild 582 BLAKE2B 19dbb056006d3930f85eea77479cae4cc30b0b4c24fa55eb50aa2a672945bf7e381037c0ff056e1f7079b011f287bc9632ac4a3ab33c24fb01eb787b24587d4a SHA512 22fa45feb8566e46279591306cb7c768ab77bbe08f0e6b72c0c6406beac0b09901808960f233f6bb63cba63880051712cfe501cb7ebca6b0d574a842eadb0c95
 EBUILD statevar-1.0.1.0.ebuild 587 BLAKE2B 21dd3bce52fddd742e228a76337347c5e3163bc88130a9e41bb3bab347cbd84414262be87651b3b3f4b25f689f96965c19ce5b81b14d734e8b8da21647eb6c82 SHA512 85c9ad21a0d27874ddcdb4ded3b3d6ded60b570d7e3d8ea296d7146b1bf6c5cdd515ffb7623c26a046ea09ad9d8cd22cf2c47ff06d998bb18d0a04ab270cce3c
 EBUILD statevar-1.1.0.3.ebuild 753 BLAKE2B 9f455591857f63f0f114cd8fc8f35d722a51663cd9787d745491c9b1f88463d6dba5d5eb67c46e5d908e526116724880e62541bf29a873f7bc29e64e1687994c SHA512 a623a4054106dc7b68c622c3bb7007fa106a0775c3ffb56f48018892204e24fa2c95e351ddca5022d159ea1b6ea5ecfef1c60f4e07b3cae915065b2b94169ec8
 EBUILD statevar-1.1.0.4.ebuild 751 BLAKE2B 7fc78f009c7f2f7ef3f3b0f1c6ebc8c290e4f390b666dffb6d41da27a6cfab0bcd34460e6b6b5cc7d00688b96062c830eb8780833f529a88195d53a141186ae0 SHA512 97d12c4a818386b96a64149fde3ab5473ab94a79be7d0e4b18bcca85b136439fac0401dcc973bfef0cc127fda2138036d2bc535ce1d59e7a829a5a372ec39480
+EBUILD statevar-1.1.1.1.ebuild 675 BLAKE2B 25e582972c9509426c06cbad189d98b596fc39368899f1a0e7d085c3bdfb1eec586f147531581b86e41c98d301c2e66bee406eb9168abeb91ed27991e5b99051 SHA512 74515cf9d75c929cb3343c57749510a01c59f276496b0a549f0820a790fb1bb6da1ec3eb26c496bf2730327dbe5e63be51ca873ec09b659d6ab5aec494d73a8b
 MISC metadata.xml 499 BLAKE2B cb138c482d3dd15d0fae893cc39a10b91be2cf24bc3c9bff5694c22e68eb9e572c154208640211f830556f55cce70acc2d82fe81efc12e9473a080810e651d2b SHA512 f9c314c50fa0d9bfd431a6506bca07b00f1359cf6a2f19bfd1bb9cdd06bd04ceaa46f64fb290482b2a8967f98af147af83f4f32624191682401d8b91b30ea111
diff --git a/dev-haskell/statevar/statevar-1.1.1.1.ebuild b/dev-haskell/statevar/statevar-1.1.1.1.ebuild
new file mode 100644
index 000000000000..df6f9269b0b7
--- /dev/null
+++ b/dev-haskell/statevar/statevar-1.1.1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.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="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/stm-2.2.0.1:=[profile?] <dev-haskell/stm-2.6:=[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/stringsearch/Manifest b/dev-haskell/stringsearch/Manifest
index 3edc2bb69f0e..a27c654d0cd7 100644
--- a/dev-haskell/stringsearch/Manifest
+++ b/dev-haskell/stringsearch/Manifest
@@ -1,5 +1,6 @@
 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 561 BLAKE2B 50539c7887aa606bdf23c974cf596ec7cd98815ab75b780d8b45bdd7a6bf431413b59b8aca660285c86082a3ba9e8364f5dbe442ce7e0d9622526eadc5f6e0fd SHA512 1deba9c840281238e3d0661b4f9ed87fcf782a13e93c86e74779d71bc12b4999c7efc2df2491ea967121496301cdd9e9d0060b3d30aa4bf02a481b4bd41fdf41
+EBUILD stringsearch-0.3.6.6-r1.ebuild 771 BLAKE2B a5763d59a2ab5b142f9ae9986973f307df02f2bac0e6a7d52ce31ca4584aebe31703408c1ce055730259f454bef56f49a6b5d68955b8649134405fb7a7d67fc9 SHA512 f7ee4d51fa5c058db46fe76e6501add3723a8c59c20c45a7abdfc61e625993282412cc63e233987a0d1b16a6f6745a498966b0c98b7b2a422aa74229ce42d4da
 EBUILD stringsearch-0.3.6.6.ebuild 697 BLAKE2B c6906cf0e814ceaa601f7630275138d02bb8e8ac480bd7105f7935fc693f7475436e757cd9ef4e5f2152b0c0d3469d52495a60a8b2983ad870f3cd1a0b603be1 SHA512 09a234680c3081dc515c306481e4a8b751915423cfa15902483d7b0f7c2abf7eb4cf9909b2ce50f5819a39aa95faf70f8b4d213d53af0e5b006e5316c0b63c4e
 MISC metadata.xml 813 BLAKE2B 82fdc42a6a0096b932c1c3e29767faaeefaca15e67bd71a70477f47568d4d85fb911f320b84eeb0da44c4807aaf727bb6e030a6a11e0795c74b7ae9724975bb0 SHA512 abfeeef6e5cb1c21b3056d2a7ddb5127f10678f213eb3ab4444bf644b0463b5a7c7c2084c860e8882f19d6a24eb86d67bbc4de6e6eda9d68e82211ef69dd185d
diff --git a/dev-haskell/stringsearch/stringsearch-0.3.6.6-r1.ebuild b/dev-haskell/stringsearch/stringsearch-0.3.6.6-r1.ebuild
new file mode 100644
index 000000000000..54844c0941cb
--- /dev/null
+++ b/dev-haskell/stringsearch/stringsearch-0.3.6.6-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# 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="https://hackage.haskell.org/package/${P}/${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_prepare() {
+	default
+
+	cabal_chdeps \
+		'containers >= 0.3 && < 0.6' 'containers >= 0.3'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-base3 \
+		--flag=base4
+}
diff --git a/dev-haskell/syb-with-class/Manifest b/dev-haskell/syb-with-class/Manifest
index aa1fad02ebfc..3ba339bc3f79 100644
--- a/dev-haskell/syb-with-class/Manifest
+++ b/dev-haskell/syb-with-class/Manifest
@@ -1,5 +1,7 @@
+DIST syb-with-class-0.6.1.11.tar.gz 13225 BLAKE2B 3c7f25fb942025284bbfba49edc7b16ae04716e42337e8668188a80a193b05a06252a29ac2244a35fa25992bc23d7fa998ddaadb85f017112f903cffb89d4fba SHA512 962eb1bcb63ce7cc1789996ad7191e3ab7c20f3c90828fb3535306ca8509ac210e70f42ebd6ac6fc075d50cc5c5e1c15bb735b5d6040c6348dc82453809330f9
 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.11.ebuild 706 BLAKE2B 0289570abadc619ce9336d6d226c077bd8a7946bf7c20aaf325e4b428de3fce80d580d8d59f17bd7e5135e7c41c588416ef46f13e82428eb17fbd3a0f98eba8c SHA512 27616f2f9078d9422386503ec0e5a1d72ffbe7e72245acf903ba2a3f45c2fb589fcf4aee741ae07db96edd2d5f2284fcdc6968b06f43e29d5fb865505a413460
 EBUILD syb-with-class-0.6.1.6.ebuild 546 BLAKE2B 415cbd6182a4ee634f2c0b1a06f3e76af9f0acd70edacd390cb309585476e933059b1dbb5ef9d27cec18c571f6470dd7c85ab80a8a45d77cc2844599ff2b6414 SHA512 02c21499dae8a733a7ad720a8524e66af77da54854703f27fafec63802e4f221d5b74b45f490d7fc01134fb05f380c2eb545f0628d7d2e1e4fa93357a5f192c2
 EBUILD syb-with-class-0.6.1.7.ebuild 544 BLAKE2B 448e68a40f2db6330deec984c0cc6c623a015b0522954d1b819ba2f7e5efdad284a6fe379ad538015e287548c414b251ca6bc0ccc19285dd37585ed5e7c39512 SHA512 1128f28f11bc690d3658eb88ea0cd7c7b8da2c2cba90f6748c50cc92c2847d039fad6dbaa932bd403d601dcd7d2e0c472dab4054a3ff8819adc482f41366425d
 MISC metadata.xml 400 BLAKE2B 6008bc250770a949e0074a7830d8451a38e7ee075295a4d2a15bb0c3b4cde670f25e5b5a91580002d19e6211b85ce06d04a650385bae6681cab3587dfbdef9d0 SHA512 db2b6e1778e715f28b5244b8d15e654692e619c2ddf674ad93dd54caaa79a3a87917b1a7ec4c0bff5af44c89faa7f0be03797cf33fad6f4fcd4279b397b6758c
diff --git a/dev-haskell/syb-with-class/syb-with-class-0.6.1.11.ebuild b/dev-haskell/syb-with-class/syb-with-class-0.6.1.11.ebuild
new file mode 100644
index 000000000000..08ffd83d3a2f
--- /dev/null
+++ b/dev-haskell/syb-with-class/syb-with-class-0.6.1.11.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Scrap Your Boilerplate With Class"
+HOMEPAGE="http://hackage.haskell.org/package/syb-with-class"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'template-haskell >= 2.4 && < 2.15' 'template-haskell >= 2.4 && < 2.16'
+}
diff --git a/dev-haskell/syb/Manifest b/dev-haskell/syb/Manifest
index 5f3c36de856d..ef8cfae41d44 100644
--- a/dev-haskell/syb/Manifest
+++ b/dev-haskell/syb/Manifest
@@ -1,9 +1,7 @@
 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 531 BLAKE2B 883d04b460de454a35d24ad8a61147b93d4ae9530536493081fa4be8c3fa1360bfc1d904fe0cce1ac1b0bf2e312450804911bdd5094cc3871957edc0f39ed41c SHA512 dc635522c18eb178de569e0633148d99f5e9cee27bd27c763220a06efcc442ef99ca01bd1df64d153af065cbdc166a1d8aed562db7c46d59c8f2fc13c7cd795f
 EBUILD syb-0.4.3.ebuild 686 BLAKE2B c8302eb77401c53e4d0bc825fa2cc2a6ef3afe4a16cd04e489b66cacd8f91b57e7102fe7e32209bb879b07ea5368b083634db4a15a56f7e583a1c8d19c3ee5e9 SHA512 9d826ae3e1b24353133996e41aa54beecdf302b2785e50c98e9f414594116c54be9d6cbb781d523caf8dd7f8f6e460f8f630fc55c789eac124c35ae363aa0e0d
 EBUILD syb-0.4.4.ebuild 689 BLAKE2B 522763a92d74523a3d312c4e7b7be346d258b16e1d2c4edaf7093925c358c899a5653b6ea33e4503704d818a94e4c17705485b4212f95672f3e4c81ecfd8b138 SHA512 00e80fd8ec8687b7eb960a908d17b7fce3793dd984e89c1135d6603afab90f1fb266e808b19524717e07ef0b586c63db54fd3ef317222d406ccaa7f7363f06af
 EBUILD syb-0.5.1.ebuild 691 BLAKE2B 4a83a2f3f6ab99e45866b21a2837a61e6f44b4e2b0c30a1334e9d74bd8256aacd6f234710c320a6808f3ae9ca8b0b74d23936f0c95857b9b46f91bb9def55e30 SHA512 0a9dd462b3a3b9c8a5d711fdedb70da52f3b7361953a1ff25cb8948dc0319039c48e79fdabe944026f774bd838539c75c1c321132bf4125ba4872a54eab96258
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 7053cb7658c9..000000000000
--- a/dev-haskell/syb/syb-0.3.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}"
diff --git a/dev-haskell/system-fileio/Manifest b/dev-haskell/system-fileio/Manifest
index d19cc5c2de62..d46b2ff85cba 100644
--- a/dev-haskell/system-fileio/Manifest
+++ b/dev-haskell/system-fileio/Manifest
@@ -1,3 +1,5 @@
 DIST system-fileio-0.3.16.3.tar.gz 15296 BLAKE2B 18a48c74794f9b2fbe33a181ce007984fdfab61202832a1bab395a3b3c1ba25aa5f45649f2b33e7608d422ad92a42719e6997ed9ab3ca4370e055d366476d779 SHA512 74ee4028caa77194120d66316677cc0f184fd4af5c4feaa7d713145b97dab8bcebc2f4b971464f9a68f8e304021d0fe5c52272bb282db0925559ff0ff6937842
+DIST system-fileio-0.3.16.4.tar.gz 15632 BLAKE2B 88c773cd78cf21a445c45a7b1548b77ed3624af54f54d0a0388b9c41ffe4595299e32ba4ffa5dad1234f810de73b07f47b16e8e2ad1b490f63811d193523abdb SHA512 68530cd11b25aa8a05967d3f51091ea57a5be138b672bd5373918163281c55a91b60dea03bdd22bcd4ba1d6bb26e2ed14660ce55bbdaf2737d2dd2b7e608d698
 EBUILD system-fileio-0.3.16.3.ebuild 861 BLAKE2B a405b400112dc12eda8d63a6759f7a36efb0bbd845016f06950744ebad6f2e984916d7df3669edcd24a36d0c4998d395479cb2149e5f0fc8b055bc9f4c95d22a SHA512 6ad4e9248e8247b9fd80628558958257fc3d38395f9561654bf7b80aa751222dca9b3cbf52d2c83e12b5532e68f9c69ee2192f40954d8b213cc229109a90c1f6
+EBUILD system-fileio-0.3.16.4.ebuild 863 BLAKE2B 953b44aabd0d709464dc40366df3b12e161ceb487954118fd3447236d278c213561bb16974491c0b4c7bb76646a31dabba7bc1c7ca63ed3b2844add3b43c8a7b SHA512 faae6f8ceee2d6ba8ce896c3bf0144d953b2cca593fbf864ad29dad070f2722f20be69f82db83e98a27ce541f472f799f8967f03e4532538053099a5157d3a19
 MISC metadata.xml 757 BLAKE2B bc8189d57e01933bede97c622425c894858e26f5a51456c17f37f2f313edb5c1ab6ea0418e3f9dbc07a73740ba739590ba5e3939931e522746e6ddb66a34addb SHA512 f54a873966d7476a2bd24095b2f83a2d5f3f80d93758050543f648ba85a578070891028db294881ce3497663e23d70d816246d72e2c10310c6b7f693728c3ace
diff --git a/dev-haskell/system-fileio/system-fileio-0.3.16.4.ebuild b/dev-haskell/system-fileio/system-fileio-0.3.16.4.ebuild
new file mode 100644
index 000000000000..d8f114feb58c
--- /dev/null
+++ b/dev-haskell/system-fileio/system-fileio-0.3.16.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.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="https://hackage.haskell.org/package/${P}/${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/Manifest b/dev-haskell/system-filepath/Manifest
index 352a222c41ff..69ec65dcd313 100644
--- a/dev-haskell/system-filepath/Manifest
+++ b/dev-haskell/system-filepath/Manifest
@@ -1,5 +1,7 @@
 DIST system-filepath-0.4.13.4.tar.gz 16590 BLAKE2B de9203bb34bb885a9b08fa7fa3f5ac977698fd9edf6af9ebb4db512e04ea352d1770ce1ea75f80da546dac707d4627d940f176177eac497b74d47f7e5dc07696 SHA512 81df3ed7bee9ae8b568533361d1b6574cc26c24218922005f03d70828624b6fd279342753c571921c62f69b6dadce4eb6c88cf4ef5cb76c536c5113c37f5cc38
+DIST system-filepath-0.4.14.tar.gz 16663 BLAKE2B 2a05dfcb1a7dace3d194e1d137d5d52ffc52eb96b1c43b4b9e6a97fce17db06ffac2a923537af0607451042d1ffa582567573a7f581a10a06971c4d1bddaf5ee SHA512 d858b077516ecb76e27d032fd123aadbbbb154afea87fab93f148aa8a0007587c1fb04d87217cf0b51a80e9a81ab20357dcc5e345899e1c2b6513900da1e6768
 DIST system-filepath-0.4.8.tar.gz 14497 BLAKE2B 4e61d45f384043da31b32b64eaa522274da66801c13bd81370cdd777b18861b2812e297766252acae43aac36e7bcf82b53061609d9f457853d8c1730b8591edc SHA512 ee23a468186f1e709ec8b39d3b6855038a9f5a7fa4b37b37407b8dbed7668ddb4efe21e877a51b94b20bc3d9a59dd9a525b7378783ac9a0c7a4183ba615b01be
 EBUILD system-filepath-0.4.13.4.ebuild 785 BLAKE2B e3e2c2d38d1c75be671871be3116a2bc51165e27e3c4fbbe4c5c99e2ba23fce930189211fffd14259440989079792c52e1a40d53d49e0a13f05419946469bdb2 SHA512 56f10b5780afcb8c397ac6db31bc66ce98268c0f8aeba4b82676d2d1886cd8fc43a6725d2d3525bde0ed3f6d9cbfce98c531fa0d383889a7301fafe6e1a45dbe
+EBUILD system-filepath-0.4.14.ebuild 772 BLAKE2B 8b7f67cfd53019e4a1c2954a34f10e30692f85a9e88f8b20aa36b8909244125a97cc8ddc36555088a5f436bee23345a28e5e7b57eec8f7e4b218e4221c54d6e0 SHA512 41bbed8943873c703a35f661350e4ef525a6ede46ee4c983d97c887f89e976f8dbb3400d040d3aaea7ccd5029d9fa1addfbbd44852c13f15e9efe98b25966343
 EBUILD system-filepath-0.4.8-r1.ebuild 744 BLAKE2B 923200c6453576014c14b63bab792991f3908d8347d24482447b41fe050dc27884922fd3469392115cd5880c1bd1098ec68022d41555e8df9bb0e5203909ac9d SHA512 3e7acd90ea386d000c0e566ee4343431c0fd25a5884f3e1bd78626413635a4f5eae519edf02a3470e2421b6ccbe72881107fb46c45c3d49074bb7a5dbb57a5ba
 MISC metadata.xml 439 BLAKE2B 4862fbaedc30b3a4520e630d113066e30c1233392789b97d0697891b8f4985c8679efed8dc515b8839126be02b3a3d17a702e4b6f2faaf01ac012b335286565d SHA512 85d9affd4354d2c9409400e6f9213b0e81c74ea4388b39c8893f588fdb3215016f0f3fc9ecb751bf45ebd8f3582b0327a25fc3cf92276b1a86e9c5479059a073
diff --git a/dev-haskell/system-filepath/system-filepath-0.4.14.ebuild b/dev-haskell/system-filepath/system-filepath-0.4.14.ebuild
new file mode 100644
index 000000000000..fbc18bba4e40
--- /dev/null
+++ b/dev-haskell/system-filepath/system-filepath-0.4.14.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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" # Drop test-suite: uses dev-haskell/chell-quickcheck
+inherit haskell-cabal
+
+DESCRIPTION="High-level, byte-based file and directory path manipulations (deprecated)"
+HOMEPAGE="https://github.com/fpco/haskell-filesystem"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test
+
+RDEPEND=">=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-haskell/text-0.11.0.6:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
diff --git a/dev-haskell/tagged/Manifest b/dev-haskell/tagged/Manifest
index a396b016d8e3..91abc6f4fd4d 100644
--- a/dev-haskell/tagged/Manifest
+++ b/dev-haskell/tagged/Manifest
@@ -2,8 +2,10 @@ DIST tagged-0.6.1.tar.gz 5238 BLAKE2B 0b1e294948a91d65fadd532f88acaa6d039133e7a3
 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
+DIST tagged-0.8.6.tar.gz 11759 BLAKE2B 6461a8489d782c1d5d49454a662c64a2cd3108ca7c0fcbe598cb8f11c7792736a61855d3c830234e31d8de900b2a191d7529557711d4724c51d38a88a7948637 SHA512 8cec49ea6f54ba84109ec6068cce209321bfa4662d5acdf75e4019087e2890e3056bf13a237cb5caf3fec597b05b710ebbfb74e06b736b7fb2f87941defeb814
 EBUILD tagged-0.6.1.ebuild 563 BLAKE2B 7a16f0250f139e2dbda6de84c83eaa4be7a1e6e23ae1246406242829d2c7feabec2d4edaa142d9fa2f34832c47adf756aecbc90b943a6cece71ec151e431272a SHA512 64d99dbd0ecb3d0556b4ece05b821fa5b2c86166f7325663179bc12c6d3e2b36eabcb370742374b7eaec35d52adf20cb9bc61f2d16015e04182e46c76c105b28
 EBUILD tagged-0.7.3.ebuild 583 BLAKE2B 8d93bc0d7aed14854d47b07938f486cdeb6d3363db3541bb26fa29fb0e00d782654e53f9ec26bb5d86fc5a6e8b261e0aab079344556af98b3ae34d5dffc45c4c SHA512 ec6d8f4da85417202a2333bb7fb9ffcbde837afe53153a2fb8cedcc413dca6b26381d44af2505f278dcf87e971fe77942731ec9ed73c3d973fceafc6d8f076a7
 EBUILD tagged-0.8.2.ebuild 691 BLAKE2B 919926d8cd425f30943ed64922bc793f8e7470711163c466916a3890fc297e9b41b049ebef4a671c8342b394ee45fef53197db6431a79e37d53d1103bc52a784 SHA512 2642443ddf4013a6559924fdda6a4c2515860fad74d3f128f608a43014808d13e52c1870fdb7e1c3b997033404de01c3127f53399a96fa5193eb031a6a026951
 EBUILD tagged-0.8.4.ebuild 713 BLAKE2B 49b3e1cea4da8dfecc3abc6bcc7df3f90bf03def71134d200ff3c5f5fdcf64804522a79048cd2fbde26f3d7432e454c2426a8cfab058585cde1988a7f5fda045 SHA512 a96b0ebfb018def2a777ba7cde741427ed522d8d10685dac971d8ae11ec91ebd5df88aebf7af97bf7607e7ec95023003da6d8f48e91e2a90e80429873b986029
+EBUILD tagged-0.8.6.ebuild 998 BLAKE2B 7e7d0b30f3395ab635939b6cbd00effdc3c29b42cab69b4c65642937e1e607c015c69372dfe161a4ce40189642825541a1d4f413dddcf3b863da8741190840a4 SHA512 ada1b1a123849d5a5f9a9a1ef6aad0685e2f206297e49cd232f49389979058e305f2cf24d149ba0622b21268d7b0fba9a2323ff6f67a517e892cabedd204484e
 MISC metadata.xml 454 BLAKE2B 3c97a837cfd34e481b2a07d5bc797648c2805ee2667d795a67992fe25be834e54403d7d062c7b33b6879011a44b8d1314e9158b218f5239946203eb07fd20c27 SHA512 016998bf11394f7fc147d93365d9b3bf7fcd688d8baec4ed9c3b072139330dd89a4a99efa04ee564622ad9aad06438688cbb9191be8bbd63d84d55b58652e9ea
diff --git a/dev-haskell/tagged/tagged-0.8.6.ebuild b/dev-haskell/tagged/tagged-0.8.6.ebuild
new file mode 100644
index 000000000000..780f35eefe27
--- /dev/null
+++ b/dev-haskell/tagged/tagged-0.8.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: +deepseq,+transformers
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell 98 phantom types to avoid unsafely passing dummy arguments"
+HOMEPAGE="https://github.com/ekmett/tagged"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'template-haskell >= 2.8 && < 2.15' 'template-haskell >= 2.8'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=deepseq \
+		--flag=transformers
+}
diff --git a/dev-haskell/tar/Manifest b/dev-haskell/tar/Manifest
index de74a7af067f..1731981625d8 100644
--- a/dev-haskell/tar/Manifest
+++ b/dev-haskell/tar/Manifest
@@ -2,8 +2,10 @@ DIST tar-0.4.0.1.tar.gz 17875 BLAKE2B c8de1ee0a04df64327f2464ac25b5d13c188aea0dc
 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
 DIST tar-0.5.1.0.tar.gz 39271 BLAKE2B 7867fb111bd5f7efe93899116fa9f36dd52e61089bfb3431a9297521c36f8c9a1c051cb141073d14a9aaa74fd95f2a695ea1a5f057162886b40dafa79ddd104e SHA512 60992ef69be64430d7d322816940182ce91669cb31b6612789abf0fca42e8fa292b2f96f284b1857d82e58e159bc5bebdefef97f7c8e3edb85be4836f0b5eb1c
+DIST tar-0.5.1.1.tar.gz 39155 BLAKE2B 8e85489e3b43044dab8ec4405413873c2be4d50cfd4a5adc80e3ec231428a120db1faa033d2e57643dad40f18a934a381f3d5657838aad42d2aa7eea951c1faf SHA512 8d0a8d3ae178570e0842a2321a7fc86a6bba28c471ec27bafbc07fc4ac0e4183f8113c99ebc7126dc71759c33083791122be32563fb0d5a2b2d39cb3b36171f2
 EBUILD tar-0.4.0.1.ebuild 590 BLAKE2B 2d4831cc75c9f833778d9a842136b34b2671d6bf3715fd562a06345ff341ef52bd6ab9696f8ba555d4985e7738e85abd73764c6c1d4981e8ccb823bc5512beda SHA512 d3ca49f4dabfabb33c304fd523c144480a194e2df22a352c88d3b04a9206798d751db04d047fc22756411521521e6d27f23cb75b2d79aff35c68515da7c024f4
 EBUILD tar-0.4.2.1.ebuild 788 BLAKE2B 4ff01aeba438a6d710627664f4f2cb2962f456403d9cc0ad80fc69259f7c5f70f030d3e949e1bf2fb658223aa836e7ef03630a55eec6adf99866fad2073b19b9 SHA512 c84dd7c40f9a91523ac891f16eee5a85f82a58fd87c8de480f6621cb58c3cccbae293be6421f1d3236677f61c04a98c4c36c4108e68dbf6b00e116ad260eea43
 EBUILD tar-0.5.0.3.ebuild 870 BLAKE2B 18e20ac92549931cbaaefec23fa11fc6372d919fe7bdaa2d969c135dce8d9a61fcabf5e2ba43ddb5ce577bcb3b78bc6d8064843847bdcda4235564a96d76e66a SHA512 e378adbb6c71a12abd065bd9d9b1d0157a25abe0e3b8674928c8c46f8b1916934472bb5a7b34b3b238a10b79e79761cb12dd82baa3e19c38e1ab18b85f8e5244
 EBUILD tar-0.5.1.0.ebuild 1263 BLAKE2B 8a8b6cde413d4c7bc4ecb044d464dd0ba42591d2d958158f11e73d43aa26be183695e693380e872b3fe6d8ede4ab158b58927c92d61062d5054ba5e08da5be4b SHA512 456f3a00fa34c6ec4e9c26f2745bb73ddba7a557c56e32cdbbc16f4d55b9b50aa7e7f7de38bfd3e62de7c7588b0c56d1319a7dfe7aea153192e7472c766e9622
+EBUILD tar-0.5.1.1.ebuild 1123 BLAKE2B da9134ce93dc3b86636079b5208cddba3f36b182f8e24fc68b8c6360c8a0ff46221261056158bceadadc843671e75451b5a33f7b5820f41f08af5fc71b323f85 SHA512 5a165d3f0375de1ba7a0ae2022366b3c38efc3f18e3379928e429c9369a0230efac38d4147f846415226541aa4fe057afed0e071dc284bdd62beb814799bbe3d
 MISC metadata.xml 636 BLAKE2B a60075b9bfcde03162a7f5a8a2a22ddecc9906c2305408aa3596763685ae5a65cdbebfe7251f9fbe70348a6045183ec840678a00efe338d0354d06cf0757cba1 SHA512 2088e0e13c3cd3539be718360a10145e17083bd135749b8ed3374cb51523f53bc0bbf4a441c879f95982ef235f18243bfb49ec822ae70ea4fa8e684e96fdde20
diff --git a/dev-haskell/tar/tar-0.5.1.1.ebuild b/dev-haskell/tar/tar-0.5.1.1.ebuild
new file mode 100644
index 000000000000..1fb71d95fc53
--- /dev/null
+++ b/dev-haskell/tar/tar-0.5.1.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Reading, writing and manipulating tar files"
+HOMEPAGE="http://hackage.haskell.org/package/tar"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~x86-macos"
+IUSE=""
+
+RDEPEND=">=dev-haskell/bytestring-builder-0.10.4.0.2:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
+	<dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+	test? ( dev-haskell/bytestring-handle
+		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
+		>=dev-haskell/tasty-0.10
+		>=dev-haskell/tasty-quickcheck-0.8 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'tasty            >= 0.10 && <0.12' 'tasty            >= 0.10' \
+		'tasty-quickcheck == 0.8.*' 'tasty-quickcheck >= 0.8'
+}
diff --git a/dev-haskell/tasty-rerun/Manifest b/dev-haskell/tasty-rerun/Manifest
index ec4756444fb2..fb1f2c4e608c 100644
--- a/dev-haskell/tasty-rerun/Manifest
+++ b/dev-haskell/tasty-rerun/Manifest
@@ -1,5 +1,7 @@
+DIST tasty-rerun-1.1.13.tar.gz 5438 BLAKE2B acccd1774900d1e3ff74362224b54d80b2b5d105f909e03750f211bd9e92305a6c52999e655b63ff5c17e33af1a7a4eb6da932a03ebaa7ce9645b7c296f8c72b SHA512 43e5e5e23ebf50d5292ae95ca69a6669188a018934e451799ae14292bc88a3186534bb10e23c74178911089dee0379b3f782f9a14ff02c5e462478b1b3a19238
 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.13-r1.ebuild 1058 BLAKE2B 4a6342671677c2d0397e0fd18e4a36a74ec86ad2882aad91c1ce0afca72c021eefc8be3193a506d8f47e70d164ec4c51b36dbc9ab97b5b6547aec6b52c7b5b6e SHA512 7f199a69e6cac019c8b86280ecca21ebc119f53719d0eb5ce61847eaa616d4c702e3074f397ee44608e22e8c54e3350b9ee609a9dc67a96127b533f8c2c73722
 EBUILD tasty-rerun-1.1.5.ebuild 1016 BLAKE2B 74a3a9267a4f593ca4397f95c051f7b062366f009d745073858ecd3af83783bbab24cc345e942c5de763cc92129527786084cf18719b4760fe9b8b5c48319916 SHA512 74ceb1363e04dbb49f9448a7a5aa7181a72965c43a899ce6a4af35595d5a176585ec920cc535e31a590a16c4a3ca051ffe7b3dc02adca474566f042539594303
 EBUILD tasty-rerun-1.1.6.ebuild 1014 BLAKE2B 69ae790ec13d3032d1cc8a44bced4749be24b79b2915110c22577c51503da1a8acb64d6859b476eb6cd77c4086e19b30e2281e223fae8b4e7c7efa0f9aa364b0 SHA512 b77a27ba6838a0ecafcffa0b4df2f5f7eaf01b71ccff8189130ddf0187d0214a244eb6856c4defbfead1bce6285741636bed25d3b3fe914cc8ac595ae9c2af3d
 MISC metadata.xml 2520 BLAKE2B 168bec58887892ef09313be19f5e114c17ace8d078340b1fa037166f150658e815c48cde5ac39bb72ce510cc96e1c4936bf4d4d489fcfc0018d99eced54cbfd7 SHA512 4cbced2264f235c58c1ebe60937a8ff0c846384be4d53add2c7d3d81927a55e1bf1be9795d94fe2e72ca510f3cfc2fc1b5e1e947eb4a17d2826acb8c275014b6
diff --git a/dev-haskell/tasty-rerun/tasty-rerun-1.1.13-r1.ebuild b/dev-haskell/tasty-rerun/tasty-rerun-1.1.13-r1.ebuild
new file mode 100644
index 000000000000..6fca3bdcd24f
--- /dev/null
+++ b/dev-haskell/tasty-rerun/tasty-rerun-1.1.13-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.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="https://hackage.haskell.org/package/${P}/${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-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >=4.6 && <4.13' 'base >=4.6' \
+		'tasty >=0.10 && <1.2' 'tasty >=0.10'
+}
diff --git a/dev-haskell/tasty/Manifest b/dev-haskell/tasty/Manifest
index 709a86963e31..aa12432fde86 100644
--- a/dev-haskell/tasty/Manifest
+++ b/dev-haskell/tasty/Manifest
@@ -1,10 +1,11 @@
+AUX tasty-0.11.0.4-unbounded-delays.patch 710 BLAKE2B afbc15dd5bd48a80ad6d976c14c2c92c569f4f2b38b35d52d4b3fd58c031f1b3c7a0e7c0a5cbbb5c33853f44a1cfe987b53f544d8570c5f54497b66879c7c1b2 SHA512 83d9c410a7b96cfdfef6563dff949d2c21d30d69b73f0c8b63e8f76b025442b47c0ffd9826986f6a21b288942532d282558fc5bbfe3e16c003732656d0025973
 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 875 BLAKE2B 15adfb80265ce10aa57b55d673d0fe04e266262716924f8ed125157bc5fd9cbc27617d2e2e149479f835c9fe4141e164fc54701dc32b07b11c3c97111c6d674d SHA512 593832398d9b08f33d53f194b7b5f3eda23205b5bad802d4a5e91ff2b1e327937fd48c8f5ccb03752445fc807767d6ecdfcd6de87a8103a9d53e836fbb0d3f54
-EBUILD tasty-0.11.0.4.ebuild 911 BLAKE2B 0c9e2859453e6ffa1d5770b3d589273463a9762b62960c4a042c4afe9e3a78d852d8912185fdfb3ae3d1a54d711c6eb537a17c0e746a8bb79fd904e05adf8ed9 SHA512 e4d743abce1f66ea017951f597af2b7320d1f721793dcfe621d6213c50d639e3aa515ab42666fb41d421ab8c36cdcd130fb6640de78471ac1e8497bc873840b9
+EBUILD tasty-0.11.0.4.ebuild 964 BLAKE2B dd8f4ced041ed8fa99594c6dd0e73ddb55adfb104ba4d63bc6278021aea5d62f3682ba64eb0b7f2d3d4d06f3969fe6194f6338408e7d09696e2ad83a100926a6 SHA512 52cc0af62aed2533f0708fe2bb0e1a0c7dd98d9fbac0869575b29703edcbfa34f0fe9226cfbcf78c70337282db6b27df4237e7027dc05c5fa565622977ed88e1
 EBUILD tasty-0.3.1.ebuild 893 BLAKE2B 2ab27e39a5d4cf9140c0334af196a229a35172849dde73f7189174ec0a095e1f91a220caaaa26cd7df73ed831eabe1e2c9bb87dd4b05238dc0c13e68199736f5 SHA512 81eb2fdf925ab8e7d3077174a39691fb73eb337611f808b5f48d2549f168ba719a661dd5feabc5320d5280015b238c6bb71aea1c6cf9ff7dcc14670d1d83a566
 EBUILD tasty-0.5.2.ebuild 892 BLAKE2B 5b5d613088918885248ea3916ea0f1eedb60371d41fd5506010488f6fcc294ee7734de0ba8b9f3f31497930257e4dd6aee4230ac0471050a5f84919691fe1f0f SHA512 9696e9c606428c954ecd0ee1e5dbfb937886bc31601537a4a6a5315390d0f8edf88b8ad5007b85782cb17c6358bfc7858ad8a525cefa32c06c79e5e5b2904448
 EBUILD tasty-0.8.1.2.ebuild 867 BLAKE2B b1b34e1de8095376eda8edc7ae1cf9ad6e59918a09a871441229e404111cac651b4a0fb034b7bccba6bceb6422513ca6c40185088f1d0b641f60cefec3e55416 SHA512 f57eaa3554b2bc354f18071c477dd062daa63bece824dd1738e128a783f1829781bf8587d43402c96946a5b5c7595f4ffae369d7502e8572d28310e60d5470df
diff --git a/dev-haskell/tasty/files/tasty-0.11.0.4-unbounded-delays.patch b/dev-haskell/tasty/files/tasty-0.11.0.4-unbounded-delays.patch
new file mode 100644
index 000000000000..ad265fdff295
--- /dev/null
+++ b/dev-haskell/tasty/files/tasty-0.11.0.4-unbounded-delays.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/702906
+
+From 74e87fff6a4a830dc64d59f4baa1a5f6759c007c Mon Sep 17 00:00:00 2001
+From: Roman Cheplyaka <roma@ro-che.info>
+Date: Fri, 5 May 2017 08:54:28 +0300
+Subject: [PATCH] Fix compatibility with the latest unbounded-delays
+
+Fixes #166
+---
+ core/Test/Tasty/Run.hs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Test/Tasty/Run.hs
++++ b/Test/Tasty/Run.hs
+@@ -15,7 +15,7 @@ import Control.Monad.State
+ import Control.Monad.Writer
+ import Control.Monad.Reader
+ import Control.Concurrent.STM
+-import Control.Concurrent.Timeout
++import Control.Concurrent.Timeout (timeout)
+ import Control.Concurrent.Async
+ import Control.Exception as E
+ import Control.Applicative
+-- 
+2.24.1
+
diff --git a/dev-haskell/tasty/tasty-0.11.0.4.ebuild b/dev-haskell/tasty/tasty-0.11.0.4.ebuild
index 9c138e80dd26..4de53058744c 100644
--- a/dev-haskell/tasty/tasty-0.11.0.4.ebuild
+++ b/dev-haskell/tasty/tasty-0.11.0.4.ebuild
@@ -17,6 +17,8 @@ SLOT="0/${PV}"
 KEYWORDS="amd64 x86"
 IUSE=""
 
+PATCHES=("${FILESDIR}"/${P}-unbounded-delays.patch)
+
 RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
 	>=dev-haskell/async-2.0:=[profile?]
 	>=dev-haskell/clock-0.4.4.0:=[profile?]
diff --git a/dev-haskell/tensor/Manifest b/dev-haskell/tensor/Manifest
index f77626f1bc5a..7e589f8a2c62 100644
--- a/dev-haskell/tensor/Manifest
+++ b/dev-haskell/tensor/Manifest
@@ -1,4 +1,6 @@
 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
+DIST Tensor-1.1.0.1.tar.gz 3281 BLAKE2B 768bf8ab52c17ef8825f83dfa7a7f2e8854305aa2afcdc0a13aa336b20fb6841c470b637d2b29b2acc988669f2ef13d079a667102be1e2d1d03cb981a078937c SHA512 000086bcf160a1ea0a9a3f1aea39ea87979db97203511549e62c5b5161ae178aab0a1e7e0a091e82e66e319dd86c90e8f07ca473027fe7d363f18bfc584c30f3
 EBUILD tensor-1.0.0.1.ebuild 633 BLAKE2B 2f934f495519cf6dc617d74ee35e2c28248d4a6f0750a6b7926ce0cb05b5b120c71721a8b8cd2fec83b0ff3c7c7fbad175e9844dadd9aa35f23c23313b078a62 SHA512 5d7adb545b95f651ed0ea53b4ca65a649ab3df73874ac2898985859756ce68b39cc64db44ee0627a51ff045f160f1db9514a9979706698487e25a7213a3a3ff1
+EBUILD tensor-1.1.0.1.ebuild 592 BLAKE2B f7557b608d55fb8a51eabdbd89c66beb39dd65d8dc4d5d7e8f1214ed19dcb0b1215b29ee5a58788f610c984fbecb92eb0016ca0a4adca437b08755393d114c64 SHA512 ce7584ce4350bb6be3953ce6766402cdb940065b12225f5ea162c50e471b12d4cbc92db56b034512c7ff5f9a0e4bced8a21a4901aedba3fe9d4e3ef6ee5c57a9
 MISC metadata.xml 381 BLAKE2B 27c33359d86af5c93547c77dc8c14e14de6f2b2afefa7726514e586b4b2d683a40a842d110508bea566769da26b1f8db030c9a7aa734386a9523a9196a6be81c SHA512 006ec9633cd8840f78485eba4ac7f17288079a22dcdd972616f47a57339b06a79488d3753320c657c319fa583d3a8443ebc358a7891d48b353907fef88411104
diff --git a/dev-haskell/openglraw/openglraw-1.2.0.0.ebuild b/dev-haskell/tensor/tensor-1.1.0.1.ebuild
index b9b66bc64d79..985326c6a143 100644
--- a/dev-haskell/openglraw/openglraw-1.2.0.0.ebuild
+++ b/dev-haskell/tensor/tensor-1.1.0.1.ebuild
@@ -1,28 +1,29 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
-# ebuild generated by hackport 0.2.18.9999
+# ebuild generated by hackport 0.5.1.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
-MY_PN="OpenGLRaw"
+MY_PN="Tensor"
 MY_P="${MY_PN}-${PV}"
 
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
+DESCRIPTION="Tensor data types"
+HOMEPAGE="https://github.com/svenpanne/Tensor"
 SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.8.2
-		virtual/opengl"
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
+	>=dev-haskell/cabal-1.10
+"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/test-framework-hunit/Manifest b/dev-haskell/test-framework-hunit/Manifest
index d4fb05513bb1..d409ee769f25 100644
--- a/dev-haskell/test-framework-hunit/Manifest
+++ b/dev-haskell/test-framework-hunit/Manifest
@@ -1,7 +1,6 @@
-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 645 BLAKE2B fd2fc0b0b1094710d2ad14436625d87abf721dad42ab6cbe78eca66c35624b7757abc4937690e3acee8f56acac72c4a38568cc080c0c3d793ec471f51e968749 SHA512 aec6aec251248fcc748462748decafdc74eacb645b39216e275e2b0734866bf1ec726b549ebc732a22e9a1440b15a50fcf57c0c14361cd1a5d12f24cd3e7e27a
+EBUILD test-framework-hunit-0.3.0.2-r1.ebuild 958 BLAKE2B b6cf5078c50c6d635149d0b168c0c0e466e86305a9ac539141c04f3f3134256c8649b37c0c09ca7e04cbf98c04d53e5ca49b6874320ef05b6d15cbdab90914f0 SHA512 8d18d652a404b397fd8539096e8c78231c7ddb8a818e1c4bca7e2beb78db486fd49f9f4ac6896c96611429e615c9fa98894e13f676b7137ff89470c7f7be9024
 EBUILD test-framework-hunit-0.3.0.2.ebuild 908 BLAKE2B 4a6a63a1de96ac089ee174a094a40bdbb27444107055bad9d005c4667257d6058b5117aafded7ebbf7f59bce5644b08bcd0f53071647cfea3549d21eabe420da SHA512 2f0de860e45ca4ea947dfcf1a5de75bee9319bd67249be91caab5684e7ee9c01353d2f911ff9bca5237a45df65634c2dc46f8aef4cb94e09028b404e99fdebea
 EBUILD test-framework-hunit-0.3.0.ebuild 817 BLAKE2B 97f30598dae355d0f14479699a8b26217984a3fa3569e7a59656f75ecb3f1547ac57fa5669772b8f9f4f43ff1a2639a8588c1cc912c8ef535165cb0f1cfc605f SHA512 f2ccd699dcb8b1d62d7b185bbe926e1fc063e5bbdb431be6dd76fe84cbbd775c86c6615ab7763dd911e23e9879aa224a0f33b77a964347eee6cd5dff66ddfe83
 MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
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 862edd2e81f5..000000000000
--- a/dev-haskell/test-framework-hunit/test-framework-hunit-0.2.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-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-r1.ebuild b/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2-r1.ebuild
new file mode 100644
index 000000000000..c64075cc9546
--- /dev/null
+++ b/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?]
+	>=dev-haskell/hunit-1.2:=[profile?]
+	>=dev-haskell/test-framework-0.2.0:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'HUnit >= 1.2 && < 1.4' 'HUnit >= 1.2'
+	default
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=base4
+}
diff --git a/dev-haskell/test-framework-quickcheck2/Manifest b/dev-haskell/test-framework-quickcheck2/Manifest
index 481ab829dd42..48fcdfb9de42 100644
--- a/dev-haskell/test-framework-quickcheck2/Manifest
+++ b/dev-haskell/test-framework-quickcheck2/Manifest
@@ -1,5 +1,7 @@
 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
+DIST test-framework-quickcheck2-0.3.0.5.tar.gz 3844 BLAKE2B 1c7ace7b85200d3ce1bcf6a48dc10d912c4cfa255eaf100b37d018128a4e014703cf378b2fee74355c1731d9062c68b164da96f6f672a10af460d41ed2b2d2ca SHA512 58c6177d52829ba1ea1858a11101e5b21ae4e4543f8f829779f62208ad16083b41e9f3b2275392693698ef3d46912096c368d90db0d67ff136af4fa73d5e1d43
 EBUILD test-framework-quickcheck2-0.3.0.2.ebuild 974 BLAKE2B eacf54f77e41cf6a8b37bbae7acb2ad2e789898ee618002418b374fdca5ca58311e651b906a48ac9290f0d6888c474f754c3c9c0977903e595341ab16438c499 SHA512 5f2104d419b4d8ebe630c5011e63d0473892126350741985967213c30e04a4add8e23874349f3a0b0cc0bf808152511dfe4be95d9716063c46c45a98fab26b19
 EBUILD test-framework-quickcheck2-0.3.0.3-r2.ebuild 1003 BLAKE2B b514cc51613ae6f9c152e1e0fc01f48e32a60a21b3d6d313db91e9d6042f4176c1e99a345b0938ade19b90778a4485e1093c9f843488127b2dbe048dbc61cf5c SHA512 2214bdbe8dfa212dbf8a3c18d385dc77d35477719fcaeb8e6a905e60ca9c5cc2588d73d3bdce3998ab55862b322d8defb77277a2dcb2c1af47f1559f37a6eb94
+EBUILD test-framework-quickcheck2-0.3.0.5-r1.ebuild 1114 BLAKE2B 0d3d47b5018e8361d07e8ae1ddf1c7961ad25c2b1877751b2af5da2af9f985b1a84c30132c9e05c003838cdc20653555760f968f6f6a237874125b6a5b2448c3 SHA512 3340de5759ddcaaa74d3063cdd0347dcb9aa54a5d063410a1860275aa63d27957a2d284513e0ff8226677575964a1e2d1820904abb0e5dfe64ff765d16b75090
 MISC metadata.xml 342 BLAKE2B 76318a533a057c55052f9c4437d1d946108af14871a8c487d3f9b4a1e693e5e6e55b8c21b80b35d428920fde240c1d48d11b5f0a573d31d5588908d8c3d22b25 SHA512 65e222a0ca20f88a7657a2820effe47cf34acee6498986b5d0af6ec100e3123e62223405181e6082397b0c7a273c0a04aecf373be5df25a89715ee4a2068b781
diff --git a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r1.ebuild b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r1.ebuild
new file mode 100644
index 000000000000..1e46f5e0459e
--- /dev/null
+++ b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.6.9999
+#hackport: flags: +base4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="QuickCheck2 support for the test-framework package"
+HOMEPAGE="http://haskell.github.io/test-framework/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?]
+	>=dev-haskell/quickcheck-2.4:2=[profile?]
+	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/test-framework-0.8:=[profile?] <dev-haskell/test-framework-0.9:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'QuickCheck            >= 2.4    && < 2.13' 'QuickCheck            >= 2.4'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=base4
+}
diff --git a/dev-haskell/test-framework/Manifest b/dev-haskell/test-framework/Manifest
index 525a734b1d37..f244ae43a69f 100644
--- a/dev-haskell/test-framework/Manifest
+++ b/dev-haskell/test-framework/Manifest
@@ -1,5 +1,7 @@
 DIST test-framework-0.8.1.1.tar.gz 20900 BLAKE2B 4046a76825e645e82c5c2de7d098233b8bd93acbe8c932fe53d67c56350e87a623ffb2b379f95fce567cd4d8ed4459ea883e49d633f6e18c9ebefe058f74906d SHA512 7fd6015a0469623d2738c2a8d14c6b3a356c9463084a1b471f1c1b7b75bd33796ae8a0c01731e7b87dfa345be16bbeb262fcb1cdd4d8f1fdabd79c45f3570cbd
+DIST test-framework-0.8.2.0.tar.gz 21317 BLAKE2B 80065ad3d87188a8310e93b9caaaca73c3176e150b254fe29dd3e08d38f7a7066119b132f6c747a35a87a13764d115fe83b131a023667a3919c0f1c0963c770a SHA512 d8e7ea274819a1b49b9f938df527d22c808f456d25b84f03173ed57dddd39c230fb037a57ce90c38f571801ee38e86bed6826df1c93f184e4a803c72ce5f41e4
 DIST test-framework-0.8.tar.gz 20253 BLAKE2B 2dc4d0926e529a22776f370bf673c797c77cec97f4d7cf02da85ffcaf245496c2d19159481b2c88a00a04b5f850bd4acffe050c8abf58525f5779799b83a5304 SHA512 5f2238b65d644faf14a1b057abd642c31bcfc337b345d155cd7b04d99589aa269b74ce9b5225b843db8fcab25454b677a05c498c873ee26635c206f6470a438b
 EBUILD test-framework-0.8.1.1.ebuild 1353 BLAKE2B 1d66c5a351d9c0ed1c00954e8c48cedc9a5da828d03adc235918d97b5e1388fb74d2d362fefa27e881e883e06eb16434f2e4ed6a3c902b6192fcc87ca7261ac4 SHA512 f567ee78e801e4e6d49690e240b8be070246b147632682fb6c03a86b0846e18b45a92b0a2bfb953aa623a80b4ef725e35e8bb1cda6b6c3412429baee53308327
+EBUILD test-framework-0.8.2.0-r2.ebuild 1734 BLAKE2B 5bfc4f8f5d46b2e194d13e1213bd9b0d930e29737a2fa843730793d93aca741e962e7728a97dc0ce6166115680cd9ae8ee3bc613b9d0ce3173c9213d66230819 SHA512 d1da4c64eca75e29b86c0b49d0436476d7ee8decab0005fdb77f7c31618fc3caccd8c28f35b09c1e84a9393291568073dd890caa2f1f20dc37ae1875c488ce3d
 EBUILD test-framework-0.8.ebuild 937 BLAKE2B 265daf24423e48d423038e37cf69fe3d9464501052b3b6f2b74077246921d6b62c154ba70c7003a427496715bb4f4292c3eb0ad1af771389136ff94f2f2b5d67 SHA512 cd5b09dbc1f4a9d42d519895c7e43cd6b9c808c177e37b98248d0f713fa56eac9d6d9a59c3af252b43fabe3d501bd8db821dd3ecc0bf756b527ed20eae8cd981
 MISC metadata.xml 618 BLAKE2B 8aa3d4fe0748ba4e45564d7f27f8e80559df6927af1cf17d2aca7a19065280d0bf1ed7021aa29a15c408ff4b49a078fb686bb075cfebce096898ac013d53e609 SHA512 a766dac2018919d0d3af4f66ef80b968d4bb70fa7c5ec5c412bded7ee2d2208ea7fcd82cf27f4fdc02f38202146ae21e57efda83e283c083d711eac341e44a11
diff --git a/dev-haskell/test-framework/test-framework-0.8.2.0-r2.ebuild b/dev-haskell/test-framework/test-framework-0.8.2.0-r2.ebuild
new file mode 100644
index 000000000000..baeb10cc95c8
--- /dev/null
+++ b/dev-haskell/test-framework/test-framework-0.8.2.0-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken test-suite: missing modules
+inherit haskell-cabal
+
+DESCRIPTION="Framework for running and organising tests, with HUnit and QuickCheck support"
+HOMEPAGE="http://haskell.github.io/test-framework/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+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/ansi-wl-pprint-0.7:=[profile?]
+	>=dev-haskell/base-orphans-0.1:=[profile?]
+	>=dev-haskell/hostname-1.0:=[profile?] <dev-haskell/hostname-1.1:=[profile?]
+	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/regex-posix-0.72:=[profile?]
+	>=dev-haskell/semigroups-0.18:=[profile?]
+	>=dev-haskell/xml-1.3.5:=[profile?] <dev-haskell/xml-1.4:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'ansi-terminal  >= 0.4.0  && < 0.9' 'ansi-terminal  >= 0.4.0' \
+		'base-orphans   >= 0.1    && < 0.5' 'base-orphans   >= 0.1' \
+		'containers     >= 0.1    && < 0.6' 'containers     >= 0.1' \
+		'semigroups     >= 0.18   && < 0.19' 'semigroups     >= 0.18' \
+		'QuickCheck     >= 2.3 && < 2.10' 'QuickCheck     >= 2.3' \
+		'regex-posix    >= 0.72   && < 0.96' 'regex-posix    >= 0.72' \
+		'time           >= 1.1.2  && < 1.9' 'time           >= 1.1.2'
+}
diff --git a/dev-haskell/texmath/Manifest b/dev-haskell/texmath/Manifest
index e21a9590db0a..7e63d4a916c2 100644
--- a/dev-haskell/texmath/Manifest
+++ b/dev-haskell/texmath/Manifest
@@ -5,8 +5,8 @@ DIST texmath-0.8.2.2.tar.gz 1599187 BLAKE2B f65be60aee417cea0ec9d8e20e257a39de3f
 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 1074 BLAKE2B 286f1c626342239488446d1c226d5c1e3de127467571dc0097ed45297ec956ee655216c55c5dd11d6ef95eb303eb59cb52fa1bebd9fc38e9b098d1155ead1e9a SHA512 629adc2e7cd0ceefc74d29999d92252d86a8f61b52ddf4e876e9067f4947e6fa2899e58a543718c1f774899fdd04fa588f96cf5d59e44f738d0209def52dc45d
-EBUILD texmath-0.6.6.3.ebuild 902 BLAKE2B 32c4b338be76bc49a3b4cfd4edffb374a16e0a6f8a95086a2e84a034c166c95399ab1e53507f1167fc34bfc23b9ba8695ed72fa22c56d23f839d7291b83e9235 SHA512 9383ed0488047eb4e2b8afd28efe5daf8761076d87f556cfe178d6856d7ca098ca36aef0d5ae5ee7bf322e588c27b2263fc05c7a052958ea43db356c7140e0ea
+EBUILD texmath-0.6.4.ebuild 1101 BLAKE2B eb4e97d99c93bd660f97098c14ab75917cf4ac6a17ab9bb633b8e4d120ce3f4ce639565aebc3ec3168834d2f79c99ffb850646e438bc30f88ea3c1adec6bbe1b SHA512 3b057c4f186bc76217c58f7daa5f976738b83455a68ff304386273777e031a84a81c613adaf91556c148a931dce1fdf03ea937eb508797c50787350424470a45
+EBUILD texmath-0.6.6.3.ebuild 929 BLAKE2B 2338d4cf07269a61baab9aa49e455691e269d27c6f328d531b434a2af4d050c2f472d23de78f27ab8e05afba793a8ea2f58a1bc93d3143bbb90b6839d71e3e80 SHA512 87b957e43152c8fde6f34f2c6a352cab8518c4c963b7515c3889e5ec3061c853921422773b077897bf96f4fcb8bcb31fb45f9198ddbab650917cfcc9480c2099
 EBUILD texmath-0.8.2.2.ebuild 1281 BLAKE2B 55ac42f5c941e3138aac3c5dbc1e1c2fc7026172f41edc1920f4b05f27b31bbce71e497c2d85f4eec54790023a20625501b3187d9837855fc8f46078a7b1cdf0 SHA512 9d0da24e1a78a97db608907175e980fc00f52ab37e213431a3fe2b21e8de8935af3885556bc377411939e048e244f336640b85b0399e9501aab3e4e548208ead
 EBUILD texmath-0.8.6.3.ebuild 1328 BLAKE2B 6b9dbaaf1ab8d5c4e2edc4fcf2819a0b0d7a5110f86438422915d39813d7c1da930ce6fad7898a4e096be9d1cb5d0bea62684f67d7657e52481af176c64b0076 SHA512 acca7537f6188712c277588cfd9459c7fa47fa6aed10efee80a85c6480aba89b855bd6846f1acde9f5234ffa9ec995d624c1bd0fbc804a5242524367414c915d
 EBUILD texmath-0.8.6.7.ebuild 1337 BLAKE2B 133fc56b10ab5fd372dfdaab4f216bad612e313c076b9a9480b463613eec51940a42f13752129023a7cdf54e2a1cd838198390b57b07dbdff2b0d02ec621e8a3 SHA512 2e62a38deecd69b2cb6d607cfa772d30ec6d423c1a34a3a33452abe1d26c4a51f7440bcd2551514b766a1e920471a406dc52621db8af86f0d5bdf33bbc1b33a1
diff --git a/dev-haskell/texmath/texmath-0.6.4.ebuild b/dev-haskell/texmath/texmath-0.6.4.ebuild
index 5e474432804a..00ff3b3191be 100644
--- a/dev-haskell/texmath/texmath-0.6.4.ebuild
+++ b/dev-haskell/texmath/texmath-0.6.4.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="amd64 x86"
 IUSE="cgi test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-haskell/pandoc-types:=[profile?]
 	>=dev-haskell/parsec-3:=[profile?]
diff --git a/dev-haskell/texmath/texmath-0.6.6.3.ebuild b/dev-haskell/texmath/texmath-0.6.6.3.ebuild
index 5b94bc5332ed..309597d081f7 100644
--- a/dev-haskell/texmath/texmath-0.6.6.3.ebuild
+++ b/dev-haskell/texmath/texmath-0.6.6.3.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="cgi test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-haskell/pandoc-types:=[profile?]
 	>=dev-haskell/parsec-3:=[profile?]
diff --git a/dev-haskell/th-expand-syns/Manifest b/dev-haskell/th-expand-syns/Manifest
index 00c75c8311a6..5b7516f56931 100644
--- a/dev-haskell/th-expand-syns/Manifest
+++ b/dev-haskell/th-expand-syns/Manifest
@@ -1,5 +1,7 @@
 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
+DIST th-expand-syns-0.4.5.0.tar.gz 8112 BLAKE2B 9a4572993f309144e70adb2967c699c06871246a00eea97e551d79cb1117970d12bc9c7594e8908f9b6a59550ba4fcef8e3e9888375136c4fccd3dc53d7e1857 SHA512 4e72ec26dbe875c3d664b94d7892001af835794f04bec83ff05952c3b9ea9b9de242cee5c713671213479bce4cfae3d0d6172a581e7fff58923688624dd493bd
 EBUILD th-expand-syns-0.3.0.6.ebuild 597 BLAKE2B 70cdd40f210fa864735fa9499b4dd70076d5510cfc7e2e1e70bb89fac388f72472a778f8963706726bef2f16a8388f236a79e51d94b2e46d58654db7eba0d576 SHA512 3b6f62e190bdd791ecf5eaf3bd0f7baec8c64400225bf3f1e9ecab1bb072cd8a484d8321db6195c6d05c62c2de114430adb2b8091813f5b0a251d3e969773053
 EBUILD th-expand-syns-0.4.2.0.ebuild 598 BLAKE2B 0356bf2510ba022235ba3e19f3a3c7eec497b06d9a0a6e46087cb4a105d9764d6491b3d23a3ad887c72196a3d9e078e2805c7f024cf3f1b91c0054c270528e9a SHA512 271981f108ee4e32401b41a8d33c7220cd46576472fea72a21ca8ec58a16d37d71a5d39918893b4994c36ff9ca0b11cbcd53bf1a1ce071171f2bac1e0b03bf9e
+EBUILD th-expand-syns-0.4.5.0.ebuild 598 BLAKE2B 35be6334b462b368388be45b8d4a25377a41716f135cb5c59b8820c6f0df2860b34f74780e5a9a099fee941d0ad4beedce8746b67639998e0cf6a0eabd800969 SHA512 d279febde7b26ee5e23337b898fede5ac1c64a26eaf2c6e09cd98efac01d56ece94ad7ee6546a7ec1d153610399e011d825b01aeb766a6fddf2bd5a05a8b5c68
 MISC metadata.xml 433 BLAKE2B a4c56830c882682082902f36798ec4164596fb02fbd9433b0ed1cd1e3795bbdd8d8c8932789721021b7e15b2846e4fb1daa828084980cba39504b972d001fb6e SHA512 f13a7f7d99f21e8b564cbd9968c6579d1e678af4660d82c19ef6e9ccd785b183ceed9874279f32ddb59cc9613e3b2551ab60e0c826dafafb734398ffc643716b
diff --git a/dev-haskell/th-expand-syns/th-expand-syns-0.4.5.0.ebuild b/dev-haskell/th-expand-syns/th-expand-syns-0.4.5.0.ebuild
new file mode 100644
index 000000000000..c4a8b84b5ab0
--- /dev/null
+++ b/dev-haskell/th-expand-syns/th-expand-syns-0.4.5.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${P}/${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-reify-many/Manifest b/dev-haskell/th-reify-many/Manifest
index 1e34b03fc01f..0a9152f7396b 100644
--- a/dev-haskell/th-reify-many/Manifest
+++ b/dev-haskell/th-reify-many/Manifest
@@ -1,5 +1,7 @@
 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
+DIST th-reify-many-0.1.9.tar.gz 5693 BLAKE2B c70b758a843b3d76982d89564a9cfe5fdc55d97ff05f3622e86b5160e06be22dd8fb870978b8da093ea5642bc1879ff7f5900fca4ff1cffe5f078ac8ec347155 SHA512 6d6f3cb939c172869e88a14ee800aa7760e090df55e0105f41ddc501c0a4bb60d59a66fafd890475fc3074a4fb25d7583570e2cfe32ce69f43c8db9663b0f110
 EBUILD th-reify-many-0.1.3.ebuild 662 BLAKE2B b1f8aca3f008faf03823a0d9d202bb63cecf606e3d7f3e47d53aece6db1bedee0e41582d50618540e7fac45c2843a55a455ef844119e0340732c37cb5eb3abf6 SHA512 1ec024cbe3f8950a03a3fc97393376a4d512560df1eec172dd4b9e0fbc007e06050c1b1291408139111d2aae11483f9f1172bb860712ecc5a4f4d8aa5bd032da
 EBUILD th-reify-many-0.1.6.ebuild 660 BLAKE2B 9f282e99887c906e52bd62511495494274168e612198f212d97af74d96beb03e83cd428d24b653af696c148dde6af9c6f30eff8db62846a52ffaa37397e798f4 SHA512 b5fc9bc08727b1c42e8ac8f9425b0da1101a239327e88833125682dfce3eaf1da5b9bc28117be1b2e8abca57f43ca7494fcc8fde505011922dbc5806e50772da
+EBUILD th-reify-many-0.1.9.ebuild 662 BLAKE2B 3d143ab39d6a16a9017fe9b701520461a5c58df01172783104c0d599f6bb60a4c0ea81fd21baa51822d69505c9325298835fc754d5e2fd3bea9ddf11cfbdc099 SHA512 0c4e24f0b7c6e945a9bcf341581678f46559d4bdd3fe74c346ce4296fab6bb644d5ca2ef324c0ad77315369261fcfcec6f9275864719e907ba4e5944ec4e8439
 MISC metadata.xml 640 BLAKE2B 3b28ed2379e816b690ff1ef27e5cbae5e4f252b4dd0703d764aeb82a6402fa111de8a586a56b060baa8cb935b6e40a020b25546c06ba39ce55a5183b96c26c84 SHA512 611cf79c5d709a401dc3830d178911e6bd5cf223d2260fd7a424f1eb4733e1937f242473d95a81723da173ef21186fe93ee10c7944aaa9e45535073009baaea4
diff --git a/dev-haskell/th-reify-many/th-reify-many-0.1.9.ebuild b/dev-haskell/th-reify-many/th-reify-many-0.1.9.ebuild
new file mode 100644
index 000000000000..c1bfcb59111e
--- /dev/null
+++ b/dev-haskell/th-reify-many/th-reify-many-0.1.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${P}/${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/Manifest b/dev-haskell/th-utilities/Manifest
index 190f653e1c00..7e9646764910 100644
--- a/dev-haskell/th-utilities/Manifest
+++ b/dev-haskell/th-utilities/Manifest
@@ -1,3 +1,6 @@
+AUX th-utilities-0.2.3.0-ghc-8.8.patch 2566 BLAKE2B 3d59929531c5de3892155d836ffdbdbbe425bb959b65c2fa15fb58c5e9f083515f263717cc68e0a780dd95c476ce2c4cd504a4abc1f8f9c51f9d86b1cf10efb7 SHA512 346e3bf318d4f8aab2edfa89719a82997d91175ff11e2d649ac281269f062396f5dea9364a74ebb2ab0f78421dbc462ecea60e1b0868ad9fa08379659e446af3
 DIST th-utilities-0.2.0.1.tar.gz 14996 BLAKE2B dc39e7f282a2b5cc4ae2442f76080e042bc0fd3fc28e29ef7e6313bd4685ed33c855c10fa9313e5b7d3c6e9fd3c8cfbe4a64d8131a156b34eabd0f437b99b850 SHA512 30cb5c09071beb1f8e029d217fefc6e58aa6eaa8a28994990d1549091fc174195b04a10e7873b1ac5f894cb4a528bf9764256ff1ad5c969493fbf5f872f1749f
+DIST th-utilities-0.2.3.0.tar.gz 15577 BLAKE2B fad72515936ba6b7876ff731c7a1e12246014e191282028fc1bd1846dc704d4d1408e82e82a394a1f58350f961c5b7b7f5b9ae0cfbf09551fc5964433d42b113 SHA512 edddde2ea3a9da44bd34cbf51d9f4ea14510eac9527f2f1a199390566e24f10ed84403f5450e47244b0cbfc4b5dc3a5c3f64ec596255f191d8bad83d9043a3ba
 EBUILD th-utilities-0.2.0.1.ebuild 763 BLAKE2B 58d8089a1704d2439c03b3e1b88fd0f5f9a01f76ca7603fb3d90ab4e1d0a2e796e8e413c6bd77346c8641f077313a837b7fe01fbb120d5fdd23937083c361fef SHA512 b7501fe8a0bd3d90eb9cb189d1100ff652289a1fa2154b5985b86ea9f496718b7e4e7a0a16fa8c3bd29d2d3d1e8aa39d32006aab3b11a2fb9e87ceca61fa20ec
+EBUILD th-utilities-0.2.3.0.ebuild 805 BLAKE2B d4c5d4b4278513198cbbb18e501bec598c9afcbf545e66b6a14655e2baba9d3fb446ab8f62111385fd2dfc1c7e8ff003dd6419ac3018aaa9665d385c2d5e6573 SHA512 392247a11b663044fd7528e0df8018b050d7494ef2487b099ede77d4a3f0156354dad3afd222acf34831ecd0c9f5264aee850b8f982959b46e1e3a6419886bab
 MISC metadata.xml 351 BLAKE2B d6d56e943b01e18fe1b9be3422620e2e59b9264c70a01c15abb29427ad82d744457ffc2fe7cc05ba8cf7c22ecff9190d1f2bdee73da42e833ac1e50e918e0a6d SHA512 22a6f9ed3b20b27470841ad774539597e351b6abd0c51fc2644c8762b7e1d08da11600c08b3cc7744984354518e046542a6409f89dac11f6c9fd0a8d87c7fb3a
diff --git a/dev-haskell/th-utilities/files/th-utilities-0.2.3.0-ghc-8.8.patch b/dev-haskell/th-utilities/files/th-utilities-0.2.3.0-ghc-8.8.patch
new file mode 100644
index 000000000000..8a3795430b1f
--- /dev/null
+++ b/dev-haskell/th-utilities/files/th-utilities-0.2.3.0-ghc-8.8.patch
@@ -0,0 +1,67 @@
+commit 5e510f6a6ed24b98d143e5baeb156a8901bf3faa
+Author: Ryan Scott <ryan.gl.scott@gmail.com>
+Date:   Mon Dec 10 15:12:47 2018 -0500
+
+    Allow building with template-haskell-2.15.0.0
+
+diff --git a/src/TH/ReifySimple.hs b/src/TH/ReifySimple.hs
+index d179829..70b929e 100644
+--- a/src/TH/ReifySimple.hs
++++ b/src/TH/ReifySimple.hs
+@@ -233,18 +233,24 @@ infoToDataFamily info = case info of
+         Just $ DataFamily name (map tyVarBndrName tvs) (map go insts)
+     _ -> Nothing
+   where
+-#if MIN_VERSION_template_haskell(2,11,0)
+-    go (NewtypeInstD preds name params _kind con _deriving) =
++#if MIN_VERSION_template_haskell(2,15,0)
++    go (NewtypeInstD preds _ lhs _kind con _deriving)
++      | ConT name:params <- unAppsT lhs
++#elif MIN_VERSION_template_haskell(2,11,0)
++    go (NewtypeInstD preds name params _kind con _deriving)
+ #else
+-    go (NewtypeInstD preds name params       con _deriving) =
++    go (NewtypeInstD preds name params       con _deriving)
+ #endif
+-        DataInst name preds params (conToDataCons con)
+-#if MIN_VERSION_template_haskell(2,11,0)
+-    go (DataInstD preds name params _kind cons _deriving) =
++      = DataInst name preds params (conToDataCons con)
++#if MIN_VERSION_template_haskell(2,15,0)
++    go (DataInstD preds _ lhs _kind cons _deriving)
++      | ConT name:params <- unAppsT lhs
++#elif MIN_VERSION_template_haskell(2,11,0)
++    go (DataInstD preds name params _kind cons _deriving)
+ #else
+-    go (DataInstD preds name params       cons _deriving) =
++    go (DataInstD preds name params       cons _deriving)
+ #endif
+-        DataInst name preds params (concatMap conToDataCons cons)
++      = DataInst name preds params (concatMap conToDataCons cons)
+     go info' = error $
+         "Unexpected instance in FamilyI in infoToDataInsts:\n" ++ pprint info'
+ 
+@@ -263,8 +269,23 @@ infoToTypeFamily info = case info of
+ #endif
+     _ -> Nothing
+   where
++#if MIN_VERSION_template_haskell(2,15,0)
++    goEqn _ (TySynEqn _ lhs ty)
++      | ConT name:params <- unAppsT lhs
++      = TypeInst name params ty
++      | otherwise
++      = error $ "Unexpected type family instance head: " ++ pprint lhs
++#else
+     goEqn name (TySynEqn params ty) = TypeInst name params ty
++#endif
++
++#if MIN_VERSION_template_haskell(2,15,0)
++    go (TySynInstD (TySynEqn _ lhs ty))
++      | ConT name:params <- unAppsT lhs
++      = TypeInst name params ty
++#else
+     go (TySynInstD name (TySynEqn params ty)) = TypeInst name params ty
++#endif
+     go info' = error $
+         "Unexpected instance in FamilyI in infoToTypeInsts:\n" ++ pprint info'
+ 
diff --git a/dev-haskell/th-utilities/th-utilities-0.2.3.0.ebuild b/dev-haskell/th-utilities/th-utilities-0.2.3.0.ebuild
new file mode 100644
index 000000000000..ce7bbd312b27
--- /dev/null
+++ b/dev-haskell/th-utilities/th-utilities-0.2.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.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="https://hackage.haskell.org/package/${P}/${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 )
+"
+
+PATCHES=("${FILESDIR}"/${P}-ghc-8.8.patch)
diff --git a/dev-haskell/threads/Manifest b/dev-haskell/threads/Manifest
index 62de027adcaf..8f73c2b511ba 100644
--- a/dev-haskell/threads/Manifest
+++ b/dev-haskell/threads/Manifest
@@ -1,3 +1,5 @@
 DIST threads-0.5.1.4.tar.gz 7395 BLAKE2B ca81e06509d5dd9603e6b8affb248eb397040845e0fff26adda91086e08eb2d78982a9342f0d6bb0b3b6aab4ead33b3b26500683e221db60f5833b3ff4c280bd SHA512 4fcce77d88bf5eeb0ef172efec8525327ae11739c89a7d31b775ed686ad943aecb53f8140539262fdc8992b338943e9f905ebf97bc7c01312a12a88ac4c08129
+DIST threads-0.5.1.6.tar.gz 7406 BLAKE2B f2676d616f09e571e08a5e53671997483dc05d633444456b4227d28c0433ccd99c5c5117e8122a6ba0f389338b165ffc18a90c51222f199d90b2f2a704ecd7f1 SHA512 d34d97e5614f23afc5d2bb671c3979d779a9d0e29147a8bf25059f35ed562264302a3242224b022388e554177aa34455cb59dc640b2fa19ec452f15afac10525
 EBUILD threads-0.5.1.4.ebuild 901 BLAKE2B c5d7d73ed743ae4b81c69ab8287537b522ab11a06610b8743f313d7a406ebf6aed5918be01126f2a680ee6383febc95cdba787336607d2539cadc390a57b616d SHA512 495e1fed2c68c2d64191aa3b516e639956895c0f616edc782f2d7b6a1ebcfe64a6861042450600d56a3da3f94fa3862218e34ac121415a869635a26ab70741b4
+EBUILD threads-0.5.1.6.ebuild 742 BLAKE2B 668bb9f016f657192a1c6c1cde4c4ba8f953e342105c34ba00cc5611715eebe76fc43ea443abefc534be7971732d11bcfcda95e57f022df1d71636f58c91e03a SHA512 6eed219cd788e004077f001b44c8f613a9fd4f305efbbf2ee6080c8f8862a85e0502ff8cceb804ab1658587149a811489de268b83f8d371db96482c62b223775
 MISC metadata.xml 1018 BLAKE2B 405986db23ff3277088864efb403b7fa20d998c37a75dcc953b6a0c490d442d469843cf856142e43f2a46ac458b1f7bb6c9e8476ac85e1ea7214cda51552c88b SHA512 b50d6d809ae35893296cf851ecf03c5a5b69342eee6db42ef13907afe224b4d46047b4bd68dafcab51e972a7cbff0e28aa6ed2b1123d1fb9d15dc6b512be564d
diff --git a/dev-haskell/threads/threads-0.5.1.6.ebuild b/dev-haskell/threads/threads-0.5.1.6.ebuild
new file mode 100644
index 000000000000..a54bed773297
--- /dev/null
+++ b/dev-haskell/threads/threads-0.5.1.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fork threads and wait for their result"
+HOMEPAGE="https://github.com/basvandijk/threads"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/stm-2.1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+	test? ( >=dev-haskell/concurrent-extra-0.5.1
+		>=dev-haskell/hunit-1.2.2
+		>=dev-haskell/test-framework-0.2.4
+		>=dev-haskell/test-framework-hunit-0.2.4 )
+"
diff --git a/dev-haskell/time-locale-compat/Manifest b/dev-haskell/time-locale-compat/Manifest
index b3a133f083a3..d44d54dec527 100644
--- a/dev-haskell/time-locale-compat/Manifest
+++ b/dev-haskell/time-locale-compat/Manifest
@@ -1,5 +1,7 @@
 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
+DIST time-locale-compat-0.1.1.5.tar.gz 1956 BLAKE2B a0980c2ba140c0ba9fb78023b7339a391e7eee8a14e942b2a7ccae4abf2a5a671f15bcce4367b214ccb47ecd0f87aab00984bd598237012e4071ed11139ff3cf SHA512 a8a87b77f017ca7e4db98101b527016a39abe4f264b3684b887464c53b792f564d0bec3304d8ed5f5889a3e3cb7e41f4d049e61e5adab688363a3342608f695c
 EBUILD time-locale-compat-0.1.1.1.ebuild 611 BLAKE2B 1439f7b3140b5fb1891c24eb81137c6b83a4e5281c569a0df7216d480007b70fa9b293d1fcf044c6c1117cbf1b1c42f1fb1bd6f6c070550b8afc9c1cbf74c735 SHA512 a4165e22d0490b73b466b53451e23c8079e664292b0f5dd8b9df1b1e6403d9e8599ad06dedda9c7a6641f0a7ff66a86563ec5a7e1c41024f6692f0344184670a
 EBUILD time-locale-compat-0.1.1.3.ebuild 611 BLAKE2B e29770285ae977f51b153c411b16518a50dcbdce3eb940e77cbb673ecd48e88f92c2f234a7f4e809e31f909ec2e90963a465ebec395f5b8b0bda7a1e2950af0d SHA512 ab920109f5ebe14f2a6e623bfb248a841307a0bc7eb89d5d977dbbaaf99133213cb9130f6836f4c8c5d0571cefbcf9d54d6fa687441928efb79480d43e296dcb
+EBUILD time-locale-compat-0.1.1.5.ebuild 613 BLAKE2B dceadfe6e093f1958b6c3b5eefd76cab13607a39b7519563511cc6cbc250c83b38761c4750cddf83a7c86abd7eff9a0029d212b375e4810af35ed393e3062bea SHA512 dfff3aa0ea2d2484997b82ab76a5b3452b46bcec7680cc1684e7031f41dd75deb69341db6ccd5ad76249c26df0e252781315a365bd48c1d2ff4449ff96331294
 MISC metadata.xml 447 BLAKE2B e3cf8b68f7afa1a9c0770fbbc5c5040f60718a704c35000abf1fc8b567b046c803c870e742d44be41a59e90d0f4ae2436f0df9496193b5b99b3ad1bbc15ee8d9 SHA512 06bd239ae0f0d7c305c5c484e91cacb7f7a8b90fa0917d9a0a17a7ab50676bcd0876f425d82a96c868964ecd9a355cdf3c67f6e57abbace27e28df0f2bb5dcaa
diff --git a/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.5.ebuild b/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.5.ebuild
new file mode 100644
index 000000000000..ba760ada6bd3
--- /dev/null
+++ b/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.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="https://hackage.haskell.org/package/${P}/${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/Manifest b/dev-haskell/timezone-olson/Manifest
index da036bc5ebb4..09a2fdfddcf0 100644
--- a/dev-haskell/timezone-olson/Manifest
+++ b/dev-haskell/timezone-olson/Manifest
@@ -1,4 +1,6 @@
 DIST timezone-olson-0.1.7.tar.gz 11313 BLAKE2B c2bb71f949beac730e9fe9ff6a5aacbe301ffb8012b6e622179a029523784d0f3a2745ff3dd8a86ecb109fed90f44a121a4b5e8f4766bf6061a7233429267221 SHA512 136bca829b40edd3c46f83e2d19b496da7b6e7268825ff017fa598f9dc8a9de5fd65101f417e9c22ae8b845c61c98347944971f8f41072be60d894ea148a4e0a
+DIST timezone-olson-0.1.9.tar.gz 11471 BLAKE2B 37ec5948b7584751ea3ed6e6aa0c11b78766d74969f6acd0813de08c36c78ddec58cc047eb5bca9fba26a692162985dbca25c6ba2d78172bb894edd4b7146c1c SHA512 1ad8f98ba3573f11154e18c5c0d2d7ee3b32f165d388318622195199da4765d1a0352b8a13fa38a6b2fb008de93f34d2a6aa35d2d7ada53e1ae8c5404d68b645
 EBUILD timezone-olson-0.1.7-r1.ebuild 902 BLAKE2B 745217b026f9929aaef9847db0376974bfb475da10bbee3a77a032ce611ad451c012ef625bc0d652ffe06d91bf61a0c5da19ab37afa295eb82a02b7accad85e7 SHA512 a6d0745bf001b393684d2a4d3216b77c6347d9a3027d423f0c548955cc56c7ca571cb0ea75ffdd7ef1f5c4194cb3d6aa6927b688c7dfecf89a1cd3f4f4c06101
 EBUILD timezone-olson-0.1.7.ebuild 841 BLAKE2B 8001bbd2a3e87641190b8f2124655a8a8dcf5379cbdfb7d56a49102e62ac88aba2ca3d750cc563e30b4319afbb10ee547c1c28a175c2ffcd90246e2f28dc8728 SHA512 b499d099ad848fbd867e95ea712117995cfaa3f98f7686b18714ec1bf462fc10e1810c2d635779686275c38b86d8feb1251387f652a460d861a5fccdd1b3ec36
+EBUILD timezone-olson-0.1.9.ebuild 766 BLAKE2B 782f6083adf89e1696267dd4c27d4f89859b8557b3965abdd51e2ac2bf5b83ee0b8bae52bc498cb1891a8dc2a8a5032bfe4d1cb561530f951ba4f97ae4849595 SHA512 016cff39efcaed8e5c3332197e8f46f829e050af8c083644096259c8fb9cf0b22b16f883d9bb592d16267a32967f7f4122a2f391f770188a3b38ad91282ad96f
 MISC metadata.xml 821 BLAKE2B ad98bfb2a5a5854e2cae7091dca6c206a37dccffa001bed5df75a0f318b200a1571e265042857d1e74abf019deda50557ee655f811737eb63f8a7a67b18f1818 SHA512 1ee91c0270137d4710f9052eadf7f522006108d9d6d2939ae44641d365078daec9671699e09aa69c19d0a8e5e503f1bceb6a0458ef3ca6f123c73bb3f774c2de
diff --git a/dev-haskell/timezone-olson/timezone-olson-0.1.9.ebuild b/dev-haskell/timezone-olson/timezone-olson-0.1.9.ebuild
new file mode 100644
index 000000000000..8bf4ec391654
--- /dev/null
+++ b/dev-haskell/timezone-olson/timezone-olson-0.1.9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6
+
+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="https://hackage.haskell.org/package/${P}/${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-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+"
diff --git a/dev-haskell/timezone-series/Manifest b/dev-haskell/timezone-series/Manifest
index 91f112156e98..54bd0700295b 100644
--- a/dev-haskell/timezone-series/Manifest
+++ b/dev-haskell/timezone-series/Manifest
@@ -1,5 +1,7 @@
 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
+DIST timezone-series-0.1.9.tar.gz 5812 BLAKE2B d45a62af6ac050406cded2740acb9988a25e38f80637e8dc8d7856786985ffe22a287873f878312faeddb524189a169af5ea6c1109613106dfc70cbba80b8b7a SHA512 9a716223270dfcb0ed39e2dcfb460e3540c0f2444f703c466cbd48ad5664e689aa3f6595f32e59b96fef7891aafabc03c9925367a26c2c043cb6adca2dad7a88
 EBUILD timezone-series-0.1.5.1.ebuild 539 BLAKE2B 5781490bb1a59a705386de8f71fa5718eb3f15f366695f1dd82fbf9fd01f6611a46f6adc8f2187ec52bcfd1717eb207c2c981b52a8724f2d261dc986505f1a85 SHA512 d845323273dd112867889ccbdf21a6c9191a0c085b68489b3c8ab722efbc3fe65e16337a23d207799324f6514f23b1e3b1e5363c4056e46a40c24aa6634eb74c
 EBUILD timezone-series-0.1.6.1.ebuild 537 BLAKE2B 53434c380c4ef651e768f16212d6212cc00fd8475cbaa66545a3caa40d02ae72241f43d5c01e918b535bbfb9f40f89af8c48368845bdf9b7a9736b8056796833 SHA512 8ed169203b77c5130c4aa55dea907c96bf4bd41ff7347ab37de1309a626ef18ae176188d7aadeadcd73f5f2ee28bb22e30794b1c4143000b008569d5ecd1ed72
+EBUILD timezone-series-0.1.9.ebuild 536 BLAKE2B c8161e31dc16a043e110701506c764706cf376899e8828f2dbd2fa94590a3b9896339f3e2798c14eaad8f5d28a583f0b47e92d5d16a5f0a98ef4e3beddc462c8 SHA512 ce89caef66538b1246d38377dc2ad0050d27229700e5a0b5b49386b9cea7cd81a36b320fc70ae9703ddaf246ea707cd624eb4a43adcdf99e281b073e462dfd90
 MISC metadata.xml 499 BLAKE2B 9fb00e434d3af8d44d166fd9393c30f5b817095c9e9fd972b0801a1591c03997388dd0a5ac93189f42ca2f58a652187ca76378169b40903ff66e0aabeb9fa61a SHA512 dcb6faaa9c24cbf69dcd2e0544177c128421aeeb2cfae5382f054e0a04970697a0d0512b42488c5e096cb6317233cc5f5b2415d85385bcc95733a865a1725760
diff --git a/dev-haskell/timezone-series/timezone-series-0.1.9.ebuild b/dev-haskell/timezone-series/timezone-series-0.1.9.ebuild
new file mode 100644
index 000000000000..2d4017b83783
--- /dev/null
+++ b/dev-haskell/timezone-series/timezone-series-0.1.9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6
+
+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="https://hackage.haskell.org/package/${P}/${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/torrent/Manifest b/dev-haskell/torrent/Manifest
index 915230c16a08..d01f00cc9d12 100644
--- a/dev-haskell/torrent/Manifest
+++ b/dev-haskell/torrent/Manifest
@@ -1,5 +1,7 @@
 DIST torrent-10000.0.0.tar.gz 3549 BLAKE2B 414547b6cd8a090a8da198dd82122fcdfe87af4db59ff06f558461550ee6c041de7f69758bae184961ff8772ccbd17523a8c0fa4dc6f6729db1293da90ee1c9a SHA512 361f7ca99196278dccdf4ac20dbe5d9861fd979ea1c84786a93928cc46e51f949618e34e55342f08e19ce935a8313526c580fed6413209a6365efc306b5165d5
 DIST torrent-10000.0.1.tar.gz 3819 BLAKE2B f2a1569c697bbd732fe4f801ff797e2cea6efa69bbd08779f36d729496dd1cd6ccc0d55dd2fca40a6c07f0e1b577213a93f13a1a2b92f9b90030037af5de481e SHA512 66b69a0bb2b7dc08fb738c60bf6402ad69a5e60c6ccc1002e9d394c9faf75e49f444ed690dd3d17c1de978d1ac85ac48f03b6dda143445019c698db83dea3fcb
+DIST torrent-10000.1.1.tar.gz 3977 BLAKE2B c1c487d6ef2d9da68cf3bbe24097824cd56a53276e8577a3dd28f949b818b8c396ce8d65eb721a3f9035969121ba4df9ca13a6f26ef085607f8b5e30d5ff1560 SHA512 db4c18ca8df4fd32c45d6fc01333a5ef083136dfd5833f13300161ca393b6f3ebb2a8ca2b2f7e2bbf7019eb9484e0b3b067677a63fd41311e3dc7a17111f5a6c
 EBUILD torrent-10000.0.0.ebuild 642 BLAKE2B 05b6a73564c7782fd57757c08a33fad780fbbc6dab04bf4d5ab5adcb3b02806c1fd98fce761b4b91c3f89e210d7899d751118a543e0d6c3121ef8cce508f8f4b SHA512 01b6a72322f77f2d19452470ddf0fb8ed5f309def9d8366c05f3a888b3a72db87e1e6272f1b301762a8a4220bc8f59ab02e93ebc8e85575cc51811d155a4a600
 EBUILD torrent-10000.0.1.ebuild 610 BLAKE2B 0d94ee78d3593eb87caffda810e4c3f806aedf091b7513879f8f210a1a0e50ec146b79d1ab5d1c2247e216a2d7352278a291160631e1c6a8e73657389038891b SHA512 74791b2154d0f0e585f3de2e39fd3e9cb9778a1b82bdefee2e832705755cfd87bfa3a66ac6cb7d762b74d01bb8ee63986504c78cfb578d6797ae069459ff953e
+EBUILD torrent-10000.1.1.ebuild 610 BLAKE2B fd43b5023687cc27fb3c3bd6538715128c8299bbe0745ee502e6d60b0c6adcdbc081bbc0ae5542ee381298545eb2cc157422639437841b7beb35d1db83161585 SHA512 7764c7eb8557e952f30eaab62f0980e9190d67afd9c41d8bdb18bdb9ddaf4166af419bc415d5c5748dade8719a1a27e99bc7fcd2c80404057c2eb0445fa69e3b
 MISC metadata.xml 327 BLAKE2B 623fd681553ed644e9708f183a159ce52e453c170e002158ac27434868083dd16d6552b62d6e86aa291ce1e6bea80e9d83ba5acface8d3b7bd4b1d8b9136398e SHA512 c7b6ac893521cc21a96055dff085a186e55a6fe20a1903bf40d3af032c3e227d82a1a93efa31ff7d0a13a1f5c124acf0bbd6b1941a6ea3208b339cd0e5056556
diff --git a/dev-haskell/torrent/torrent-10000.1.1.ebuild b/dev-haskell/torrent/torrent-10000.1.1.ebuild
new file mode 100644
index 000000000000..b95d0985a904
--- /dev/null
+++ b/dev-haskell/torrent/torrent-10000.1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="BitTorrent file parser and generater"
+HOMEPAGE="http://hackage.haskell.org/package/torrent"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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/unbounded-delays/Manifest b/dev-haskell/unbounded-delays/Manifest
index 90a5749fe664..5e92a1bb440f 100644
--- a/dev-haskell/unbounded-delays/Manifest
+++ b/dev-haskell/unbounded-delays/Manifest
@@ -1,3 +1,5 @@
 DIST unbounded-delays-0.1.0.9.tar.gz 4199 BLAKE2B 92d31c926c202f8bfe4323433ad365de57e507712b81ea65a3780c0b1321a739b72e24546e93770830996b970cb082098f2f3ac7556b5f20719a54856ae48704 SHA512 808d45b3123cc68ab1021f44b90c8a8f803ff8fa933c8e93cc241ba10e8b960281d96403ccd85b5f9af382becc9a05817c0de12ec483fa3e813c2ca78266b592
+DIST unbounded-delays-0.1.1.0.tar.gz 4166 BLAKE2B 158b05e35afd4c2b8f33caeea748466ee8cb6348f4505649c442f76777b41326128b84b8b7559e06d031c1486886e99e95bf69ac7e80eb16ec1c17cc5b5354e3 SHA512 70e26055abe40b38e20bc5dadc3ae32b699613698d0fc36bbd519fe011128fbdda7e963a69f25375b4e8a26b2ebfa2cdd4496d9d045e9f19672224654e5e7948
 EBUILD unbounded-delays-0.1.0.9.ebuild 544 BLAKE2B b9c102801b64dd8e77c093258719e5d5cb24cb2d1467ceec67e0a5af98047a417302d8987c76043c6482385809d6156949bb96b4c74a25fb9e7c4008fc0ea6e8 SHA512 b304757e63940c066793a7042e830dde20e73eff76281a2a181ad920fcf9dc37d74465beb1c835ae5f85535bf5a0542398046e35fe465bb961b33037df4ecc09
+EBUILD unbounded-delays-0.1.1.0.ebuild 546 BLAKE2B d90d13de53f83f2f8f2943677c86330e1423026b58defdb411bd7a28ccc61486ca76f3cad62bfda903fea594ad4381dc43dfd3946630bad5d415ebbc9af26e4f SHA512 e9be2d4b4b1240fc34bf6b4447b3e8189161fb0f97cfb956cd11626113905874d9065bfe33320351e473fd295685d0da855a25b1c90837ab5895ddce647ff149
 MISC metadata.xml 601 BLAKE2B c662d527e0bfd817db1dab15ee44389e00d0adeb2d5b8931e24f8e4c5efc20cc9fa7eac23640ec2ccf1356234f4c327f5573d9d4483441cacebb22a4e95a6b49 SHA512 99f9c703965b90237d69ce27878de6f85293be37b1f0e26d3fa83ecd0d84ce99a5c1cc756fae595c8bd5f302471c70e8ed49b36c7b2e913c82b4399042e95923
diff --git a/dev-haskell/unbounded-delays/unbounded-delays-0.1.1.0.ebuild b/dev-haskell/unbounded-delays/unbounded-delays-0.1.1.0.ebuild
new file mode 100644
index 000000000000..68645ff0c7fa
--- /dev/null
+++ b/dev-haskell/unbounded-delays/unbounded-delays-0.1.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="Unbounded thread delays and timeouts"
+HOMEPAGE="https://github.com/basvandijk/unbounded-delays"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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/unordered-containers/Manifest b/dev-haskell/unordered-containers/Manifest
index 6cced0e9efc2..452327865a7f 100644
--- a/dev-haskell/unordered-containers/Manifest
+++ b/dev-haskell/unordered-containers/Manifest
@@ -1,8 +1,10 @@
+DIST unordered-containers-0.2.10.0.tar.gz 44733 BLAKE2B b25fe354f9f47ea16b4dfd40e0b7e3520056f582a600d4a5cc3e5c122c83bc903f9d2dd6d7c3cf940a13d5ddfe33eac0ecf6ac82bf005d9531f72be1d802f431 SHA512 450e5e839e0092b2476a0abfc3eb2f45fba634a9e782cddf25b3db3730d16dd2e65673f46678ab4ad23be71525ae5f72888b89b03402cb70e20fc33feb765766
 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.10.0.ebuild 953 BLAKE2B 72662c81580d2671b5e19d7a36a3f6b528628aea740a58fd2879d9f827cff715dc37f2921ec73559ec9550b4e8f075abfe595188977e9f960865483a0c79dcc4 SHA512 1736b1849e5c987cfc75e600d833cca6477dd013572b377b84b533875eb6e930b48aa298abf0d2278af3f0b1cce5d05e0aae1e3f0cb24e732e70a11cc8a8b12c
 EBUILD unordered-containers-0.2.3.3.ebuild 901 BLAKE2B e12797f214f2c2ea5a3b2f451afda6f8631bcb1799a77f33936a6e9d2b22aa0757355ad210dd95ddda20e75bf3167767f6a1adb1af4a1be78529a65fa0b44559 SHA512 c133ff424202426f9cc2dbe431c9b4d752acd62047fee199b2d63ca441b4d51d2e594c38cec4a5ad63e740d1dd91f16237fcfc150dab26030e47b2dffa36960e
 EBUILD unordered-containers-0.2.6.0.ebuild 940 BLAKE2B 32bb42b45c66cde2dfc93864259238d9498783c35d046aa42005955f20877573320f824435d4914a9e9881dfcd59a691c8a12c386c2f1b307b7ddcd8fa91b7fe SHA512 3a4a464ab95a680b05243b92dd26718c6f8f92c86f7a9ff3b0ccb43ff22e09a8fd2358e24abcc7f99946f655b01cd7a9bae953528383326d8e3ead0de345d907
 EBUILD unordered-containers-0.2.7.0.ebuild 938 BLAKE2B 63e2ba3ba3e6ee2ea6125cce1171943035024917aa4f709d0ad8da442d3bcd1437317abb8d953baeb6ffa0313056997013480d5e17523f8a726653c83cd7ad90 SHA512 9ad2fb9426439f4be1a54cfa7841d96e753b46013e855b6bc23c93ccdc3fc80e6055f2b403c86abcbc1f617732167a8a29ded1ea76518ab9edb0480053cc50fa
diff --git a/dev-haskell/unordered-containers/unordered-containers-0.2.10.0.ebuild b/dev-haskell/unordered-containers/unordered-containers-0.2.10.0.ebuild
new file mode 100644
index 000000000000..20e3233ceac9
--- /dev/null
+++ b/dev-haskell/unordered-containers/unordered-containers-0.2.10.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop test-suite: circular depends
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient hashing-based container types"
+HOMEPAGE="https://github.com/tibbe/unordered-containers"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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.8.2:=
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag debug debug)
+}
diff --git a/dev-haskell/uulib/Manifest b/dev-haskell/uulib/Manifest
index 0a4e0595c527..612b78084ce9 100644
--- a/dev-haskell/uulib/Manifest
+++ b/dev-haskell/uulib/Manifest
@@ -1,5 +1,7 @@
 DIST uulib-0.9.16.tar.gz 44333 BLAKE2B a99c29d41f6ba34d4e62bb134bf7917e93ba7924b2838e43db2070c581af8eb8337f78f6e021b41c380453b7631e57bcc680c533216d96caefbde60c9c35acaf SHA512 89a9a2d34e8cd5e367a479f3d9bd6083abc140c247ba48cce5a39f2ea0835bee67c57b7c6c5850968d2f4b5cbc78b2835e85c8255c041981650d62d40070cc78
 DIST uulib-0.9.22.tar.gz 45487 BLAKE2B d2a597ae5a011b46c80886331a91130400ec01d338cc65829d20a65e64014a5b41704d8eed64fb93fdca474909cf036d61f64670d6961fcdfcb30ba90cae014a SHA512 34803448aa29870ec4776128565b52ac52da4395425ba4fdb6fa38ec45b5af59cb89b2b88e3502e409707491863f88b6d95b13093a15cf04a7c58d24244955f7
+DIST uulib-0.9.24.tar.gz 45362 BLAKE2B ea9b2854ef75cdc4f0555ca275b18089d40121940ed2b0eff5b86489b608e916b6cc568c425faca98e77cfdc89bae4f9d95ec64639c4117c405eebf669360e17 SHA512 7c5feadbeb6a67a7d7b0ed1a15dbbe50e8f4b05534aa9602bfc91feef9ee0e9239ef6fe879a8fec881902692a8c30daa8fdaab5503a6e15f97b26fcf31de8223
 EBUILD uulib-0.9.16.ebuild 541 BLAKE2B 3b79d12fac7f5cf711bd3a7cd00ab2ff651e5d796d0081641e7f7012574d223f2f059f926ab4dd0b17e1f3917b291075754247d978243a50f5585d4015969ae9 SHA512 c2691dee54b586a659a6529c752dcf678d826c184a87d429168a181145c36baead7a3dfe1822c8da94a2f9ce908eca54a2cfeea989d95d979538087526fc5910
 EBUILD uulib-0.9.22.ebuild 553 BLAKE2B 4d65051fc273e633012204a82ffdbd25665f6be1b6799874b36745e2619fab6f80c256b8e8e296045a6d5abad909f08e473e4a8e52c256034147af44d70d5262 SHA512 0d5c58af71a23a813a000a56f6a3441e2c7e69115d010afec8129786909e7bcb96754c2690677bdfe694e88ac76ae51a188f382dfd3a91e90fe7432dd0438c67
+EBUILD uulib-0.9.24.ebuild 553 BLAKE2B fa2ec60607fe3aa29f87083387975f1914c0eddd8a2c3aff6e59aea7e7df8d61f7850629e71a6ca5dbe9a650b71a898b375b405812ac3379416aa2b4bfb69714 SHA512 381df6c0e4c3db2d6db158d9e210e4295ae0e6f8ffd791d5acb2b9bd88ca5aff86293a00297cc3834900ab4ea0201824ea2287989605e8bd30e729828811f3e7
 MISC metadata.xml 316 BLAKE2B 429f8ee2f019f1283eb5b06f47cc1f7f8843427b778fba99e4a1a9a195b79ed64434ec5d05a5bba168ac6fdcd4ded5cabe18145d6bb225422fc8d2a2372e7fce SHA512 83f1ff662ca76ca62ed4e626aa1fd65112a0a124cb4188b387f6a32e84c2717e2a721710fb3e1142f646be6190e5214cb99a7a40fdc5ae5aaf9bfc7326c6bd1e
diff --git a/dev-haskell/uulib/uulib-0.9.24.ebuild b/dev-haskell/uulib/uulib-0.9.24.ebuild
new file mode 100644
index 000000000000..574b8e389e66
--- /dev/null
+++ b/dev-haskell/uulib/uulib-0.9.24.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.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="https://hackage.haskell.org/package/${P}/${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/Manifest b/dev-haskell/vault/Manifest
index da7922a9355d..6adc5c793019 100644
--- a/dev-haskell/vault/Manifest
+++ b/dev-haskell/vault/Manifest
@@ -1,7 +1,9 @@
 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
+DIST vault-0.3.1.3.tar.gz 5314 BLAKE2B 99b98c771075c38e9ad11dfced093556af020dd03f4549ed9eca2f2e8066b69a2e3c3c6ea8ff27488c5c3c2a3c4fa62f4b03dd2b4a899ccc8dfacabb0e219d1d SHA512 70773be0f9c6fc9db290b633e663cdaad3e4d30dee5a6754415d475b40adf1bb20aca61c80b2971570c411ebc6644e646f5908fe7149e8698d38270e1f3f409b
 EBUILD vault-0.3.0.3.ebuild 813 BLAKE2B d9a95c1e6cb3ed9c0b3c8bd437511507d7513c6735e39e7bf6d957f74c84d61d1b93be92b54ade3e75e032c499592f2b5881227894ae97441325053ceb6ab97f SHA512 c695df4ee3506b646201b834682a981cf0188a81eb6a7c31dab8a851cd93e64675f1ddb39d7b8a3edf62bbd5395b5e1063f0a0174302293e07590057113c44a1
 EBUILD vault-0.3.0.5.ebuild 835 BLAKE2B 1124396f7851ae0e7374889d9cc11b0ab59f9132c893fe32dea0a178762e05e061814391533b8e0709f61ce5b69deb1be0bf82671784be1efc60a402c2a15eff SHA512 fd9e03d24554e248a6fc82151001a1c8255ac17b464b0589a23d8fee10a569d1dcc941c26511dcc6911cc79b95efc36f47279a1eff6b4733a07db9a0de66f964
 EBUILD vault-0.3.0.6.ebuild 835 BLAKE2B 83d316674fbf3b20ca1b20cc0093f89e273c842418d4f3d784dad71bb8bd2808bd211b084bd9f812ffee7174a4d0e9fbb72370e9cc2d4b6bb87696b77c80c417 SHA512 df35296bbb73fd60d1b3ac969a6c18eca6ef21a7d14efa4f20cad24a0d4f07b0404b8aa80f6774b8ceb9d4796a87c01f4ddee9fa7a9fe2c0948fdd998f149361
+EBUILD vault-0.3.1.3.ebuild 993 BLAKE2B 080bc1df4e3ab364e6b15477624c9aaea105c41ce4e07587d881e9ef2e50710cf5b625efe23acd8e5d2286c2cd5c2293a6e6d8fb328ae0544761092b5d4eede8 SHA512 56d844b4c8b81bb8642f97bcc22d73be4a2ec058c9ceeb6b015d3f61356d71ff9fe62ee1c2310e7bd6b2d4256d314d8f3d772dabf7b156472e1b174480e73e0b
 MISC metadata.xml 658 BLAKE2B 9dd8c71a6edeb66e554b41232200643af326c4d89c8ce87f187462b46abdb52a2275c4f19b9679fb6ee0e038dc7589f02b19636f19df42f6d3a8242796e62d27 SHA512 e76c19492190a13feb99f15f8cfb283ed55525dbdfe786bd33fe9e123b1fb344d45d8751da292d10dbdc906b8348b6840810aac2c871c9c39f5b4fc3823dc169
diff --git a/dev-haskell/vault/vault-0.3.1.3.ebuild b/dev-haskell/vault/vault-0.3.1.3.ebuild
new file mode 100644
index 000000000000..f3506a9f6106
--- /dev/null
+++ b/dev-haskell/vault/vault-0.3.1.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: +useghc
+
+CABAL_FEATURES="lib profile haddock hoogle" # disable hscolour: ghc-8.8.1 is buggy: https://github.com/haskell/haddock/issues/1091
+inherit haskell-cabal
+
+DESCRIPTION="a persistent store for values of arbitrary types"
+HOMEPAGE="https://github.com/HeinrichApfelmus/vault"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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.4:=[profile?]
+	>=dev-haskell/semigroups-0.1:=[profile?] <dev-haskell/semigroups-1.0:=[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-algorithms/Manifest b/dev-haskell/vector-algorithms/Manifest
index 9d4553210c67..efa1f0216c3d 100644
--- a/dev-haskell/vector-algorithms/Manifest
+++ b/dev-haskell/vector-algorithms/Manifest
@@ -1,9 +1,7 @@
 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 738 BLAKE2B 28a6b4ea65ca4e4e31681810875b4a71880ead733f4612efec9f1800b8c0e4014366ccd86f1325d72fdb163581336dda73620764956546f98e015fd29022fd16 SHA512 d8c7f0f4d583d5097ef4cba224ff889e8e3b21f3e29cb8ef2acfe6638b7667ae828d44e0ba9730eb0fa560db84cd02dbd3e2852265ea4e0c700d8dbc3e3b83e7
 EBUILD vector-algorithms-0.6.0.4.ebuild 1162 BLAKE2B dc926a19c51788f5bf13d149417e074092e26b58cbdccc05d04ddc22379099e3532534ddeb7e5f6670b289c4ca9fc5e83ae1a426f561d92872694fc259ecd8b8 SHA512 7019840b03582ea50bda03c1192896421b5d0092173ff73f4a0b82345a9c10e5738738a7a6d82c451504e7be4f9a6b428c49080deeffeddff5c7a2f471c428e2
 EBUILD vector-algorithms-0.7.0.1.ebuild 1189 BLAKE2B 3c44f272cb5aa4f44ea6537a81e6f8b86b4d74a948da6c026f15b810d6f2a0fa2854d1a37fb69e826ac5b6a345fede5da00d5085e65603fdcb00c7bfef057778 SHA512 ab2d86134c329e442fe9031184255cad08ebab4f3b447a01b0a41a5048926bc211b87cb91dcf19c3d0142b4b5d115ceabcc75cf6e2a899766174aa50a98ba47a
 MISC metadata.xml 770 BLAKE2B 1d7320d9f761a8668d4cdb7868edc4eb543841ca23849fc16ee451a7c1ada0b531ca7f05129a144c67319b67b2948caf31b10d45f04775e0abf13de70ee5d334 SHA512 081492732eda3a8884417445a79cec19f7f84cdfe3c3e84743f86d00a5051c7e936d3c286ba414c13a6813d7cf1d740408c44a597aa82e3489d012c75c9eeef8
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 aa6c02e2629b..000000000000
--- a/dev-haskell/vector-algorithms/vector-algorithms-0.5.4.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="https://hackage.haskell.org/package/${P}/${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-th-unbox/Manifest b/dev-haskell/vector-th-unbox/Manifest
index 32653ed93f19..cc1d1e78e249 100644
--- a/dev-haskell/vector-th-unbox/Manifest
+++ b/dev-haskell/vector-th-unbox/Manifest
@@ -1,5 +1,7 @@
 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
+DIST vector-th-unbox-0.2.1.7.tar.gz 4771 BLAKE2B 72d25981c2dd42bce7028d94a1805ad9a836cfbdce9dfb8bdbfe2f1aa26f4180ea8fc02b3323eccaa11c53065659ddc25063460b737831cc565ae08cecc914d4 SHA512 fa65c32eace3ad93f0df69830eca0334519bbdbb2bbdc511db6e6abffe48c78870fef131dc34451873775a037634a87f0cd0d06dc1c4bc9404af2a86d7593ae1
 EBUILD vector-th-unbox-0.2.1.3.ebuild 654 BLAKE2B 2a6cbe25a67bb60964178fea457921c15ec71075d08e23a77a192584f7b015c261172fe2d4ae7100a8107417ae32240488ec7b19fa1ae6f0db30c9260132505d SHA512 6e3f602e417a02dedba269eca16b583f34bbf551aad70a4997e7ddf75e4e8e38a7caa5c44f4835a9e23ca449154879d9d3271fa8c398d2e7fb9064a555ebed65
 EBUILD vector-th-unbox-0.2.1.6.ebuild 654 BLAKE2B 4adb02265bb1a7cb6e55111c89aabd91ab7edec496cc35ed649b2952bd93120f1a68486bd9975c9107e532a5d062a0186a8e91ebbe9dc7b229af44575b395be6 SHA512 7a99f7b50c9f00a10c310ecc7acf119f7a6b5374a9576da50fe760d96024513b50386107d03ed21303f23c2b9e255f9b1747534232abbb83a095a2f60e5f8607
+EBUILD vector-th-unbox-0.2.1.7.ebuild 693 BLAKE2B fd89fdf79a3da8d685871a6d971fb3e8a0fb15e26df29a5272472ce64a1c685519b20b12d96a2ff2b9e1b54269ae8839405029fcc09e221289f271732e797d40 SHA512 29c6930eb9b639435c3fce5e2efd29691528fb542658f6ad70ca84b2b9171f7e2b27a306236746960208e703b492124eb55bbf8499f062bd701210396efea5c9
 MISC metadata.xml 507 BLAKE2B b7d5ac975575519f663f97b6af10f1d30c01654181291b76005aebd9bf7a53093bd1fb89704412d00379577796ddae52a3cf6f536bd2dbb061e957b72b185880 SHA512 d26a922cea4556e110e803e2d4f51eb87969abc695f51cf85fd7057dc1a1fd09ec6758c5eb0cce2fbfad127f4731415deaffc33efc1f54e6d8c95d30ca7cbd9d
diff --git a/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.7.ebuild b/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.7.ebuild
new file mode 100644
index 000000000000..7546e8019bc7
--- /dev/null
+++ b/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/vector-0.7.1:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/data-default )
+"
diff --git a/dev-haskell/void/Manifest b/dev-haskell/void/Manifest
index 0eed177bb405..d69d56a61fc9 100644
--- a/dev-haskell/void/Manifest
+++ b/dev-haskell/void/Manifest
@@ -1,5 +1,7 @@
 DIST void-0.6.1.tar.gz 3807 BLAKE2B 649b810bdb0d4ff1e670dee0d4f2feeb131eec09e10d4aeef1094b06dc0b2e4ed67ee3867c3a39d3efbd14ffea5479b54ea81e928a3bb345cc1b823eb35ef922 SHA512 9158e201547b43e97d13112d87ab27b7dddff90fff11727c880bbd03e50faf2755ff27c03710e7bd634325a2c31f07e70dae61e62d925fa1f31b0b66e3927c48
 DIST void-0.7.1.tar.gz 4103 BLAKE2B 194310d0aa555d7524fdda5e57be6e56026dbdf99a299cd03d20863027e3e67f86521d62cbfe56b5126513c0f6c06ef793fa537d190ca532bd965252f0d7bfce SHA512 15cffa3ad31f365ffd276d962ba6c401907d5f4d74deb0b2635a8dc9b516519961c7b5d44751a816cc3480d12bd84be4a81b05703e31d4e796a58c4205e4785c
+DIST void-0.7.3.tar.gz 6741 BLAKE2B ff5e21a4d902d23b056c39ab691d532c9be6d2c11452291629a0d40113a5fc72fd68f5713834c6a5ba5a07c3f4a4603faf8f53aa9968406a7d03468ffda78d48 SHA512 d9ecf726c6f7806d25d7d3f759a94d8b82c21c348b1cb7943c48d799bbdfdc01d9d729f1a64aebbf66d52275f2e69fa2b060db2fcb408b83a23ccff2730d8a11
 EBUILD void-0.6.1.ebuild 704 BLAKE2B 8785b2d377d5e2253c6abc205112bd6c6380c40e927bb995d3ebed97381df81fac6d3e511b39b2dcdc473bf8e4b3ff49e025544c212872c82fb6238012ba3f32 SHA512 bea826f7d3a3554a7e506696ff2d023280b53101c48b8ef34a76e80f2caccb34c4270768203d8f4937657abfdf4499b40b69357471b49319cc70d6aa565f6086
 EBUILD void-0.7.1.ebuild 727 BLAKE2B 6e92d38b130b5262597549eef390b1a975df3b505ae13e5a7eeac483924c2fc00388e951822b110615919b48ea846673f123f6045afb48e2c07fc296c3815e7c SHA512 4d663f768a65e36ec37a4d1b650b74a24d6392ae9bdc994b661bc296ce376b2123b4e964e654d7d43a280f195a66443b78ad9abe7b8f93e61432217363d1c93d
+EBUILD void-0.7.3.ebuild 703 BLAKE2B f7abd7369431cce7d56d4e8b98156a8bc8d338101967f6f353d850b70a16d9272d754601a587407882cfad89b926b0d1144c4e513492eb61703f6f179bee788f SHA512 04c017cb9ee414c4682e8c6f81396b1d29da60503287a165321c2b252aadb340fb721df10df409d9f551fc7068379fd0ed337ff1153a5f7fc34bc8c91b5b4a99
 MISC metadata.xml 547 BLAKE2B d9050b7cfcd668512098f65236813cd5b045b39306d4b872feab05a9ec160b8a2368e9db0b61d9ae9c0cc9fb2904129f4f597cccf4acf14e5574136986044f9c SHA512 e6fc6b0ec727f8c5aedf5f141719cd225d3799c47947e69b2c4b0b7b26052418bbe4f8198c737dccc823a919f03d3b337c468f7f8cd152cc0dc2f8c343f1f71e
diff --git a/dev-haskell/void/void-0.7.3.ebuild b/dev-haskell/void/void-0.7.3.ebuild
new file mode 100644
index 000000000000..dd7ae273a1d5
--- /dev/null
+++ b/dev-haskell/void/void-0.7.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.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="https://hackage.haskell.org/package/${P}/${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/wl-pprint/Manifest b/dev-haskell/wl-pprint/Manifest
index b1fef68cbd99..9e3d36c8155c 100644
--- a/dev-haskell/wl-pprint/Manifest
+++ b/dev-haskell/wl-pprint/Manifest
@@ -1,3 +1,5 @@
+DIST wl-pprint-1.2.1.tar.gz 9959 BLAKE2B 03192e4e28f6a30661f156006f2cfad91f857b0c99d19fc5c00083de278a9b7a77e5bd60bf677f555b570965c9ea476b6d0cbcfb7daf67e55f8574aa6562d35a SHA512 84a3646b9039455b24c3dd4a4bbb2fc69ffa1fa3ead4d0574dc90da1a28064590a28c147135a0568700550c42e4ff83b04b0280564f0ed19acbfcb9d0400c2a3
 DIST wl-pprint-1.2.tar.gz 9881 BLAKE2B 7025f41b0a5213b6c08b07d0a87deeb16526f102ec73c1196be72179bb76320a83ac5631bfd16d88845751a756d0f87db60afe9109106e8676f8953eb6095851 SHA512 b5e6a8be51f10f1e1dad225020ba769cac62c311d6c0cc13a4ff8623e9b906218826d6f829e9169396eef9fc44379ba32d642914f543bd2f4e7070d6886ee91b
+EBUILD wl-pprint-1.2.1.ebuild 540 BLAKE2B 47992aa1d9f854794b9fe0a97fbde3abe26bd0f817b096af542ddd63a9e9ff5ab096baae1c282c8c511ecec08b0c35312a7f4c0472788949449230569d9c5510 SHA512 b49547b8ede5145c3fb890026105c44911d866ee3282169f4087e2f4612ecfb632a4994c51c47ac0efff9463d46b40f7f5a435300f25ed2a09815a23f54fc765
 EBUILD wl-pprint-1.2.ebuild 540 BLAKE2B 77b8f67c0483e48b8c3c9219706f14e5d4a992dce04463052ba355996fe054559fd056c048edf211da08367b68d722b51ed8a31ec8ebd718b0696b8ff1ef0857 SHA512 48d230a838eeb3fa18d4a4b0fee8333544fee72197e5c2e6ba91b5545759fb67ad1801aab21708425fbd2c44d60a3d1d140eb80cd083a661baed9231c256f150
 MISC metadata.xml 501 BLAKE2B c0aae3d26b53e999389afe2ee7faef2dd6284403a2854200a3d2f76de9ffbedf21be4d1a1ec85b8812d66022a2cebe91e3ffdb4e61e2e6d44ef96a238ec02e3e SHA512 b4f191fd31e74205e3118692ad610bafa56754be9ea44b127f0ee1f79f9da60c5d168315b1cb6b6c0008573fad874191b53218b6436e450faebc0b140c6bd43d
diff --git a/dev-haskell/wl-pprint/wl-pprint-1.2.1.ebuild b/dev-haskell/wl-pprint/wl-pprint-1.2.1.ebuild
new file mode 100644
index 000000000000..619d7513bdca
--- /dev/null
+++ b/dev-haskell/wl-pprint/wl-pprint-1.2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.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="https://hackage.haskell.org/package/${P}/${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/Manifest b/dev-haskell/word8/Manifest
index f1716f29d457..636a42c29e02 100644
--- a/dev-haskell/word8/Manifest
+++ b/dev-haskell/word8/Manifest
@@ -1,3 +1,5 @@
 DIST word8-0.1.2.tar.gz 6218 BLAKE2B 5001304392cb5e7be20f129f308df2d67ae0aca789e5d45b160e3477cd2f1f42c09d11133e127704f137f5ed63681b9062a7756614a85808238a23c5646d2972 SHA512 6eb6bbf5e0e06fe5846fcd9eae24d9716e11b56aa1d431a96a0c0092be621668a0350f6c8d4ca0bdd3e1d2e3d2453e600c1a5a0bcfc058005ed1e7ddbe12608c
+DIST word8-0.1.3.tar.gz 6271 BLAKE2B 55b1bed8a7e7c6e11cab5d6c229c6e60d74154042565644d52aab806737c180773a498104b949f8331f300190656e438170b2f51c2be44fdada20429095f98c7 SHA512 e6442eddb582c41f38206a436fc69c476ff97bf1bd5f37aa173d4efd0153744e9d20b71435329b69dc12a7919034082d4195db88bb2f83b462e1ba430b1ad988
 EBUILD word8-0.1.2.ebuild 556 BLAKE2B 810bae23638c6dcce566e03d6f66188769c999d06e71e9d974217058689b8d2ce5c233524e1a139cc416a600ef833e8af068fa8947e25e2275ef9216ae2fbb88 SHA512 fa4cbac988b11a2bc2c0764de9cc350bc8ccd0ddb156eb18aabf0b613e799accc6b2a73c769165de0f57f9b88f21e7f7e07a897a12dad40d6bfd8d7ca1b0b832
+EBUILD word8-0.1.3.ebuild 558 BLAKE2B a0de4bea6ec6531c4228d8563e82f118dcc87ec15109bb882b1153b5029bced3573a65b52efcd6dfd839af7ee9433a94d2116545499c9314bdb1b7d5a7149aa7 SHA512 0133039b268d90740504800d02976a9f431415322fd11ebffd5222126ba1a5079702be6db8644ebe2c9729d4a028e8d0b28ea5eac0a75b4142128b73f20ff98b
 MISC metadata.xml 336 BLAKE2B b8daa3ec5fb6b1d2d4ed3829e6d7a232e7c0ab142446682cb7589a766b6bb90c8f5574815a749a4cae5ad8be5dbb7549f55d435bf7fb730d87b3a517ccda5561 SHA512 94035095e35e81f290830333938b2959c98aaf97c03abeb940cd39e74526c25b0355363a37eb534f8213dd43f66489488c1088ecc6a3454041c871239ee56767
diff --git a/dev-haskell/word8/word8-0.1.3.ebuild b/dev-haskell/word8/word8-0.1.3.ebuild
new file mode 100644
index 000000000000..34198f843a52
--- /dev/null
+++ b/dev-haskell/word8/word8-0.1.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="Word8 library"
+HOMEPAGE="http://hackage.haskell.org/package/word8"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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/x509-store/Manifest b/dev-haskell/x509-store/Manifest
index 631c316d00a3..677274939717 100644
--- a/dev-haskell/x509-store/Manifest
+++ b/dev-haskell/x509-store/Manifest
@@ -2,8 +2,8 @@ DIST x509-store-1.4.4.tar.gz 2992 BLAKE2B 9727c4a16f63003222c8794158ad96304f2557
 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 1130 BLAKE2B 922aa5ed2a432ffd25476be208118530454bb72a97a92bd06536d4dc10bbfb60abe67882684d5271c86762448bad5b404bc80d35f2a86b59e85686134e4ab540 SHA512 0b15f75ccced9356b7570ae358843d04317260dd44d5389bb24f70eedee1733c1485435ecf448b842e1ce84d36eec0f7e8351d7322a84ae4febd98b3a7568e15
-EBUILD x509-store-1.5.0.ebuild 1119 BLAKE2B 290739b341d4b115a2cae7f25b2a0dadd5b80a8b170b9ce6b59e427f5c71fce0250a22536fd251d132c6cee825f025775445241d7da80b95068098676df6733e SHA512 9e928b57cf7cae6072760d46b3d7d4d3e49675acada123df8ff331d1ef5b544a9c91f82ba9f19af2f0a2892a4c3c95a0a16107f6f0d91040389b09dddadd0d47
+EBUILD x509-store-1.4.4.ebuild 1157 BLAKE2B a4a839c40bd40407543188e90d53acdbaddd7adcf1773d6ea1b3deff88848a3f17096c5a798f5be25242a9694fc0090dfd036f68255139f8cbaa988a1335c284 SHA512 c1913cd0a753633840f7b819c1b5e135bd961b8db428a519c4f5f1ea1f21a961149ee55ee000a77015ba87908c5232e9422d810513b844b59621878970e84216
+EBUILD x509-store-1.5.0.ebuild 1146 BLAKE2B 6b376ca40c434e032fa37112c400b2989df3f8c5d9e1607ab385986f6c903396b0847cb59bba41f0d7f36f2df3b83da1322cec522e2245a57ee496fa722301b2 SHA512 f56826c018552e1ef077611b4e554d1bdca24dd04fe98f3ae25968fad6724d75d9aad25a8c4cca0e5947aa9cee883338317dafd2b315a7179298ecd31dda7183
 EBUILD x509-store-1.6.1.ebuild 927 BLAKE2B a46849395e8f46d9c5afd6554a5ffe9a266e4601238ea5844c3356d3b48e2114a60e55d337af13cbb362f03def59982066d50a94ca955abcacfb831be55aadf9 SHA512 4c1d74607891d08b117f782ad40adc903f96496f8b1c2eadcad5503589f81b3db39c5d3159218cf336e86d01617cd308de62cc54f484425d5a54b06ccc15f697
 EBUILD x509-store-1.6.2.ebuild 925 BLAKE2B 635fda8934e662ce566cb5d6853ced09df30b775bfb11badf5cdfa4e0809618dbe4b8d1ab488e9393b728c405fc15e7f857ca2c6512937b260f404ba07644b69 SHA512 ae722c9f8021b54a996e09ab0fcbd4c99028e488df8ed09b88ec69a1730d8045713b82ab0e1ab354acbf12ea4bd2fb56c568766bfd5d2082cdbeb473e5ce317d
 MISC metadata.xml 532 BLAKE2B 0ae737c7d16f08e631f3d791580eb72ac16094e81f2fc8e2b9e2a84067c0deb4fb2bcae28e7df8fc65acb5abd27095fec9ebf6c733bdb2e55a84ddc4cd55c8cf SHA512 e40040999883c0b8506bf95e554d84f2edfa0bb36bb61c3edc44b8756c1b584c20470fd40c04599a9506d9775846b62744c40814163bfb44542fbb8a26c50bbc
diff --git a/dev-haskell/x509-store/x509-store-1.4.4.ebuild b/dev-haskell/x509-store/x509-store-1.4.4.ebuild
index 34da476d758e..b7b75bc7daa4 100644
--- a/dev-haskell/x509-store/x509-store-1.4.4.ebuild
+++ b/dev-haskell/x509-store/x509-store-1.4.4.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="executable test"
+RESTRICT="!test? ( 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?]
diff --git a/dev-haskell/x509-store/x509-store-1.5.0.ebuild b/dev-haskell/x509-store/x509-store-1.5.0.ebuild
index 32de1203393f..2800baae1629 100644
--- a/dev-haskell/x509-store/x509-store-1.5.0.ebuild
+++ b/dev-haskell/x509-store/x509-store-1.5.0.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="amd64 x86"
 IUSE="executable test"
+RESTRICT="!test? ( 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?]
diff --git a/dev-haskell/xmlgen/Manifest b/dev-haskell/xmlgen/Manifest
index 77c0390d09f4..53dbd73d47b9 100644
--- a/dev-haskell/xmlgen/Manifest
+++ b/dev-haskell/xmlgen/Manifest
@@ -1,3 +1,5 @@
 DIST xmlgen-0.6.2.1.tar.gz 9452 BLAKE2B 724a2905a92ea95f02e71502d6f0025812e1cce52a6f6e8d3f04e4c82ac2022b7d47a04268461786cc3a45b1aa4ff3e3e6bcf2463d86a9ddb2c53b4e3c9cf6fa SHA512 c3c978859dd54cf5df970cb05f49b8b2a75a2096ef25e9a204fe665bdb3694139f69fd32f8eaef0ca047948b4c08dacae54eb67e64ac8da63cc0885022e09591
+DIST xmlgen-0.6.2.2.tar.gz 9640 BLAKE2B eb83a9548e436905e6332cac8dc658611ab6a319aabb2aae35ce60876e556c5f275799214804f5b031b5520b2b000142563645d5e3fc424f5dd775850c00115d SHA512 af86121d9417309fd27dc10c99878d5bd95c98d15ec4fc6cf29877fdd214046c0a60fc43eb7eb7fe99017553e31d615168ccbc41dc8cb915826f867e1e225b9c
 EBUILD xmlgen-0.6.2.1.ebuild 897 BLAKE2B e82779e853de52ae0e0944e8a85ac0490c27bb5f5e919af8d5a69342114a37d8f5a4ab38a3d0aa371b2f7af98c815a3c476b378379b0ef2000f0e75b2632b52f SHA512 d1a28b9ec23f3178e15847eeb7a368b8c01834dce07032d4a7c8f427d21bf52a7f3d842f607f3e9fd9596e5d87f2b93f01f04617b34ea602322e44ebf3dea0be
+EBUILD xmlgen-0.6.2.2.ebuild 815 BLAKE2B 91753ef9fd469542ce5c27370f900190a265075f6768e1045ea733c00cc8301e135c5412688f234a9c692e1b7ffaf11795236a42ac1107e335839e1415fcad3b SHA512 9a7e544308e852ff92507e190df3d94f4c0804c87c5ab46f847f60e6bb96db032d91a2d612ec10cd1ad959a3499fa6e5bed07b130c2b03279b837d2afc4b7139
 MISC metadata.xml 335 BLAKE2B 29f4099fa59f213d3e2f2b15e059378d976e994e750cedc9494c8b7e7f13a21809483cee167915680cb11fde7806759a10b2c67b5bc3e175de5c2cd9708a9976 SHA512 f3b4690fac3229bf0f46e5630c11fc582e3985dda31303327d2f316bfe6dd70f989c06b6f98ef0fb73f523d05f3babaf0f84d178237ea86cf0a799438694e4d9
diff --git a/dev-haskell/xmlgen/xmlgen-0.6.2.2.ebuild b/dev-haskell/xmlgen/xmlgen-0.6.2.2.ebuild
new file mode 100644
index 000000000000..793b2596c2a1
--- /dev/null
+++ b/dev-haskell/xmlgen/xmlgen-0.6.2.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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" # test-suite: needs a port to quickcheck
+inherit haskell-cabal
+
+DESCRIPTION="Fast XML generation library"
+HOMEPAGE="http://hackage.haskell.org/package/xmlgen"
+SRC_URI="https://hackage.haskell.org/package/${P}/${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-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/xss-sanitize/Manifest b/dev-haskell/xss-sanitize/Manifest
index 6917a474147a..7c9e97a9ab46 100644
--- a/dev-haskell/xss-sanitize/Manifest
+++ b/dev-haskell/xss-sanitize/Manifest
@@ -1,5 +1,7 @@
 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
+DIST xss-sanitize-0.3.6.tar.gz 11655 BLAKE2B b1d438a6bfa587aa9eb62031fb2c1c53cc48bbadc26b6f64ce717d20d5ab9e282ed657ce5109e0501de393a8609ba99fb9e73966220dc358b222f69301ab5661 SHA512 8d038d807b7fa01a65f4b73d135c87ab75385f4c91ce174b332cd5fd1dc1ebdec26b0c5713cf3f68c27351e19e099815d1b530af3ecb7e4c45e71fec4ae12b4c
 EBUILD xss-sanitize-0.3.5.6.ebuild 1245 BLAKE2B 9f448af781eb547c6f47b3496577f4ffc3f7d40141810e643c0a6a0191babcde2c04a318c0be3d7574b4d670c3760d5abcbc499e8d193bb31eb10aa714f21125 SHA512 6650735172e73b59e31ef4f634dcc028687ac88eef49dcbd72162356fb4b8b07509ad8602224baa682726d7188b3341ff586344ef7933ce3b9fb59f1f7aa9ec6
 EBUILD xss-sanitize-0.3.5.7.ebuild 1247 BLAKE2B ce8706ecb7f1526bb40cfe58f45320c3c53798a5ad2eab74640d0ade840a5e3b4fd47695430c8b922ed580c727a235534e167da2d4b1e361a5daa57438baca33 SHA512 913716bfc77a617c53ab0b0dca49913abfd730c1b27803041cd50caf618f234483d3432acaf642b2ac97f170c2964bec0cf282cae0a1974b4a54c8938fc9f3fa
+EBUILD xss-sanitize-0.3.6.ebuild 1082 BLAKE2B 2b75c89a13a8695c029b98a08c469f103c77ad6e5729c33fc2bbfde84811d8d44273f8db29465a59eb8dbc44fcaf7e12abc999a0649e8167be65c311508d741d SHA512 7d0fe8225ed6cb4c45bd3f065110b24ba6e8984bb8caa9f2f6db9056d999a398e006db53760718df7a70d7b78ad407f33d77de14313ea7696c611390ca12056f
 MISC metadata.xml 652 BLAKE2B e217ab4fa0cb3ec8b691df94fe1913baffd459f186a31e7678808af0ff72645e999094c513dfd5be0fc64b1ffb875afb93fe755c386f0b9460a502acfe60c3e2 SHA512 426da46ff379aed8b7a5251fde63e79ef56513a88592ec3c9eaf3f796f75c83f7b490738b74a5d53198edd965b58c599a846d888a7e2e3d00564ff163df27e52
diff --git a/dev-haskell/xss-sanitize/xss-sanitize-0.3.6.ebuild b/dev-haskell/xss-sanitize/xss-sanitize-0.3.6.ebuild
new file mode 100644
index 000000000000..b690a7cba4ef
--- /dev/null
+++ b/dev-haskell/xss-sanitize/xss-sanitize-0.3.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.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#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+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/network-uri-2.6:=[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-8.0.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.2.0
+	test? ( >=dev-haskell/hspec-1.3
+		>=dev-haskell/hunit-1.2 )
+"
diff --git a/dev-haskell/zip-archive/Manifest b/dev-haskell/zip-archive/Manifest
index b646226a5cdf..d6725a6b015c 100644
--- a/dev-haskell/zip-archive/Manifest
+++ b/dev-haskell/zip-archive/Manifest
@@ -1,5 +1,7 @@
 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
+DIST zip-archive-0.3.3.tar.gz 18229 BLAKE2B ed15ccb0c80308afa246c7c7e805f01df050242af4fa881863ee07f9b52496a5ea7f41c9a9e01db5cab2734055c5d7399a0d955a35a3c3dc16fe9dd54c96c1cf SHA512 f799c5e324ea40313c312649f5c2b2e96128fc70b52f86a51fa9475354488d8c3b85220b297bc557728a1c0dd5c0827ead8b4613aef16edae7071bbf250ad25d
 EBUILD zip-archive-0.1.3.4.ebuild 922 BLAKE2B a5cf6cfc9f0b2513637c8f916245f684f23e3c46c4121aa36c8d6d6af3e76ed746975e2fb0b9e7db03da2379500062c7c09ce54fbd75e2ded6d857030cb9c6f4 SHA512 5dfc87d35c3380e19198f86706d0c7156147bb8263e755afb0b01f3107484d59a3136b31480c7d8d9a0097b7bd9ab8c0cde5268f932cca3ea06874741b35bc1d
 EBUILD zip-archive-0.2.3.7.ebuild 969 BLAKE2B d3925ba4dc058aeb80b5c329bd2b9add296302be947c8d26ee508084bcd51abb4ae9f193e20c806c0e651c2a4209e442901cdb09dbc9a510e8bf6c3adcd06364 SHA512 1461d6488fcb9519cbf310ac42bb74bac53bd3efbe97cbb92616af1a052dafe38f0d9a0ad09043858e018503573e42a0b7293deffc6ca35c8e233a62a4ce8656
+EBUILD zip-archive-0.3.3.ebuild 940 BLAKE2B 47f5b5d6c6c56c54ea96aa2e30fdb9a1d313ab56c92a28ad053050426b531bcbee97300c359787ff7e1273887d7ff7d3fe81ba8ca23f65a757cc66df72350b29 SHA512 6774a9837a1cb710288f76044f7c256574c70381c653e682d54a530197eedeeb93cc3ab3a0fbe601af236a6660bb9596aac5d362206d852c2429f252f14d69ce
 MISC metadata.xml 554 BLAKE2B c174354f44b6718bb8fe11bd45e5ab1474362828356539197f38160104c2589fcfddd691d120294d65f14a1a7659c5777f018e96b1cbddb9aa952e688c3c119d SHA512 0dd9cdbf572293e8e8aef46bc393c2cdb672b09170e383bc1a18100275061369abb875d38a8d00a7da5a7babe45ea827d551e19e49053649daad9fdd4201e5cb
diff --git a/dev-haskell/zip-archive/zip-archive-0.3.3.ebuild b/dev-haskell/zip-archive/zip-archive-0.3.3.ebuild
new file mode 100644
index 000000000000..a883f504333b
--- /dev/null
+++ b/dev-haskell/zip-archive/zip-archive-0.3.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="executable"
+
+RDEPEND=">=dev-haskell/digest-0.0.0.1:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	dev-haskell/zlib:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hunit
+		dev-haskell/temporary )
+"
+
+# non-haskell depend i always forget about
+DEPEND="${DEPEND}
+	test? ( app-arch/zip )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag executable executable)
+}
diff --git a/dev-haskell/zlib/Manifest b/dev-haskell/zlib/Manifest
index fec90a3aae10..cfd1896b4ff0 100644
--- a/dev-haskell/zlib/Manifest
+++ b/dev-haskell/zlib/Manifest
@@ -3,8 +3,10 @@ DIST zlib-0.5.4.1.tar.gz 127760 BLAKE2B 3e0ade0091a9d9e50fd4d0b9e65eba9a1fa7037f
 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
+DIST zlib-0.6.2.1.tar.gz 143424 BLAKE2B 2395cb4a87943025088e343036772deae6d2d7a695cf7f6c958a37681e99da9d0a1acbe1f3191cb587d077128b9fe0f6986b3883fbdf91483f83b879b79b3e9d SHA512 cee7942a86afbd08f03c19abd88154cc866a3ccc52342264d4d5b28a71643adf30bf03ba939d6a98b7c065752f9ec326729fc38cfe72b66998551c89186048c5
 EBUILD zlib-0.5.4.1.ebuild 624 BLAKE2B c6149a1b4162e75359df4dd6ade2e12b6fe3644c1ef0c2536fc2299e09123ae70ee49ae3e10270435af920cb775a796db4470757cb2250d0616ab897990e99cc SHA512 6ddd6a68329008f2b079e7ec78c6a321a5309ace5a432619e3dddecee4d2afc32e3a87dd40c9c699f4a5a6b6650803e493958f8c4319d94f7d4521c3260dc312
 EBUILD zlib-0.5.4.2.ebuild 628 BLAKE2B 7b03453dbbd516840d49939b634db5d816586c6d044fedc4b6828419bfd95c728d0da73ba68c4748ea1bf0ce8cae8f09dc665ef5113301a6ce3be63b6355c23e SHA512 0b4c236a48548012bd35d82dc25aea27bdbcc867221fcdaca3148e0c9cf40d454ce93277670ecf3bbc31b75782203b96d3ac3ae4a74b33393a2b29ced1431e6e
 EBUILD zlib-0.6.1.1.ebuild 818 BLAKE2B 3c466897a1590ad5bf28654b72b60bc5518f88fdd570bd46856ab69c9f8d0fea832eaad4fcfce640d605f3c6193ebfba57c71200d41ad890b1cdf83a1a56fa67 SHA512 8310c21bc6fef0f803cc1717108085e1faf4da499a976157fbc9f1aa87cc6e85cbdfbcd99fb1c7005e7c6ef736990f9819ee141b33d1ff0f2c22934314505e89
 EBUILD zlib-0.6.1.2.ebuild 1046 BLAKE2B bc20a7d77ad29890531bcfff0610d91eaed70e7cc50239f82b9bc89454ad288238cb5a1ee1a8fc505b8900cfa8a18e433060488d857e6bb1d53318fc3fab0515 SHA512 40849fe121e95fb480a0b7c9fea60fbd6a77032de52ab4e91f85456df9bcd6e97bbf09ee8484195ad70d65b2f54819d9e89c0a997f5086f7b42b84b8c8bb946d
+EBUILD zlib-0.6.2.1.ebuild 1044 BLAKE2B 1169cddfad1c60ead6c09c18403d836eec06e588279b5db6908ae75c2f1d4a9870a9409bb62a228089f17ac2b31eb78d179458e4eb495bfd343c7753c3546cf2 SHA512 a1528c66b22424d06335649a84710690d222aab80ad65df6a6c5f93990ae08d68aec03ce5d24f95aacd4569f6571c035971b4bb28de7eb3816e51f4953dd1ffb
 MISC metadata.xml 824 BLAKE2B ea99ec3ad9a549c70455e91a59f38b6937da780e406c2bc18d039f93ef3cfdd08f600fb8854173c54ccbf029125204693f0da1592d30eb4554d479357299a7bb SHA512 c291a8088ad2d586390dad8cc2bb80a606fe7e558f4fdbba5c5168024693ea400f6d3a2795144f2c5af6cea51b90fe9097759027377ee8ead929296a4b4f26de
diff --git a/dev-haskell/zlib/zlib-0.6.2.1.ebuild b/dev-haskell/zlib/zlib-0.6.2.1.ebuild
new file mode 100644
index 000000000000..71f2a8a6203b
--- /dev/null
+++ b/dev-haskell/zlib/zlib-0.6.2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: +pkg-config
+
+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="https://hackage.haskell.org/package/${P}/${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
+	virtual/pkgconfig
+	test? ( >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
+		>=dev-haskell/tasty-0.8 <dev-haskell/tasty-1.3
+		>=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag non-blocking-ffi non-blocking-ffi) \
+		--flag=pkg-config
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-haskell
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)