gentoo resync : 02.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-02 14:09:07 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-02 14:09:07 +0100
commit: b17a3ef12038de50228bade1f05502c74e135321 (patch)
tree: 9026dffec53f92cba48ca9a500a4f778e6304380 /dev-haskell
parent: 3cf7c3ef441822c889356fd1812ebf2944a59851 (diff)
217 files changed, 1597 insertions, 2632 deletions
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 89af81231186..048e538343db 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/alex/Manifest b/dev-haskell/alex/Manifest
index 8736642b1f8a..99c5a194a096 100644
--- a/dev-haskell/alex/Manifest
+++ b/dev-haskell/alex/Manifest
@@ -1,11 +1,3 @@
-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
 DIST alex-3.2.5.tar.gz 108531 BLAKE2B 283f8f619f72e72da0786b1f8975b256d4aa0c075be849d50763e7d57201089e2e8c09a59df27f1ff21d90e9fead94e8466ddd63d61a6055fbfb4bb6e18161fe SHA512 5823fb066c5ec67256108cfc1550703b86881f319337922e7248fb33def374f0010c60605538a49cfaaa880b0f73ace9dba6d088c078f3c455c5d9adce2719c9
-EBUILD alex-3.1.3.ebuild 1371 BLAKE2B 5dd265f2e0c8456e30ef539bba200329ae654192b1ec4b73d2e155b4c6e704d71f93d0ac49e49d94adf00a2457c166111b08942f2df1c32b209959fa186d8270 SHA512 8a7b5d7f2739c47e22b91cfb2ae74031efcf28ea0ffffbd37f647364270887fca4ab975df14b66a046868faa189ff05f32a9a4727d5460ce1afad7f90f79ef93
-EBUILD alex-3.1.7.ebuild 1532 BLAKE2B 927c23034d8190a9a52db4fceaea63c584ec959e5dcd4f8b1deedaa204f60af4dbd2effa5e0f7b788fbb1031c44567b8a03b3dbe4131f53f0048a2d2c2198b59 SHA512 5c8973025255e912eda9609fc5012765de3cf0dcd5dc6a95ab5d72236841046293e1d7fd777ab697f2d1bd95f63e8f2e5f071a524bf712bf8d70799300b5aa57
-EBUILD alex-3.2.1.ebuild 1560 BLAKE2B 350d9b30f3a66d611f029633e6c27eb1d3a4f8a3d1367c8eef9a93565e4d6a01c84018ba4588ec908ea463809e8219bf5145aba98516d66467e4fdfcc087976c SHA512 bfc264bf5c5c20b632152c5061d71f6aeebc8dcf75025bfb84d2a5c4a393e28dfabe328005c5b2b26ce873e0662825aee5eda606d2a5bb244d67485b565e9737
-EBUILD alex-3.2.4.ebuild 1433 BLAKE2B cc5ca9970e76ea1919fbc5239699758c0792e2d9d429915fab5d5f6757af3cc42b1f246adce2995f984932ce2377d6f65733cf2bb1e2f81c71cd1eb24f9651be SHA512 ef14398b35a1af58e0572c895b3a175390924fa1067076511641155c69856c06b81daebb0986add6565d975345cf9ec4737853f7b144d3a70e2e60287d659202
-EBUILD alex-3.2.5.ebuild 1446 BLAKE2B 50605f432bc4b9db5e16a0f1fd667be885877034da5276cf3be6cf761763248d5500c33aace91c58e404742fed7e80207869d5b997269806d0004c34fea89108 SHA512 4246ceca5a642e97f71718055cd27f3f1f87550810ab7f0899e122fa2f8e6632b11feb4923a8641e3557e148db5a537e05ea80c7d0d6fcfd0c3075b55e8125c0
+EBUILD alex-3.2.5.ebuild 1447 BLAKE2B b5abbbae8f3d437a02c32b9d862d7869fb2dcb55c2d8a918cf4a97ccadcdb013c90f850512fbfcbd1e63b2fd6be3f8ab6ccc6f7087c2915368bb96364432b329 SHA512 4ad0e5d1429d8d87b20d9a2abbeee99568d0dc0e140394702f241ddc9cdf5f11be50d7d9788f756e7da335a3984d7a2417a3491d8de55ce3fb70d9f2819bd155
 MISC metadata.xml 349 BLAKE2B 0e0922a706cc99af24707269cbe80a8969df912d02317294a007d43a81263b232a3f2b199b4f981a023143a765427851335493a10235feb627ff8adf85497c62 SHA512 9c41217241498cd036d00fce456cea108f675c71c12bab05305dcfbdbd5d55d5c7db8163e5315eef12f9ca8467276b6fad9038d47da729f448338655691a9ff8
diff --git a/dev-haskell/alex/alex-3.1.3.ebuild b/dev-haskell/alex/alex-3.1.3.ebuild
deleted file mode 100644
index f7ade6c53c42..000000000000
--- a/dev-haskell/alex/alex-3.1.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit autotools haskell-cabal
-
-DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
-HOMEPAGE="https://www.haskell.org/alex/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	>=dev-haskell/quickcheck-2
-	>=dev-lang/ghc-6.10.4
-	doc? ( ~app-text/docbook-xml-dtd-4.2
-		app-text/docbook-xsl-stylesheets
-		>=dev-libs/libxslt-1.1.2 )"
-
-src_prepare() {
-	# drop depend on itself and happy, otherwise cabal tries to regenerate it
-	rm src/{Scan.x,Parser.y} || die
-
-	for f in Scan Parser; do
-		mv "${S}/dist/build/alex/alex-tmp/$f.hs" "${S}"/src/ || die
-	done
-
-	if use doc; then
-		cd "${S}/doc/"
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	# make sure we don't accidentally use those
-	# installed in system
-	haskell-cabal_src_configure \
-		--with-alex=false \
-		--with-happy=false
-
-	if use doc; then
-		cd "${S}/doc/"
-		econf
-	fi
-}
-
-src_compile() {
-	cabal_src_compile
-
-	if use doc; then
-		emake -C "${S}/doc/" -j1
-	fi
-}
-
-src_install() {
-	cabal_src_install
-
-	if use doc; then
-		doman "${S}/doc/alex.1"
-		dohtml -r "${S}/doc/alex/"
-	fi
-	dodoc README
-}
diff --git a/dev-haskell/alex/alex-3.1.7.ebuild b/dev-haskell/alex/alex-3.1.7.ebuild
deleted file mode 100644
index 47cfe0e5d3c2..000000000000
--- a/dev-haskell/alex/alex-3.1.7.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 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: +small_base
-
-CABAL_FEATURES="bin test-suite"
-inherit autotools eutils haskell-cabal
-
-DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
-HOMEPAGE="https://www.haskell.org/alex/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-haskell/quickcheck-2:2=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	doc? ( ~app-text/docbook-xml-dtd-4.2
-		app-text/docbook-xsl-stylesheets
-		>=dev-libs/libxslt-1.1.2 )
-"
-
-src_prepare() {
-	# drop depend on itself and happy, otherwise cabal tries to regenerate it
-	rm src/{Scan.x,Parser.y} || die
-
-	for f in Scan Parser; do
-		mv "${S}/dist/build/alex/alex-tmp/$f.hs" "${S}"/src/ || die
-	done
-
-	if use doc; then
-		cd "${S}/doc/"
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	# make sure we don't accidentally use those
-	# installed in system
-	haskell-cabal_src_configure \
-		--with-alex=false \
-		--with-happy=false \
-		--flag=small_base
-
-	if use doc; then
-		cd "${S}/doc/"
-		econf
-	fi
-}
-
-src_compile() {
-	cabal_src_compile
-
-	if use doc; then
-		emake -C "${S}/doc/" -j1
-	fi
-}
-
-src_test() {
-	# workaround https://github.com/haskell/cabal/issues/2398
-	emake -k -C tests all
-}
-
-src_install() {
-	cabal_src_install
-
-	if use doc; then
-		doman "${S}/doc/alex.1"
-		dohtml -r "${S}/doc/alex/"
-	fi
-	dodoc README
-}
diff --git a/dev-haskell/alex/alex-3.2.1.ebuild b/dev-haskell/alex/alex-3.2.1.ebuild
deleted file mode 100644
index 4301b5a3c4ff..000000000000
--- a/dev-haskell/alex/alex-3.2.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: +small_base
-
-CABAL_FEATURES="test-suite"
-inherit autotools haskell-cabal
-
-DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
-HOMEPAGE="https://www.haskell.org/alex/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-haskell/quickcheck-2:2=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	doc? ( ~app-text/docbook-xml-dtd-4.2
-		app-text/docbook-xsl-stylesheets
-		>=dev-libs/libxslt-1.1.2 )
-"
-
-RESTRICT=test # fails tests
-
-src_prepare() {
-	default
-
-	# drop depend on itself and happy, otherwise cabal tries to regenerate it
-	rm src/{Scan.x,Parser.y} || die
-
-	for f in Scan Parser; do
-		mv "${S}/dist/build/alex/alex-tmp/$f.hs" "${S}"/src/ || die
-	done
-
-	if use doc; then
-		cd "${S}/doc/"
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	# make sure we don't accidentally use those
-	# installed in system
-	haskell-cabal_src_configure \
-		--with-alex=false \
-		--with-happy=false \
-		--flag=small_base
-
-	if use doc; then
-		cd "${S}/doc/"
-		econf
-	fi
-}
-
-src_compile() {
-	haskell-cabal_src_compile
-
-	if use doc; then
-		emake -C "${S}/doc/" -j1
-	fi
-}
-
-src_test() {
-	# workaround https://github.com/haskell/cabal/issues/2398
-	emake -k -C tests all
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	if use doc; then
-		doman "${S}/doc/alex.1"
-		dohtml -r "${S}/doc/alex/"
-	fi
-}
diff --git a/dev-haskell/alex/alex-3.2.4.ebuild b/dev-haskell/alex/alex-3.2.4.ebuild
deleted file mode 100644
index 8fb18f3a96ac..000000000000
--- a/dev-haskell/alex/alex-3.2.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 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="https://www.haskell.org/alex/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~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() {
-	# 1. workaround Setup.hs deadlock: https://github.com/haskell/cabal/issues/2398
-	# 2. use freshly built ALEX= binary and datadir path
-	alex_datadir="${S}"/data \
-	emake -k -C tests all ALEX="${S}"/dist/build/alex/alex
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	if use doc; then
-		doman "${S}/doc/alex.1"
-		dohtml -r "${S}/doc/alex/"
-	fi
-}
diff --git a/dev-haskell/alex/alex-3.2.5.ebuild b/dev-haskell/alex/alex-3.2.5.ebuild
index 504ef0e79fb0..3592bc74fd47 100644
--- a/dev-haskell/alex/alex-3.2.5.ebuild
+++ b/dev-haskell/alex/alex-3.2.5.ebuild
@@ -10,7 +10,7 @@ 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/"
+HOMEPAGE="https://www.haskell.org/alex/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-haskell/basic-prelude/Manifest b/dev-haskell/basic-prelude/Manifest
index c6f0a02adb5a..f2cd9a88884b 100644
--- a/dev-haskell/basic-prelude/Manifest
+++ b/dev-haskell/basic-prelude/Manifest
@@ -1,5 +1,7 @@
 DIST basic-prelude-0.3.11.tar.gz 5234 BLAKE2B 4f4fe53affabf8fb21b3dc950dce46f9102410be56a2e03c3e9b7e75f2230e77740adb674d4056781e2e0c734e75522081f421db64e0ce6c03e77e24fcbf43d4 SHA512 450fe8f2c628d93b4a092c29cf229e0722b31604204b3b82956ea19e682c0a3bf83665046425f422185c4b9ab22e65bd87788f814279cb6e4e4aa9057aac9445
 DIST basic-prelude-0.4.1.tar.gz 5513 BLAKE2B 6d6e85b610a60ef7bc123daaaacb52984bb6a53874d424c85c1fe800b7cdb2f120bd7a4564ba60b002b4440e0beff8b96268d8da0af7fd6c8aabd156efe9e0ef SHA512 5a7d692cccc6e2a9dbc7a947611334583f8f99a455c302f4904b4c5461436cebc5e1a90d450990fa11927fe7f3dd41f10aca8720d538fb926ece11cdcd4a0a10
+DIST basic-prelude-0.7.0.tar.gz 6471 BLAKE2B 17bb72b3d508d8a4def83c2946a01ab3f48b84c2484103cc66b6ef8c956599d90e060198536e02ca593c6a6f9b5845b76463281113e4fff0b37a72716100c6bb SHA512 34b62d1cdddb8d5c5ec51f0b9cca8746174f2daf40e5fe0f0188707da1f590844bffccfc6d049e8e161323f541281130aa92700514455a947c503274422e271f
 EBUILD basic-prelude-0.3.11.ebuild 985 BLAKE2B 77e263d6970e741efb085da3b4f4307e6b136efa670b49be3e5b83d841bf76093bf84eb585eaa69109457810c507ad6e80afe7f6ef49a9ee721691a3af2d0b9e SHA512 780192257439100f417bd2031a5da0965f7435bebde22bd5cfc5dd462050e5afc9f09c02649100741735ead29e2345efc69b8875f81a5931706db5f6066e0d0d
 EBUILD basic-prelude-0.4.1.ebuild 898 BLAKE2B 1001da0c9d388679b9a9c6ed5a9442e1038fd7f4888e4d5f5ebade046005f0505812fcfac784ee9266b4f54819434341272e407b95fdb8742d72988eeeb4f783 SHA512 5833fc6ea0d88a89483108f68a81fd31fb6df98d2b19b3ef8ce82acf2ec0d59f01d808ec405ccdf7b2ebe34ed6c6df958ab84a7ccddb592fdbfc2a4a5c3738c4
+EBUILD basic-prelude-0.7.0.ebuild 727 BLAKE2B 32d6afcb77d75c9ddf6d3d6cdcbd7487ac0f7e2b9900070cac33f543550489395b54dc05e96af486b9895c1c5869d2d521d8b5367070df2ab8002f348d57fbca SHA512 369d29449a2258584dfa2261680f3e6b9f0595f5b1ecd44986f50922d3567f956cf230c6a9d48cc4a236a4a7fcb0a5bd015956680d71443e0c7a36448b59af9f
 MISC metadata.xml 1662 BLAKE2B 855e736a9ecd8690814bfec10d3313645398c1c04e6877d6c4f02e703536b7323cd0f46ee1e4c8be7be8a95c240bd8634d77c703d879fbec8971a412c02078d0 SHA512 6911021fe7f0229f3509bfa2efef2036ed232378a13be90a63f70deeb2f93378c9c45d10169ecc117bb3cfffed5803ab0fd3905a165ca5c641d90fdba3543fb5
diff --git a/dev-haskell/basic-prelude/basic-prelude-0.7.0.ebuild b/dev-haskell/basic-prelude/basic-prelude-0.7.0.ebuild
new file mode 100644
index 000000000000..392aa816a5a6
--- /dev/null
+++ b/dev-haskell/basic-prelude/basic-prelude-0.7.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 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="An enhanced core prelude; a common foundation for alternate preludes"
+HOMEPAGE="https://github.com/snoyberg/basic-prelude#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/hashable:=[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
+"
diff --git a/dev-haskell/blaze-textual/Manifest b/dev-haskell/blaze-textual/Manifest
new file mode 100644
index 000000000000..798f6cb2de05
--- /dev/null
+++ b/dev-haskell/blaze-textual/Manifest
@@ -0,0 +1,3 @@
+DIST blaze-textual-0.2.1.0.tar.gz 6914 BLAKE2B 1f56b564d91429abf12984602784dd1af4e3e4f0ba603e306912c00fae4efd5e74575e1c3387fc382265edb3343987477f24950e3814cacb9651c9e3333259c6 SHA512 260036fc712fab44e6f852dd8b40d9fbe79e0a181788d647806b128da19f57cf2e024ffe0567265deddabebb27b9dc9dbd34422cbdbf04c9e21d3e010a4f7ee5
+EBUILD blaze-textual-0.2.1.0.ebuild 1043 BLAKE2B 02e86600872251ace44867f8940b2c2c190a77343adc5e2d027adebd500329c0a1e083d234d57af935c8f9ddb8577e3dd8d9c6eb81229eabdb112738aa2a7414 SHA512 52a647edeb74d93bc278e6bc3c08571e660a5e9392ff8c7feba694811a31f299b68d027dac14b584650fcd79fc1dab3094540e0dceef36452e2f395475d68d54
+MISC metadata.xml 588 BLAKE2B a553bf9c629c8eaa97ac41d325aac053c217975d05bd6dde745688f0f6874c42d49ea3ed6021754781da3f292db4d005a22238a56c1f54c029d80815a96ca96d SHA512 8871d79e6c8d076098f6f1c57b13c64bf5533eb9388d32137e97feefaab3d918212a473599a9dc8d858fa543c6c33d7229247494baa6d8179d06365bcfdec8ab
diff --git a/dev-haskell/blaze-textual/blaze-textual-0.2.1.0.ebuild b/dev-haskell/blaze-textual/blaze-textual-0.2.1.0.ebuild
new file mode 100644
index 000000000000..b83befa93abe
--- /dev/null
+++ b/dev-haskell/blaze-textual/blaze-textual-0.2.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+#hackport: flags: -developer,-native
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast rendering of common datatypes"
+HOMEPAGE="https://github.com/bos/blaze-textual"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # fails tests
+
+RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
+	>=dev-haskell/double-conversion-0.2.0.1:=[profile?]
+	dev-haskell/old-locale:=[profile?]
+	>=dev-haskell/text-0.11.0.2:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/quickcheck-2.4.0.1
+		>=dev-haskell/test-framework-0.3.3
+		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-developer \
+		--flag=-native
+}
diff --git a/dev-haskell/blaze-textual/metadata.xml b/dev-haskell/blaze-textual/metadata.xml
new file mode 100644
index 000000000000..f60e6e2a0376
--- /dev/null
+++ b/dev-haskell/blaze-textual/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		A library for efficiently rendering Haskell datatypes to
+		bytestrings.
+		
+		/Note/: if you use GHCi or Template Haskell, please see the
+		@README@ file for important details about building this package,
+		and other packages that depend on it:
+		&lt;https://github.com/bos/blaze-textual#readme&gt;
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest
index f977ef0866fb..d9019191d3a9 100644
--- a/dev-haskell/cabal-install/Manifest
+++ b/dev-haskell/cabal-install/Manifest
@@ -1,13 +1,7 @@
 AUX cabal-install-0.13.3-nopref.patch 775 BLAKE2B c2c9478da820ffd22ab5450a38f54d74249b8b5000732be2e9cb68229876cdd50062ad7a668bef860be53161b2a820d0e31e3701f5c5f28602e964267a8ad30b SHA512 e0abaebca3d85bf09cffe76a7cdc0dc4df9ef7d0b13950932cbb0bedaeea59173cbf28b2a89f3f1b9e8ea15cb5c611678cf79ea63ea5a3f5acb4417082de19e5
 AUX cabal-install-1.24.0.0-nopref.patch 651 BLAKE2B baf9f0b75bdfe0c49c0c54f9cfb63a917c778a4983db9d79672244b3c424488686914e0a3fee58e249510e489d45f358f33645a427762583c65c5233c0e4905a SHA512 052241ec023ffd24fdb45902835f79d639ea8ae0bb745b1456e5a730448880739f3a050a48f5af1715b7669f1168f52c28f967fb8a6c7a47d5064efcad501d48
-DIST cabal-install-1.18.1.0.tar.gz 257577 BLAKE2B ea5d1eb3458657b81f04b2de1bd17b3f006912d0eb9a4d6e1bd23f0ecea5560912409603e8a58154c64f6863165fbc850e1015243b727e4d9bdc4bcb4006d7f0 SHA512 252304480ebde673fba873b9d7f709e47d1acfc7ab936a2b19f663d8e3c8ef7a20abeaac0cf9bbdb4bf0d1c30688e8a9b1cf1f73c27ce8f47845c3431de6752e
-DIST cabal-install-1.20.0.3.tar.gz 274779 BLAKE2B 4b46e3722305566e9671677292a3ef64df9ca018dc54c088759a396b04bbbfbe28a72dc058cc98cf8ec552846d47a07d9d792a02a5834aa7808052183b4a93b0 SHA512 a272c7eb1c87a933b30697afa7bf78f95fb0afa203e791448d5e96d5c62105533347b8b777af7a7e6db5703654c319045e089d46d2263a09ed5ada10144ce12f
-DIST cabal-install-1.22.7.0.tar.gz 302579 BLAKE2B e8a92bc69f0b00e5fc12145277216652fa52fb1de9ce3458b5fc3d9bc6f89cfe3a95d26dd7585566b55c55c2a9b2d021336baa10694aa39ca442bdb58c6997e7 SHA512 a88895ee38bf7451ba6a2e929ff224643ea0a536a9633d463d91a471e41b6aae302af2c3ca4fc914e4b3401fcadb137bb0c68c9fb7d0f768835374aef1b22766
 DIST cabal-install-1.24.0.2.tar.gz 499937 BLAKE2B c2e1ea88e20b1a43064010117e1830b052c339464f3188a931e7ca72220287a2862ea25423e5190e8f3fe6ed6b38dc7b688474796faf3d049626b04cf6c191cc SHA512 bd055a52ff0ac697e6f21a588d53dd811d50ee9410659a242c00a5665b360ef10c024df4872b9070c33aa49f779c8817b883b40087d3f4e0be4096a54b2ad5f0
 DIST cabal-install-3.0.0.0.tar.gz 654045 BLAKE2B 5036948651098b83f073b5ce29e2aaa31e4382f07e8b1e79d206889bd9c74fb88789f4b1cbb3bddc6d03375a6e3a3e164d6bda4ea19e3f944904ab11d7693fce SHA512 0b15313fc11bc6b6018e01b6a3a65242306977c16ce9333ea1191c1ce0020b180451235a7a65b47bc01791e05d1b246bf9d573fc7e981a46fcfc7da0fed04cca
-EBUILD cabal-install-1.18.1.0.ebuild 1404 BLAKE2B 18b1074ecee7904e6fc46066754795caa5fac2f038ae3a3892a1891f23f9b50e4ec84a3a435418645f9a545999f6b2ca8410612edd64692247d5c56cb6a3d2e1 SHA512 24ce6ab581d6a2b28933fb5b2c6c045712e54627edff52ccb4004eabcc4c00e92027ad2cb5102fcc445f02f1522a5b525e53f0d2ea72e2f8c6ad44dd1bb8cfc5
-EBUILD cabal-install-1.20.0.3-r2.ebuild 1617 BLAKE2B 2fe558681193ec82df3d8ec1eab1169d0da922311876e1a4605bf139d2a58f6d000651d6e70d784564eaefb11b5878672e98fd8d5b8f34fc28706487e91530c7 SHA512 3d0141e49223aee98f920e6376264da936855e38eb2bd649192d5cbee0874bac51a90ac3635bc37c0fc3094de881cd95a6fa212264747d2e1cf75112a21e3313
-EBUILD cabal-install-1.22.7.0.ebuild 1871 BLAKE2B ab2ecf9c710b3c2e3c39acf655fe201903d693a5bfeb075607af9ca933c92f70b32b5dbf0c52712826c1eb49c30048ef66a6fa7fb77daa8873e1e197b53af706 SHA512 5fa9f10924bf7e38fdc44921f5720b951e424966d74f68edda1c62933058761091cd624d660a09d5a7a52ac934591dfe2fd096153bc817e403cb3920ff9e62ff
 EBUILD cabal-install-1.24.0.2.ebuild 2408 BLAKE2B c2b3610a41005997f6ac0fac5e8c950722a9250d3490fb8c07cef67b31b8547579e0fb83467e7aba7b7d87dc44cb7b9dfa27e6298ea72dcfb8d1d649dbf8e795 SHA512 255447d3d772615b66e16cc92276a82d1e898d9e0960c3448c98279719cbd56cdc69c93e6604a91af8dda9a3feb27eeec3e4874b974430702800d0f9f1fbdc2c
-EBUILD cabal-install-3.0.0.0.ebuild 2473 BLAKE2B 4d648dc0b2c118e574013f63601657f5cf3da3667d3e8625166b087f9b2c30594cf2901c90abbd11faefaba90979c7668d95ae9c33bd2bc7becfc6c9757c0cc8 SHA512 8849d37c06b253f4b3e6927a8d728aa47dfe50cf16d1abc557cea09eeed16b771e5f7fe2ff303994793f3a51e97b178ded109b1d082d2b809776610cc0a179c9
+EBUILD cabal-install-3.0.0.0.ebuild 2474 BLAKE2B 30b95a329b7af6a57e1d3fd59dbf468f7addb010556e7dba0be7c51ce103b79f6f4abb640ac57fbd73a52dfb360e857c868cad5738dae9ee16e8b669bc19b468 SHA512 967298ab3af7495f4338763da78b5dcfeaed058740883ae54ebcda868b3307c16dd26f9277a7cf3dcc6a26cf4c697d34b354c6c49325c94c8c402c2d579c0a78
 MISC metadata.xml 773 BLAKE2B 3be3014c36c393086afcfd6723ff532907dc89eba816f512fb05b25966ccbce4cc1726a45284703f8ac9cebd25cc070a9870d592828d8928f22db78e85a21279 SHA512 e6176c36f85f5764e8974654fcc599a1f4c9f840d8761c32d1d5e7103d6e536667618fafb37c0741c57bfd1c0cb9d283cf0cfd0e0084710bec2ed1263f25cb6c
diff --git a/dev-haskell/cabal-install/cabal-install-1.18.1.0.ebuild b/dev-haskell/cabal-install/cabal-install-1.18.1.0.ebuild
deleted file mode 100644
index b03eebc1bce2..000000000000
--- a/dev-haskell/cabal-install/cabal-install-1.18.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit bash-completion-r1 eutils haskell-cabal
-
-DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+noprefs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.0 <dev-haskell/cabal-1.19
-	>=dev-haskell/http-4000.0.8 <dev-haskell/http-4001
-	>=dev-haskell/mtl-2.0 <dev-haskell/mtl-3
-	>=dev-haskell/network-1 <dev-haskell/network-3
-	dev-haskell/network-uri
-	>=dev-haskell/random-1 <dev-haskell/random-1.1
-	>=dev-haskell/stm-2.0 <dev-haskell/stm-3
-	>=dev-haskell/zlib-0.5.3 <dev-haskell/zlib-0.6
-	>=dev-lang/ghc-6.12.1
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.5
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.3 )
-"
-
-src_prepare() {
-	if use noprefs; then
-		epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
-	fi
-
-	# no chance to link to -threaded on ppc64, alpha and others
-	# who use UNREG, not only ARM
-	if ! ghc-supports-threaded-runtime; then
-		cabal_chdeps '-threaded' ' '
-	fi
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	dobashcomp "${S}/bash-completion/cabal"
-}
diff --git a/dev-haskell/cabal-install/cabal-install-1.20.0.3-r2.ebuild b/dev-haskell/cabal-install/cabal-install-1.20.0.3-r2.ebuild
deleted file mode 100644
index acfa6f958558..000000000000
--- a/dev-haskell/cabal-install/cabal-install-1.20.0.3-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit bash-completion-r1 eutils haskell-cabal
-
-DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+noprefs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.20.0 <dev-haskell/cabal-1.21
-	>=dev-haskell/http-4000.2.5 <dev-haskell/http-4000.3
-	>=dev-haskell/mtl-2.0 <dev-haskell/mtl-3
-	>=dev-haskell/network-2.0 <dev-haskell/network-2.7
-	dev-haskell/network-uri
-	>=dev-haskell/random-1 <dev-haskell/random-1.2
-	>=dev-haskell/stm-2.0 <dev-haskell/stm-3
-	>=dev-haskell/zlib-0.5.3 <dev-haskell/zlib-0.6
-	>=dev-lang/ghc-7.4.1
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.5
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.3 )
-"
-
-src_prepare() {
-	if use noprefs; then
-		epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
-	fi
-
-	# no chance to link to -threaded on ppc64, alpha and others
-	# who use UNREG, not only ARM
-	if ! ghc-supports-threaded-runtime; then
-		cabal_chdeps '-threaded' ' '
-	fi
-
-	cabal_chdeps \
-		'network    >= 2.0      && < 2.6' 'network    >= 2.0      && < 2.7, network-uri' \
-		'network,' 'network,network-uri,' \
-		'random     >= 1        && < 1.1' 'random     >= 1        && < 1.2'
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	dobashcomp "${S}/bash-completion/cabal"
-}
diff --git a/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild b/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild
deleted file mode 100644
index 81f2a4b03b57..000000000000
--- a/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit bash-completion-r1 eutils haskell-cabal
-
-DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri +noprefs"
-
-RESTRICT=test # missing files
-
-RDEPEND=">=dev-haskell/cabal-1.22.2:= <dev-haskell/cabal-1.23:=
-	>=dev-haskell/http-4000.2.5:= <dev-haskell/http-4000.3:=
-	>=dev-haskell/mtl-2.0:= <dev-haskell/mtl-3:=
-	>=dev-haskell/old-time-1:= <dev-haskell/old-time-1.2:=
-	>=dev-haskell/random-1:= <dev-haskell/random-1.2:=
-	>=dev-haskell/stm-2.0:= <dev-haskell/stm-3:=
-	>=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:=
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=
-			>=dev-haskell/network-uri-2.6:= )
-	!network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/extensible-exceptions
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.5
-		dev-haskell/regex-posix
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.3
-		!network-uri? ( <dev-haskell/network-uri-2.6 ) )
-"
-
-src_prepare() {
-	if use noprefs; then
-		epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
-	fi
-
-	# no chance to link to -threaded on ppc64, alpha and others
-	# who use UNREG, not only ARM
-	if ! ghc-supports-threaded-runtime; then
-		cabal_chdeps '-threaded' ' '
-	fi
-
-	cabal_chdeps \
-		'QuickCheck >= 2.1.0.1 && < 2.9' 'QuickCheck >= 2.1.0.1'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-
-	dobashcomp "${S}/bash-completion/cabal"
-}
diff --git a/dev-haskell/cabal-install/cabal-install-3.0.0.0.ebuild b/dev-haskell/cabal-install/cabal-install-3.0.0.0.ebuild
index d2d67c73fd0d..6e85d8ae9421 100644
--- a/dev-haskell/cabal-install/cabal-install-3.0.0.0.ebuild
+++ b/dev-haskell/cabal-install/cabal-install-3.0.0.0.ebuild
@@ -10,7 +10,7 @@ CABAL_FEATURES=""
 inherit haskell-cabal
 
 DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="http://www.haskell.org/cabal/"
+HOMEPAGE="https://www.haskell.org/cabal/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index 00d2a58476d2..ee3b310249bd 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -15,6 +15,6 @@ EBUILD cabal-1.20.0.2.ebuild 1517 BLAKE2B 2db8326a9cbd2f7c81817f81df63eb4b2fe946
 EBUILD cabal-1.22.8.0.ebuild 1406 BLAKE2B ca1f5fffd1544682816fb0b31543ffe431d82004599309dae49f5c9e556b6b157eb7622a06c3e2d2a9437ebbdef7431355da549641d8994888b61b7081b6cf19 SHA512 2ec1cc5c33c016542a320f9962c144f41ea077bc983bf3964ab42baca0f2a585fa4e71dd655c01d05e77d7d7678948dd44dcc46440f11c87f1b94309bedee490
 EBUILD cabal-1.24.2.0.ebuild 899 BLAKE2B ec8118777ccf6abb07a40658155fbf780b34c26173ba5ef3f0f41e3b6d243d3da7cdc0f6b501f143e51299c6eba254c5647631db4184f40d5330325d49657607 SHA512 32316a678ccfecf9f66613a92b247beac4444066d9e7caf16345946ea497ea5f565432a0da6a23d07fa994822186ac6b45d375bf3e81810d77eee18975a9c6ba
 EBUILD cabal-2.0.0.2.ebuild 993 BLAKE2B 2a1793800eb8e3f2e11d61f6fb7060a0defad4ee940df373c07088bc82ee68a9f22e249322efeb183946a90c3a0ec35ad1542b20a9a1e143a736fbd21210e624 SHA512 4f23c3d6af175bb67b49c6aacf29165e04abe065ce5c829fc8400ad1f16467f8037909a3228a62f8bf90574c0ec89988600eb639bd6d3564cc439c59479fb324
-EBUILD cabal-2.4.0.1.ebuild 1243 BLAKE2B f11aed04f1da1cbec196d4aa73150c0842de01b7b090969302e5b6b663ec2b7f1ec7e2cb4f9dd2a65ce4057eed2c1c54251576a179d63afc60d2cdda5d7373f9 SHA512 fa24076f44643380cfebea6fc3c49007e69e036d62cb8e02640c60eb5e4eeceb54e5f59adf48fb7532718bf83f403ec6e466547600bcc8ae45e2ab146a3e4695
-EBUILD cabal-3.0.1.0.ebuild 1370 BLAKE2B bd55576eaaca4b460a1ed46ef7a70cf90048f8cb5198a010fee95589aed238bd74256ed5d1fac2d3a193b0c282bb5c9e9ea51c7df6f899d277b4cc2ff97255cf SHA512 5854790fc7ef0e0fd08a89f9d781c2616a1c4a534b472bc9c79df4ba93a6b4abcdb3633fcb0f72cc3d7315c332500c82c1782a955064de65d7a02955d1318acc
+EBUILD cabal-2.4.0.1.ebuild 1244 BLAKE2B c49bdc329ee67863a9f67c0c2f47232cbec726194a00b4a61688cdc19099f239a3902dbe94834257ea0285835b4b85f1de69933ea1d8ce14b52ca08b36e82006 SHA512 4f52e44cab2d5654d3134692cd1ee5387e1aff48c95291be0258faed089848fff3e291d8859ce01d402a7e8d2fec3434c422f8288aee5e687f03a3a0801ce18b
+EBUILD cabal-3.0.1.0.ebuild 1371 BLAKE2B 6f3bcb6ae134a74ad5c01a51adab10a394cec8cad6e63fba1e24ea63b4fb03422edcd34967058659433d880c03f934c2da78e1f17a9b0e4ea6f70d768668d4d5 SHA512 092aceb106ac4ab7d325b8fdb6df5157f48db6175b3f7cca4c6b8222d8e2bc198591700f7384c5a72b97b99b6c988a425268946a0486309ef2c3087928b0d035
 MISC metadata.xml 620 BLAKE2B c506aec421eed73838acb77891628cece6a7e8045069b51325669067f8900bd3028aaa93a784a5c4f0383909ff46ffa4044d09e091518e0bf207eea0f1594c4c SHA512 e52cb4657e879d3a4d384daa3fcb8c109e61278ca2875b3fbc6c55b5e4ff9c98716eb7d740ef425634130d13639f92cdde7b04f88e266f112d393b99ce389b0b
diff --git a/dev-haskell/cabal/cabal-2.4.0.1.ebuild b/dev-haskell/cabal/cabal-2.4.0.1.ebuild
index 0b868d122cef..9335390f8e66 100644
--- a/dev-haskell/cabal/cabal-2.4.0.1.ebuild
+++ b/dev-haskell/cabal/cabal-2.4.0.1.ebuild
@@ -14,7 +14,7 @@ MY_PN="Cabal"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="http://www.haskell.org/cabal/"
+HOMEPAGE="https://www.haskell.org/cabal/"
 SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-haskell/cabal/cabal-3.0.1.0.ebuild b/dev-haskell/cabal/cabal-3.0.1.0.ebuild
index 88d667c8f674..a5735f4398e2 100644
--- a/dev-haskell/cabal/cabal-3.0.1.0.ebuild
+++ b/dev-haskell/cabal/cabal-3.0.1.0.ebuild
@@ -14,7 +14,7 @@ MY_PN="Cabal"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="http://www.haskell.org/cabal/"
+HOMEPAGE="https://www.haskell.org/cabal/"
 SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-haskell/classy-prelude/Manifest b/dev-haskell/classy-prelude/Manifest
index 361715eb62be..05862f89ddc3 100644
--- a/dev-haskell/classy-prelude/Manifest
+++ b/dev-haskell/classy-prelude/Manifest
@@ -8,6 +8,7 @@ DIST classy-prelude-0.6.0.tar.gz 9852 BLAKE2B 19e486e95902df93d3e13baf8dff3fafc8
 DIST classy-prelude-0.8.0.1.tar.gz 8750 BLAKE2B 5eae77d218783e634887b71d1dde12ee227a00192b1ee62bf3d5f28f095bae9af530f4ddcb4e649443b9c256be79f9e6cbf6af2ddca1898f38c98c12831e08ca SHA512 2c2cc5e4faac8169f970c001158865b760324ff743c3fcf0f183625bf432db6a22c89002a849e7996c42e6bfcd27d253760a921ded84b4bef537d969bbdfd604
 DIST classy-prelude-0.9.2.tar.gz 9333 BLAKE2B 7156ea43d2f075f54b571116d341a1ead418d38e4115a538b91f5e34d55a7daa66ffcc21c5e6b28aee41e5a23e10843ea8f43d261f236c3484aedcd857247600 SHA512 8cda5453fefde018a1a15f6c42f650a035a734741e83078e1a7a8426aaa6c80342b4b13e389096278fa9df018892bd22aebef924dfa06e0c5a206a9815f56d6e
 DIST classy-prelude-1.0.2.tar.gz 11404 BLAKE2B 46ca086079734c35200021a0efd66962a7c88459cb869c61313766895e29eccf668d03e839b822c8d47cba29493d0f44620d929686c0af501745fe165c34fd73 SHA512 859602dea474c49307041dda9c79eb1fb01178c9f6136c754008392969ca6d09e3a9a4a3177615ffbe39553ea421d0f94fd97474c2b11b4937decbeeab42d444
+DIST classy-prelude-1.5.0.tar.gz 12053 BLAKE2B 20bf1f3807ec372813b1d2783fe1bb4a215e5dde52c2d98f09c26e30b2868c2126a078d8290b0f43c3afa4209ff1543a51842383cecb999634f6632aae2d33e3 SHA512 eb8afb8a8988d0b251f6b3c2046f3ad943201d35379bfcd21f024afa67031c1b43677f43b22a0dd88e5e586a669bf5cb0b7348e13f40bbef624d09a3c6c62dfd
 EBUILD classy-prelude-0.10.2.ebuild 1385 BLAKE2B 55634cbf97ad5921f48e870e5c63cad0ef2de4b24ff0e23fc8dca1f6ef27a8144dad8b9ff1a9c134d5755e3e38ab515b1644da9d7ac362ae6053d9ed2e5f8143 SHA512 adef18bb17714c3076582d43d1fc7911955f7235ecbc53901de40f00b9d7fca90b6307cba41e4a1c70bf10d12dd9a5ad9a97187e4daeb62f48e872bcaa4f916b
 EBUILD classy-prelude-0.12.0.ebuild 1535 BLAKE2B aed68d6ee4095346795ffb289711292013673c06aad2f900b9aa84d5bbb4e0d395b11fb7c50adb53a7dcd7ec53dacac939fb941a0cf90980f2677da63460a14a SHA512 8a4466f934dd4605ae4b4138c3ac9f121486dc6b300a020b932746a8c40067b8721dd2fb70419ead6ae7876fa3deab97c55e65b1685d84dc6136d1afa92f0243
 EBUILD classy-prelude-0.12.7.ebuild 1517 BLAKE2B 564920af2da5b94f6573560c51e65ef442ed6e0df504740598fb667eee61c7af780819f546fd2b7ca9a6a1a4e4416ee5a8524c74974d53bcd4a5c754fc6efeea SHA512 ed32e933250d4d19a5d396c57038ec610b1ee0e4df81b6d9f06f2b91c8e1dd241baa53825b4083f0be2f2100be4ce10dc8ac69158c3a0bbc6b00fed5f0143111
@@ -17,4 +18,5 @@ EBUILD classy-prelude-0.6.0.ebuild 1203 BLAKE2B cb430ba9ac0d3bbb3e4ae4f8a25f34a7
 EBUILD classy-prelude-0.8.0.1.ebuild 1322 BLAKE2B 4f5d0590b48f234d70d0bbe54db21df7a60d394e9614c357ed578342f01040126a5b28a94aa7434aaf761e35a0600774e3a8a548bc6389a4815c0082cb06e270 SHA512 4c4d916d3bfd1f9625450489924ee6cfaed3f1e8d7081cdcc054ab56f19f40faec030398571002fae7deaa3838f0bb2aca6e106eb63c36d0084f037d32eae969
 EBUILD classy-prelude-0.9.2.ebuild 1287 BLAKE2B cb062f7b764126a4cfb9271da50907c51e73b2c43d57cee3f1428e5c8183f79dc0fb45e418cdfd39e9e458c547613f15f6b8a5d1c716e1824d241065a54d090d SHA512 317209ff09f15b10f15ac7f4f8b7b67873dbfc0a6e53c85dc2a26639110fe94d062d865ca6fe4ebdb8cd2c99e734fb1c90e7e593474aeaf07c4d9a996ea17a07
 EBUILD classy-prelude-1.0.2.ebuild 1733 BLAKE2B 9f67ce429888259603d69e9ab8517818f93b89601ff0729092ca72011fa734d43c47be51f821e48c0ed4825f04a0291bfa062bfaf45eb9a8cb19c0ed64e2f181 SHA512 62d3e854ca8a88890d68e4c363bd217a61fe3e273286561fbc5701016da18cf8d8d54f73610309d019d2155cea93b4925cab005ce5f4293d4d397f34bc85dc37
+EBUILD classy-prelude-1.5.0.ebuild 1432 BLAKE2B 6cb4f79036f9a456bd6a78d27bee5f173ff69e3739b82f678ed1be611a3f399e91da23c366ccb07ae7a3372b140413480698cc97d450401244e9af45fb09c775 SHA512 30fe5d6391920344c410568f9b69e731622d14b263ec3368a0c480e1b56e94852da1e10b908c6b9321e92ea5b5250d3db82bc87722adb5911c1cf3656fb9d84e
 MISC metadata.xml 606 BLAKE2B 335d0b0014d95c4755e63c02d04b71f77529fb9f725e903d91e8c66ece9f8104a8fa115c8fa48865cd5513265da2505845b2e2f6928ad9371fdc80967adc08ea SHA512 6a47c85d77e11f174242cc69d45c7d181f2f1c980917f2d9454dbbe8c92049f391341f168fab6c19c0c15d51fc19f9f3ed85019a7ad356423604f5df6c052c28
diff --git a/dev-haskell/classy-prelude/classy-prelude-1.5.0.ebuild b/dev-haskell/classy-prelude/classy-prelude-1.5.0.ebuild
new file mode 100644
index 000000000000..ecf707d98127
--- /dev/null
+++ b/dev-haskell/classy-prelude/classy-prelude-1.5.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 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="A typeclass-based Prelude"
+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/async:=[profile?]
+	>=dev-haskell/basic-prelude-0.7:=[profile?]
+	dev-haskell/bifunctors:=[profile?]
+	>=dev-haskell/chunked-data-0.3:=[profile?]
+	>=dev-haskell/dlist-0.7:=[profile?]
+	dev-haskell/hashable:=[profile?]
+	>=dev-haskell/mono-traversable-1.0:=[profile?]
+	dev-haskell/mono-traversable-instances:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/mutable-containers-0.3:=[profile?] <dev-haskell/mutable-containers-0.4:=[profile?]
+	dev-haskell/primitive:=[profile?]
+	dev-haskell/say:=[profile?]
+	dev-haskell/semigroups:=[profile?]
+	dev-haskell/stm:=[profile?]
+	>=dev-haskell/stm-chans-3:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/unliftio-0.2.1.0:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vector:=[profile?]
+	dev-haskell/vector-instances:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/colour/Manifest b/dev-haskell/colour/Manifest
index ceb60cc4099b..051527b40873 100644
--- a/dev-haskell/colour/Manifest
+++ b/dev-haskell/colour/Manifest
@@ -1,5 +1,3 @@
-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 1195 BLAKE2B d31a2eba0ae093be5be8f5bad32dfdf9290d59a26281884f1765282c300f8bd67408013f540dd519b6c30d3f7709e6f910cd77f5c165178d75d665f67f86577f SHA512 883afbd021c5092e0f4a3b630afd470cc235fe3667f71c569303993ee6f1bed8a39d35a1bb7e3777966a58a6d4175d1f598c4aa06620a5ccb88eca70d939f083
 EBUILD colour-2.3.5.ebuild 676 BLAKE2B 4d5d07ee70ec9988a44d1031bb59016b25c3684b3cebdc8252e1694d5e4603a48d01a24131a890f60a92a604a420bb1c871318c859fc1032c1195c3b5d438784 SHA512 28f7ea93e5cea7229d7e5844cc6e0dc70b27a99e3ddb42701ac90c5c91baef9d1d1b268a2f96f18c79011bf6d50d7c6cf5280db8e93c5276a84309868456f1ee
 MISC metadata.xml 494 BLAKE2B 3e64417d61195a8ffdaf511f43813fd558933fc983f637f0da4cc7c33843f5cb965451164ceb906e317b1dce823535f1c970e0c88b552e5d2d61fb88ac7d439d SHA512 32e07ce3aceeee92cd07819b05b61683492e0ab0805ca94391d898d589cfbe47aa468c84a7dc36f2410e6b24c7120dbd062cf5170e1eb55fe42e747175736caf
diff --git a/dev-haskell/colour/colour-2.3.3-r1.ebuild b/dev-haskell/colour/colour-2.3.3-r1.ebuild
deleted file mode 100644
index 50717cf33cbd..000000000000
--- a/dev-haskell/colour/colour-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A model for human colour/color perception"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Colour"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	if has_version "<dev-haskell/haddock-2.9.2"; then
-		# Workaround http://hackage.haskell.org/trac/hackage/ticket/626
-		# The haddock --hoogle option does not like unicode characters, which causes
-		# haddock 2.7.2 to fail like:
-		# haddock: internal Haddock or GHC error: dist/doc/html/enumerator/enumerator.txt: commitAndReleaseBuffer: invalid argument (Invalid or incomplete multibyte or wide character)
-		sed -e 's@&#176;@ degrees@g' \
-			-i "${S}/Data/Colour/CIE.hs" \
-			-i "${S}/Data/Colour/CIE/Chromaticity.hs"
-		sed -e 's@&#8220;@"@g' \
-			-e 's@&#8221;@"@g' \
-			-i "${S}/Data/Colour/RGB.hs"
-	fi
-}
diff --git a/dev-haskell/contravariant-extras/Manifest b/dev-haskell/contravariant-extras/Manifest
index dd78512c7b47..54180047db39 100644
--- a/dev-haskell/contravariant-extras/Manifest
+++ b/dev-haskell/contravariant-extras/Manifest
@@ -1,3 +1,3 @@
-DIST contravariant-extras-0.3.5.1.tar.gz 5324 BLAKE2B ea5554629785efe557a9b708a4487aa9096c963f0ef2d60480a4f155a7f6fb7c696d3a763792af209d9af7a3e77107ac7115ff1fe6f1e043119f4ce575f0933d SHA512 871e9545f8e288e6bd89a5fa5ddc93154092f713505e30120db30750bdacea40f55ed52bf9d59984fc8ee936f4e9148c3d1125b8e59fb4ed0c68044158de7917
-EBUILD contravariant-extras-0.3.5.1.ebuild 746 BLAKE2B 2e699c79addee3137db372833f71bc0e1f0a9b8508e2a34b48d77500e07acc21d2b460cb1d934c28aa58c974e614e0f11da6ece46563a254f8d59483952e557e SHA512 eb07e2ea3d3a3719c7b7fe57a73be04b218924dc65ea7afd2ca791f75326ecbc12fecc9e6d0e6f7ebdc56f7b1aff45196482b002ee548a47e1295ca6a92043c4
+DIST contravariant-extras-0.3.5.2.tar.gz 5426 BLAKE2B 152271da74a36054c641a31e49ddad866b2eeab0bf732d0ba94a1af2fa98e59f8cdfa8f5c6c280ede7bc222934c61efca44f7e97a9f3c585e1bfdc12f3941a29 SHA512 79b9be33cd173320f0aee1e764bd667a97e104a03653ec671d9a5fb767deb49163baa40fb331e79324a2ac1cdc5eb1aa565ac1f7d7414dbc1424b0778d34efca
+EBUILD contravariant-extras-0.3.5.2.ebuild 767 BLAKE2B c1c0aaa7fec9d92f88925c84ad721802fa9c03568360bc9bf6bf147ff148e8a088b1b29645d4521b991a1729f350638da6b4f6e724e6d731fc6bab24b70e2ebe SHA512 59551b43495a5ca5132476b851c464f4575441b66ef3b7ed55e9a41c442f1c90413a46e6394382ceb07e3363c9ab5c327499a4017e42e7da83d4e6537f7309f9
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/contravariant-extras/contravariant-extras-0.3.5.1.ebuild b/dev-haskell/contravariant-extras/contravariant-extras-0.3.5.2.ebuild
index 3fe3c978d3fc..7e81e8fd31d3 100644
--- a/dev-haskell/contravariant-extras/contravariant-extras-0.3.5.1.ebuild
+++ b/dev-haskell/contravariant-extras/contravariant-extras-0.3.5.2.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
-DESCRIPTION="Extras for the \\\\"
+DESCRIPTION="Extras for the \"contravariant\" package"
 HOMEPAGE="https://github.com/nikita-volkov/contravariant-extras"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/template-haskell-compat-v0208-0.1.2:=[profile?] <dev-haskell/template-haskell-compat-v0208-2:=[profile?]
+	>=dev-haskell/template-haskell-compat-v0208-0.1.4:=[profile?] <dev-haskell/template-haskell-compat-v0208-2:=[profile?]
 	>=dev-lang/ghc-8.2.1:=
 "
 DEPEND="${RDEPEND}
diff --git a/dev-haskell/data-default-class/Manifest b/dev-haskell/data-default-class/Manifest
index c411b62204ba..6f593db0bb99 100644
--- a/dev-haskell/data-default-class/Manifest
+++ b/dev-haskell/data-default-class/Manifest
@@ -1,5 +1,5 @@
 DIST data-default-class-0.0.1.tar.gz 1461 BLAKE2B 59bdb47ee92796b1ec6b46eccd93da9928b7208ed47cb4f1f97dbc8374f4bdd89a30c28ac23bde0d084d2eecfe6c58301a64b73223a7667c722b3dad8da0ea98 SHA512 f9960deb48938bf0364273762662e56ad0dba3d5db005bf0a00b8eff11cfa2e94c5b5c1d2b2af2622a680dad4495cb31445a17074cfe752cbcf3de7b91e0e313
 DIST data-default-class-0.1.2.0.tar.gz 2522 BLAKE2B b6449a9bfbd9fa352a7cc453540f3b8eb69c0f144635d573d6073ed950b7289f3e71aecada5f8d85faed7293b1203133a9239dbeb9e5e6b286404b0b6948a67c SHA512 293c899cb2b5cded58baa086251110e4c5e7a15477f1864c33be30be8d16d6fadb55e1b5fa8117f4c47ac5c86ac09abb2f7f8b3b4fb658d1492eadd099f6f7b2
 EBUILD data-default-class-0.0.1.ebuild 591 BLAKE2B 35dcd277267cc07e1ef3d188c9d2e3a3098f6b55d2f481b70fa917831a04e7baf68f094ebcebb8a0906f926092494cbb43e2808f1df6d98fd75413e662a617d2 SHA512 dad5f73197cad1d607e828f52800028a3026091a632c08faae8cdf5e9c31a99264a4e860c4ad4665f6c50bb4b900f0c44c7e295ed3ca4c488ebc3a9bc1d8cd17
-EBUILD data-default-class-0.1.2.0.ebuild 588 BLAKE2B 5736871abc9ad85de7c7ed57d098c3cd1efc66a180bec9d3aa6f4f0bfcb9b375bff3ff5e250950e10228b8a994a1cba193f8a0ba530a6ad0abdf3a23dd185220 SHA512 e0f4b849d52345ad7e11757e40fb332388d9fa66b5a8b16afb269a6fcd3cba91d90a5255d1a96624177b3eb77ee1925d8ec9a93c3c828a2a34c7eed408284b53
+EBUILD data-default-class-0.1.2.0.ebuild 589 BLAKE2B c5b8f96727514932ff8f884a0e129d14b299107943530bd3e6aaf93847b75093cf438b4b79edefb919e18ed162c9dbac47bf3c7edb3f54bc1c031e8c57461f07 SHA512 c4242e672495d477a09911cc6a5dbae6b2e8aacb17dd2680c4eecc29b61a73ac3c259bf4e02fed19f97ff61bf3f6ac0b46270c40ac7bf54be968f65921b95e92
 MISC metadata.xml 329 BLAKE2B 43b0027f4eac9c823695630e0f414b99bd0460e9958141ee7f3aa4c6615a57722b3958dd9fb96288a3c88c8da98f150bd2ac5e0d2c5f567e24d6b82358835af2 SHA512 c0cf6ea5636d8e9b5c038d4ed8eb81ed2698a56e30050d3aa28b55a65dcce1aa8258bc4f4d6456ba546627be96a7f3588cdc02978774eeef8ecf49ca0ebf6d9e
diff --git a/dev-haskell/data-default-class/data-default-class-0.1.2.0.ebuild b/dev-haskell/data-default-class/data-default-class-0.1.2.0.ebuild
index 40887e49f0ab..19289a932258 100644
--- a/dev-haskell/data-default-class/data-default-class-0.1.2.0.ebuild
+++ b/dev-haskell/data-default-class/data-default-class-0.1.2.0.ebuild
@@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="A class for types with a default value"
-HOMEPAGE="http://hackage.haskell.org/package/data-default-class"
+HOMEPAGE="https://hackage.haskell.org/package/data-default-class"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-haskell/data-default-instances-base/Manifest b/dev-haskell/data-default-instances-base/Manifest
index ef860cab6593..2ea5a200e31f 100644
--- a/dev-haskell/data-default-instances-base/Manifest
+++ b/dev-haskell/data-default-instances-base/Manifest
@@ -1,5 +1,5 @@
 DIST data-default-instances-base-0.0.1.tar.gz 1930 BLAKE2B 61faf28f84aeb2fccf07845072a7480ec14f30744fa310bec74cc1e26d2fba1c55872380c417b8b7697656e81bb0b90ee9b6da60af8395b19dfc13eb45520ee5 SHA512 e5598ef3d940b9512b0e18bcc526d41ca08df3d8b0a640717914ff7c510de68b6a8aa1299d0681062f510b31be3f62f6f318dc305e2797879739e19a8c871728
 DIST data-default-instances-base-0.1.0.1.tar.gz 1554 BLAKE2B 3dd2c2dd09790e96ca0921af32f2c384b40a9ae9978f25843e32710545be1715b19b2bc25324c8a541986bf1b620d8aeef879ad282e0124d48bbc45daa5378a2 SHA512 32d25a84dc22be5fc0145a32eb4bb8879c4ab43ec08cba9a6e48084e668ca704b1fa69b82f756759a467c23958878c0dfe00620a6a8763e95e319ef71dcbb46d
 EBUILD data-default-instances-base-0.0.1.ebuild 642 BLAKE2B d1c988a2b4c00d466016ee8195441935204622b7832869006a5d7134465a82107105415f19b94b3aea1af4fc6aba0030b5496453f27e7f951b770db9e39bdd32 SHA512 6f55af0c4432409e9ac5d2e1b7ab6c047df7f1ab87b3af13bf710a43f1315747da4b91b5aaef3e525c35f80e74477a88a5065c381070b79dc2981ee9f7b4f440
-EBUILD data-default-instances-base-0.1.0.1.ebuild 648 BLAKE2B d46e0731c2eda81dedf2392731e9a9190cb68b6e76578dbf34b6848de8685a35c709f7c03e807b6e0473b1b154e4c71d2670ac183e009c6dbbc69f92f82391c5 SHA512 6d192b345b3abba1d59837a7342f780d3054ac988fff41cb2056c73c26a399e75ddfdcbaad73cc6ab79bf3805b3f0c992cf19eb5ba3eaee6f547a8e4e8cca510
+EBUILD data-default-instances-base-0.1.0.1.ebuild 649 BLAKE2B 61dcde81d58b06be050ed28a07dae769ea1531c390e117f19e2db27d9be84b8e454db701cddf897f6de57c46979aa0529a59fc6f72a5fdc417d2f6b802515a70 SHA512 dfd4f37bb57baeab5503d27a56975143a944434fbb3681678960f8bee0e7d84aabe66f0762d40d0409ddf6c795e9e6d2ab87d7934b58ac468b43e0f64c208197
 MISC metadata.xml 326 BLAKE2B a53bded82cab952d7f6dcf8d5c714023a308a6bffb03c15942e7a4ff7ddc3432fb5cbe465b15b33d7b70a1c5a79e25f61a3cdc79511f5178f4140db5844a1dc2 SHA512 79bb1f0f9f4ea2cce2c3c806eae5eb3b0035d7d649c550528f8aac9bfb824ef8f017e9c56f59b884558dbdc1bdd350990adbb4bdf99eef3107d1e8ac08d5de8b
diff --git a/dev-haskell/data-default-instances-base/data-default-instances-base-0.1.0.1.ebuild b/dev-haskell/data-default-instances-base/data-default-instances-base-0.1.0.1.ebuild
index 4ec2b2aa0921..f81cff28d14b 100644
--- a/dev-haskell/data-default-instances-base/data-default-instances-base-0.1.0.1.ebuild
+++ b/dev-haskell/data-default-instances-base/data-default-instances-base-0.1.0.1.ebuild
@@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Default instances for types in base"
-HOMEPAGE="http://hackage.haskell.org/package/data-default-instances-base"
+HOMEPAGE="https://hackage.haskell.org/package/data-default-instances-base"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-haskell/dbus-core/Manifest b/dev-haskell/dbus-core/Manifest
index ba1c626fde70..58db26ef5014 100644
--- a/dev-haskell/dbus-core/Manifest
+++ b/dev-haskell/dbus-core/Manifest
@@ -1,4 +1,4 @@
 AUX dbus-core-0.9.3-ghc-7.10.patch 2960 BLAKE2B cbf0294948a042fd3135558755ed0dd61aede38cbb0777b62c8b6ca27fe68bf20622914264d0f50acc20a9e99f25e8461b474e0fc9d89c9eddc87320e5b55087 SHA512 f64631810064c8598264835f58a8bc952160e24a14977bd440cb34895dc4a3a28dfa1122e045f5c16a1ecb3245207b1a5b2349f51f65facfd4eee08b0e203a6a
 DIST dbus-core-0.9.3.tar.gz 216896 BLAKE2B affa443c08cfcc978aeb57a9b73be9afd4f0650e1fa363821688ad7c42439e6446f687f666acef793b95ba65b134bfd7c35968337dbd4c3878c8a8be9b8abe01 SHA512 4eee88958a49a0e0280744b490b9bc71e27f7f7fb32cc8ce34487439a124ba5fe72cb6b006781a03a41e87bdaeb2975fd19374fc19f699f7ad011a9b821ed32d
-EBUILD dbus-core-0.9.3-r3.ebuild 2085 BLAKE2B 06d05b1084631905004c49d9a70e8342b804afb6e978adc4c69bd8084a3407744c79fd3d46acd0e6313f93989402f05d9fda848196f0f8dd321c1d3a840d7c28 SHA512 2711db561df9b6fb583d35d5a5940c44cc6d60d0618292394ab92a39c5ff1190b87d429ac935076a5cc3cb7cfe521839f0ca508c46613c5a16d90a8c7df2f61f
+EBUILD dbus-core-0.9.3-r3.ebuild 2086 BLAKE2B 9c3fbb67d1492b00f2232e8c0719d5bf9bd6febc44c298ddea4720711dfcf255b8d84a1c196833ea7d2f8f15019869306e34d5229619773953b0cac4bf132582 SHA512 b0bc4f59719d517b9bee2a8c182a3798310bd64a4aad3a1a12cb5c5853cc8185ce919236f7dc535ddc5e4ee4718fcfb249d54783cbacb38aa3986fe215322b70
 MISC metadata.xml 330 BLAKE2B a8f740494ea67b7eb5feacfd853aec03ecddd42c3d59cdaac045a82100b15d4663ec64a9fa1aa509dea37f63e825b14436dd931cfe47c45107bff4718ae62c61 SHA512 55edf794d4db633aeffb156a8f35bf05967fefc4d1e3c342f8a360b4f5c3260a150488af3fdf8410204cb7ae9c8d0cf5a98374638d8c85737e5eb4e24119e063
diff --git a/dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild b/dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild
index c5a98d4f8a8a..8578e6110faa 100644
--- a/dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild
+++ b/dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -33,7 +33,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
 
 	if has_version "<dev-haskell/haddock-2.9.2"; then
-		# Workaround http://hackage.haskell.org/trac/hackage/ticket/626
+		# Workaround https://hackage.haskell.org/trac/hackage/ticket/626
 		# The haddock --hoogle option does not like unicode characters, which causes
 		# haddock 2.7.2 to fail like:
 		# haddock: internal Haddock or GHC error: dist/doc/html/enumerator/enumerator.txt: commitAndReleaseBuffer: invalid argument (Invalid or incomplete multibyte or wide character)
diff --git a/dev-haskell/dbus/Manifest b/dev-haskell/dbus/Manifest
index 2f03cf3b96ff..821246188ab7 100644
--- a/dev-haskell/dbus/Manifest
+++ b/dev-haskell/dbus/Manifest
@@ -1,13 +1,3 @@
-AUX dbus-0.10.11-cereal-0.5.patch 4545 BLAKE2B e6c657d037b0e3d296e5199351179968a536dc493e904b7805384530880fbb423648216d76400ce39045835e8809b7da1506213f07a684c647799400c90908fd SHA512 40b8996d4e5b8f77beeca0947f1f46a969a54fb34a875f7b04766767a1188f83f1f2e1aecc0f82be56146c496ccf2cf2c4d85d6fd48d22581a3a128768eb52ba
-AUX dbus-0.10.12-QC-2.8.2.patch 466 BLAKE2B 21e5312a3f931aecdd7a5d906e8cb528919dcdfe9161a9c072b38d2555cfb8d989ea1eb48e5e7d24fbdc4f76d54608ca79df670375d7324e4173f4fd71b35523 SHA512 d1c4da222986b1570a4e9777d39f83d282471039abae1a65ec158b781bcd56fbc02ce1ed2592fa9541814b2943c22697a475c66b526eeda7d95fc67950544d5d
-DIST dbus-0.10.10.tar.gz 73707 BLAKE2B 90903a39d6962fcd3864988215fc74a3f85571509f021a3507f392dd14f2b358d75558dc25269a49426bfcef18eccc53e76c468559b3329367db7ab5904e9879 SHA512 c2faa76c32abb19ab903c015f6fc133beb605bbb4459d018fa544ffe4e04110cc63fc45815d862e8311f5b99de9c180c8eeb8e135fd6c7eb388ff579529a8ead
-DIST dbus-0.10.11.tar.gz 74853 BLAKE2B e72838c14906106b2114d9be9d8580295617c33fd322a3139c8c8245849dd77837cc26587c0289982de32442265b477754196f1b600f630d2f05f1c5312941f1 SHA512 290c1e9b142b920d56c59f3b250da88e114d850c8d846c37b400b21e92fae2d58983b4821497b61d0ff96f54179aedb70a5eb3ca40e1fbb6bbe59dee2f9256ff
-DIST dbus-0.10.12.tar.gz 74960 BLAKE2B b0bf015a761e3bcff8b5b40165f475c0ce00320f95a3f21cad65fed2db6955d982c2c4dbee2e9697f9a67f44b680f12e00c892a1dfa5fd45f745167d39307e66 SHA512 e725adc1b9dbbef4e2f47fd96ae60894f6553a15d5524071f7d6a48ab60cd6c25cda9be3cf84c5f4090f9769810abab7939a7333dcf77f31d1a71690bb6852d9
-DIST dbus-0.10.13.tar.gz 75603 BLAKE2B b1acb541505f0f9afe63fd8d9441114fcee3574e109686b16cd5c506aa940674352d32c14e155d2a2ddbc4bab3485ed70f747f59240b572559d6e649aff3a8da SHA512 e3cbb4153cd9df9308d89662b83659e13f07881f4d652c6f02dc6b6768ac1009552a7cfa9c610ededc9b630d26290eec153a9b08b7a3d70b44a6946af3d030ec
 DIST dbus-1.2.16.tar.gz 78086 BLAKE2B b0909a8679f746e9f7ab4f949f44d44246271441e23c9baac41514a478d7cf2a6e58a2c697b2e7f005341b544d4533efb6f0065eec40f178303aaea7b1f5014d SHA512 fbcddba41d5a6ea3c93841f56b80c43e968758eb8979412cd15a3e6f384bb042a025dc4850dc2e584b459b0c7b99db791d1a9b17090108c004f657f7e125e441
-EBUILD dbus-0.10.10.ebuild 1313 BLAKE2B 7d1afd22d5dcf7bd5aacb2e734a31b2407dce256fd7985c0e0a4db47ae74f24d583a9fcf22c42d1a51a6365b09629c664627fb6780412cf54c3c2a6cb109ab8f SHA512 3a47e520b3155bb66170ac5568b299ba7ceb0622b90ead06adfc60513078f989429f771fdb06143fd187e6c5589abe6c1003f14e433b1d4ff98d0c630ea7bd2a
-EBUILD dbus-0.10.11-r1.ebuild 1404 BLAKE2B e2bb6c8e71c99e63ef6c9501f1f37fcc880d70a738c6f747cd345c3219d7bd065faac1d29af395877bde7e5ee50c18f86e2dc6ea53c35a52f68ca0115f4bd706 SHA512 8591db3379fbae4a2f6499407344ceeb3762f870531e6a1a0c075bc61e68da6f39655e9157bb618aeb04ed84315a9b2d0d7bab01e1c0957dc1b4b8a5161de1d3
-EBUILD dbus-0.10.12.ebuild 1379 BLAKE2B cf846230405bb7edb602200550cc0546c9979393ef4ac53b3ffc5e5c304d587164cae6fd61f1f2fc49c769d1995d55b14a6ab317054c8998eb7a266623738d68 SHA512 20336eae131125f72300bcbed66fef209eb5b787a713b767063a88c0fbbaa01cee93435e307d1e4f585000b1f4edcba8914f09e981c0c0e8791a8113aee85a5c
-EBUILD dbus-0.10.13.ebuild 967 BLAKE2B 5b2f7e7487085b837c3147a84224c6b74f176a0fec8bdefeea53c8e005f49d432bc1a81f2fbd4b24f26912c0e6586d26ececeffb76c06d2489bf73aeff153a98 SHA512 9663246ced8d0df541d0bb98297ffec2af029ab495a051512c49dfc1b8fd91e512e8cdf95c351ec111e0e98e3e3124060bf94964008ecdb20e47cbd5f5e58a9b
 EBUILD dbus-1.2.16.ebuild 1429 BLAKE2B e1a77a159060586c971bd3e89d5fa1024de1a494fa50afa2e36f16782f0cf965e20a5937ccf4fac93010e1c23ed2462e0f64c4ff391888cf54439cc7411cb36c SHA512 5a07bfec67ef2ed706c53fb93ee9c3186f8ccfec7997db6015852e5d811f5e426b27a2f6f3ea3aa3c2bb83da8c2d420692b5fb5b23ec049cc9ab79c37115b90a
 MISC metadata.xml 2059 BLAKE2B 6b4337ace7dfef9da556e9effadbf17714b10926a5f8ac738fa31685fe615b9dddbbf1a4e65550477bd75dd44d46081479faeb67d270218d53bd421cc878e94e SHA512 5fe5ada12b86da78282ff30e5bf0c8218ec81a451988695907c82759aba1dc022539d1d852d078023b37263c1f21a58831edc69a02730caca79487a897065a3b
diff --git a/dev-haskell/dbus/dbus-0.10.10.ebuild b/dev-haskell/dbus/dbus-0.10.10.ebuild
deleted file mode 100644
index eb0ec15878c8..000000000000
--- a/dev-haskell/dbus/dbus-0.10.10.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A client library for the D-Bus IPC system"
-HOMEPAGE="https://john-millikin.com/software/haskell-dbus/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cereal-0.3.4:=[profile?] <dev-haskell/cereal-0.5:=[profile?]
-	>=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?]
-	>=dev-haskell/network-2.2.3:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-2.0:=[profile?]
-	>=dev-haskell/text-0.11.1.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3
-		>=dev-haskell/quickcheck-2.4 )
-"
diff --git a/dev-haskell/dbus/dbus-0.10.11-r1.ebuild b/dev-haskell/dbus/dbus-0.10.11-r1.ebuild
deleted file mode 100644
index 394878470e02..000000000000
--- a/dev-haskell/dbus/dbus-0.10.11-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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 test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A client library for the D-Bus IPC system"
-HOMEPAGE="https://john-millikin.com/software/haskell-dbus/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cereal-0.3.4:=[profile?]
-	>=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?]
-	>=dev-haskell/network-2.2.3:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-2.0:=[profile?]
-	>=dev-haskell/text-0.11.1.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3
-		>=dev-haskell/quickcheck-2.4 )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cereal-0.5.patch
-
-	cabal_chdeps \
-		'cereal >= 0.3.4 && < 0.5' 'cereal >= 0.3.4'
-}
diff --git a/dev-haskell/dbus/dbus-0.10.12.ebuild b/dev-haskell/dbus/dbus-0.10.12.ebuild
deleted file mode 100644
index 6473e10b62e4..000000000000
--- a/dev-haskell/dbus/dbus-0.10.12.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A client library for the D-Bus IPC system"
-HOMEPAGE="https://john-millikin.com/software/haskell-dbus/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cereal-0.3.4:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
-	>=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?]
-	>=dev-haskell/network-2.2.3:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-2.0:=[profile?]
-	>=dev-haskell/text-0.11.1.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3
-		>=dev-haskell/quickcheck-2.4 )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-QC-2.8.2.patch
-}
diff --git a/dev-haskell/dbus/dbus-0.10.13.ebuild b/dev-haskell/dbus/dbus-0.10.13.ebuild
deleted file mode 100644
index 7a5756839d15..000000000000
--- a/dev-haskell/dbus/dbus-0.10.13.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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="A client library for the D-Bus IPC system"
-HOMEPAGE="https://github.com/rblaze/haskell-dbus#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # don't allow access to running dbus
-
-RDEPEND="dev-haskell/cereal:=[profile?]
-	dev-haskell/libxml-sax:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/xml-types:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/chell
-		dev-haskell/chell-quickcheck
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/dbus/files/dbus-0.10.11-cereal-0.5.patch b/dev-haskell/dbus/files/dbus-0.10.11-cereal-0.5.patch
deleted file mode 100644
index 5c2c4c57cbb0..000000000000
--- a/dev-haskell/dbus/files/dbus-0.10.11-cereal-0.5.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff --git a/lib/DBus/Transport.hs b/lib/DBus/Transport.hs
-index 8c50ab9..9517212 100644
---- a/lib/DBus/Transport.hs
-+++ b/lib/DBus/Transport.hs
-@@ -42,3 +42,5 @@ import qualified Data.ByteString
- import           Data.ByteString (ByteString)
-+import qualified Data.ByteString.Lazy as BL
- import qualified Data.Map as Map
-+import qualified Data.Monoid as M
- import           Data.Typeable (Typeable)
-@@ -49,3 +51,3 @@ import qualified System.Info
- 
--import qualified Data.Serialize.Builder as Builder
-+import qualified Data.ByteString.Builder as Builder
- 
-@@ -151,3 +153,3 @@ instance Transport SocketTransport where
- recvLoop :: Socket -> Int -> IO ByteString
--recvLoop s = loop Builder.empty where
-+recvLoop s = loop M.mempty where
- 	chunkSize = 4096
-@@ -156,3 +158,3 @@ recvLoop s = loop Builder.empty where
- 			chunk <- recv s chunkSize
--			let builder = Builder.append acc (Builder.fromByteString chunk)
-+			let builder = M.mappend acc (Builder.byteString chunk)
- 			loop builder (n - Data.ByteString.length chunk)
-@@ -163,8 +165,8 @@ recvLoop s = loop Builder.empty where
- 				-- Return what we've got so far.
--				0 -> return (Builder.toByteString acc)
-+				0 -> return (BL.toStrict $ Builder.toLazyByteString acc)
- 				
- 				len -> do
--					let builder = Builder.append acc (Builder.fromByteString chunk)
-+					let builder = M.mappend acc (Builder.byteString chunk)
- 					if len == n
--						then return (Builder.toByteString builder)
-+						then return (BL.toStrict $ Builder.toLazyByteString builder)
- 						else loop builder (n - Data.ByteString.length chunk)
-diff --git a/lib/DBus/Wire.hs b/lib/DBus/Wire.hs
-index 43ae315..09bf8bd 100644
---- a/lib/DBus/Wire.hs
-+++ b/lib/DBus/Wire.hs
-@@ -34,2 +34,3 @@ import qualified Data.ByteString.Char8
- import           Data.Int (Int16, Int32, Int64)
-+import qualified Data.ByteString.Lazy as BL
- import qualified Data.Map
-@@ -37,2 +38,3 @@ import           Data.Map (Map)
- import           Data.Maybe (fromJust, listToMaybe, fromMaybe)
-+import qualified Data.Monoid as M
- import           Data.Text (Text)
-@@ -45,3 +47,3 @@ import           System.Posix.Types (Fd(..))
- 
--import qualified Data.Serialize.Builder as Builder
-+import qualified Data.ByteString.Builder as Builder
- import qualified Data.Serialize.Get as Get
-@@ -180,3 +182,3 @@ appendB :: Word64 -> Builder.Builder -> Marshal ()
- appendB size bytes = Wire (\_ (MarshalState builder count) -> let
--	builder' = Builder.append builder bytes
-+	builder' = M.mappend builder bytes
- 	count' = count + size
-@@ -187,3 +189,3 @@ appendS bytes = appendB
- 	(fromIntegral (Data.ByteString.length bytes))
--	(Builder.fromByteString bytes)
-+	(Builder.byteString bytes)
- 
-@@ -275,3 +277,3 @@ unmarshalGet count be le = do
- marshalWord8 :: Word8 -> Marshal ()
--marshalWord8 x = appendB 1 (Builder.singleton x)
-+marshalWord8 x = appendB 1 (Builder.word8 x)
- 
-@@ -282,4 +284,4 @@ marshalWord16 :: Word16 -> Marshal ()
- marshalWord16 = marshalBuilder 2
--	Builder.putWord16be
--	Builder.putWord16le
-+	Builder.word16BE
-+	Builder.word16LE
- 
-@@ -287,4 +289,4 @@ marshalWord32 :: Word32 -> Marshal ()
- marshalWord32 = marshalBuilder 4
--	Builder.putWord32be
--	Builder.putWord32le
-+	Builder.word32BE
-+	Builder.word32LE
- 
-@@ -292,4 +294,4 @@ marshalWord64 :: Word64 -> Marshal ()
- marshalWord64 = marshalBuilder 8
--	Builder.putWord64be
--	Builder.putWord64le
-+	Builder.word64BE
-+	Builder.word64LE
- 
-@@ -441,6 +443,6 @@ getArrayBytes itemType vs = do
- 	
--	putState (MarshalState Builder.empty afterPadding)
-+	putState (MarshalState M.mempty afterPadding)
- 	(MarshalState itemBuilder _) <- Data.Vector.mapM_ marshal vs >> getState
- 	
--	let itemBytes = Builder.toByteString itemBuilder
-+	let itemBytes = BL.toStrict $ Builder.toLazyByteString itemBuilder
- 	    paddingSize = fromIntegral (afterPadding - afterLength)
-@@ -568,3 +570,3 @@ marshalMessage e serial msg = runMarshal where
- 		marshal (toValue (encodeEndianness e))
--		let bodyBytes = Builder.toByteString bodyBytesB
-+		let bodyBytes = BL.toStrict $ Builder.toLazyByteString bodyBytesB
- 		marshalHeader msg serial sig (fromIntegral (Data.ByteString.length bodyBytes))
-@@ -573,6 +575,6 @@ marshalMessage e serial msg = runMarshal where
- 		checkMaximumSize
--	emptyState = MarshalState Builder.empty 0
-+	emptyState = MarshalState M.mempty 0
- 	runMarshal = case unWire marshaler e emptyState of
- 		WireRL err -> Left (MarshalError err)
--		WireRR _ (MarshalState builder _) -> Right (Builder.toByteString builder)
-+		WireRR _ (MarshalState builder _) -> Right (BL.toStrict $ Builder.toLazyByteString builder)
- 
diff --git a/dev-haskell/dbus/files/dbus-0.10.12-QC-2.8.2.patch b/dev-haskell/dbus/files/dbus-0.10.12-QC-2.8.2.patch
deleted file mode 100644
index 5fbfa1f61981..000000000000
--- a/dev-haskell/dbus/files/dbus-0.10.12-QC-2.8.2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/tests/DBusTests/Util.hs b/tests/DBusTests/Util.hs
-index cc83cef..972afb1 100644
---- a/tests/DBusTests/Util.hs
-+++ b/tests/DBusTests/Util.hs
-@@ -1,2 +1,2 @@
--{-# LANGUAGE TemplateHaskell #-}
-+{-# LANGUAGE TemplateHaskell, CPP #-}
- 
-@@ -194,4 +194,6 @@ countFileDescriptors = liftIO io where
- 
-+#if ! MIN_VERSION_QuickCheck(2,8,2)
- instance (Arbitrary a, Ord a) => Arbitrary (Data.Set.Set a) where
- 	arbitrary = fmap Data.Set.fromList arbitrary
-+#endif
- 
diff --git a/dev-haskell/dense-linear-algebra/Manifest b/dev-haskell/dense-linear-algebra/Manifest
index 5e9236b47c0e..65f6430325aa 100644
--- a/dev-haskell/dense-linear-algebra/Manifest
+++ b/dev-haskell/dense-linear-algebra/Manifest
@@ -1,3 +1,3 @@
 DIST dense-linear-algebra-0.1.0.0.tar.gz 6285 BLAKE2B 22cfbc68a2511ae4ed946c7b3c99dc171b515f0fa929ee5b4a8b01a6c6a707b3a66e0168104b37a49882880658119ea0d9fc5c1bc9d562eecd2f9349eadd90b0 SHA512 bcc70b42c3ea59aa3a739e2b189b9a1018d3dc27e65f5016502a2068005f480c296960ba7758a810cb22bfde53b5a597a66a3e1dd7bb732e54fe5daa1be08aa0
-EBUILD dense-linear-algebra-0.1.0.0.ebuild 924 BLAKE2B 78d13d1d532d2fa6ff5d7fb7c047cfd1034e17a90536217d5aeb8ffedf2bc6fb3401703ea48726c2fa813f46d683988fac3f846078e5e2cd72948817e5a46b6b SHA512 4b078f237b25570b7bf716214818083af33f080c6ae365e9945ddb831da2fde3e5ea7f9ded8011be23f709197fc17fbd6bf2aa739c58cd01104af22a4e50da7f
+EBUILD dense-linear-algebra-0.1.0.0.ebuild 925 BLAKE2B 7a82f4eeda83a9ef57509480c4daae9321cf4c702df458a63331829fd6876e04a7bccdc726ceaaf4ea58da758480b53918715ac26024876ec4609c842bcf3dd8 SHA512 f7df0b8f164c6d26f9af5d64a771a5e66629ebc0608da09b5ce28f0a167fa7d745d393e9bb1499850e593949b1d7d2293db411f3ac32e921bbc3abd8465a3d1a
 MISC metadata.xml 391 BLAKE2B befcddae61e2057cae51eb4008f84d20ef9f791f682ec9ab2cc8cbfeb6ca7768beab03de81480980e66dfb63707cb5539290a26bae324ab5cd8cb51a9b8a2c1f SHA512 b55c19a1840ba222dd5c6e45f3698fd003feadc25e6c985d28743a5d237f5e55cc6d344abfff3eada702a42c9d37b2e61e8af32e1270a791ce59106996f3281c
diff --git a/dev-haskell/dense-linear-algebra/dense-linear-algebra-0.1.0.0.ebuild b/dev-haskell/dense-linear-algebra/dense-linear-algebra-0.1.0.0.ebuild
index 50c1580601fc..0a6a6c4d3fe3 100644
--- a/dev-haskell/dense-linear-algebra/dense-linear-algebra-0.1.0.0.ebuild
+++ b/dev-haskell/dense-linear-algebra/dense-linear-algebra-0.1.0.0.ebuild
@@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Simple and incomplete pure haskell implementation of linear algebra"
-HOMEPAGE="http://hackage.haskell.org/package/dense-linear-algebra"
+HOMEPAGE="https://hackage.haskell.org/package/dense-linear-algebra"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-haskell/dictionary-sharing/Manifest b/dev-haskell/dictionary-sharing/Manifest
new file mode 100644
index 000000000000..b55dbaeccb1b
--- /dev/null
+++ b/dev-haskell/dictionary-sharing/Manifest
@@ -0,0 +1,3 @@
+DIST dictionary-sharing-0.1.0.0.tar.gz 2524 BLAKE2B d8a5a942749add31b4622b8bcea9784273fde2cb87865f5d7103f06f2fe9dbd82f247101b235ed7b716a8fb5e3dc813e897776778ee377442685d2b7d08d37b8 SHA512 5af84caae1339ddb006ba77f2505da63e0977368f93f4d84dbd8f31c0e45cea988a9175b5273cc2280b8d8f44dd8c921385ea2c38b239f08a565cae7c1fd6415
+EBUILD dictionary-sharing-0.1.0.0.ebuild 723 BLAKE2B 7c6030e683cf608e7fa4e61e1acaa8fb94cb591d5a07c5a02058d3906f8ab1ebda25b37088d7d612dae2a016ead8303de3505276fd0f8fb8f54ab4943009e526 SHA512 96fdabb81123a31047bb0750b0c376ad7a2095e0fbd476bcc38e9bed2730bd6a557c610fdcc84331be24d46df283be6c757f3b232c5af26478aeada927540ded
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/dictionary-sharing/dictionary-sharing-0.1.0.0.ebuild b/dev-haskell/dictionary-sharing/dictionary-sharing-0.1.0.0.ebuild
new file mode 100644
index 000000000000..925356c70df5
--- /dev/null
+++ b/dev-haskell/dictionary-sharing/dictionary-sharing-0.1.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 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="Sharing/memoization of class members"
+HOMEPAGE="https://hackage.haskell.org/package/dictionary-sharing"
+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
+"
+src_prepare() {
+	default
+
+	#https://hackage.haskell.org/package/dictionary-sharing-0.1.0.0/revisions/
+	cabal_chdeps \
+		'containers >=0.5 && <0.6' 'containers >= 0.5'
+}
diff --git a/dev-haskell/dictionary-sharing/metadata.xml b/dev-haskell/dictionary-sharing/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/dictionary-sharing/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/double-conversion/Manifest b/dev-haskell/double-conversion/Manifest
new file mode 100644
index 000000000000..8ea8e545652a
--- /dev/null
+++ b/dev-haskell/double-conversion/Manifest
@@ -0,0 +1,3 @@
+DIST double-conversion-2.0.2.0.tar.gz 7023616 BLAKE2B ecdd9ff171a976f48390626eda39a23f3e6b9f3ec204515a9730ebc22bb6a49b40baf77f5c12dc01f47c90225055d5c1199b00e739ef809861bf564d3aaa38df SHA512 1713c4e8a28de2ee85e1f312dc12d30a9c6d7a139d89f04ea88048578ce65c8bdf62ded90b92bce011955b95867ca95a623a5109758276a29ba7b6843fbe37eb
+EBUILD double-conversion-2.0.2.0.ebuild 924 BLAKE2B 342183e5abfb43fdf770531afe534c4f108c9f1924be836e3b73b5ac14f83a220b056df3ad74ba1eb1f8a183a43ffc14b13d615ad654ed7fcc85875370ed2096 SHA512 98506d9ee98593c51601d6d0a65830fc13624c141752936cc575ca817dd6936b3f58cd7dc7ea3f473d1b737db32c09a6159f815d89cb06b6997757168e9307ff
+MISC metadata.xml 1001 BLAKE2B db7b2d3e4456d83adcea266a44104a495b72c8da397beb3d41741cfb4e379eacf1d8bc2db94455b7d0d4a51555c47195f4db0ec281d970c24c83b19b4a9e97d6 SHA512 5a5d2fb52baa372f24d4e060b05bcf1fd8836ee5699d461bb11673a74c42d5fb714a208a7ee9151a6a7ace2ebb326dbe187a95df162481f9151d79ff85b2e84f
diff --git a/dev-haskell/double-conversion/double-conversion-2.0.2.0.ebuild b/dev-haskell/double-conversion/double-conversion-2.0.2.0.ebuild
new file mode 100644
index 000000000000..721be4fc964b
--- /dev/null
+++ b/dev-haskell/double-conversion/double-conversion-2.0.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+#hackport: flags: -developer
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast conversion between double precision floating point and text"
+HOMEPAGE="https://github.com/bos/double-conversion"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # fails to compare 0.0 with 0.0
+
+RDEPEND=">=dev-haskell/text-0.11.0.8:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	sys-devel/gcc:*[cxx]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hunit
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+		dev-haskell/test-framework-quickcheck2 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-developer
+}
diff --git a/dev-haskell/double-conversion/metadata.xml b/dev-haskell/double-conversion/metadata.xml
new file mode 100644
index 000000000000..b9abb6a6f244
--- /dev/null
+++ b/dev-haskell/double-conversion/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		A library that performs fast, accurate conversion between double
+		precision floating point and text.
+		
+		This library is implemented as bindings to the C++
+		@double-conversion@ library written by Florian Loitsch at Google:
+		&lt;http://code.google.com/p/double-conversion/&gt;.
+		
+		The 'Text' versions of these functions are about 30 times faster
+		than the default 'show' implementation for the 'Double' type.
+		
+		The 'ByteString' versions are /slower/ than the 'Text' versions;
+		roughly half the speed.  (This seems to be due to the cost of
+		allocating 'ByteString' values via @malloc@.)
+		
+		As a final note, be aware that the @bytestring-show@ package is
+		about 50% slower than simply using 'show'.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/ekg/Manifest b/dev-haskell/ekg/Manifest
index 5ac1cf2568fa..11eca5806189 100644
--- a/dev-haskell/ekg/Manifest
+++ b/dev-haskell/ekg/Manifest
@@ -1,3 +1,3 @@
 DIST ekg-0.4.0.15.tar.gz 171305 BLAKE2B 41184045d138f0dc8a925c81d1c15b09b0af10e5dfe80600206bbb4b4cb460521fa71fb09ca2cc32fe4abad28e38183a2f8a168c4ea22c22e3ffdf4668693fc3 SHA512 da7f776e8eedcf0d038495535ca2953d0d813a8a90c2bdb18898932d59ce1b2181e66f06188afea95c14e8b9910b5d6a07930952b2172f67e1bf5b94dbb4967f
-EBUILD ekg-0.4.0.15-r7.ebuild 1213 BLAKE2B 79b23245193bf6ed6d16fc8fb59677b84de68aa3ac3698941ef4abd57d35bf1638d2aa22158d1a8fd73d3d8145b45b2e8c5c17e0d8b708aa070aba17b5e0a898 SHA512 9e8402702a66d4847efd4783f00e1e843f922ca84d4950f8467c7a4c7e9a74fa5418027e8fbf23f171b6772dca3bf2aaac9cdf36045d58259077760d4ed82f88
+EBUILD ekg-0.4.0.15-r7.ebuild 1214 BLAKE2B 88c756ac5fa2d0f7d9416f0373b8329f818d4781855b09c0aa69fb56b396ad75fe1762775d6103ca64d353ebb9e1e39ed71b2c46db7f5c6f7d5d241fa303f1a7 SHA512 eafd2bcd36f54bda6c4975db4de876f96a5fde150ddaa58b1d8921cbe7bbbdb4ca229005f0c61123aade70f87eea7bea26aab5d4a4ab0edd3d39a09844df1e8b
 MISC metadata.xml 516 BLAKE2B a6a0016ef3903e1ded31bff0a26b0990827db839593a48fd2a8b1bc8f92e32161c88dde0396c544a5ecba9944f5fe8c8fb0386a1b0e1813a4828bb107a6a64a5 SHA512 b5193ab4665caea0b015e7bfd80098a87940aafc0d0733212532fce7c1a8c849c264e7b4cbdd98f0251f53b1a9cf80a89aa8ec11288fa6a9545c490ee608e0fd
diff --git a/dev-haskell/ekg/ekg-0.4.0.15-r7.ebuild b/dev-haskell/ekg/ekg-0.4.0.15-r7.ebuild
index b392e081104e..533c5a2cd191 100644
--- a/dev-haskell/ekg/ekg-0.4.0.15-r7.ebuild
+++ b/dev-haskell/ekg/ekg-0.4.0.15-r7.ebuild
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	default
 
-	# As per http://hackage.haskell.org/package/ekg-0.4.0.15/revisions/
+	# As per https://hackage.haskell.org/package/ekg-0.4.0.15/revisions/
 	cabal_chdeps \
 		'base >= 4.5 && < 4.12'	'base >=4.5' \
 		'aeson >= 0.4 && < 1.3'	'aeson >= 0.4' \
diff --git a/dev-haskell/encoding/Manifest b/dev-haskell/encoding/Manifest
index 8114dc333ec2..5577fb89580a 100644
--- a/dev-haskell/encoding/Manifest
+++ b/dev-haskell/encoding/Manifest
@@ -1,12 +1,15 @@
 AUX encoding-0.8.2-cabal22.patch 914 BLAKE2B d80455cd8477ad38ec5ab8653f64553b70e181e4fec824e16203e8bcdd8740bd05200a5071061cbe127931164c4f3319615c304ec5264908b08054d28f116103 SHA512 aca99c6fe58d5f33797f11026d82eecce241440c3643be22eedf0b28a6caa68d42cc669e53ea9ab8d5bdb3537432adcfe73700e14b949b4ac5114ac72305b6ab
+AUX encoding-0.8.2-overflow.patch 1403 BLAKE2B 4ada33908b07997beba49b98f889b761e57867b8fa7f47aed1ca0023d3788af122044a78a04e501aba478eccc0b94d705ba7f1b9a529f4cb24034d382ada63d3 SHA512 4aad7e9a19347a55191c1cd9eccfb1d0814a74788ded5c5b5472c92549729d3af0c54bb3efed05ad38050d551232cbdae4cb7849b8e7904671e76eb6c0c39807
 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.5.tar.gz 380798 BLAKE2B 0b8ccca2de17e00c59b114c8b6b7107a80e92e376cc3bf9d5e95eadf2a2c1e5a2d2a12294e7ec669b1203d4b4c6809c8a129aaf17f1022f361b64542fcf45d9b SHA512 2ae2f44007735bdcb6b7cd35614ffcb5fe211321d516350555b03d9074c679995260f30de1df788b800711613bfdca037cb9c24cf90afc88d32a706c237df386
 DIST encoding-0.8.tar.gz 321410 BLAKE2B ee87c14457c3474c571ebe25b5f98d50713b85666aeb5e099767d787bfaa9b10d03feb0e596c6c93ddf68bfc583285971f30d8e526cdc12d7570ae63b9b80f77 SHA512 c1f05333fa34eb0dc9ed1e1c82bc4d84e9fb3d0252a45519998a199ef1eafd49e9dea7ad60e8ae855b4efdaf4977f8a9aa6324d7b73bfd122bdef60341dea1e0
 EBUILD encoding-0.6.7.2-r2.ebuild 997 BLAKE2B 51becebdfb34dc776b59a1bca61a28636e84cdaee91cae238252d5eb3cc36fcde047d70bac93d51d5739ebc70c293cbc08b209f9a311cd3509b1a6d9195fe723 SHA512 55935e03e6fec1ddf66b57378511a4eae7ecee137e7f03d468241aa4e257c9ddb33f465d87955369fd518482825c57421f3d7361dd63c6c44a1ab287583becc5
 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.5.ebuild 1195 BLAKE2B 516fe912c3c4a09b425be8aabff06e59b6b12f04d963284290cbfc800d4f6b0e97ec0f752606c04464e1c3f215fdb7fbd49d25f6061bc249fbbe7dc792c3c94c SHA512 c4f47840f6a8d45747b09ddf143f04debfacf96d3da6bedb8f16c707abefdd7a518e6b87f8d957f15b9ad9728e570e8cf9a276bb202a946a438756861ede8080
 EBUILD encoding-0.8.ebuild 876 BLAKE2B 753184058d1bac292b957f43d1afd46b4d9df0425a3666db2a9114eac261bb61462a2a7133176e5336eb054f3dd6cc102ba4c9d32e7c4a2c4deecd5c0e0b5844 SHA512 cc771810ebf695cc3b32e475c0028e068c74e981e1f7b9231adbf371a89b22d31d005c5b51e5208ec4209a5a6bed56a0a81bf1c1475474f741e0191f4160376f
 MISC metadata.xml 676 BLAKE2B e2bfda2c8e81fdbb369a7a99d555ab71d7cdd93517bc54a4f399d3ae9dafc384d1921a0f0e78f9b738bb0d72cbb9814ea75613b4ffaec0ff2615141b5f795014 SHA512 86d83b18876390cb974df3ea61782f32b5e8c893877664e7e9722e6ad5d596c2b6454c60fe6537c2c2492f9fa28d614fe0c473a5bc702a21632210f516328d3c
diff --git a/dev-haskell/encoding/encoding-0.8.5.ebuild b/dev-haskell/encoding/encoding-0.8.5.ebuild
new file mode 100644
index 000000000000..48de713accc6
--- /dev/null
+++ b/dev-haskell/encoding/encoding-0.8.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6.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-2.0
+	>=dev-haskell/haxml-1.22 <dev-haskell/haxml-1.26
+	test? ( dev-haskell/hunit
+		dev-haskell/quickcheck )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.2-overflow.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-overflow.patch b/dev-haskell/encoding/files/encoding-0.8.2-overflow.patch
new file mode 100644
index 000000000000..c8085c827197
--- /dev/null
+++ b/dev-haskell/encoding/files/encoding-0.8.2-overflow.patch
@@ -0,0 +1,41 @@
+https://github.com/dmwit/encoding/pull/11
+
+From ce27249d4260c7eb3f514c95d5edd762804dd4f3 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sat, 29 Aug 2020 13:52:33 +0100
+Subject: [PATCH] Data/Map/Static/Builder.hs: avoid shiftL with negative offset
+
+On ghc-8.8 building `encoding` fails as:
+
+```
+Preprocessing library for encoding-0.8.5..
+arithmetic overflow
+```
+
+This happens because `findSplitSize` can't handle
+small values, like `findSplitSize 1` and calls `shiftL`
+with negative value, which is forbdden:
+    https://hackage.haskell.org/package/base-4.14.0.0/docs/Data-Bits.html#v:shiftL
+
+Work it around by always passing non-negative offset.
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ Data/Map/Static/Builder.hs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Data/Map/Static/Builder.hs b/Data/Map/Static/Builder.hs
+index 486e19c..61851cd 100644
+--- a/Data/Map/Static/Builder.hs
++++ b/Data/Map/Static/Builder.hs
+@@ -37,6 +37,6 @@ treeDepth sz = find' [0..]
+ findSplitSize :: Int -> Int
+ findSplitSize len = let depth = treeDepth len
+                         free = (maxSize depth) - len
+-                    in if free <= (1 `shiftL` (depth - 2))
++                    in if 2 * free <= (1 `shiftL` (depth - 1))
+                        then maxSize (depth - 1)
+                        else len - (maxSize (depth - 2)) - 1
+-- 
+2.28.0
+
diff --git a/dev-haskell/esqueleto/Manifest b/dev-haskell/esqueleto/Manifest
index c3a445b7f739..d4083c429157 100644
--- a/dev-haskell/esqueleto/Manifest
+++ b/dev-haskell/esqueleto/Manifest
@@ -1,4 +1,6 @@
 AUX esqueleto-2.4.3-persistent-2.5.patch 6114 BLAKE2B 594cb0dfd2f6e6fb5ac28df75a1e6451bee2483036f5e465fbcb6bcbc98a10214fa7ec534558022b60096b849e68440060f8c1b4f95c235691a4b32b4d2e05d7 SHA512 a229ebc9e9f513102324e78641a4eb4e86d9fa87764f2f88fdf8512d96c6eb223ad870d20dcd0c7805d3a695cebb7e03bb3912421fa25cd7647d804b21320b65
 DIST esqueleto-2.4.3.tar.gz 39664 BLAKE2B 03f56caca53815bf751503eaba55d0c6c225d9bcd2751371aeadaa1244c90649babf7cc2f05f8dcc2206fc5a7e235de14c11cde3f246c1fb78967defe566cc88 SHA512 50ad774bbd83c587775887320e24b329b575c9b3dad5aed920d83da7b8e5fa259624c38a40c457a3c12258e2b34cce39042c1b33002a06dcd3020bf370a06cbb
+DIST esqueleto-3.3.3.2.tar.gz 88010 BLAKE2B 18ffba5a512f92bac2c98a6ce730bd5004d5ff4c97e1d777a16e9d2601508d93878a7a3e13ebed79c55c46aae5516d3caf82f1579fd0ffbc60c670413125c702 SHA512 96496f60affcbaa4051b75671bb8b8f54f8c42b350d88bc4d81a687f05d2516bf0e2aceb7540a477d8dd995cb431e575e184d741e06e3bc12f1f4794a40a001f
 EBUILD esqueleto-2.4.3-r1.ebuild 1372 BLAKE2B 3d042c033ea9a939f27d1e72e39dbcd45546b699a2c2555fe53e7e41e0ac4adef9e796b5fb4a3ee7fbf9f0fc4b02f38ad4cfdcaeb26fc8696a4e8b47961b8863 SHA512 69cf8a6a1bb11697a21288316ef6424075efc3e75fb22eb4d39dad4d31598f90d938cf42eee9d10c16b6b67628c5bc137f7519dbd93ac568b2206bcb34c957f7
+EBUILD esqueleto-3.3.3.2.ebuild 1682 BLAKE2B 9d1336d56f81ce3cb47bda2e7e31fa5d18f67fa345592aceea36b151bf618aab97d6e621724fd736bcfef038b628ed893356167156ec9fb3c59e8d695775007d SHA512 9aeeb0420f4a7022ae125238c3c1f97fc3a2ca5d84d12664f14c412491beb7d13ef1c3d26c40015274dabe42fb0485bbb5675060702b18003a141cb2ca4a139c
 MISC metadata.xml 2043 BLAKE2B 7b418084368f204d12010f088f55544feed211ed193787a9698a45c891f5c5c579a9e9b583cc606401ff43975755fbe73725588ebcf27e8dcfd77b3344534596 SHA512 162af6c274fb74b5df2c040c8dc8de89ab08bf5839f6c80b099a7c906e4168c92a1c49a09ecae0dda69e45239002625abdf70fa323ab1258d55c314931875599
diff --git a/dev-haskell/esqueleto/esqueleto-3.3.3.2.ebuild b/dev-haskell/esqueleto/esqueleto-3.3.3.2.ebuild
new file mode 100644
index 000000000000..d8643a5a166f
--- /dev/null
+++ b/dev-haskell/esqueleto/esqueleto-3.3.3.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: -mysql,-postgresql
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Type-safe EDSL for SQL queries on persistent backends"
+HOMEPAGE="https://github.com/bitemyapp/esqueleto"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # tries to access network
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
+	>=dev-haskell/attoparsec-0.13:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	dev-haskell/blaze-html:=[profile?]
+	>=dev-haskell/conduit-1.3:=[profile?]
+	dev-haskell/monad-logger:=[profile?]
+	>=dev-haskell/persistent-2.10.0:=[profile?] <dev-haskell/persistent-2.11:=[profile?]
+	>=dev-haskell/resourcet-1.2:=[profile?]
+	>=dev-haskell/tagged-0.2:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	dev-haskell/unliftio:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( dev-haskell/exceptions
+		dev-haskell/hspec
+		dev-haskell/mtl
+		dev-haskell/mysql
+		dev-haskell/mysql-simple
+		dev-haskell/persistent-mysql
+		>=dev-haskell/persistent-postgresql-2.10.0 <dev-haskell/persistent-postgresql-2.11
+		dev-haskell/persistent-sqlite
+		dev-haskell/persistent-template
+		dev-haskell/postgresql-libpq
+		dev-haskell/postgresql-simple
+		dev-haskell/vector )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-mysql \
+		--flag=-postgresql
+}
diff --git a/dev-haskell/extra/Manifest b/dev-haskell/extra/Manifest
index e0d1d682cac6..8cd7209a0fe9 100644
--- a/dev-haskell/extra/Manifest
+++ b/dev-haskell/extra/Manifest
@@ -1,3 +1,3 @@
-DIST extra-1.7.6.tar.gz 43033 BLAKE2B 96b7c541b238bbec81b3f51342466559eebb935479020b03947273f21d35038d5c235cdb5a51b6d60f09aafeb559e72926014394944b2a0e34997b7391aa8341 SHA512 1b8bdab361807aafe3ea0048904d17984330f4b3ac137053d95957de89b4ed00e1e52c8828e26cbdd4ddb216244a21b0dc07f0c0f56b7cded96a9dd527443699
-EBUILD extra-1.7.6.ebuild 665 BLAKE2B 7e91cf5448516b4d71a1cda4bd3319136a6d33107870294abb603dbd1627730aa273207db5d2b5f5769c56547c84fad05e96e7a54544c34eea8344badaed757e SHA512 9a3639fa362538e0954df1695ca4b73d3c45aaac8f2719c882b03c7851f905eb0c09b25b2c89871a181bbbe9c697c33f5df8c7800ae34a850c9d1445bcf3b3a4
+DIST extra-1.7.7.tar.gz 43139 BLAKE2B 17a0edb62ddc868c2666f70f1619638cfb3d3eee79e73521225cbdb1f3b14ad9cdeb43adf8289c0a838b5437a82ad5bbd0b522db2cb62cca15c3da77d907da5b SHA512 1a628a4f59d36043835d1e6dab1834e9375ab284e8c089eaaadfdd57556736a06aaba71ac176b6e1c2b5e3d47e472b977747f991d3d3291cce5a501e45b4b6d5
+EBUILD extra-1.7.7.ebuild 665 BLAKE2B 7e91cf5448516b4d71a1cda4bd3319136a6d33107870294abb603dbd1627730aa273207db5d2b5f5769c56547c84fad05e96e7a54544c34eea8344badaed757e SHA512 9a3639fa362538e0954df1695ca4b73d3c45aaac8f2719c882b03c7851f905eb0c09b25b2c89871a181bbbe9c697c33f5df8c7800ae34a850c9d1445bcf3b3a4
 MISC metadata.xml 330 BLAKE2B 02bc69029c346d132aca400cfbc70f13d9bffaa36fcafd9c01a7f8213c27623b9fc19ae9c9a8c75ca898c5a251d5f5189239f16b805316a2edb32f7eef5424b4 SHA512 67832d58fae9b3c4ad5d3943f35135a20f2d26af7debff66857e36316ed9e697f5cfb285d2e67da2422c626dcac38c8bfbf1e1320237ead4cfb10514a6d1df4c
diff --git a/dev-haskell/extra/extra-1.7.6.ebuild b/dev-haskell/extra/extra-1.7.7.ebuild
index 4acec8c5bc8e..4acec8c5bc8e 100644
--- a/dev-haskell/extra/extra-1.7.6.ebuild
+++ b/dev-haskell/extra/extra-1.7.7.ebuild
diff --git a/dev-haskell/filestore/Manifest b/dev-haskell/filestore/Manifest
index 2e99690f12f2..ecdbb9f41f46 100644
--- a/dev-haskell/filestore/Manifest
+++ b/dev-haskell/filestore/Manifest
@@ -1,10 +1,3 @@
-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
-DIST filestore-0.6.4.tar.gz 32225 BLAKE2B 49fd010ddabb0b940d228b7adae61908fb98d81bd8aa74f8d910e7ec0f1086a6d9741e9894d0c96d61cbf489814574d08375dd32c60c8c6c2e6ae03dac4eab06 SHA512 07a8ce976b354139ae4894c3e6751b9ef02957191a15e18b2eccc8cfbc97344eca2ad44b6cca863ccf7c43b444ed999355c33d99cd20b87c126f04d8f248cabb
-EBUILD filestore-0.6.1.ebuild 1605 BLAKE2B 38f0a68765f861183396537f2480bb83fff2571f13acceb2ee2e20f2566b5baafe67aa40a3b105ba8c9325d1c00e2a0c5c62b43c33c78ac17ac35eca99d9e628 SHA512 d0b71f7526634b05b6f658ca064f9ec9bedca7eb284d89f6e9ce6d56ee2e7b368887a5f4016745384b415c3ed56fe67d4c9cc3d82c038c69f0c8468c7352b2da
-EBUILD filestore-0.6.2.ebuild 1357 BLAKE2B 8aa81d07099d947ed6a6e34b81235160081089941930296d285308cec3aaf011aad172e108e4b95c799b23b058485ae88b307115ab193c11f82f68c91f5fee01 SHA512 fa7e15c8a2fd7d2b80572ceb428ab4fb5f5bb4dca2501ca5204e6c66e49d4b69452d46dd9cfc303c1c916ab8e6ddeb16440ac4b509046d732be3690226a09fa1
-EBUILD filestore-0.6.3.4.ebuild 1174 BLAKE2B d26385d73b4b37b0632441316cd9a79a06405221060d13474c83d4addc963ba60dbe4cc248ee57a0f5d7c8868dc163aa08c19dc67aedbcfe301b6d95b252fe7a SHA512 7c8b71b2dfeacaea7d43bb9f10ccb7a6c1bfdd49cd3f46b4af83e9f23cf34718c9bed0f70a131a983c69b817c0f5122535b25764c14deaf8c579da2d4047b0c7
-EBUILD filestore-0.6.4.ebuild 1217 BLAKE2B 0941c7d9e246c5d5167ba3561e850a9bd833b811151272e988c8bb9c72b8b4e2a696bcd6e116696c874f7ac8267994a00938cc4457615f7ab0b9f938bf09fc64 SHA512 6b95135bef88576b97b82d311c16d680b9f2de05ecc9359258c9073f3acd043dc34aa13fb228fe14f8cfb8cf31efc034f97050e3b5c504f15a150abe70d5b836
+DIST filestore-0.6.5.tar.gz 32338 BLAKE2B 534d2eb492fb6a6b3db460c181616d401f9f045772e91758249480ecf838ff56a210ab40dfaa1e360891f2509352268b50046dbd4d0f2f9d46c40a295f1a9fbc SHA512 e4710e1e01cf0eb25a60e48961679009f7d1838104ec81ef1444c39fb25f1426e8d9e2ab557d69a2196d503b829d3bc2791f18083cf39ca623efc6fc0d070dcc
+EBUILD filestore-0.6.5.ebuild 1217 BLAKE2B 92a466d954bf3c642143b515fa9692b74df550dffb29744705b3bc830735fd1f3237a3ea7c5749c3c36da4743dcf8a4d36e803977f6e68bfafcf73761fbaa408 SHA512 3350d598183ffe6ca3f4b2afe321f87375a5c92b60afd350fd0a08b9154851bf91c596442479e4fce3a3f8177eb024e899197b4f73701feb6775facab00afd7e
 MISC metadata.xml 796 BLAKE2B 375f217f68beae2145186476ace228a86b22bc18296934a7a811d0a54847a73d730c3dfa93483947f6f87c4a7e6ffcfa3afe68fe4b9b2bb7314c7f1a7724fc43 SHA512 8f45afc127a379b15396f639424cd31b9e241b547ccf743c5509eb80d07dc74dc7cbf3a0edc17f62e9a4202ed2fd420c6a055f0bc1325d09c36662bd695891d9
diff --git a/dev-haskell/filestore/files/filestore-0.6.1-ghc-8.patch b/dev-haskell/filestore/files/filestore-0.6.1-ghc-8.patch
deleted file mode 100644
index 126a0564b4db..000000000000
--- a/dev-haskell/filestore/files/filestore-0.6.1-ghc-8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Data/FileStore/Types.hs b/Data/FileStore/Types.hs
-index e950c7a..e116761 100644
---- a/Data/FileStore/Types.hs
-+++ b/Data/FileStore/Types.hs
-@@ -152,3 +152,3 @@ data FileStore = FileStore {
-     -- | Save contents in the filestore.
--  , save           :: Contents a
-+  , save           :: forall a . Contents a
-                    => FilePath          -- Resource to save.
-@@ -160,3 +160,3 @@ data FileStore = FileStore {
-     -- | Retrieve the contents of the named resource.
--  , retrieve       :: Contents a
-+  , retrieve       :: forall a . Contents a
-                    => FilePath          -- Resource to retrieve.
diff --git a/dev-haskell/filestore/filestore-0.6.1.ebuild b/dev-haskell/filestore/filestore-0.6.1.ebuild
deleted file mode 100644
index 014a6b37f9e9..000000000000
--- a/dev-haskell/filestore/filestore-0.6.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Interface for versioning file stores"
-HOMEPAGE="https://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"
-
-RESTRICT=test # one darcs test fails
-
-RDEPEND=">=dev-haskell/diff-0.2:=[profile?] <dev-haskell/diff-0.4:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/xml-1.3:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		dev-haskell/mtl )
-"
-DEPEND+="
-	test? ( dev-vcs/darcs
-		dev-vcs/git
-		dev-vcs/mercurial
-	)
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-8.patch
-
-	cabal_chdeps \
-		'time >= 1.1 && < 1.6' 'time >= 1.1' \
-		'process >= 1.0 && < 1.3' 'process >= 1.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag maxcount maxcount)
-}
-
-src_test() {
-	export HOME=${T}/
-	git config --global user.email "git@src_test"
-	git config --global user.name "Mr. ${P} The Test"
-
-	haskell-cabal_src_test
-}
diff --git a/dev-haskell/filestore/filestore-0.6.2.ebuild b/dev-haskell/filestore/filestore-0.6.2.ebuild
deleted file mode 100644
index 7fb7dc8e97ad..000000000000
--- a/dev-haskell/filestore/filestore-0.6.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Interface for versioning file stores"
-HOMEPAGE="https://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"
-
-RESTRICT=test # one darcs test fails
-
-RDEPEND=">=dev-haskell/diff-0.2:=[profile?] <dev-haskell/diff-0.4:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/xml-1.3:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		dev-haskell/mtl )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'directory >= 1.1 && < 1.3' 'directory >= 1.1' \
-		'directory >= 1.0 && < 1.3' 'directory >= 1.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag maxcount maxcount)
-}
diff --git a/dev-haskell/filestore/filestore-0.6.3.4.ebuild b/dev-haskell/filestore/filestore-0.6.3.4.ebuild
deleted file mode 100644
index 1082ff53bba2..000000000000
--- a/dev-haskell/filestore/filestore-0.6.3.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 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="https://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/filestore/filestore-0.6.4.ebuild b/dev-haskell/filestore/filestore-0.6.5.ebuild
index 50730cebdde2..31604b341ad1 100644
--- a/dev-haskell/filestore/filestore-0.6.4.ebuild
+++ b/dev-haskell/filestore/filestore-0.6.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
diff --git a/dev-haskell/git/Manifest b/dev-haskell/git/Manifest
new file mode 100644
index 000000000000..41356e382c36
--- /dev/null
+++ b/dev-haskell/git/Manifest
@@ -0,0 +1,4 @@
+AUX git-0.3.0-monadfail.patch 3097 BLAKE2B 5d826420a9372f79371872eab74b107a8e0b47f7fa125e30a2ecce77844fcda977a528bd5c010d1b2f75a33c68336bccf2ccca74e1114589d2111617a12b905d SHA512 3ea3775ac72cda8182bbf134795f33025ff922d087485ab1fc2abb2e3b260580d3598c56fa85c93b59cda363fe732a0f44959569d809f21cf315f136b11ed0e5
+DIST git-0.3.0.tar.gz 45846 BLAKE2B 93eb07d136085a0512f51b67e2e3b906fc7bee2c63e1bb621570a6123da0e08e87c829c88f7f17ddaf2a9f3cb3b8d5ddc485f83a14c814da86f2863fe17087f5 SHA512 f50061a6b3bccb063f7af74cbdcad33561b45c353ce35b8071ad03b0dd0b6e0d215381d6145dfeeff8bb66fbcef0379a9d749a8a1c1f8e45857b0c6bc4574f29
+EBUILD git-0.3.0.ebuild 1160 BLAKE2B 8272efd6f046c3d95f65a886d788ed3f40adb225bfffdca0cfa7341baace350384ac5922e8111876305473f19d1f99e2c8666b227a9ea223a07c47a99fabd06f SHA512 ba19073392e5e818cb85a17763df12084bf88fb4bc9deeb3f5164d21f71d88a65286f9af4c2b69c6bda9ad9c1b63ea0005251abe1bcdb54c9e2b483a7ee4bc58
+MISC metadata.xml 666 BLAKE2B a16f733e871a14cbcc3baa90b77552628f425d2268eb727a4255104195f54da0be0518de7e34509e6f98a56746ad1de0fcdfd47ebf013225161fc6b410ea4a1d SHA512 1c27601184979a61fbfea352c04e8ff6005a99518ba91229f16e8646579f94033c2d384571fdc2a706c2eec001cc275094e5f85a6e61fd972d7ee7c7dfa0702e
diff --git a/dev-haskell/git/files/git-0.3.0-monadfail.patch b/dev-haskell/git/files/git-0.3.0-monadfail.patch
new file mode 100644
index 000000000000..ffca3a1534e1
--- /dev/null
+++ b/dev-haskell/git/files/git-0.3.0-monadfail.patch
@@ -0,0 +1,103 @@
+From ad1e877d8e32bc3f573d92cadf697f0bb67a7da2 Mon Sep 17 00:00:00 2001
+From: Jack Todaro <solpeth@posteo.org>
+Date: Fri, 10 Jul 2020 07:01:08 +1000
+Subject: [PATCH] Data.Git.Monad.hs: port to MonadFail proposal
+
+Signed-off-by: Jack Todaro <solpeth@posteo.org>
+---
+ Data/Git/Monad.hs | 30 ++++++++++++++++++++++--------
+ 1 file changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/Data/Git/Monad.hs b/Data/Git/Monad.hs
+index 480af9f..44a7018 100644
+--- a/Data/Git/Monad.hs
++++ b/Data/Git/Monad.hs
+@@ -17,7 +17,7 @@
+ --
+ -- You can also easily create a new commit: see 'CommitM' and 'withNewCommit'
+ --
+-
++{-# LANGUAGE CPP #-}
+ {-# LANGUAGE FlexibleInstances #-}
+ {-# LANGUAGE OverloadedStrings #-}
+ {-# LANGUAGE Rank2Types #-}
+@@ -74,7 +74,9 @@ module Data.Git.Monad
+     , Git.Person(..)
+     ) where
+ 
+-
++#if !MIN_VERSION_base(4,11,0)
++import qualified Control.Monad.Fail as Fail
++#endif
+ import Data.ByteString (ByteString)
+ import qualified Data.ByteString as B
+ import qualified Data.ByteString.Lazy as BL
+@@ -240,7 +242,11 @@ instance Applicative GitM where
+ instance Monad GitM where
+     return = returnGitM
+     (>>=)  = bindGitM
+-    fail   = failGitM
++#if !MIN_VERSION_base(4,11,0)
++    fail   = Fail.fail
++#endif
++instance MonadFail GitM where
++    fail = failGitM
+ 
+ instance GitMonad GitM where
+     getGit  = getGitM
+@@ -313,7 +319,11 @@ instance Applicative CommitAccessM where
+ instance Monad CommitAccessM where
+     return = returnCommitAccessM
+     (>>=)  = bindCommitAccessM
+-    fail   = failCommitAccessM
++#if !MIN_VERSION_base(4,11,0)
++    fail   = Fail.fail
++#endif
++instance MonadFail CommitAccessM where
++    fail = failCommitAccessM
+ 
+ instance GitMonad CommitAccessM where
+     getGit  = getCommitAccessM
+@@ -423,7 +433,7 @@ getDir fp = do
+ -- >        l <- getDir []
+ -- >        liftGit $ print l
+ --
+-withCommit :: (Resolvable ref, GitMonad git)
++withCommit :: (Resolvable ref, GitMonad git, MonadFail git)
+            => ref
+                 -- ^ the commit revision or reference to open
+            -> CommitAccessM a
+@@ -474,7 +484,11 @@ instance Applicative CommitM where
+ instance Monad CommitM where
+     return = returnCommitM
+     (>>=)  = bindCommitM
+-    fail   = failCommitM
++#if !MIN_VERSION_base(4,11,0)
++    fail   = Fail.fail
++#endif
++instance MonadFail CommitM where
++    fail = failCommitM
+ 
+ instance GitMonad CommitM where
+     getGit  = getCommitM
+@@ -599,7 +613,7 @@ deleteFile path = do
+ -- >        setFile ["README.md"] $ readmeContent <> "just add some more description\n"
+ -- >    branchWrite "master" r
+ --
+-withNewCommit :: (GitMonad git, Resolvable rev)
++withNewCommit :: (GitMonad git, MonadFail git, Resolvable rev)
+               => Git.Person
+                 -- ^ by default a commit must have an Author and a Committer.
+                 --
+@@ -670,7 +684,7 @@ withNewCommit p mPrec m = do
+ --         )
+ -- @
+ --
+-withBranch :: GitMonad git
++withBranch :: (GitMonad git, MonadFail git)
+            => Git.Person
+                 -- ^ the default Author and Committer (see 'withNewCommit')
+            -> Git.RefName
+-- 
+2.27.0
+
diff --git a/dev-haskell/hit/hit-0.6.3.ebuild b/dev-haskell/git/git-0.3.0.ebuild
index 8751b75ec770..521fbe6b0456 100644
--- a/dev-haskell/hit/hit-0.6.3.ebuild
+++ b/dev-haskell/git/git-0.3.0.ebuild
@@ -1,29 +1,26 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-# ebuild generated by hackport 0.5.3.9999
+# ebuild generated by hackport 0.6.2
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Git operations in haskell"
-HOMEPAGE="https://github.com/vincenthz/hit"
+HOMEPAGE="https://github.com/vincenthz/hs-git"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug executable"
+IUSE=""
 
-RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	dev-haskell/cryptohash:=[profile?]
+RDEPEND="dev-haskell/basement:=[profile?]
+	>=dev-haskell/cryptonite-0.22:=[profile?]
 	>=dev-haskell/hourglass-0.2:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?]
-	dev-haskell/patience:=[profile?]
+	>=dev-haskell/memory-0.13:=[profile?]
 	dev-haskell/random:=[profile?]
 	dev-haskell/system-fileio:=[profile?]
 	dev-haskell/system-filepath:=[profile?]
@@ -33,8 +30,6 @@ RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?]
 	dev-haskell/zlib:=[profile?]
 	>=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
-	executable? ( >=dev-haskell/hashable-1.2:=[profile?]
-			dev-haskell/hashtables:=[profile?] )
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
@@ -43,8 +38,4 @@ DEPEND="${RDEPEND}
 		dev-haskell/tasty-quickcheck )
 "
 
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug) \
-		$(cabal_flag executable executable)
-}
+PATCHES=( "${FILESDIR}/${P}-monadfail.patch" )
diff --git a/dev-haskell/git/metadata.xml b/dev-haskell/git/metadata.xml
new file mode 100644
index 000000000000..4cbbb473028d
--- /dev/null
+++ b/dev-haskell/git/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		
+		A Haskell implementation of git storage operations, allowing users
+		to manipulate git repositories (read and write).
+		
+		This implementation is fully interoperable with the main C implementation.
+		
+		This is strictly only manipulating the git store (what&#39;s inside the .git directory),
+		and doesn&#39;t do anything with the index or your working directory files.
+		
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/gnuidn/Manifest b/dev-haskell/gnuidn/Manifest
index 19a7e61b4b56..b666c6b6245b 100644
--- a/dev-haskell/gnuidn/Manifest
+++ b/dev-haskell/gnuidn/Manifest
@@ -1,6 +1,3 @@
-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 624 BLAKE2B ae3b9a86b01574eb5b3cc4c990ebd001cf75fa2aef601ec4ee0bb44509aed30e3d16b561a24d951e543f4904ae8b1f316e497a2cf87aabb24c55c3921c8c5c40 SHA512 0214c79b1f1c293061c0e74f3783bbb03902da2e1d76b7232cb4f90cd381612fd118ddd56fdeece358173198b66b816ec31c373cf914264095663cff4b993515
 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.1.ebuild b/dev-haskell/gnuidn/gnuidn-0.2.1.ebuild
deleted file mode 100644
index b7ba91e322d3..000000000000
--- a/dev-haskell/gnuidn/gnuidn-0.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings for GNU IDN"
-HOMEPAGE="https://john-millikin.com/software/haskell-gnuidn/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	net-dns/libidn
-"
-DEPEND="${RDEPEND}
-	dev-haskell/c2hs
-	>=dev-haskell/cabal-1.6.0.3
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/gnuidn/gnuidn-0.2.2.ebuild b/dev-haskell/gnuidn/gnuidn-0.2.2.ebuild
deleted file mode 100644
index 3d7f79e6c4b8..000000000000
--- a/dev-haskell/gnuidn/gnuidn-0.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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 test-suite"
-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=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	net-dns/libidn
-"
-DEPEND="${RDEPEND}
-	dev-haskell/c2hs
-	>=dev-haskell/cabal-1.8
-	virtual/pkgconfig
-	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3
-		>=dev-haskell/quickcheck-2.4 )
-"
diff --git a/dev-haskell/haddock-api/Manifest b/dev-haskell/haddock-api/Manifest
index 1641af2cc906..ad7cc90bba86 100644
--- a/dev-haskell/haddock-api/Manifest
+++ b/dev-haskell/haddock-api/Manifest
@@ -4,5 +4,5 @@ DIST haddock-api-2.17.3.tar.gz 145142 BLAKE2B 1ca87c180baed23ec5df5d5cbfedc7e382
 DIST haddock-api-2.23.1.tar.gz 200096 BLAKE2B 0635881e198c1df3690f07185da7cc49f8eb92283d99c581756c86fb9f293b28608ac3eea9090abcc3afa12c646e584939df9b8c38b4844e9c462824426019f5 SHA512 fb7826102476a3f292da336f8f16c7a647df7c4432bed905815509fff0df164255c0856cc17663bb42479114ed9a418e6bcd214fb8594b245d401c9e091ac4ef
 EBUILD haddock-api-2.16.1.ebuild 837 BLAKE2B ad6019c4dd7dfb6c408372f22daee9d4c4309cb490ab6adf613575a01989ecc11a8ef42d5e65bf0b5c47cbeaefd3347bd369c25f5587fa7dd027261d8ec95cce SHA512 d533027bf3c3546e05450638c6168039eec533d3f17ced01bad05c781d823281ae90957f1964fa2ed63566aef8c05625a4c43d633bcb4dd25b19145ac42aa3f1
 EBUILD haddock-api-2.17.3.ebuild 1050 BLAKE2B fa65189aeb89200c0d55a4e30b29cda630d346ba3d6a6430a331f83515f73a626913080e02b6af7b9bfcd60ee9204cd548ed4da943128e4547e8e2fd760dc37a SHA512 1cdc9ddeda2cad2193975ebd504d2ebb1d319f6aaf0f0b3d10cd677b14880e7495eeeddf701820b34cc6d7f8b419ff63887b0dee099d15f687166ab3970f500a
-EBUILD haddock-api-2.23.1.ebuild 1086 BLAKE2B f1cdd9f7d6c64fb3bd25722db68c547e6c75ea6c0b5e2fc397d3ebc98debb864c78b5c87ed18d701d30d04acb43af3e15ba743626317775b28a4038e716e62df SHA512 3c5ba5d5dfe9fb91f0c16889a3b2fc8057d8d59cac5096767d3d30d1bf399dd26a67f8837fe833b68300519699c99f93e5de8b1e4f25ac0231a759d5be9fb811
+EBUILD haddock-api-2.23.1.ebuild 1087 BLAKE2B 937fb9b076c2081f74228d85f11366b937ebfcf450a04f8eccf0ce43b03a8c8c13657a4571a873db543b346c853658bee39c6706857e69342eea953b7e27cae5 SHA512 d795bc7254f46790f615b6a6d507ed8693c1cc84bab3fb143f5e9201d486d77459579705f22cb1e335a6dca6532621e10eeafddb0e5ca0721b5771f346834918
 MISC metadata.xml 357 BLAKE2B 808036b0cf5b428f9488a39d294aec21cd83215e5224007492c96b6b49a296c5a350a1ba1fbc75e3ffdc33456a02f4669e45d3e740da8324ea9f635cbcd8a2c9 SHA512 0f4a0bb813ebec80793d97d4ab2df397fba47ffdfb19afc8de5262cd3cd627172a982afd9fd36ce25051285f3b33cc3ba70ede63de59ac7be7ff72d237b85db2
diff --git a/dev-haskell/haddock-api/haddock-api-2.23.1.ebuild b/dev-haskell/haddock-api/haddock-api-2.23.1.ebuild
index 3d0bd06d30c6..cd03ee56f66b 100644
--- a/dev-haskell/haddock-api/haddock-api-2.23.1.ebuild
+++ b/dev-haskell/haddock-api/haddock-api-2.23.1.ebuild
@@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="http://www.haskell.org/haddock/"
+HOMEPAGE="https://www.haskell.org/haddock/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-haskell/haddock-library/Manifest b/dev-haskell/haddock-library/Manifest
index 9edfc687cecd..d175ba585cae 100644
--- a/dev-haskell/haddock-library/Manifest
+++ b/dev-haskell/haddock-library/Manifest
@@ -5,5 +5,5 @@ DIST haddock-library-1.8.0.tar.gz 30918 BLAKE2B a8bcf9e08f6596375186930cf4a98ae5
 EBUILD haddock-library-1.1.1.ebuild 664 BLAKE2B aab3d7db8cba5626ed859b8a8c16036245d3d3d1557bb8d647f1cb46ec0359827f7b4c041f8c2cdb8fc4ac47469b25498aec7d66d020822c9fce9933ec4adef3 SHA512 461b622b104e531253546eb15b043d374c1853e2d9f219006afce7ae08d0f2b92d8592fae4550ff4bbd86146e277b0edf9bd80a16aecbc7c0ca68336520acb8d
 EBUILD haddock-library-1.2.1.ebuild 788 BLAKE2B 619f531f45d6d7cc9e470026e00c99e1004c1c8026fc03ffd23184f3d71d86484bf1a63c5858e54cabcb8fa8fd4dbdb1c03f50473699ce38e9bd0dfc4f8d2e13 SHA512 3e062c7652c1fd911fe9dab727ddbe11f5b3d5afab382337b4ac98b758bd0a760b1432acfac2fade49ec44e9d775dee7aef37078ce8e4b3c1106859e5338d4bd
 EBUILD haddock-library-1.4.2.ebuild 803 BLAKE2B c79dc51e3bb499e40127ead0cea5c873ea52442bae3b5c2b9d7e8837c5e7ed2db842a2bc52bd955e060c7d19d51c900d1cf7cbf1a849f71bfe8fe6ab0a87727f SHA512 9fa9237bd3befd6cbfee8b146cccf0e06327736ce985a2758813d38b1967bc36dc4a80273d373412fcbe38b5c060f51f3f7d3ea27cd79f21b0bd223c4da7c5cc
-EBUILD haddock-library-1.8.0.ebuild 1268 BLAKE2B dbc4a4a10086c4c62bde0a65a4cf6ef1c5e790cecc42e0796dff2c06e13bf186528c40b01e1b6d05eb6b6a595c84e74bb1f80ee9e74e466e631cc423253e41dc SHA512 cd186926e82bdf34af55cd084999185dfdbd874bec03051451d374481d77133a3027e7e9050fd133c1eb8bf8ea8b9038fcf77de3c05e4f3086840e43b1ebc4da
+EBUILD haddock-library-1.8.0.ebuild 1269 BLAKE2B 746fc2165ee259ef53bbe513028b2eee7dcf1b676f34d8916e8365a7fbc68155b8d5a576cde611d7c4989aee8d84a6979c70731c919b41cdb7eb27f12fdbfd13 SHA512 ed721288d65543cdb488e30d64912725fe67bfb493259e536127ee4eb5f529c4a26a6b08e59d6fefad6df2efe2379af1aa0297e18250b92aaaf6dafa3cf63542
 MISC metadata.xml 649 BLAKE2B 3009fffda0bdf4a08fb7014a168578c8054cd7e701ca254b12debebf6aadf7a36d968d3d39a555767aef11646e2cc71707ab40f5ad77bc85923bdac3a3ac45a3 SHA512 316469b542dcc67cbf2c6f28a2cb7c3321fc13654349c59631c185ceeb2bc55b78d23b2bbb224ab7b19b1aa0d2d8237fb9ec98693e4420fe8e1556e5acd370cc
diff --git a/dev-haskell/haddock-library/haddock-library-1.8.0.ebuild b/dev-haskell/haddock-library/haddock-library-1.8.0.ebuild
index 8bda04a8c3d4..0a9bf5474c7c 100644
--- a/dev-haskell/haddock-library/haddock-library-1.8.0.ebuild
+++ b/dev-haskell/haddock-library/haddock-library-1.8.0.ebuild
@@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile test-suite" # haddock hoogle hscolour
 inherit haskell-cabal
 
 DESCRIPTION="Library exposing some functionality of Haddock"
-HOMEPAGE="http://www.haskell.org/haddock/"
+HOMEPAGE="https://www.haskell.org/haddock/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index 3e1b23b8f174..d70f4562820b 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -5,5 +5,5 @@ DIST haddock-2.23.1.tar.gz 302698 BLAKE2B 1dae0019ddc08c537aec2f0fa71f5bd1570db4
 EBUILD haddock-2.14.3.0.7.8.3.ebuild 2033 BLAKE2B 1346799ad1cf6ce9c96f8348b88736df3a4995d6093ac35d049ec397ce7fec02ba54a9e3ed42786c508823809a62e2bdf9bfcbd33feb7f915d4501bf22eba03e SHA512 e46c1ef04b10c315771236e73295e36396a285156e481a7eac91655af463f33cc35ee408d33ba48968aa7cd1912168ff11449af9f190693385f7e18cd6e5019b
 EBUILD haddock-2.16.1.ebuild 1919 BLAKE2B 195a42e6f55a9c94a5e0bcf5b1a8674edc4ddfb64fb913129aec1ddd09bb1a87756ae1db82d15744aab75c6e36b38961ca4f384c3f5b781433e3bc75581a9490 SHA512 f26c619dda53258e3fbcb286979ad1f3f21368d384091a11e729201e4408846a2f478a27844304c6084427f68fde3828dcc5b92064724f1734f20d2bd5272ed8
 EBUILD haddock-2.17.2.ebuild 802 BLAKE2B 8498ed4ea1900e4e28c5a76977bc33c74010ebea30f9376230e1cc839e60df7fd9b7a972594f75b7050647f60220910280ca162a2266aad782cce89010a7b3b7 SHA512 c0291127f88ab1ae5134343eb2eea1fd7890efe128835e1f2208f44fc04b5b690ea7913eae4ae3784ee9ca9f56b94f40a903769318d9d83706f2c3667edf59a7
-EBUILD haddock-2.23.1.ebuild 814 BLAKE2B 7a4100097c71ddfdeb1f3528eb9f646aa0935c8d439be60e48053f8385c1ac108f401305de67e19866ac3bcd21b09e142d802474c54fea0b37491dc48e27aa8a SHA512 eaf44280bb93043062f047ede3e696331de40e10550e3cc758cfc32da25a2f1681f3af728b952dff5ed64e7654261264676d5280bead0520bf06e7420f719eff
+EBUILD haddock-2.23.1.ebuild 815 BLAKE2B 9bc7ba6da63c4f8befb46acbe62384a58fd2b766d2561ce3d1fb5a66e9b9c20fa1392a34b93af1de0f8feae0c0a517e1cba4e476db5865489ba7c9c9cb4ea21d SHA512 6b9f03e5bdea82ec6defd6e32b35ab67ba097e07e0fa24b9022dbe75b081e927b7f84422617d8bb281b54675f86af67e04bd83bd2f61a6552ea8dc494e5ffede
 MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/haddock/haddock-2.23.1.ebuild b/dev-haskell/haddock/haddock-2.23.1.ebuild
index d2e622f4d065..21f858ae97ac 100644
--- a/dev-haskell/haddock/haddock-2.23.1.ebuild
+++ b/dev-haskell/haddock/haddock-2.23.1.ebuild
@@ -10,7 +10,7 @@ CABAL_FEATURES="" # test-suite unavailable
 inherit haskell-cabal
 
 DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="http://www.haskell.org/haddock/"
+HOMEPAGE="https://www.haskell.org/haddock/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-haskell/happy/Manifest b/dev-haskell/happy/Manifest
index 45110e3e5353..10045d0344ef 100644
--- a/dev-haskell/happy/Manifest
+++ b/dev-haskell/happy/Manifest
@@ -1,8 +1,4 @@
 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 1224 BLAKE2B 0d38053f64f2b917bac8e561b578ab9633cf4cf647ca88587071512bc3ac54306e7265624f3d7fa95862cb1e001307db4368702dafb09027be4bf2657dbc1580 SHA512 c3994b9eb5e2e3f4a0abe10f30b8ba1c17ef25d7a364aa091bfa715143557b4e7b7e97591994b461aa01ea7b05105c75042fd337484140539653547f32bebaa0
-EBUILD happy-1.19.4.ebuild 1368 BLAKE2B 8b8b05c2d333825d071001f53e8192d724d27728b62400d208a34eea9ede23545d5ed58f977f2e45c2eb8585f1234c0e50ae526acf06a74253dc378aa5ce709e SHA512 1e594b6d83b8d1ede2f8a630634c59c9539ce70344c10d17903393b2a3de60b9fa22c83201228729c0a10aa28be11405942273d929c8c20df950dd8fadb30908
-EBUILD happy-1.19.5.ebuild 1519 BLAKE2B ed36ae8630111a8d674da9fad5ccd56979cd2d735ee12b556529bc04e52eaee686a55e695b23a42ef83617e560bca4a0ffcf46590e28fc94048b6b3590b649d6 SHA512 c02d54aa955b763cbf5f6244f5647b845509227b5c10785e0086e1af16a18da68b4e3e62c5b46ff591887da170fc269ebda86391bd39a4fa21d8a276b0c208ef
 MISC metadata.xml 330 BLAKE2B 12dc311da8b192ead3d26e96a70e56d8aaed9ca86162993d1277f5738c0929cd058cde3a47e72ea0e0bbf268bf404b88cf602738f8dd34f0bb95fbd66afdeb78 SHA512 505782103d2814ce34e9e6e7ad91cd466c3f6593e636f9e38eb70e5c89892c2231e24feb310ebd4a33af0d15cc0cc58bd083da6573f65a1604fdbc3dd9380889
diff --git a/dev-haskell/happy/happy-1.19.4.ebuild b/dev-haskell/happy/happy-1.19.4.ebuild
deleted file mode 100644
index c7ee325b440a..000000000000
--- a/dev-haskell/happy/happy-1.19.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit eutils haskell-cabal autotools
-
-DESCRIPTION="Happy is a parser generator for Haskell"
-HOMEPAGE="http://www.haskell.org/happy/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	>=dev-haskell/mtl-1.0
-	>=dev-lang/ghc-6.10.4
-	doc? ( ~app-text/docbook-xml-dtd-4.2
-			app-text/docbook-xsl-stylesheets )
-"
-
-src_prepare() {
-	for f in AttrGrammarParser Parser; do
-		# drop broken autogenerated
-		mv "dist/build/happy/happy-tmp/$f.hs" src/ || die
-		# drop depend on itself, otherwise cabal tries to regenerate it
-		rm "src/$f.ly" || die
-	done
-	use doc && cd doc && eautoconf
-}
-
-src_configure() {
-	# '--with-happy=false' allows detecting circular
-	# depends even when 'happy' is installed in system
-	haskell-cabal_src_configure --with-happy=false
-
-	if use doc; then
-		# does not like out-of-source builds
-		cd doc || die
-		econf
-	fi
-}
-
-src_compile() {
-	haskell-cabal_src_compile
-
-	if use doc; then
-		emake -C doc -j1
-	fi
-}
-
-src_install() {
-	haskell-cabal_src_install
-	if use doc; then
-		cd doc || die
-		dohtml -r happy/*
-		doman "${S}/doc/happy.1"
-	fi
-}
diff --git a/dev-haskell/happy/happy-1.19.5.ebuild b/dev-haskell/happy/happy-1.19.5.ebuild
deleted file mode 100644
index 5fc779132c7c..000000000000
--- a/dev-haskell/happy/happy-1.19.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit eutils haskell-cabal autotools
-
-DESCRIPTION="Happy is a parser generator for Haskell"
-HOMEPAGE="http://www.haskell.org/happy/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	>=dev-haskell/mtl-1.0
-	>=dev-lang/ghc-6.10.4
-	doc? ( ~app-text/docbook-xml-dtd-4.2
-			app-text/docbook-xsl-stylesheets )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.19.5-ghc-7.10.2.patch
-
-	for f in AttrGrammarParser Parser; do
-		# drop broken autogenerated
-		mv "dist/build/happy/happy-tmp/$f.hs" src/ || die
-		# drop depend on itself, otherwise cabal tries to regenerate it
-		rm "src/$f.ly" || die
-	done
-	use doc && cd doc && eautoconf
-}
-
-src_configure() {
-	# '--with-happy=false' allows detecting circular
-	# depends even when 'happy' is installed in system
-	haskell-cabal_src_configure --with-happy=false
-
-	if use doc; then
-		# does not like out-of-source builds
-		cd doc || die
-		econf
-	fi
-}
-
-src_compile() {
-	haskell-cabal_src_compile
-
-	if use doc; then
-		emake -C doc -j1
-	fi
-}
-
-src_test() {
-	# workaround https://github.com/haskell/cabal/issues/2398
-	emake -k -C tests all
-}
-
-src_install() {
-	haskell-cabal_src_install
-	if use doc; then
-		cd doc || die
-		dohtml -r happy/*
-		doman "${S}/doc/happy.1"
-	fi
-}
diff --git a/dev-haskell/hdbc-mysql/Manifest b/dev-haskell/hdbc-mysql/Manifest
index 436101f9f165..295b54f9d330 100644
--- a/dev-haskell/hdbc-mysql/Manifest
+++ b/dev-haskell/hdbc-mysql/Manifest
@@ -1,5 +1,4 @@
-AUX hdbc-mysql-0.6.6.1-cabal-1.18.patch 1110 BLAKE2B 49bd9b39d789903063c7c7b0c454f0e9f844c275b8283e632481f183b55bcb8a8656d117ab587004e8f9b6f65b2e7e22d03b20eec7926d1a8eb734e614e98c00 SHA512 fca7c256c0035df6bf3e882a368e1207cee8177a1348e7502982b7085c0d81c667bdd905aa0ad5c04761aa8edd9e62809c690bcd220957769fba221f94c79e28
-AUX hdbc-mysql-0.6.6.1-extralib.patch 460 BLAKE2B 845a5c16767c4b0ed569de5b9a7312eb1a3fe81d798d2d16860be28b297d2c9cf03c4567831fdb40e9be1951e10e9cd5338f74a691936a069beb36dd2dfade56 SHA512 04e374b7803748d34bf8f87505609aa4463e70e49b29054a16f65d693eef2bc5ddcfa56c072a4f95e5576c1ad72b9ee94dd00c16538ce04e34b96c060954b114
+AUX hdbc-mysql-0.7.1.0-cabal-3.patch 470 BLAKE2B 2afbc4da32a3b6a47e67910824df9b106d00a98984376b25ec73585e73b5391c8bb96103ae68a51da5a6ca67d6df9989af3c722f0b830579aa722d6ee2465673 SHA512 78c0a76cdd0d0b55a2f6546d74d2eff12c2d2ab02158fd35251a6a5538457e5fa68db2f1bc7d93ddf5e9f54dbf511c47f609c55e72fe453e1a511da2dfbea9c9
 DIST HDBC-mysql-0.7.1.0.tar.gz 24086 BLAKE2B fd480ef5a3374aa8c6d36bd4f34fb1cb558769a134f60ce1b94cba7143b93adecc2cff6253cb1afbefe52c9ed8081fc7f812f7bc6539c043f783e9ced10ff4d7 SHA512 aec9387f08c16c8ccb6df1ca82e69005105a2781e253b6b8788665fa88e54a697601f99d10931ea6d3854dd9c0b43f062bccad1362a1512f5a2135cede0b0cc1
-EBUILD hdbc-mysql-0.7.1.0-r1.ebuild 829 BLAKE2B 9b5498d344f2f66407f8c1f1bf7dcdc12d11ff26fe255b09638afbbd92e5f9c94e3ce6b0497c752c1000a90668dcf5793fdcacc3e1c99e1abe4c6a90a143e5d3 SHA512 5813d6e479c0463ec7ffc7ef3787c80bc56b859d82e071e8ba085fd6019defad8c611827f6129ea57fb4a03294c9574c0852b50a036d1a300c2d613a4106405e
+EBUILD hdbc-mysql-0.7.1.0-r1.ebuild 873 BLAKE2B 439c564bcff81d63a4b6f38817290299fb4924075eda0f813a2a22d5820fd8321d261ce61c7cf197e6a479818275272fccd317f81b4288b52c321943de7acd2b SHA512 a0a46f6e1e35da0be9d1750b4c1439b6ad0c4513b8eecfcb32c29761502658141ae0270a69b60947c0a172f9294a735cba0be9953d108b8426cf5eb20dee96e9
 MISC metadata.xml 475 BLAKE2B 3a0c594d8c7acbfad9b7c48660ac89b0e85ec100646e4999dff911866e654520139eb0003d18f53ddf8ea79e70a9d6a76bd9f4fe760468f7254f8c0b2106524e SHA512 da1098ad2d5808af1dce10679f4e0146f9cab003e5a68fff7b7d389fadcb6a28cc0c67abca16571a6b76bef1c9d838882496cac5fb7febddb4da71b5d9baa4a2
diff --git a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-cabal-1.18.patch b/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-cabal-1.18.patch
deleted file mode 100644
index 83ddd4a4c8ca..000000000000
--- a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-cabal-1.18.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- HDBC-mysql-0.6.6.1-orig/Setup.lhs	2012-08-30 13:40:03.000000000 +1000
-+++ HDBC-mysql-0.6.6.1/Setup.lhs	2014-07-03 22:31:21.162259637 +1000
-@@ -1,6 +1,7 @@
- #!/usr/bin/env runhaskell
- 
- \begin{code}
-+{-# LANGUAGE MultiParamTypeClasses, FlexibleInstances #-}
- import Distribution.Simple
- import Distribution.PackageDescription
- import Distribution.Version
-@@ -26,8 +27,21 @@
-     }
- }
- 
-+-- 'ConstOrId' is a @Cabal-1.16@ vs @Cabal-1.18@ compatibility hack,
-+-- 'programFindLocation' has a new (unused in this case)
-+-- parameter. 'ConstOrId' adds this parameter when types say it is
-+-- mandatory.
-+class ConstOrId a b where
-+    constOrId :: a -> b
-+
-+instance ConstOrId a a where
-+    constOrId = id
-+
-+instance ConstOrId a (b -> a) where
-+    constOrId = const
-+
- mysqlConfigProgram = (simpleProgram "mysql_config") {
--    programFindLocation = \verbosity -> do
-+    programFindLocation = \verbosity -> constOrId $ do
-       mysql_config  <- findProgramOnPath "mysql_config"  verbosity
-       mysql_config5 <- findProgramOnPath "mysql_config5" verbosity
-       return (mysql_config `mplus` mysql_config5)
diff --git a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-extralib.patch b/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-extralib.patch
deleted file mode 100644
index 8b9993969cb3..000000000000
--- a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-extralib.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit d53860f7edb75873e263111129c159802b2ac5a6
-Author: Satoshi Nakamura <snakamura@infoteria.com>
-Date:   Tue May 27 15:44:57 2014 +0900
-
-    Add mysqlclient to Extra-Libraries
-
-diff --git a/HDBC-mysql.cabal b/HDBC-mysql.cabal
-index 2d56d8b..6a8967a 100644
---- a/HDBC-mysql.cabal
-+++ b/HDBC-mysql.cabal
-@@ -32,6 +32,7 @@ library
-     time,
-     utf8-string
-   ghc-options:      -Wall
-+  Extra-Libraries: mysqlclient
- 
- source-repository head
-   type:     git
diff --git a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.7.1.0-cabal-3.patch b/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.7.1.0-cabal-3.patch
new file mode 100644
index 000000000000..11fe2231d73e
--- /dev/null
+++ b/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.7.1.0-cabal-3.patch
@@ -0,0 +1,11 @@
+--- a/Setup.lhs
++++ b/Setup.lhs
+@@ -35,7 +35,7 @@ mysqlConfigProgram = (simpleProgram "mysql_config") {
+ 
+ mysqlBuildInfo :: LocalBuildInfo -> IO BuildInfo
+ mysqlBuildInfo lbi = do
+-  let mysqlConfig = rawSystemProgramStdoutConf verbosity mysqlConfigProgram (withPrograms lbi)
++  let mysqlConfig = getDbProgramOutput verbosity mysqlConfigProgram (withPrograms lbi)
+       ws = " \n\r\t"
+ 
+   includeDirs <- return . map (drop 2) . split ws =<< mysqlConfig ["--include"]
diff --git a/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild b/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild
index 5a09fbb7663b..b1a0712a1a16 100644
--- a/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild
+++ b/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=("${FILESDIR}"/${P}-cabal-3.patch)
+
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag debug debug)
diff --git a/dev-haskell/hit/Manifest b/dev-haskell/hit/Manifest
index 219778ac708a..acf3acc86396 100644
--- a/dev-haskell/hit/Manifest
+++ b/dev-haskell/hit/Manifest
@@ -1,3 +1,3 @@
-DIST hit-0.6.3.tar.gz 38690 BLAKE2B 928a532cacb2393b46b9e5abeee6d66bf140e9e4a71f359b8a35016f97db4eeb32f4efb6c56d74528d3311ae4d6477716670c14ae6ad7361a7892575185dd336 SHA512 82ccfeb77a439caa1792f1ae29535636764be9e6e94f75973f37a86db6627a492e57da835954384ef8468799de9f0897e20905f65dad256fe3547a4248d5fffc
-EBUILD hit-0.6.3.ebuild 1442 BLAKE2B 01945a2a79632eea07533b0639fe5a21d5baf4a4934086fda204f063c2af90922eebf90b387971633bc8fcf9e952ac86393ebe25ae6b66e34e4c7518f3f06e9f SHA512 694846e9cf9d7d035d645aa4a81a175ce510a10dcbcb609717838992d40c4e67a9e22e111e73b27f7dc8269b94a00d8e38bdad95cf2eba7ea3f158114af12959
-MISC metadata.xml 717 BLAKE2B c3c7f87958186af89f91d209015050b8adf88a9da76dbcb4e64f2132d4eca3f209b8c97873af77cc98d5d3a605cf13eb8edb1261ed4b80086c8aa6774e1c5ea4 SHA512 64247968400adb4b29dc6de54ecada645f2c7365c9ca111e8639f803a416a6865ad783f19d73a0a70b35be9bc900d0d5fb346e657b85f18ffb37c482ecc74c77
+DIST hit-0.7.0.tar.gz 4919 BLAKE2B ff48cdc9421da4d2ef122a93859d82748c951f445f02d91cb1b320646a1cc68251380bfb6dfbe358ddf009e3664f258c1b7fe1e0f4dc402b2223ccc1bb929fe2 SHA512 d900c768bd60533092cf01627021b5b09804a0f29e3188bf4b9c6c2c79c709afb1c461a8d49459d5434d0d4d1241f5863a242e38ac9e28ddfaa02ef7565b9270
+EBUILD hit-0.7.0.ebuild 668 BLAKE2B b4b0a5bd7103335504295e4921b43bb0d9ece4b2b81300e43d00bfaf07e3b42a416adc8242cd6c75f4cde6ab3ca37fd32d30b55b71bd528f1c42ef74ee7d698d SHA512 fdd0e43345eab094ad2f47adc6e4d5b446452c98cbae55ccd2ffbcdbcc9d52c952fa349f24c7cac63529acc5b98c6c2ae6ce13bc41128c1740170516cc4bff2b
+MISC metadata.xml 648 BLAKE2B 57946e08815247e2a81cbe76933be3afa1ed24c6dba6818c2c27df6834e85c6a5f5414a16c5f2db91ca19f91cc19065d985fd177cac2fc772b17791bdc596a1e SHA512 18e142c417b68008c322a7380b63e3bd51e95bb489748dbfb95d44ff658b0ff68928ade585df8647a5e1e46fdc31cf1010f1f4ed67ee3da69123f0c6643d7581
diff --git a/dev-haskell/hit/hit-0.7.0.ebuild b/dev-haskell/hit/hit-0.7.0.ebuild
new file mode 100644
index 000000000000..f5754a04b7a8
--- /dev/null
+++ b/dev-haskell/hit/hit-0.7.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2
+
+CABAL_FEATURES=""
+inherit haskell-cabal
+
+DESCRIPTION="Git operations in haskell"
+HOMEPAGE="https://github.com/vincenthz/hit"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=dev-haskell/git-0.3.0:=
+	>=dev-haskell/hashable-1.2:=
+	dev-haskell/hashtables:=
+	dev-haskell/hourglass:=
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag debug debug)
+}
diff --git a/dev-haskell/hit/metadata.xml b/dev-haskell/hit/metadata.xml
index aeb520f51526..2d822f7e7d49 100644
--- a/dev-haskell/hit/metadata.xml
+++ b/dev-haskell/hit/metadata.xml
@@ -14,7 +14,4 @@
 		This is stricly only manipulating the git store (what's inside the .git directory),
 		and doesn't do anything with the index or your working directory files.
 	</longdescription>
-	<use>
-		<flag name="executable">Build the executable</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-haskell/hlint/Manifest b/dev-haskell/hlint/Manifest
index f403944818b8..9106aa850430 100644
--- a/dev-haskell/hlint/Manifest
+++ b/dev-haskell/hlint/Manifest
@@ -1,10 +1,4 @@
 AUX 60hlint-gentoo.el 231 BLAKE2B 2fef831bc7a3056d59e67dcfbb6cd5ca86a4ad4d46c8728ba528b0bd8b5c9e10fb765282de3f856ee59146e1f1043d7b5cb47c8352e60a72f2a86119654283c6 SHA512 1e83147144fb72a9e98fd405116baa2ff10532bdfb954fd86486f1abc3a6df7db54f90875dfe325f827546c03cc6c1d9980003fa839857f8c6b4410cfe8cccd4
-DIST hlint-1.8.57.tar.gz 79071 BLAKE2B 5c538ecd36a22d879b0746fa0f3df3715e7d8f85407ff3375f4b850256eb125d0dd01d875fe6babe8c912b62402da7fd88df6d05194e5501c449f9230f33b500 SHA512 1fca029067cf34f9d024640fbacfc455e733adb239e339471131b014c3d5cab671e5c267d855d1df7dd76440dab45a8981502dd840073005a4e5c50d177f91da
-DIST hlint-1.9.21.tar.gz 88802 BLAKE2B 08708331c50b73433c7fde7c826d976126f7bdd758722f6a8903d18d45da6d9ffcd32b883036f17c74165feb0245199e2e248fee9701c01153736d62f73b9494 SHA512 e7e87aba3905bb577d952a960a92038816bf057ed19aa85cff0deaa653a9c248b6a4b44b907024ad271abf615ab94ebac6f4801c77f545cadbddf0db57f13ad8
-DIST hlint-1.9.35.tar.gz 97402 BLAKE2B ea3bb516769c496be4943ab57a37bde97e1a03fca56dd6c9bdc3da30ac86b1b0538796e868de85049d28fa8286bfd45e0f1fb960e15cf12294bdb74dab08f926 SHA512 14daa5ad5652f93b3e3c4d5cff1df3735755c1561c2eb6c7ae3d05401d4a253ccba87d0cb5d09e690ce1a30f0352a26839856dd648bb10a13013cb43aed28606
 DIST hlint-2.1.17.tar.gz 119243 BLAKE2B 09d70dffdaec25e8f574fb4dd1f6012828cc8032e38b9275a676b836bff0a86e331ac4e7780618001931622e985ad4a9bd799267b06dee059f3f1b28b33bdf16 SHA512 b0a78fa970bcf2b74d969e1825dee1c7382fb5cebc47f3c752f3b3d5915905943dff21e36f8c0158e3bd10696c4785a2c86a2e1abfcf72b610ab2b564f3be5f3
-EBUILD hlint-1.8.57.ebuild 1510 BLAKE2B 301453bd59088ed714cccdb12d06c3778649bdd948cf58404d70f1fa78f927d90722533d2fe367bc4085130d0673a16f6d63ada4d94eaaf25b4232021574040b SHA512 4e3818c8778ff8ad917e5ffa83c38227d475328a5e4e6956304a22298fd30b8cc3f32f0319c90e2ebac27baeef7fc7f654b12072d96b9107fe51398feb2797e3
-EBUILD hlint-1.9.21.ebuild 1681 BLAKE2B 077581279d68813acdced8a470aa835e7ad266ae874b23c9b54bd8a55a813180378825aa43c551bc7ce158f4a08742b474fbee85d34dd49ba7abf6b0332514f3 SHA512 8ac76c9a42da219ed3ac7ca22054346f82f0349d892411d85e8903c0d07b8ecfec0502f397d20e07bfaedd774fadc41893c6a12ffe227ec4d8decac87d0e83bf
-EBUILD hlint-1.9.35.ebuild 1745 BLAKE2B 4cdf84877fbaaa17ab02e3e23b7427eb5ee405578faaac93c09cbc6b32640b5f9c5acf2d8d0d7e31cb28986c2cf1cf43981a895928095c2b3ad7178f35997a02 SHA512 24dcb66f37772594966ae025973e5a1d6c12f75e404794f727de13afc6ba39dc8750f5385e843678ef484c94b30e5de91f7fb43ec27547d7bde40fe8733d7786
 EBUILD hlint-2.1.17-r1.ebuild 1948 BLAKE2B c599034a9b4139ff21d8d493efb4ceae6b072eda74077c6c3e19129dc0fb63506db1c6d438b3117e866e5239a7688344c643941bd271a8296c9dc65b02185a80 SHA512 cda3327dc8192d7b00ff35d0a380ab5c923f1c04f2a9fde8c8adee988d9cdb16570a2053de29b52688febad57acfd8227bbf0dc28d15483e0f49455a55b182db
-MISC metadata.xml 514 BLAKE2B 9d4466ded84b33d243146bf75ecc80aa920dd4d959ed661498d6bc8d51676bea2024441300a79a3c6f39bb94bfc4d9b3a5727f5f79c012ff8ea91ad5596bc0d7 SHA512 09783e5f456c5e5f7c9b4cc0b61d5d45d9a77ba4e582368f75e17fb8cd3b7a94ac56c6acbe1a5eee4a65a53fce1c72bf7ce3d0a00e736aaa249c0211b76926c5
+MISC metadata.xml 413 BLAKE2B b3c7a44237cd8756edc1863caf50815279f3ddaf58f1660ade12c8e17adf60d842643fe678f7c718dc7a2d92a84eab6582414d0868ab066d7d7db45eb8cadfbc SHA512 26df7942f29f0082fcd3ee674af3e33ad7b2e23570033ee5d6206b7f8adab98efb59fe4c2d04ff38073078b366dacc3fee9608289e930bb1576e20f3cc1a22bd
diff --git a/dev-haskell/hlint/hlint-1.8.57.ebuild b/dev-haskell/hlint/hlint-1.8.57.ebuild
deleted file mode 100644
index 20dddcc621fc..000000000000
--- a/dev-haskell/hlint/hlint-1.8.57.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal elisp-common
-
-DESCRIPTION="Source code suggestions"
-HOMEPAGE="http://community.haskell.org/~ndm/hlint/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs"
-
-RDEPEND=">=dev-haskell/cpphs-1.11:=[profile?]
-	>=dev-haskell/haskell-src-exts-1.14:=[profile?] <dev-haskell/haskell-src-exts-1.15:=[profile?]
-	>=dev-haskell/hscolour-1.17:=[profile?]
-	>=dev-haskell/transformers-0.0:=[profile?]
-	>=dev-haskell/uniplate-1.5:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_configure() {
-	local threaded_flag=""
-	if $(ghc-supports-threaded-runtime); then
-		threaded_flag="--flags=threaded"
-	else
-		threaded_flag="--flags=-threaded"
-	fi
-	cabal_src_configure \
-		$threaded_flag
-}
-
-src_compile() {
-	cabal_src_compile
-
-	use emacs && elisp-compile data/hs-lint.el
-}
-
-src_install() {
-	cabal_src_install
-
-	if use emacs; then
-		elisp-install ${PN} data/*.el data/*.elc || die "elisp-install failed."
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	doman data/hlint.1
-}
-
-pkg_postinst() {
-	ghc-package_pkg_postinst
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-haskell/hlint/hlint-1.9.21.ebuild b/dev-haskell/hlint/hlint-1.9.21.ebuild
deleted file mode 100644
index b69731516182..000000000000
--- a/dev-haskell/hlint/hlint-1.9.21.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal elisp-common
-
-DESCRIPTION="Source code suggestions"
-HOMEPAGE="http://community.haskell.org/~ndm/hlint/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs +gpl"
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
-	>=dev-haskell/cmdargs-0.10:=[profile?]
-	>=dev-haskell/cpphs-1.18.1:=[profile?]
-	>=dev-haskell/extra-0.5:2=[profile?]
-	>=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.17:=[profile?]
-	>=dev-haskell/transformers-0.0:=[profile?]
-	>=dev-haskell/uniplate-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_configure() {
-	local threaded_flag=""
-	if $(ghc-supports-threaded-runtime); then
-		threaded_flag="--flags=threaded"
-	else
-		threaded_flag="--flags=-threaded"
-	fi
-
-	haskell-cabal_src_configure \
-		$(cabal_flag gpl gpl) \
-		$threaded_flag
-}
-
-src_compile() {
-	cabal_src_compile
-
-	use emacs && elisp-compile data/hs-lint.el
-}
-
-src_install() {
-	cabal_src_install
-
-	if use emacs; then
-		elisp-install ${PN} data/*.el data/*.elc || die "elisp-install failed."
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	doman data/hlint.1
-}
-
-pkg_postinst() {
-	ghc-package_pkg_postinst
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-haskell/hlint/hlint-1.9.35.ebuild b/dev-haskell/hlint/hlint-1.9.35.ebuild
deleted file mode 100644
index 6ee0f0185d98..000000000000
--- a/dev-haskell/hlint/hlint-1.9.35.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal elisp-common
-
-DESCRIPTION="Source code suggestions"
-HOMEPAGE="https://github.com/ndmitchell/hlint#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs +gpl"
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
-	>=dev-haskell/cmdargs-0.10:=[profile?]
-	>=dev-haskell/cpphs-1.20.1:=[profile?]
-	>=dev-haskell/extra-1.4.9:2=[profile?]
-	>=dev-haskell/haskell-src-exts-1.17:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?]
-	>=dev-haskell/refact-0.3:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/uniplate-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_configure() {
-	local threaded_flag=""
-	if $(ghc-supports-threaded-runtime); then
-		threaded_flag="--flags=threaded"
-	else
-		threaded_flag="--flags=-threaded"
-	fi
-
-	haskell-cabal_src_configure \
-		$(cabal_flag gpl gpl) \
-		$threaded_flag
-}
-
-src_compile() {
-	cabal_src_compile
-
-	use emacs && elisp-compile data/hs-lint.el
-}
-
-src_install() {
-	cabal_src_install
-
-	if use emacs; then
-		elisp-install ${PN} data/*.el data/*.elc || die "elisp-install failed."
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	doman data/hlint.1
-}
-
-pkg_postinst() {
-	haskell-cabal_pkg_postinst
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	haskell-cabal_pkg_postrm
-	use emacs && elisp-site-regen
-}
diff --git a/dev-haskell/hlint/metadata.xml b/dev-haskell/hlint/metadata.xml
index d9589665f744..1d96b0c9db84 100644
--- a/dev-haskell/hlint/metadata.xml
+++ b/dev-haskell/hlint/metadata.xml
@@ -5,9 +5,6 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		HLint gives suggestions on how to improve your source code.
-	</longdescription>
 	<use>
 		<flag name="gpl">Use GPL libraries, specifically hscolour.</flag>
 	</use>
diff --git a/dev-haskell/hsql-odbc/Manifest b/dev-haskell/hsql-odbc/Manifest
index bf29a7b20962..42da19553458 100644
--- a/dev-haskell/hsql-odbc/Manifest
+++ b/dev-haskell/hsql-odbc/Manifest
@@ -1,3 +1,4 @@
+AUX hsql-odbc-1.8.2-cabal22.patch 435 BLAKE2B de29d70a76cb295dc9e088db974dc0b7d1a1cf1d5d0f523cc967131f0dca2790ce3b9bcf8ad2dbdcd91474279394c9e1e47ee387e4530c7fed810887b9eeb8f0 SHA512 f1c68fe436fbf33cd60e5d195c0b1d3472ed21f96d053ddb0091f1eb3643712137293c9754c5929127ca78a4298966ba557ab39f6ed81f4676543a485c4a1be9
 DIST hsql-odbc-1.8.2.tar.gz 8041 BLAKE2B 80b3881297218b7dadfc7826acdb19e9f61d41124f5ca2d5a589ceabdfb03a6b64020432b43579e9fc9af82956e64147354b35ac5fb08b8e6eccd13e0f10afd1 SHA512 78f91ee63007e02820eefd1bd9ae08b9659667aa70f545ef83ff6d83d592c7f542339db129bb6c3ad14f4cdde320b3a4e1251c25267db716dbd88cbb5931a6d5
-EBUILD hsql-odbc-1.8.2.ebuild 579 BLAKE2B 4121f41f0a22da1e0e849cc6c27e474ec32bfc278e65d3600e82b86434d5d31920ce5e630b896c21d4dee44ef3e73d30809c91ef01e6c51dfaf42ff750ee3b06 SHA512 2962ce6e7deecef9ef62c516085e2a548edc691308e3dc39b3916a2c99d4c9e1e3f74fd57e5461e886b7d141ee905d0f1112a27d79296a99e69390df0ab19cf8
+EBUILD hsql-odbc-1.8.2.ebuild 630 BLAKE2B 66e7d2bb52b548d0f4a770d802fcb434a44acfc6c2ea3ac5e0aaf8ad3573df86b646c708bf1ea1e4674bc1c34904de3eb020d3de28d958e13836fc7d645dabce SHA512 8af1eb2747ad2435bbd2c7c9eae44ed745ad9ba8b095835c7d49fd4809ce8cabc419c2d6fb659fdeb1eee945424ab7807f752d461bfb8cea4db9334806cebfeb
 MISC metadata.xml 312 BLAKE2B 32b0d8d9d9bd075ada8a8aa688d088fedc4a2012f2595c435b1431df4ed7f3c6ea84910847ec59ac728a2a4a7322ac6839b8edd6a8651953e37e4b43a245d6d1 SHA512 45f671f7f757de6d1e94cb82e6c791aa1b9e97f0f2a78a84cbba3b433ed190befa0c3c9930e990251bedfbfa15bf6f75fd087db40235882171d7cc1176b97d94
diff --git a/dev-haskell/hsql-odbc/files/hsql-odbc-1.8.2-cabal22.patch b/dev-haskell/hsql-odbc/files/hsql-odbc-1.8.2-cabal22.patch
new file mode 100644
index 000000000000..1c6c599b9cd7
--- /dev/null
+++ b/dev-haskell/hsql-odbc/files/hsql-odbc-1.8.2-cabal22.patch
@@ -0,0 +1,13 @@
+--- a/Setup.lhs
++++ b/Setup.lhs
+@@ -3,5 +3,10 @@
+ \begin{code}
++{-# LANGUAGE CPP #-}
+ import Distribution.Simple(defaultMainWithHooks ,simpleUserHooks ,preConf)
+ import Distribution.Simple.Setup(ConfigFlags)
++#if MIN_VERSION_Cabal(2,2,0)
++import Distribution.PackageDescription.PrettyPrint(writeHookedBuildInfo)
++#else
+ import Distribution.PackageDescription.Parse(writeHookedBuildInfo)
++#endif
+ import Distribution.PackageDescription
diff --git a/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild b/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild
index 0e404b50ee54..ed0ebe28b8f6 100644
--- a/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild
+++ b/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild
@@ -3,7 +3,7 @@
 
 # ebuild generated by hackport 0.2.13
 
-EAPI=4
+EAPI=6
 
 CABAL_FEATURES="lib profile haddock hscolour hoogle"
 inherit haskell-cabal
@@ -17,8 +17,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-haskell/hsql-1.8.2[profile?]
-		>=dev-lang/ghc-6.10.1
+RDEPEND=">=dev-haskell/hsql-1.8.2:=[profile?]
+		>=dev-lang/ghc-6.10.1:=
 		>=dev-db/unixODBC-2.2"
 DEPEND="${RDEPEND}
 		dev-haskell/cabal"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cabal22.patch
+)
diff --git a/dev-haskell/hsql-sqlite3/Manifest b/dev-haskell/hsql-sqlite3/Manifest
index 692391e9829e..cccf08ffebd4 100644
--- a/dev-haskell/hsql-sqlite3/Manifest
+++ b/dev-haskell/hsql-sqlite3/Manifest
@@ -1,3 +1,4 @@
+AUX hsql-sqlite3-1.8.2-cabal22.patch 452 BLAKE2B f66a32f251a836948de482e5b67fc385ee87d8c360efe9018d06690821363561462eba24585b436331365df518ac4e1db0d5f7a7c47f0311df3046bbd07c483b SHA512 197c91990be179a65f7bf76efd822f3f5444d4c10c47a2b475897f6d76dbf2175f4d71370cbe4b443383cd6e48c004d1c8da0988d5b6a0c3322cf5a9ddb5f35c
 DIST hsql-sqlite3-1.8.2.tar.gz 4752 BLAKE2B 84a77f8bc835b4337d99cdd974f7cd5960f7b52faeb4c06e2572d31887bdae3d2cdf6bf00d4c44eae7a4f98b116a134e950353932ef9cb43d557b11b85ffff96 SHA512 962d4396a3844f4d1b4f4be6f6d81e085f1deaa2e7ca0776a93aed4f34cb5e40edab96d568fa3a086ea0c4017dff7de8dd1d25e81ad27840c844ed885af5e42e
-EBUILD hsql-sqlite3-1.8.2-r1.ebuild 594 BLAKE2B c92cca1c58dd04c5b5ca252dcafcbdf7fbbb62ae123cb691e062b817db9b32b8240cfab1a873dd12651575188d92cb58e7c5257fd98eaadee9a69b9d34a52f21 SHA512 34476d087b71852a09de0197e68dce097f027144268b81ada12521c00685b1b45576fae8403ff7d9e3d0ee66696fda5fe756c6def46a65a6ee90d875b863c949
+EBUILD hsql-sqlite3-1.8.2-r1.ebuild 641 BLAKE2B 877fe806afe98d9bc7668a13624cacc34329da1828055e8c637f30d496fb6d595b78a112957d1912466888ad57a0b942f22981e10c09a49ac75ad219b8bb4585 SHA512 9bf6d7cbe23ef99e22fbadf19b3304d2bf4b283370a580dcad1dc42c385a3c35c8e2d40af647edbb9f6f767ec92d3e1c632096ff6dc60f30e935fa244b8cdf9a
 MISC metadata.xml 369 BLAKE2B f9a73abb5c6344b68e146cfee342fe63e5830c73d3e2110d1c7e70a4ef59879ab555e0824ed76dc60ea18c0f03a10ec16cd52af3d7af051926078d712bd30a21 SHA512 382796958de20ebe7a8894a85d41e3a695861647909b57e3816475ea0d54fbdc6f57895101b85d4f35a4046d11d3cd356c26d0602143d03bc954cc9ccd485abb
diff --git a/dev-haskell/hsql-sqlite3/files/hsql-sqlite3-1.8.2-cabal22.patch b/dev-haskell/hsql-sqlite3/files/hsql-sqlite3-1.8.2-cabal22.patch
new file mode 100644
index 000000000000..b421fbb9362a
--- /dev/null
+++ b/dev-haskell/hsql-sqlite3/files/hsql-sqlite3-1.8.2-cabal22.patch
@@ -0,0 +1,14 @@
+--- a/Setup.lhs
++++ b/Setup.lhs
+@@ -3,2 +3,3 @@
+ \begin{code}
++{-# LANGUAGE CPP #-}
+ import Control.Monad(when)
+@@ -13,3 +14,7 @@ import Distribution.PackageDescription
+     ,emptyBuildInfo)
++#if MIN_VERSION_Cabal(2,2,0)
++import Distribution.PackageDescription.PrettyPrint(writeHookedBuildInfo)
++#else
+ import Distribution.PackageDescription.Parse(writeHookedBuildInfo)
++#endif
+ import Distribution.Simple(UserHooks(preConf,postConf) ,simpleUserHooks 
diff --git a/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild b/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild
index 0f537298e791..5385305b3fd8 100644
--- a/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild
+++ b/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 # ebuild generated by hackport 0.3.1.9999
 
@@ -22,3 +22,7 @@ RDEPEND=">=dev-db/sqlite-3.0
 		>=dev-lang/ghc-6.10.4:="
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-0"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cabal22.patch
+)
diff --git a/dev-haskell/htf/Manifest b/dev-haskell/htf/Manifest
index 82d2d04f7d41..8286bc988aa2 100644
--- a/dev-haskell/htf/Manifest
+++ b/dev-haskell/htf/Manifest
@@ -1,6 +1,3 @@
-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
+DIST HTF-0.14.0.3.tar.gz 80795 BLAKE2B 8933c2bc9480ff7d29cf86cf5d7718ebd179aad55a7836b2f19cf1b93ba6acd48eba89410fe4040bb073111686ae736360554a598456b7a25c77e52ed05c4335 SHA512 cf839a3fa67aec998b1f035a9b5ddb326f57c859c13767f3681deb2f8041ac283c3bcf36d0c37b08ef7878fc8ada5623af60c72a548adf8c272d2d38f8609784
+EBUILD htf-0.14.0.3.ebuild 1203 BLAKE2B d9916e56999049859fffdc377855d591cb6a93f9f53bb0844dedc20c194647dd0056b84432717c85963ad6468b0837e004dea975f4d88efa4f35c07e9fdf8dad SHA512 a4992975e214cfa72be33a7653ca751730e48b64aeb864711144b508d6d38247b3f1e214942c5cc75baeca39a651376a0d6382036dfb5c7a8f29501ef0b634c5
 MISC metadata.xml 923 BLAKE2B 690bbf2765309647e8029490cd2c7ba9055f00e8f4ccfd45ae8ef826deac43a13bf919b73607fc0241e9f60d6cda44bba1ae95de8031f76744d3eb5fefe7138b SHA512 1bcdd3551b19f09f600b050f84ab81de6e99133b29a8a94942ff068ef354a9bb31226395cb221c416a65466a96973a92521d3aa3b13c94b557bdedf011e28164
diff --git a/dev-haskell/htf/files/htf-0.13.1.0-aeson-pretty-0.8.patch b/dev-haskell/htf/files/htf-0.13.1.0-aeson-pretty-0.8.patch
deleted file mode 100644
index ac1472051eba..000000000000
--- a/dev-haskell/htf/files/htf-0.13.1.0-aeson-pretty-0.8.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/tests/TestHTF.hs b/tests/TestHTF.hs
-index 4a71874..c0442a5 100644
---- a/tests/TestHTF.hs
-+++ b/tests/TestHTF.hs
-@@ -383,3 +383,3 @@ checkOutput output =
-           BSL.toStrict $
--          J.encodePretty' (J.Config 2 J.compare) json
-+          J.encodePretty' (J.defConfig { J.confIndent = J.Spaces 2, J.confCompare = J.compare }) json
- 
diff --git a/dev-haskell/htf/htf-0.13.1.0.ebuild b/dev-haskell/htf/htf-0.13.1.0.ebuild
deleted file mode 100644
index 614b9ad03d9c..000000000000
--- a/dev-haskell/htf/htf-0.13.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HTF"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="The Haskell Test Framework"
-HOMEPAGE="https://github.com/skogsbaer/HTF/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/cpphs-1.19:=[profile?]
-	>=dev-haskell/diff-0.3:=[profile?]
-	dev-haskell/haskell-src:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?]
-	>=dev-haskell/old-time-1.0:=[profile?]
-	>=dev-haskell/quickcheck-2.3:2=[profile?]
-	>=dev-haskell/random-1.0:=[profile?]
-	>=dev-haskell/regex-compat-0.92:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-haskell/xmlgen-0.6:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/aeson-pretty
-		>=dev-haskell/temporary-1.1
-		>=dev-haskell/unordered-containers-0.2 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-aeson-pretty-0.8.patch
-}
diff --git a/dev-haskell/htf/htf-0.13.2.5.ebuild b/dev-haskell/htf/htf-0.13.2.5.ebuild
deleted file mode 100644
index d69d9e380af8..000000000000
--- a/dev-haskell/htf/htf-0.13.2.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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/htf/htf-0.14.0.3.ebuild b/dev-haskell/htf/htf-0.14.0.3.ebuild
new file mode 100644
index 000000000000..25806e6a0ae1
--- /dev/null
+++ b/dev-haskell/htf/htf-0.14.0.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib haddock hoogle hscolour" # test-suite: needs htfpp already installed, profile crashes cpp
+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:=
+	dev-haskell/base64-bytestring:=
+	>=dev-haskell/cpphs-1.19:=
+	>=dev-haskell/diff-0.3:=
+	dev-haskell/haskell-src:=
+	>=dev-haskell/hunit-1.2.5:=
+	>=dev-haskell/lifted-base-0.1:=
+	>=dev-haskell/monad-control-0.3:=
+	>=dev-haskell/mtl-1.1:=
+	>=dev-haskell/old-time-1.0:=
+	>=dev-haskell/quickcheck-2.3:2=
+	>=dev-haskell/random-1.0:=
+	>=dev-haskell/regex-compat-0.92:=
+	>=dev-haskell/text-0.11:=
+	dev-haskell/vector:=
+	>=dev-haskell/xmlgen-0.6:=
+	>=dev-lang/ghc-7.6.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0
+	>=dev-haskell/cpphs-1.19
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/icalendar/Manifest b/dev-haskell/icalendar/Manifest
index e498476ce493..c135b56b39e1 100644
--- a/dev-haskell/icalendar/Manifest
+++ b/dev-haskell/icalendar/Manifest
@@ -1,5 +1,3 @@
-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
+EBUILD icalendar-0.4.0.5-r1.ebuild 1476 BLAKE2B c44bd1b517c248c568cd419678f5a829af9b2ccfdddd1d5807ac922febbd0152e5f9d8252ea401943e8ddf37d9b4bbf4dd9cbbe17ebdda24bb7cf6891b7938f4 SHA512 d57f09dbc7c49a4d3d49da16b689fa60cb2b6672e7c9b9926352d733d73ab423577a2f099ba80171304ce00f46b85da26c014224aa314a2a61f1c626797c05ec
 MISC metadata.xml 519 BLAKE2B 8011b4fd4c19e3aab29a03f1503cd5dbe5e8c93d4c9a9f770c8555a8ffc2ce5f80eee1a55bc7427d17520d462e2665dff43b2a626136664a1692eba667f04405 SHA512 0b2ad70f6f48a2d4041fa9575e93fa067777eaddb401bea31a2106a76c539370d514a25f0dda7c26f55900ddead6a2e194fc4a6d65d85568724ab0c9fedfccb5
diff --git a/dev-haskell/icalendar/icalendar-0.4.0.3.ebuild b/dev-haskell/icalendar/icalendar-0.4.0.3.ebuild
deleted file mode 100644
index 42839a6bf3ca..000000000000
--- a/dev-haskell/icalendar/icalendar-0.4.0.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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="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/text:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/icalendar/icalendar-0.4.0.5.ebuild b/dev-haskell/icalendar/icalendar-0.4.0.5-r1.ebuild
index 5683640c698a..0a3044a8a291 100644
--- a/dev-haskell/icalendar/icalendar-0.4.0.5.ebuild
+++ b/dev-haskell/icalendar/icalendar-0.4.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,9 +30,9 @@ RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-byt
 	>=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?]
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
 			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2.4:=[profile?] )
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.22.2.0
@@ -43,9 +43,9 @@ 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'
+	cabal_chdeps \
+		'containers >= 0.5 && < 0.6' 'containers >= 0.5' \
+		'network >= 2.6 && < 2.7' 'network >= 2.6'
 }
 
 src_configure() {
diff --git a/dev-haskell/ifelse/Manifest b/dev-haskell/ifelse/Manifest
index 1bb081467302..0c649202f3f6 100644
--- a/dev-haskell/ifelse/Manifest
+++ b/dev-haskell/ifelse/Manifest
@@ -1,4 +1,3 @@
 DIST IfElse-0.85.tar.gz 2865 BLAKE2B 620522dd255b30d28dd1ffe93591ceff0191845731e4a717bcd92dbf746f363fa37b1eb6694af55fc9f4fe56add4fb9b82bdb17d0b0263cf82feb2bf76cc4c39 SHA512 5378b0f98d3a14dbc5b297a01a5c48aed4825f4ab2192e35b3a6aee932cce5b740e5ea44cbbd69dc3e74ff38415d77df43136e2a8ddf9bc6fd9fe1497a6dcd1c
 EBUILD ifelse-0.85-r1.ebuild 658 BLAKE2B 3988fbda1743ee629c7834dc9fccb02add046a09186e5e2cb85951006180bee4f9b06016e1f5946b1ae664a8ea204f68aef4d6b87cffdccdede1af22263c14e0 SHA512 0cd013d01d5509dab5a9333c67c38ea7c507e79bce512582ec977396fbc9bd1019e0392f7ce850169342d2730d2f111153bd95be850b354404b1ed8ff7f620e4
-EBUILD ifelse-0.85.ebuild 654 BLAKE2B 0629a25c6b354c5662ba8858d152e8fa30d8c1667b7a9b48ffda640435a42d218789682b817212ab7495b29e1fba228c08fd6f87f811f3ffbd5f9aa8f95d101f SHA512 398ed69b48e9dd69e8556e84cb89f05df00f4153188ddaa04cec5684a7a4d6ed46143e5bc78612be2e4a50bf6b5301e1767f4173dbf236149cac98f741febc28
 MISC metadata.xml 338 BLAKE2B b967eb99be919c60c3849806900de1b7cd5aa4c4c9e546169054fc6e3f868e608af33851b3fe7a462fe15c8c3d8a68182cab1a16723bedfaf70ad99e578e9bc6 SHA512 3d3ba29cee849c5df537b91d74061ee101f6db16b8efd79ab8fc81ef0599023b0b21fd2cdac7633c8ffaea2614989edc2fbbf4e539afffe7cff74ddb3c67a8df
diff --git a/dev-haskell/ifelse/ifelse-0.85.ebuild b/dev-haskell/ifelse/ifelse-0.85.ebuild
deleted file mode 100644
index a54cf2302aff..000000000000
--- a/dev-haskell/ifelse/ifelse-0.85.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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
-
-MY_PN="IfElse"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Anaphoric and miscellaneous useful control-flow"
-HOMEPAGE="https://hackage.haskell.org/package/IfElse"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl[profile?]
-		>=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/inspection-testing/Manifest b/dev-haskell/inspection-testing/Manifest
new file mode 100644
index 000000000000..185a5adb9f72
--- /dev/null
+++ b/dev-haskell/inspection-testing/Manifest
@@ -0,0 +1,3 @@
+DIST inspection-testing-0.4.2.4.tar.gz 20946 BLAKE2B 20547c5a231083391c886fcef8b3dc153fde8498d9268a297013691a055c65dc93deb31b5988a8cdf1e32d465344802153448850a89b819744551dc13712a1a2 SHA512 16ebfcd20e4ee3a9117670ad9e0d683002262a2f3c52dcfdb7c7123f256db4f133780e759a80469a14c786a4158ef9ba4e7d534e728e8d44188b11765a1e8745
+EBUILD inspection-testing-0.4.2.4.ebuild 788 BLAKE2B 655214cd4f38ac3ff3d34983e4649a94fbe20b09807e784ebffd8ab37cabf59773703c99a1dcb81e3ffbd31cf9b291ef4a024e2e60ff8100458e886e98974e7a SHA512 c94b80a261a0509b5807d88199bd2f3c205a976a77e403cb10daddb7631896434bb4a832945aff92ead2705a89295b7052da565b9804f379f4be2a111003a57d
+MISC metadata.xml 1362 BLAKE2B d0711467f7ad20755b6c997b9091bcf51415a8e214f2e0236d6f469dbef15651581f25ea5f76f0193e0177d7b62d32e6f4d5d0600bf40ff9cda8d1ba017b67f9 SHA512 f8d04337b4963dca5fb5f91b9d769d6a5a03984961cc330b8a460bb6e227ab3810be4aa50a3c2fd2716f7e89ba76ddb819021727581e1f9c98587111778a5edf
diff --git a/dev-haskell/inspection-testing/inspection-testing-0.4.2.4.ebuild b/dev-haskell/inspection-testing/inspection-testing-0.4.2.4.ebuild
new file mode 100644
index 000000000000..92e6cb057df0
--- /dev/null
+++ b/dev-haskell/inspection-testing/inspection-testing-0.4.2.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: -more-tests
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken test-suite: compiler-dependent
+inherit haskell-cabal
+
+DESCRIPTION="GHC plugin to do inspection testing"
+HOMEPAGE="https://github.com/nomeata/inspection-testing"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # examples/Fusion.hs:22:1: sumUp1 === sumUp2 failed
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-more-tests
+}
diff --git a/dev-haskell/inspection-testing/metadata.xml b/dev-haskell/inspection-testing/metadata.xml
new file mode 100644
index 000000000000..f4d3257dab77
--- /dev/null
+++ b/dev-haskell/inspection-testing/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Some carefully crafted libraries make promises to their
+		users beyond functionality and performance.
+		
+		Examples are: Fusion libraries promise intermediate data
+		structures to be eliminated. Generic programming libraries promise
+		that the generic implementation is identical to the
+		hand-written one. Some libraries may promise allocation-free
+		or branch-free code.
+		
+		Conventionally, the modus operandi in all these cases is
+		that the library author manually inspects the (intermediate or
+		final) code produced by the compiler. This is not only
+		tedious, but makes it very likely that some change, either
+		in the library itself or the surrounding eco-system,
+		breaks the library's promised without anyone noticing.
+		
+		This package provides a disciplined way of specifying such
+		properties, and have them checked by the compiler. This way,
+		this checking can be part of the ususal development cycle
+		and regressions caught early.
+		
+		See the documentation in &quot;Test.Inspection&quot; or the project
+		webpage for more examples and more information.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/language-c/Manifest b/dev-haskell/language-c/Manifest
index 33889ccbe4e1..aa7432ec4f6d 100644
--- a/dev-haskell/language-c/Manifest
+++ b/dev-haskell/language-c/Manifest
@@ -1,8 +1,6 @@
-DIST language-c-0.4.2.tar.gz 167052 BLAKE2B 8f1b5192470a25eaad5be8c0a0f374163a91f840b6b184496d1adb45c1239a666214950fda939bddcd8617becc92eaf461b564ded29ebe3b852e16900700b772 SHA512 e2cd4c2871c04fecdcdf82026c79edf7681e00bf632fcff6c119cbd95e53905695bd8f08010d2662e10d883b2fdf6bb114a199b0eaf7be31ff65aaa29df6083b
 DIST language-c-0.4.7.tar.gz 112569 BLAKE2B e7a1333315f10ac3e8490b8dc3b5aa04e40b1a7e1f9c68615f549c82f7d02bf7de5b687dd9d4f04f82202b89e468b22833816346f53bb1cd075ed6386ee1142a SHA512 fb2602606b8c2e678e170d928c3dd023acccc079381a37b64624af658788c0dee982c2d53c2d3ba66b576aa75de350d12e35a94f867e1d714e89c27d26f2af6b
 DIST language-c-0.7.1.tar.gz 181648 BLAKE2B 6c5219698fbbe995d759a0bd6e629b9dbb29137c3dfa879cbdf139721f4acd341245172ccfb3f7d3cec58a831f72f03d092f29960f6dfcf190480df02a30e66a SHA512 c62dee86b70ead9c0795cabc6b1e0487ab3d4e1e4df693cec94c255aa96d21589d9161150073a5ec1d2ae168924dd8a11ae6ee0cd46730a25ccda009f7a45f58
 DIST language-c-0.8.3.tar.gz 194870 BLAKE2B 6b35d741f73543d929bac18e3567911f7d2fa56734463cbc15f2db4ecdc127eaaa1ec2afbe6962f39feb860669c33b50d6c7c941cdd7f6b3c97b42f911b21309 SHA512 a2e653c3d6fe4573c0a7f34115d5a5d3db925c174cd574755bb174de834165bce236b354f04e1158309eda654d12104ea03e88f94cdc8b3e11cffba7260282de
-EBUILD language-c-0.4.2.ebuild 672 BLAKE2B 0ce6ac2925bfa0720c33fd481174c28ae169f88989f948576d84de5946708e7df6df0c2510b5518312d1ae953aa879b89d368ac76325b46701180225713dfd19 SHA512 999a56ce8eff6d86d5e5c2b81a661d4b5e5e2721153d246b4aa1212e198c146ed461703e39ffecb805843ad515b71f5e1eb1476923e9f9ea5b9b6072cd351771
 EBUILD language-c-0.4.7.ebuild 775 BLAKE2B 018a71b9e12d977ac04367faee3a2c66cf1562858bcbbc499ff9069988918360e22d67d15993ef418d92b4ea9926ec2163d1225c7c7f5bf9a0037b38c2a30d53 SHA512 0f88856a4d79b1703524cd9a47aa2f0f36c42923d822c612d4f727f76b2d1b3fea7d4d44e39920b30fdb6d043e7731d42f546c6e642eca74a7d4bb220ecd794a
 EBUILD language-c-0.7.1.ebuild 755 BLAKE2B 7f003b4d9cd81e358f13441b0cd5b7b30e0ab1183dfef8e3236bb8316e6b48b86b1543dfc5ce61a0c2bf2319243185f0c44eb8b39b03deb940c9a42d656be8c8 SHA512 e54d69d98c3db00a002c9e07768231ad76b334344c2e8f5e73be2b55229b45b91be3a785426812ef37171574055902c25e5f8e6c1f12e3b131a5309a97bb7397
 EBUILD language-c-0.8.3.ebuild 868 BLAKE2B fb1d114064d06c436cd149ad60bc9f14c0a680ed87a70dd73e31e3c67901c979ec866330a0fa1172e87ea6a860807ef05a4f47781723d05606a20b3cd9a4cfbd SHA512 db22e8e5eaff028367301d0686ed70258a714c4891d5377924487d8e5c35a8736e95b30c2cc3b6203a2e645be9efb5a9eeb0a3e446fc7798d0d5583922e98175
diff --git a/dev-haskell/language-c/language-c-0.4.2.ebuild b/dev-haskell/language-c/language-c-0.4.2.ebuild
deleted file mode 100644
index ab50276bca3e..000000000000
--- a/dev-haskell/language-c/language-c-0.4.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 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="Analysis and generation of C code"
-HOMEPAGE="https://visq.github.io/language-c/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb[profile?]
-		>=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		dev-haskell/alex
-		>=dev-haskell/cabal-1.6
-		dev-haskell/happy"
-
-src_prepare() {
-	rm -vf "${S}"/dist/build/Language/C/Parser/{Lexer,Parser}.hs
-}
diff --git a/dev-haskell/lazysmallcheck/Manifest b/dev-haskell/lazysmallcheck/Manifest
index c344a3ea829b..d952206f16e2 100644
--- a/dev-haskell/lazysmallcheck/Manifest
+++ b/dev-haskell/lazysmallcheck/Manifest
@@ -1,3 +1,3 @@
 DIST lazysmallcheck-0.6.tar.gz 16862 BLAKE2B 8099de24e51e19106da50d30e370ea71fea42da2d25641b7887d06e57a341ae10f5b440b7431ab50beffba97f9fc22cc517f7a1e8f12be4341769559ead19348 SHA512 cd9e7d53686587828b5be892bacbd902b4e916d01e65c56d7634717c00353f9d0b81f92fcae9fab5008361dc7257da50a1429568f8265136883d4cca942f954d
-EBUILD lazysmallcheck-0.6.ebuild 506 BLAKE2B 2b259af3e1bb3cbd96815f35ad09a4a97d4db2df9b019208c4969cc1e7be7a689001bc55f5eae8544fe587f540ceea54a995c792a72837ffc337cd0138301ba8 SHA512 ae50b0a714d0201e10c8a2cf1bbca218623e08def0a3ca114229292ce2a110a6cd59ac023f27cb5b222807edc34273d6c18583c0dbb006c7e096c2a6ee25eb19
+EBUILD lazysmallcheck-0.6-r1.ebuild 553 BLAKE2B 37c6499e85fd2b15e561ee84dd03b6865518f38eaa97ae3148c5920cc68d4aabf7a8a1ad9ce3d58f692c39b369796a1fd6c9f82fc4ec30a9b25500e53f33cce9 SHA512 f8e4ee37bcd22c71d8005e1183aa1556acd2d247785343e7b5c6175cfec6b982ce84b2e407564b13374042d5d89e97e706d3111f410c58975915e09600322475
 MISC metadata.xml 720 BLAKE2B 1282f2856d8a2425a2bbde2fdc80a614ca805f54154cb84f869e7a4803de3af4f01ada0f4ea4464bb8670c4cfeb3910993c55fd19d92c7026cd61e9296bdbd94 SHA512 14241f31672c4e24c60880919b2191da3daafdc2fecb7cc0d841ac32fe4a14d9695fadc05b43ade6f80890f65486412314308bf21689df93c7b8e0d0372bc71a
diff --git a/dev-haskell/lazysmallcheck/lazysmallcheck-0.6.ebuild b/dev-haskell/lazysmallcheck/lazysmallcheck-0.6-r1.ebuild
index 08dfa86ae3e2..2495ff0d6e00 100644
--- a/dev-haskell/lazysmallcheck/lazysmallcheck-0.6.ebuild
+++ b/dev-haskell/lazysmallcheck/lazysmallcheck-0.6-r1.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -11,10 +13,12 @@ HOMEPAGE="http://www.cs.york.ac.uk/~mfn/lazysmallcheck/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${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"
+	dev-haskell/cabal
+"
diff --git a/dev-haskell/lhs2tex/Manifest b/dev-haskell/lhs2tex/Manifest
index 909088f19f0b..f4987f757231 100644
--- a/dev-haskell/lhs2tex/Manifest
+++ b/dev-haskell/lhs2tex/Manifest
@@ -1,6 +1,4 @@
-AUX lhs2tex-1.18.1-mandir.patch 790 BLAKE2B b0de9a0630e6801c48484a172555cc29c9db2cd7df86a10c2cbf6479beeab338685428ecb4050029125d212d5406f4918e6ef901deb658aa8f7e2441f1cc3396 SHA512 2d97ce0015e9844f1b8954ae658807116293ebea07e12d3a8553c48c515e02625b6390c6640ae17e68394a00d908a821783fa5a063a7e6ad10a80f436f73c4ae
-DIST lhs2tex-1.18.1.tar.gz 661053 BLAKE2B 64dbefde30d3a6a00c47d5b3397b6f7b4cb44bdf272768ed84f66db1d3e99e95df99f16e537d3959ef0566424151a44fdd70e975ac156abd2a5907bed8044520 SHA512 c44b4c5972b833ae41921d86e13c71ea60ac876a9996fb9a4e8d69ba25d000bbddb85f82d223b8a73381e3a4453c2757154a866fbbb48473f121dd88efb917d7
-DIST lhs2tex-1.19.tar.gz 658353 BLAKE2B 2a6d0ca1bc23fce29579d1f020ad9db178801177d1b0c171771d24470bf604359b85f5afab6aacc6a566fecca1d0edd26ddb01d97d8e9bc3c8bc98e042d47690 SHA512 63d4cb626c14dccc6e0989b358299078427d0c22ab726fd3d933bfef3b0d072a35113d132c87b61b7b8ac2c259c856e192d04e04d3eb744b958fc0df54c80abf
-EBUILD lhs2tex-1.18.1-r1.ebuild 965 BLAKE2B 2c1bf0a12918bd3107b7e28266faa195207e2b09305abf6c1e76e19002a348681d82036f69262cee2e548a5b29a6f98bc64b8c1ea72816ea2866e928aba5677a SHA512 c461305eb6d99a708fdbeb24044f3c11cfdd8e60a312a9bebd460a7e72da692d18657e6ce5015b0e060da7b649176149b80a090b3ceb9310331aa6907c530186
-EBUILD lhs2tex-1.19-r1.ebuild 965 BLAKE2B 2c1bf0a12918bd3107b7e28266faa195207e2b09305abf6c1e76e19002a348681d82036f69262cee2e548a5b29a6f98bc64b8c1ea72816ea2866e928aba5677a SHA512 c461305eb6d99a708fdbeb24044f3c11cfdd8e60a312a9bebd460a7e72da692d18657e6ce5015b0e060da7b649176149b80a090b3ceb9310331aa6907c530186
+AUX lhs2tex-1.18.1-mandir.patch 794 BLAKE2B 4296361754535520be00275308063234411eb4fce97642c785c77b4e0f9174e21a4070c907bb14b1c885cd7641bba1538bed0a3ae344140f54f370f7132d93f0 SHA512 2b45245b2be8f3ac07e7a2f4650d2ba24272109e1cbb2f819c43f5a6016e73c254526ddd55ddec205823bf7715672e36410e033c16684408bafaec1534575748
+DIST lhs2tex-1.24.tar.gz 775885 BLAKE2B 106d2677655f4e36412083b98051eb33d1912039e0db91556b12b442d95dc7e8d4b1167d45606a8ac69b0b32a4457d86a871b0a5032d8e758fefa3536af28b0d SHA512 1491368ba8d34c42d32ad4f77b6a803e8a3b885d336e4bd718f2398aaebc59fa2692e667a6c6a99b6e8839e4f627892c128f1feaf8557313ed144619f21c1876
+EBUILD lhs2tex-1.24.ebuild 907 BLAKE2B 69551d11a7eade13e7a52b956925a5fcecf09a2870831a9baa73e03c65d87f369350fee0679dbc1e7abf62b39c45605347c0ba5cd22097dcb4c24e8cef9f4707 SHA512 452a9b475c30e4259ca38b4cbd74a59cbdd6ebbac1794d26d1756e22bbaf2a9d3fda6840a6633057eaf72614236c55662a6215853f643534a98477aa3d0e2354
 MISC metadata.xml 358 BLAKE2B 3f5e83a9b333d6c597ffa57ca34c74186b48789ca4fbfb10087d31740e53ec215052d9a10b659d5f7006641a34fb47d83179f93b1eba92fa19514a238a38ae88 SHA512 dbc254e5e7925c09f99e64a91fba2f8f63d4b7a12c41a5c13bf315352885f24058cec0becc6e25e98153d2a82f49772f4bc61d1cb21ae5e9ad061b58771fb7fb
diff --git a/dev-haskell/lhs2tex/files/lhs2tex-1.18.1-mandir.patch b/dev-haskell/lhs2tex/files/lhs2tex-1.18.1-mandir.patch
index 1a3c922723e1..285fbd7d23fe 100644
--- a/dev-haskell/lhs2tex/files/lhs2tex-1.18.1-mandir.patch
+++ b/dev-haskell/lhs2tex/files/lhs2tex-1.18.1-mandir.patch
@@ -1,5 +1,5 @@
---- Setup.hs.orig	2014-11-03 00:57:44.033467328 +0530
-+++ Setup.hs	2014-11-03 00:58:05.775218672 +0530
+--- a/Setup.hs.orig	2014-11-03 00:57:44.033467328 +0530
++++ b/Setup.hs	2014-11-03 00:58:05.775218672 +0530
 @@ -205,7 +205,7 @@
                         else docdir (absoluteInstallDirs pd lbi cd) `joinFileName` "doc"
          let manDir = if isWindows
diff --git a/dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild b/dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild
deleted file mode 100644
index 81391c36b1b2..000000000000
--- a/dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CABAL_FEATURES="bin"
-inherit base haskell-cabal
-
-DESCRIPTION="Preprocessor for typesetting Haskell sources with LaTeX"
-HOMEPAGE="http://www.andres-loeh.de/lhs2tex/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# dev-texlive/texlive-mathscience contains 'stmaryrd' font used
-# for guide generation
-# dev-texlive/texlive-latexextra for polytable
-RDEPEND="dev-texlive/texlive-latexextra
-	dev-texlive/texlive-mathscience"
-
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10
-		dev-haskell/mtl
-		dev-haskell/regex-compat
-		>=dev-lang/ghc-6.12.1"
-
-# Setup.hs uses 'Text.Regex' available in both 'r-c' and 'r-c-tdfa'
-HCFLAGS+=" -ignore-package=regex-compat-tdfa"
-
-# datadir is /usr/share/${PN}/${GHC_VER} so mandir is ${DATADIR}/../../man
-PATCHES=("${FILESDIR}/${PN}-1.18.1-mandir.patch")
diff --git a/dev-haskell/lhs2tex/lhs2tex-1.19-r1.ebuild b/dev-haskell/lhs2tex/lhs2tex-1.19-r1.ebuild
deleted file mode 100644
index 81391c36b1b2..000000000000
--- a/dev-haskell/lhs2tex/lhs2tex-1.19-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CABAL_FEATURES="bin"
-inherit base haskell-cabal
-
-DESCRIPTION="Preprocessor for typesetting Haskell sources with LaTeX"
-HOMEPAGE="http://www.andres-loeh.de/lhs2tex/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# dev-texlive/texlive-mathscience contains 'stmaryrd' font used
-# for guide generation
-# dev-texlive/texlive-latexextra for polytable
-RDEPEND="dev-texlive/texlive-latexextra
-	dev-texlive/texlive-mathscience"
-
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10
-		dev-haskell/mtl
-		dev-haskell/regex-compat
-		>=dev-lang/ghc-6.12.1"
-
-# Setup.hs uses 'Text.Regex' available in both 'r-c' and 'r-c-tdfa'
-HCFLAGS+=" -ignore-package=regex-compat-tdfa"
-
-# datadir is /usr/share/${PN}/${GHC_VER} so mandir is ${DATADIR}/../../man
-PATCHES=("${FILESDIR}/${PN}-1.18.1-mandir.patch")
diff --git a/dev-haskell/lhs2tex/lhs2tex-1.24.ebuild b/dev-haskell/lhs2tex/lhs2tex-1.24.ebuild
new file mode 100644
index 000000000000..969c65b57289
--- /dev/null
+++ b/dev-haskell/lhs2tex/lhs2tex-1.24.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES=""
+inherit haskell-cabal
+
+DESCRIPTION="Preprocessor for typesetting Haskell sources with LaTeX"
+HOMEPAGE="https://github.com/kosmikus/lhs2tex"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# dev-texlive/texlive-mathscience contains 'stmaryrd' font used
+# for guide generation. dev-texlive/texlive-latexextra provides polytable
+RDEPEND=">=dev-haskell/mtl-2.2.1:=
+	dev-haskell/regex-compat:=
+	>=dev-lang/ghc-7.4.1:=
+	dev-texlive/texlive-mathscience:=
+	dev-texlive/texlive-latexextra:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+# datadir is /usr/share/${PN}/${GHC_VER} so mandir is ${DATADIR}/../../man
+PATCHES=(
+	"${FILESDIR}/${PN}-1.18.1-mandir.patch"
+)
diff --git a/dev-haskell/logict-state/Manifest b/dev-haskell/logict-state/Manifest
index fd4d23429f52..e782ffce4b49 100644
--- a/dev-haskell/logict-state/Manifest
+++ b/dev-haskell/logict-state/Manifest
@@ -1,5 +1,3 @@
-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.2.ebuild b/dev-haskell/logict-state/logict-state-0.1.0.2.ebuild
deleted file mode 100644
index ca8bd82ad6e5..000000000000
--- a/dev-haskell/logict-state/logict-state-0.1.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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="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-haskell/transformers-0.4.2:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
diff --git a/dev-haskell/logict/Manifest b/dev-haskell/logict/Manifest
index 0bf5392411b0..61d0f267dbc7 100644
--- a/dev-haskell/logict/Manifest
+++ b/dev-haskell/logict/Manifest
@@ -1,5 +1,3 @@
-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 605 BLAKE2B 558959e5853ea73b8f77584109eda4a883f5ce1527c6a9b027b1372bc4264d274771ecac2c226ae1ba53819706160acf0b1dbcd911623ecff5e1d6f271a41c1c SHA512 d12a30dc822a28457a84917cabb8f909555b78526d21655c93fedf315e52d865b9efc9f518bc9413fe887439024b396ea6f4b9295ef2f048d86a30fc1bda86c3
-EBUILD logict-0.7.0.2.ebuild 707 BLAKE2B 7a040032b815b56792c680038f292cc8469f3a9cf8eec69c1662c61b1155ec704150bcb07b4928d53e0a499c3bef6f119cbf8ce9be8165c0262c13b8c64c0b49 SHA512 630c36e6a7cb41173f039c5d3a1b7ce9a46524ca8ddf2bc7d5e7c787d8db2823270bc2e42a20b3441121518dd24c84ae1ee273ee006edb647dce10639fb5698d
+DIST logict-0.7.0.3.tar.gz 5924 BLAKE2B 1d5fe5a78ff0448e70b68c063f3e1a4d632208e4b5bc35c51c17d12bf0ae5175db31b5c8854776ae41d7ca1fe450f8767a9f5db113c85e60ffc26bb949f1406e SHA512 0d845daffb841efea93b59e48ee86daeb0dbacbe4fc7fa417ff71d1dcda3a5551901f589097416441736007d256197932b83de76a2f630a5f7835909cd758e79
+EBUILD logict-0.7.0.3.ebuild 706 BLAKE2B cc1d28dc0f3b622ba2e147f9ce5fb370a8114a6797d6ac7d4e0ac80f8fa17a3f78671104e4d0bdb1850c34226755856f515e645b8c52571ae2a563c492fc1056 SHA512 d2d7ffbb49d84509d862ccec5d256a0f338a118a18080f8b1bd0b6d9491b8baf0db056167a84a94a78a214e7713ebf0c80466bd3524dae5e1fcdec42fe27577a
 MISC metadata.xml 639 BLAKE2B 3230f1fbd426ece61b20dfaf9941948b1dbab928b0a346ae1e169147879e606cd1516984f2c5db2f238a81d77f5a709d259110c8bc9be25ba86f7198ce152bb1 SHA512 f73942e60af15017476d75dbc89ae2e3f15e0f4f6dc95a63ca8e86e4f785f6cd4a672c4ab6f5e47f4779e7644ea10ec19d8de4a55c815a606489bbcf5a611b18
diff --git a/dev-haskell/logict/logict-0.6.0.2.ebuild b/dev-haskell/logict/logict-0.6.0.2.ebuild
deleted file mode 100644
index 6f613d9a92a6..000000000000
--- a/dev-haskell/logict/logict-0.6.0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A backtracking logic-programming monad"
-HOMEPAGE="https://github.com/Bodigrim/logict"
-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:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-"
diff --git a/dev-haskell/logict/logict-0.7.0.2.ebuild b/dev-haskell/logict/logict-0.7.0.3.ebuild
index fda9f35cc82f..9215ee27620a 100644
--- a/dev-haskell/logict/logict-0.7.0.2.ebuild
+++ b/dev-haskell/logict/logict-0.7.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.1.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -22,7 +22,7 @@ RDEPEND="dev-haskell/fail:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
+	>=dev-haskell/cabal-1.10
 	test? ( dev-haskell/tasty
 		dev-haskell/tasty-hunit )
 "
diff --git a/dev-haskell/mysql-simple/Manifest b/dev-haskell/mysql-simple/Manifest
new file mode 100644
index 000000000000..d880d815bb17
--- /dev/null
+++ b/dev-haskell/mysql-simple/Manifest
@@ -0,0 +1,3 @@
+DIST mysql-simple-0.4.5.tar.gz 18867 BLAKE2B 578d84c6416f67edc8d148122838c50cf864a2bedda7670d04307b99fe3fc4e957952c5602c8c8d64c0acc31f38b0c6da2bdd95c7dba3911df76e97a78964ca1 SHA512 a0f254d9adeeab7cf3e738163be900e8947903336cb3d0c6e6e847280d6aefa230cd44722d2b2eea418d098aebe610e595fc69dd54df759465e21244e763510c
+EBUILD mysql-simple-0.4.5.ebuild 1156 BLAKE2B df1a2a614e32da6dfd5c61523d3fd93f155329a03436c54a8d71790eda7aa15498ff01ad5001532c97040d86214144436c4069437c961765554a9f9b9e71810e SHA512 8c1fb5c7cbcb050aabe725872648c3475800c129c16582dc47a5c61bdd7f66ede4f2db098304e8fd3d566ef85ed176aaee2412b234c38e98cfcd286a231a2c73
+MISC metadata.xml 733 BLAKE2B 4ec9afb5953a115d17706457c6086192f2bb470427931c4225ed8de8155e7a4a230965ac6556787bca51f5fb759fecf0051a11004f0c12f1062432c950e86735 SHA512 a2ec65f86ba601783cba57dff345168244983abd287d20b5e89fc2c956314aa98349840ee2754aaf0456e03ce42589d9b16498a41845558fcf2e9b621707e050
diff --git a/dev-haskell/mysql-simple/metadata.xml b/dev-haskell/mysql-simple/metadata.xml
new file mode 100644
index 000000000000..bb3bfed65702
--- /dev/null
+++ b/dev-haskell/mysql-simple/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		A mid-level client library for the MySQL database, intended to be
+		fast and easy to use.
+		
+		/Important licensing note/: This library is BSD-licensed under the
+		terms of the MySQL FOSS License Exception
+		&lt;http://www.mysql.com/about/legal/licensing/foss-exception/&gt;.
+		
+		Since this library links against the GPL-licensed @mysqlclient@
+		library, a non-open-source application that uses it /may/ be
+		subject to the terms of the GPL.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/mysql-simple/mysql-simple-0.4.5.ebuild b/dev-haskell/mysql-simple/mysql-simple-0.4.5.ebuild
new file mode 100644
index 000000000000..72f2b2c8d56c
--- /dev/null
+++ b/dev-haskell/mysql-simple/mysql-simple-0.4.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: developer:debug
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A mid-level MySQL client library"
+HOMEPAGE="https://github.com/paul-rouse/mysql-simple"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RESTRICT=test # need running mysql, missing files
+
+RDEPEND=">=dev-haskell/attoparsec-0.10.0.0:=[profile?]
+	dev-haskell/base16-bytestring:=[profile?]
+	dev-haskell/blaze-builder:=[profile?]
+	dev-haskell/blaze-textual:=[profile?]
+	>=dev-haskell/mysql-0.1.1.1:=[profile?]
+	dev-haskell/old-locale:=[profile?]
+	dev-haskell/pcre-light:=[profile?]
+	>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-haskell/text-0.11.0.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hspec )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag debug developer)
+}
diff --git a/dev-haskell/mysql/Manifest b/dev-haskell/mysql/Manifest
new file mode 100644
index 000000000000..3b9b2789356f
--- /dev/null
+++ b/dev-haskell/mysql/Manifest
@@ -0,0 +1,4 @@
+AUX mysql-0.1.1.8-Cabal-1.24.patch 1039 BLAKE2B 581b3ce615530fd2ef339b9f7a5bbca13eed1df0fcca7f2d53f930de5c6d31a7837ba98c7cc13ff7a867af98e9cc527d5c2f7a3f1bda27bd1416ed788b10fddb SHA512 699338c70af38b3d145d621db35f3f65e8b8be8675c34da6655d89abbb100ffb02ed95a2237f541090bc9b475e4a8aec37cbcb51d78adc474ea988a996b6ac5c
+DIST mysql-0.1.7.tar.gz 16544 BLAKE2B a7617293f2dc970b9ace46c0b2a9452f23a90524181a1b37aa10176f2ba4ee3f9e967d94faa9e714a947e50b59d368c79fc59602cbc8e0792e4e396a09b4596c SHA512 45074050e17fed48f865c21ccca72cdcca02631715ee4a34b46f71fda74b50ab6332d8998d1047e6ae43df84e3fc865610153f15c3092c6b300e3e5ada30efa1
+EBUILD mysql-0.1.7.ebuild 830 BLAKE2B f2626ef99c471ff5612caaf470d97c2d751cc487bf2fc7c08bf51f511729455dadeeda7916ab51830b484fc4c9586dc6e3ce22cdf21ef9c2b070464f50e25ba6 SHA512 1bc555a73c842f8a14d063fecf6f4cc688da55c9c09ba1ed2992a2004f17ffb06432d38f9f01f6714e0e0c9b0b5928269367a25fa284e8d19061725480ef7c2a
+MISC metadata.xml 748 BLAKE2B 6ae07aa053448d068b8788e39caaece7bb54343493dbc067d57edeebe9dd4334dfe3033da8c5fb45ed40052ec60f307df79e1972e43fc6b58e7b92d23aca1a83 SHA512 ff8661d182778285dad7640382e41d32c2764f0456eca1a471b60ece089a810ccd6b6c021b8bd4099f799cf4d57d1f86617fb11f71cbfb7f3aabd260b87f6316
diff --git a/dev-haskell/mysql/files/mysql-0.1.1.8-Cabal-1.24.patch b/dev-haskell/mysql/files/mysql-0.1.1.8-Cabal-1.24.patch
new file mode 100644
index 000000000000..475d3f79722c
--- /dev/null
+++ b/dev-haskell/mysql/files/mysql-0.1.1.8-Cabal-1.24.patch
@@ -0,0 +1,29 @@
+diff --git a/Setup.lhs b/Setup.lhs
+index 2bf8d37..8fb2d3f 100644
+--- a/Setup.lhs
++++ b/Setup.lhs
+@@ -14,15 +14,2 @@ import Distribution.Verbosity
+ 
+--- A Cabal 1.16 vs 1.18 compatibility hack, as in 1.18
+--- findProgramLocation has a new (unused in this case) parameter.
+--- ConstOrId adds this parameter when types say it is mandatory.
+-class ConstOrId a b where
+-    constOrId :: a -> b
+-
+-instance ConstOrId a a where
+-    constOrId = id
+-
+-instance ConstOrId a (b -> a) where
+-    constOrId = const
+-
+-
+ main = defaultMainWithHooks simpleUserHooks {
+@@ -39,5 +26,5 @@ main = defaultMainWithHooks simpleUserHooks {
+ mysqlConfigProgram = (simpleProgram "mysql_config") {
+-    programFindLocation = \verbosity -> constOrId $ liftM2 mplus
+-      (findProgramLocation verbosity "mysql_config")
+-      (findProgramLocation verbosity "mysql_config5")
++    programFindLocation = \verbosity path -> liftM2 mplus
++      (findProgramOnSearchPath verbosity path "mysql_config")
++      (findProgramOnSearchPath verbosity path "mysql_config5")
+   }
diff --git a/dev-haskell/mysql/metadata.xml b/dev-haskell/mysql/metadata.xml
new file mode 100644
index 000000000000..a966cd047c61
--- /dev/null
+++ b/dev-haskell/mysql/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		A low-level client library for the MySQL database, implemented as
+		bindings to the C @mysqlclient@ API.
+		
+		/Important licensing note/: This library is BSD-licensed under the
+		terms of the MySQL FOSS License Exception
+		&lt;http://www.mysql.com/about/legal/licensing/foss-exception/&gt;.
+		
+		Since this library links against the GPL-licensed @mysqlclient@
+		library, a non-open-source application that uses it /may/ be
+		subject to the terms of the GPL.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/mysql/mysql-0.1.7.ebuild b/dev-haskell/mysql/mysql-0.1.7.ebuild
new file mode 100644
index 000000000000..0e759fb01ffc
--- /dev/null
+++ b/dev-haskell/mysql/mysql-0.1.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: -developer
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A low-level MySQL client library"
+HOMEPAGE="https://github.com/paul-rouse/mysql"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # needs local mysql
+
+RDEPEND=">=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+
+RDEPEND+=" dev-db/mysql-connector-c:="
+
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hspec )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-developer
+}
diff --git a/dev-haskell/neat-interpolation/Manifest b/dev-haskell/neat-interpolation/Manifest
index a358788a5a3c..1a5405722940 100644
--- a/dev-haskell/neat-interpolation/Manifest
+++ b/dev-haskell/neat-interpolation/Manifest
@@ -1,5 +1,3 @@
-DIST neat-interpolation-0.3.2.1.tar.gz 4339 BLAKE2B e3f7a87308839de027e566bb5498ab7d1983bfaa8c81ee225a18d40e3cf5a3ad31dc8f52660e85f1532e33fcc5bc29e6ffcc3d9bf69095ef7d5408cf98231659 SHA512 aaefc95b85e8546bd20848b3d4da39437b48e5e3c54829f9ae06f8f4021752812a643a638bcc10213db168d3217bd8913b2feec81d90199a14eea8c35fe62245
 DIST neat-interpolation-0.3.2.6.tar.gz 5437 BLAKE2B 0a84a4e0ed3126d6ab11ff382dc46d8760a14f725c23bb87650290b2b8c3791be996f734fecfe326fc8236548360a163de3979eb12534e52fa927787d2dfb803 SHA512 0b3725258cebdf6144a9442b3dfb5e46a1d36525fdfec7f1797546416ef7788c7ad679d33105d541ae37b208c170d695757355291ef0d05297d8e35ea4116546
-EBUILD neat-interpolation-0.3.2.1.ebuild 824 BLAKE2B b8aee4e4a24762dfbcd784452ec1dbf8d9ef4a821dc2c2cb3764add6bf222aac5c797dcb77ec3fe2c24b311b4534de25d199df7b13dd437f7bb6f67462b1baff SHA512 c98005f8484611bdfa0126c26a2fb42cc3070298b7ca21d211fcb74c34d3f0895d852e1d65d646acf70e963ad1d9194041245625aa6535f52285d10a2c9ff5c0
 EBUILD neat-interpolation-0.3.2.6.ebuild 1103 BLAKE2B bba5c44571a69ebc3764018ecd28aa53c51f4c0dba1208ce3f97039c7f381c55dc15cd91a139e2ed3b83125282c5c43942e54d95f3489fc49e3fd4440a764049 SHA512 34b4673d5ebcfed4d3c3963bb9b87a7bddc8d1eea98ce433786bed96056fc725a02c0aea49695a6a7227d339b4afcb5eb85d55932519982937601615ac94012f
 MISC metadata.xml 528 BLAKE2B 8f1ce2fd25af69785d68ddc9dda15763c223577601992b171479ad804a75de01dc8acd97afff5ff9230d3dbf08f935d6ea37dc82620860571f7727ec1834b678 SHA512 0f3cad29fba3eeeb53a1b9091ed7dab3799f1dca2df3896976785edbd8b194676fe42d8f0ee642fb74eb69afea8ef2ffadbb8e3bf39799ec25a87f36e7df48d9
diff --git a/dev-haskell/neat-interpolation/neat-interpolation-0.3.2.1.ebuild b/dev-haskell/neat-interpolation/neat-interpolation-0.3.2.1.ebuild
deleted file mode 100644
index 01a6f8cd2457..000000000000
--- a/dev-haskell/neat-interpolation/neat-interpolation-0.3.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="A quasiquoter for neat and simple multiline text interpolation"
-HOMEPAGE="https://github.com/nikita-volkov/neat-interpolation"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/base-prelude-2:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-2:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/htf-0.11 <dev-haskell/htf-0.14 )
-"
diff --git a/dev-haskell/network-protocol-xmpp/Manifest b/dev-haskell/network-protocol-xmpp/Manifest
index 92f5741b19cc..da30dadcb835 100644
--- a/dev-haskell/network-protocol-xmpp/Manifest
+++ b/dev-haskell/network-protocol-xmpp/Manifest
@@ -1,3 +1,3 @@
-DIST network-protocol-xmpp-0.4.8.tar.gz 24289 BLAKE2B 53d5f7c35846a4727fc15994d332213573b73893e37ef8fb5121bcf7e4ea684e1f794856317d3b8b51e0b8a7d5cb829ab1af0d226c75d745a7e280e9c4ecc992 SHA512 029cbb1a0ea6691fd886b326eee7a24e8300bbece1f0c0f564b43b0e344f4107ca980d97342271cab0b9c1333fc445ac10f7dfae41dd2b6e6ea995bfb810311e
-EBUILD network-protocol-xmpp-0.4.8.ebuild 1134 BLAKE2B 5fa47ed9216157abee77b618a739629fcfffcf374968d739711ad04897c251aa1144ba7c29be0026e9adffe2cc4170b0e0c2793465717b6a3f5123383c48c891 SHA512 e86a477c60ae6756722453f6f295863c31790aaa2870b757ef08f176a78ad9ccbdf545bbeea974ed4660bcb0cc9ee421bd8c2e0f751654da7c594abaf93a29bd
+DIST network-protocol-xmpp-0.4.9.tar.gz 24623 BLAKE2B e8d0e611bdb2ce42a4ec0a9bd80221aa863eb8a5d69f3580a12c67ccf45492205f52b6de4232e7db0bdd568da1deaa39b610ea543c6f1ea63e05355567974472 SHA512 51c97677a4e56b016c23287076ee75a6ca023b9d4e073aae2d9b406e2f3aaa5147194d0f08e3673562df6b965b686b115577da9ce92a94892c515a6032989c86
+EBUILD network-protocol-xmpp-0.4.9.ebuild 1134 BLAKE2B baf0666f2d35ad1f43707e51e22cec64570887b81b3938afa070f03aea43e1b850a8c3c7b86c6b9becab8a856113b014d1dadb1fd39353c9f2567bdb3d062d0e SHA512 fb4af1895b3275d6cc9474eb8a2f054b5640325d923dfc860622291f3fd471ebd20498a697fb0f8cd0d06a9375b938e311a2fa5bedceeabc123b07f30e50bf35
 MISC metadata.xml 328 BLAKE2B 3dc9ce30dc6ca5538f15de5a750943a1104a446c80b89b04a2e78b010fabc56c0790ac2f20b22f2dcdfa1286196aa29f1e8a9476703420a308a0439d66f362a3 SHA512 c3ca347c855d7510dd2be06116586d131b091c056fc6ae221f8ee4aee122e3cf355d590e44fda1af5b8907488d5df5731901b5798d9300757cf83d8c646da968
diff --git a/dev-haskell/network-protocol-xmpp/network-protocol-xmpp-0.4.8.ebuild b/dev-haskell/network-protocol-xmpp/network-protocol-xmpp-0.4.9.ebuild
index b60b7b8f9632..a728492f5d64 100644
--- a/dev-haskell/network-protocol-xmpp/network-protocol-xmpp-0.4.8.ebuild
+++ b/dev-haskell/network-protocol-xmpp/network-protocol-xmpp-0.4.9.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-# ebuild generated by hackport 0.4.5.9999
+# ebuild generated by hackport 0.6.4
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Client library for the XMPP protocol"
-HOMEPAGE="https://john-millikin.com/software/haskell-xmpp/"
+HOMEPAGE="https://git.sr.ht/~singpolyma/network-protocol-xmpp"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-3"
@@ -22,12 +22,11 @@ RDEPEND=">=dev-haskell/gnuidn-0.2:=[profile?] <dev-haskell/gnuidn-0.3:=[profile?
 	>=dev-haskell/gsasl-0.3:=[profile?] <dev-haskell/gsasl-0.4:=[profile?]
 	>=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?]
 	>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?]
-	>=dev-haskell/network-2.2:=[profile?]
+	>=dev-haskell/network-2.2:=[profile?] <dev-haskell/network-3.0.0.0:=[profile?]
 	>=dev-haskell/text-0.10:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
 	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-7.8.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
+	>=dev-haskell/cabal-1.18.1.3
 "
diff --git a/dev-haskell/network/Manifest b/dev-haskell/network/Manifest
index 0372d3fb20cd..9622cfd568cd 100644
--- a/dev-haskell/network/Manifest
+++ b/dev-haskell/network/Manifest
@@ -10,5 +10,5 @@ EBUILD network-2.4.2.2.ebuild 758 BLAKE2B 17e24180297edbe9edad8e81b1442bbab5915a
 EBUILD network-2.5.0.0.ebuild 755 BLAKE2B cdc83b6a6d9054cbde04d0a0109136e946330d4aa212724d3547c146cbace04765ecdd557ad96ece65c8997cecc28cf6bf6d9077d290412a609d8ced73069b03 SHA512 35ce8c255db968ffbea5a0618009845e055abae0403293cfc8e56691c28de5ed90d14aa80144e7d33f39a2fd1d84847061860c28d5205f02abf12767ad0e440d
 EBUILD network-2.6.2.1.ebuild 678 BLAKE2B 2bb5b5d9e7e2d4cc6b11fb1a5b5a257396ac92cd7c64ba6e10f86b349727cf1388ee1f0c95e70ceb73b9c00327a87385c0c5ee75a2254a28794fd3c621c591c2 SHA512 707655cf45eaa9b5259d4777ff3438b57ad55ba35ea99a147fd517f20c9851b7c78a2de5e56a7cfe7dfbe73eca28ce39e8c620c0698e004daa9952249cb83b69
 EBUILD network-2.6.3.1-r1.ebuild 778 BLAKE2B cb1f8675e642dd107e8eca115066848132c26433380ab3956d38c8b347c3886db3248bd014a8cf7d6861e3c145b399a7d48c47d559e3522ffc10175c127b7ce4 SHA512 20ad310375bc4a831ce4cc1b0f914cc095d492cc1753b32c5b5ba677a71b1f700b86cc6a786144e0bacbd3cbe28b8652934585ffe4029fb5f422f01c4429137d
-EBUILD network-3.0.1.1.ebuild 696 BLAKE2B 06240f3559d1b788a640d742e49da4b1e577f736f96df52b24b6763e1f0346dc3d8251d42abc2ef399b61240f89e5817d2e354d93d2136594bf89df7b30258fa SHA512 4500a0a1ba90b4afc17ffd4a87106ea62f4612498ac87021a07401ab03711613a08bc7c387cf95ed86f00fc472f4783e7cb2a51dd92126eb624ce00785884558
+EBUILD network-3.0.1.1.ebuild 657 BLAKE2B 62d9561a77429954b61b9ba601bd5afb3a1b9fe09434d953373284d7703da0d746d503c2fa10ccddf5e5e4cfbf2801b4a1217dd7b3e488b41bcb68fa26db7c08 SHA512 bc44648e8f2c9d02bf4744fbf8e5718669e000a72c9f86f363b2a73de05558ab2c3a496724695b12e83ba590495bcba90eb3f481e0af4079c70ec3b94a194333
 MISC metadata.xml 339 BLAKE2B 18307a0d079346dd5375b9b1bc7e305cab5d4d540b3c2c3dabe7cfd58fa4d1c3cfa85ec9e783b39e3aa5680f0341a42cbe67d13243cf44e90ede9835c5c69f2a SHA512 d01bf59dc204787d38413ec975da4530201bfaa8e7f68547e253013469c881cd258813129845de80aa3cbe0939c94cf59efc4605ae6351560fd214e7dbd4ce0f
diff --git a/dev-haskell/network/network-3.0.1.1.ebuild b/dev-haskell/network/network-3.0.1.1.ebuild
index 4756e2bc55d0..ba075bfdb94a 100644
--- a/dev-haskell/network/network-3.0.1.1.ebuild
+++ b/dev-haskell/network/network-3.0.1.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/haskell/network"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="3/${PV}" # NOTE: remember to set SLOT="3/${PV}"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
diff --git a/dev-haskell/newtype/Manifest b/dev-haskell/newtype/Manifest
index 6b5ff0f47581..f707d843d98c 100644
--- a/dev-haskell/newtype/Manifest
+++ b/dev-haskell/newtype/Manifest
@@ -1,5 +1,3 @@
 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 568 BLAKE2B 1f957f73182af6a794361c48e42321e8f541f007c749d8d7b874fbabc1967f6ef75e4f1759d976462b3596a32189abdc7da1245749e53314e86a77cd390d7415 SHA512 ff7d2d0cc5ed590deffdf4d597b8065ca2a1c5b4b6a62593da07d4778a158a5b3b36cde386e465ff5a50e26f6e3bd0e89efa7fbe370fd0baf29df7f679f30e5d
-EBUILD newtype-0.2.ebuild 552 BLAKE2B f499897e671b3122cb94f528be9d9bb54abf648803dc33a324f04f35a3bb6755987ec4154d15d910c4f36ecea3290d55a72f7a765c674478394e64ab5bdbb58b SHA512 58e4718b425f8323617819dd31d1a7b9e6228cacfb2a743f54707d99c444b2d104d00c0a2a3f548e8462c2061b0cb31903dfbe9a5062aa2fd4ed3a546eda2d89
 MISC metadata.xml 457 BLAKE2B 91199f5831c7431f71b4851e9ef19b0be90d604ad18087201febd2402e7839cc343dbffdc0904f0b43d31b2900037fc63d9f036d8daab713e4dcce80edbdc6b9 SHA512 75b00c69ad2b24cee918d3ae93f9bf4d8f66bb4a8e977af215c88b712dbbb235586add1750647215896544bfe79ac073fc50d588de267a4df2cdbcf2d7c53075
diff --git a/dev-haskell/objectname/Manifest b/dev-haskell/objectname/Manifest
index bf719cb92e67..a3a032eabed6 100644
--- a/dev-haskell/objectname/Manifest
+++ b/dev-haskell/objectname/Manifest
@@ -1,7 +1,5 @@
-DIST ObjectName-1.0.0.0.tar.gz 1843 BLAKE2B 029eddfd406b45bec034b8e93d1b8bea78ef4f217f6bf3fc8fb81630f67933f538327df59688c34e64f43d35a447b23fd4d8cbc04b1b11e6b18f9faccc84da99 SHA512 ceb9c88e20641f29725d1cfd4ad421cdd3ade2b6e7ba6d45efa1802a616b950299832d47d2c71208c639bfdb7ae8af051541dfef4d92c9a10ae7d3cf4ba076c7
 DIST ObjectName-1.0.1.0.tar.gz 2265 BLAKE2B de1e8ae29569f355f4b711d8e08f03842e4176feb7bd79a1b5d3c1df050f698a8927ed216447783182b601b339564f172a58bc2431331039d0389a46aa5e1078 SHA512 e526ca1334a2ec81eac1ab7dde4a459d9541761cf708098fe011f84681143819553e1540ce71d122a5f744c1adc9965bb9eb25f216e039233edcdfbc5d6d33d2
 DIST ObjectName-1.1.0.1.tar.gz 2557 BLAKE2B ba67de5c6bf8dc522dbb245064ceaf9b6498979d511fb0b7624083362c6d954c70e292c03edec1663e4265cf935c5eb833dc4833b2acb17b29f957e6b028a98e SHA512 e0b94813d29ccba4a54c699e039ab101039a9482f594c990547a04f9de511e4d27d5a93fc5f176ea5e3a8d940d31477f0e69dcd6f7c867f67bb117933d2cce64
-EBUILD objectname-1.0.0.0.ebuild 592 BLAKE2B 247821d05fe7f4264632166c1cd752421c6701f32b26fce4d5af3e2a3030c54b996b2f7853fb2632232e245382669e968d52fb0b27121287487a92076570b4d7 SHA512 44b909bbe5f01edbc1ce6a5e8396cbcae01321d3d396066d268141b48545562a81cdc0081d01fa5b1292bbb23907841a1ff14852e31adf49b3b7558bf719b218
 EBUILD objectname-1.0.1.0.ebuild 595 BLAKE2B 73b922079ac0630e5535505a1436dc9d681974261f2dc41982cf88c10a57ddd15f2d06d74b61b31d52fe61f49c96200bace9b910a09cf3037c1272dbad88de0c SHA512 20eb53a0a05479dc5f4cdc504b44934b6e76f4f7d805788f8ad61157c4dcf441fe72e93f25820acd6e62c91c52aaaf1c892b346a9025fe5635ef5f41e551f040
 EBUILD objectname-1.1.0.1.ebuild 693 BLAKE2B 85daeb5c66aa84e2494baa027aa0b9f2b690c72e402d3567c6a07e66a25867798ddf8a9af2059b9f6f3565164f6b7b7fc93a073eb800ec87117b31747c2faff2 SHA512 e536d7e1f7fbc7e1037bfeac7a7a78000e9f75f0e10952cff02b81e763539fc227d6bddcaebeaf665ad3b4cd27243e3fdff3db3dbdc82d9b3c90af49defb472a
 MISC metadata.xml 596 BLAKE2B a43d8028870e22b19d34519c3ff131a473293aa8f2572657a61489163a6d157064b191b0dee3b8c93b77b05cc40b1c3c4201a688cb4d57e7a0e4aac988fe8cbd SHA512 efce1983ae651b42654dfdfcba73f7c73ebe8dcf725b43bf8ec80e7b9b98c4b5f1611ace0f74147299ea92c4d5d973cd399e116280451cbc6c817f8a6b8f7d7e
diff --git a/dev-haskell/objectname/objectname-1.0.0.0.ebuild b/dev-haskell/objectname/objectname-1.0.0.0.ebuild
deleted file mode 100644
index ae972b29958d..000000000000
--- a/dev-haskell/objectname/objectname-1.0.0.0.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
-
-MY_PN="ObjectName"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Explicitly handled object names"
-HOMEPAGE="https://github.com/svenpanne/ObjectName"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		dev-haskell/cabal"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/openglraw/Manifest b/dev-haskell/openglraw/Manifest
index 7afec6227ca9..b282a4ae5d83 100644
--- a/dev-haskell/openglraw/Manifest
+++ b/dev-haskell/openglraw/Manifest
@@ -7,5 +7,5 @@ EBUILD openglraw-1.3.0.0.ebuild 635 BLAKE2B 18835e22bb25ba6b8bcc5fa09fddca3a18a8
 EBUILD openglraw-1.5.0.0.ebuild 823 BLAKE2B c030abf20ddd028a02e2c5cc82aaed45ef61b60fa67fc325885b6ee03714afc4eeb594d1984d24793a3a4195c96a48766f314499315079548aafcdea9c94bc66 SHA512 e088e1661a5f09912b92f9079637e8dc073569fe08da5b452c7a11b5c0ce8686f5d3538503de64de2593b4d2313f287c889ec5af11cd483bd3dfb1611c87662c
 EBUILD openglraw-2.5.1.0.ebuild 976 BLAKE2B 9bd109ec4188da05e60513016a771dca528299ace905eeca131bc2ec6c3c35ad6c3c92f01a51aa9c0172da4181db2bfa80436e4cf32d5565c1a65cbc5058837c SHA512 f199c217504b897912c38384161c745cac1a659ffbb59257893271201e3f6fd046f09c3c1e05971e6d85bfaeeb69effd5fcb06b995b0d6329885d286ad2cc145
 EBUILD openglraw-3.2.4.0.ebuild 1110 BLAKE2B adc779524f8f9956a56c51fbd159313ae89e416c6a456a5104bcc719cd8c3883d471a094900086ac49a57a6b1c0951574768dd93dc096e49c47c7e65e0573248 SHA512 c318a0860a6ec6880fd47f139ad272010d785b796457228102512fabfab3c20b6f95a35f7ce1213be7315a54338aac75e9d1ad101180aa4f26cd6946d2fdd117
-EBUILD openglraw-3.3.4.0.ebuild 1104 BLAKE2B 08a89b7ac5efe078b3dc878fd048d84b20725f4ec7bd648106ada0ebe3c40f2365165b40e11dcb1528a9d27f839ecc6b25a7676098d35726482dca96be0699c5 SHA512 3396822b2b4d222949cc4a246b9260f75b3aa93d933fd17e9dbe21818bbc152efe6023ebc26e43e6e7356721bd1cb0e8e661e8ad1f9b2c025c7c7a698b3a9053
+EBUILD openglraw-3.3.4.0.ebuild 1105 BLAKE2B 427491b1b164699aeb5f854d04ed235197d422cb3e71d516e55a2f051e0fba288dac5403e2c319f9f1662c42c78f2f4929c542807920edf1a41e87f99e00fb13 SHA512 6d11909d1ed0517609276d8e4012ae8342a376a8d52b0c044206fd414c105d2ec908e72c8d217a36cba2a6f330383ca8b01a43bbc37ef2e2151f66099abdd161
 MISC metadata.xml 1327 BLAKE2B b71049e49f15888f0f67058e7518201ca46e7ae64ad907f36fd3507fdb0de0b07a04bc8d8c1f0bc0c6565951ab8ce9ce30a579a678e8de99c99519474fc6ed06 SHA512 d44492c262c233ad31f207d991a69a6404d37aa3bf158479017ec74bac144eef6e69db8179f022c4cd6c6b15cefeb7431345b0cb76885ac37e1e8a2c1e18feb7
diff --git a/dev-haskell/openglraw/openglraw-3.3.4.0.ebuild b/dev-haskell/openglraw/openglraw-3.3.4.0.ebuild
index 61096c6ba093..bfce4ad892c0 100644
--- a/dev-haskell/openglraw/openglraw-3.3.4.0.ebuild
+++ b/dev-haskell/openglraw/openglraw-3.3.4.0.ebuild
@@ -13,7 +13,7 @@ MY_PN="OpenGLRaw"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
+HOMEPAGE="https://www.haskell.org/haskellwiki/Opengl"
 SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-haskell/options/Manifest b/dev-haskell/options/Manifest
index bd839c5488a2..6337016a2fe0 100644
--- a/dev-haskell/options/Manifest
+++ b/dev-haskell/options/Manifest
@@ -1,3 +1,3 @@
 DIST options-1.2.1.1.tar.gz 25327 BLAKE2B 66611694e5beb558e185cd9a89e9368ebac035118360a4c1cb9bcba5ad2a0be74c32848e3983aec999b4cee6e3138c527fe31c869b52c84719ee89afe3aad232 SHA512 615a3767b74ca0ba2eae993f6e475963df2a0933f1e6c9bbfe35144c4dc6018af276144b2ec1b608b695dc7fca904784ebc63cd58a432f966588846cb36f94ea
-EBUILD options-1.2.1.1.ebuild 827 BLAKE2B a6da5217dda78f55c91707648c2f5e2640a84e504a0423d6ba1079c29097180ec249c89e72f5875bedbe373d58a5850d42b1fe335eeaca33818f66b6ada31f1e SHA512 011d9f470424f440e9c2aafe71eed105896d5074d2df86cb6f898853992aab7c1ab81d8ecfdbdb474f3da74f4ae1023ad998c4475195677395ffd0f1bebb7061
+EBUILD options-1.2.1.1.ebuild 752 BLAKE2B 134fd68d90508729194b3367bc2c5a2ca0c3221bd5f64deadcc396e80aa35bfd4d5dcb1066f9d59548cfb8497cf65b54cb58b15391768401af27dea2f6546bfa SHA512 58356bc6cfed66c2e5bde9cba0081ac8941eec0148959139e47aa2328e2a55b05fd25e585c1e978bf38d4e4393f8f7bc93ecaff2f8ca10475b5ac49cba5345da
 MISC metadata.xml 1803 BLAKE2B 8cb824136f208f42f22c79344cdceeff042be92bb2fda3ebd0ff18931b028980459bcdfac015b4c5bdd4481d2b4fd2e5395eaf6eee2bb3352649354c238cf59a SHA512 0ee4d11702f1f43fb4fbb5416b96fbcf5d56ce3280deaa0474acce57a00f172133b19a8ce204c76a1b89320e708b9e3eb2cefb0ed1306d45d131073a382cef27
diff --git a/dev-haskell/options/options-1.2.1.1.ebuild b/dev-haskell/options/options-1.2.1.1.ebuild
index bf9be388fee6..8a12b69409b4 100644
--- a/dev-haskell/options/options-1.2.1.1.ebuild
+++ b/dev-haskell/options/options-1.2.1.1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 # ebuild generated by hackport 0.4.4.9999
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" #Drop test-suite: circular depend
 inherit haskell-cabal
 
 DESCRIPTION="A powerful and easy-to-use command-line option parser"
@@ -17,7 +17,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RESTRICT=test # circular depends
+RESTRICT=test # circular depends: options[test]->chell->options
 
 RDEPEND=">=dev-haskell/monads-tf-0.1:=[profile?]
 	>=dev-haskell/transformers-0.2:=[profile?]
@@ -25,6 +25,4 @@ RDEPEND=">=dev-haskell/monads-tf-0.1:=[profile?]
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3 )
 "
diff --git a/dev-haskell/persistent-mysql/Manifest b/dev-haskell/persistent-mysql/Manifest
new file mode 100644
index 000000000000..a65f8dda9bf9
--- /dev/null
+++ b/dev-haskell/persistent-mysql/Manifest
@@ -0,0 +1,3 @@
+DIST persistent-mysql-2.10.2.3.tar.gz 21760 BLAKE2B f997d0250cb639ce5f5b77e234388678ed45d499e283ffc9436c9d39171d7dfa35980525ffb911a492d28f147b5239220035452b2c9c6c8c154d4e5f82eb556f SHA512 6fbc72345a6fba4880fdcc87cd220cae3a574d7e945fe5d7a02124177b597d8a19d6b429ea16bd993e73b79cd8b74351f220d30b806567f0eec6cb7641788040
+EBUILD persistent-mysql-2.10.2.3.ebuild 1409 BLAKE2B def1b9d28a5993a4a0a3f9e4b57defef6348c7d4feb32ced72b29b5c2a94c019b971309655349df1b61aa3edc1dc074d78cbd8f90e3075e54908e60883d9cd0f SHA512 0a40dbffcb4c944dc8cc104cf61feebc1fb1303fdb1dacb5a1f3ffc85a6681b0380880301ae75523135510b4ed8abace5cb61a2563ebf61d6cc51362c0a20b56
+MISC metadata.xml 666 BLAKE2B 873170c1db35645b123cdc5ef90796c49b2c12b11d38b6acebdece4ae7672279251576a341c18967a3049e069adb843fa850e0f256bb8d27a425bf46d2d579fa SHA512 190f4eff6d6ab03fdca8dcbde10c293d965e195203335e332bb7e715fa59a5c035d05e01d63aa3576d8b719d3d927b6b17671837835f6bb48c70c5dce855db4d
diff --git a/dev-haskell/persistent-mysql/metadata.xml b/dev-haskell/persistent-mysql/metadata.xml
new file mode 100644
index 000000000000..035923944fce
--- /dev/null
+++ b/dev-haskell/persistent-mysql/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This package contains a backend for persistent using the
+		MySQL database server.  Internally it uses the @mysql-simple@
+		and @mysql@ packages in order to access the database.
+		
+		This package supports only MySQL 5.1 and above.  However, it
+		has been tested only on MySQL 5.5.
+		
+		Known problems:
+		
+		* This package does not support statements inside other
+		statements.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/persistent-mysql/persistent-mysql-2.10.2.3.ebuild b/dev-haskell/persistent-mysql/persistent-mysql-2.10.2.3.ebuild
new file mode 100644
index 000000000000..a284caa095ef
--- /dev/null
+++ b/dev-haskell/persistent-mysql/persistent-mysql-2.10.2.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Backend for the persistent library using MySQL database server"
+HOMEPAGE="http://www.yesodweb.com/book/persistent"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="test" # tests require mysql
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
+	dev-haskell/blaze-builder:=[profile?]
+	>=dev-haskell/conduit-1.2.12:=[profile?]
+	dev-haskell/monad-logger:=[profile?]
+	>=dev-haskell/mysql-0.1.4:=[profile?] <dev-haskell/mysql-0.2:=[profile?]
+	>=dev-haskell/mysql-simple-0.4.4:=[profile?] <dev-haskell/mysql-simple-0.5:=[profile?]
+	>=dev-haskell/persistent-2.10.0:=[profile?] <dev-haskell/persistent-3:=[profile?]
+	dev-haskell/resource-pool:=[profile?]
+	>=dev-haskell/resourcet-1.1:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( dev-haskell/fast-logger
+		>=dev-haskell/hspec-2.4
+		dev-haskell/hunit
+		dev-haskell/persistent-qq
+		dev-haskell/persistent-template
+		dev-haskell/persistent-test
+		dev-haskell/quickcheck
+		dev-haskell/quickcheck-instances )
+"
diff --git a/dev-haskell/persistent-postgresql/Manifest b/dev-haskell/persistent-postgresql/Manifest
new file mode 100644
index 000000000000..7e61ecc12840
--- /dev/null
+++ b/dev-haskell/persistent-postgresql/Manifest
@@ -0,0 +1,3 @@
+DIST persistent-postgresql-2.10.1.2.tar.gz 27624 BLAKE2B 6ffbab607819d725cc85e7f9f8939d3d7397214d4ae19bf1ce20deab2ddf5433479d5b5e521cafa8595d6c1938140ff4b0e054981f73bea47d7150b3f0edcfa0 SHA512 0b0e33ede6ec38f8030b127e4073202dd7fe6a8c14d3b7e4a739a6ff197500bf4c013fb7d54a76f2d56b4d9f143409a23f2a4a33658e3bce5a2960657c6742fd
+EBUILD persistent-postgresql-2.10.1.2.ebuild 1534 BLAKE2B b706fa24b4cda387422fb0b68e70cdc5ff4aa6d030bd440beb7483701167977af8a70e6ea05a701f8cd56f8af0752cb07a02c6c7171295d9836ce6938e2a389e SHA512 0d7bd14f7e814731f946059e8dab4ecfdd73bbb49b160c99b62a7a97ea3c284399bd83ac5781a49e9f39a1407e4f32b6ed4c1bca40b8c19a77b6bcd5aa32fec3
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/persistent-postgresql/metadata.xml b/dev-haskell/persistent-postgresql/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/persistent-postgresql/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/persistent-postgresql/persistent-postgresql-2.10.1.2.ebuild b/dev-haskell/persistent-postgresql/persistent-postgresql-2.10.1.2.ebuild
new file mode 100644
index 000000000000..f663f52a22d9
--- /dev/null
+++ b/dev-haskell/persistent-postgresql/persistent-postgresql-2.10.1.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Backend for the persistent library using postgresql"
+HOMEPAGE="http://www.yesodweb.com/book/persistent"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # tests require postgresql
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
+	dev-haskell/blaze-builder:=[profile?]
+	>=dev-haskell/conduit-1.2.12:=[profile?]
+	>=dev-haskell/monad-logger-0.3.25:=[profile?]
+	>=dev-haskell/persistent-2.10:=[profile?] <dev-haskell/persistent-3:=[profile?]
+	>=dev-haskell/postgresql-libpq-0.9.4.2:=[profile?] <dev-haskell/postgresql-libpq-0.10:=[profile?]
+	>=dev-haskell/postgresql-simple-0.6.1:=[profile?] <dev-haskell/postgresql-simple-0.7:=[profile?]
+	dev-haskell/resource-pool:=[profile?]
+	>=dev-haskell/resourcet-1.1.9:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( dev-haskell/fast-logger
+		>=dev-haskell/hspec-2.4
+		dev-haskell/hspec-expectations
+		dev-haskell/hunit
+		dev-haskell/persistent-qq
+		dev-haskell/persistent-template
+		dev-haskell/persistent-test
+		dev-haskell/quickcheck
+		dev-haskell/quickcheck-instances
+		dev-haskell/unordered-containers
+		dev-haskell/vector )
+"
diff --git a/dev-haskell/persistent-qq/Manifest b/dev-haskell/persistent-qq/Manifest
new file mode 100644
index 000000000000..86b1c9bea42a
--- /dev/null
+++ b/dev-haskell/persistent-qq/Manifest
@@ -0,0 +1,3 @@
+DIST persistent-qq-2.9.0.tar.gz 3642 BLAKE2B c99dc47f9ffdf80979896fd0bf2b9083a724c6ea63c92799a4e7d00f801ab1671e523098351794b7d5c08bead2a39d91e2f9ce3a39d413c5efeb107d55a32963 SHA512 0bd5a00d9bc97128e3eaf556af46347e924b4b20713b0526ed79cc55bef5350f2c03c5e30fbccfb3d62a980ee92e52b34d1626504a4a70ec16caf95f4b494cd5
+EBUILD persistent-qq-2.9.0.ebuild 794 BLAKE2B 5ecea88ccefc9016b3a5a99b4e7bfb60bfcaa3a671d202e2298c2b3ab0bd6301fb5aad4a4c6176d30b93650dbc67914c053360175a97093beb5d1c2abbfc2524 SHA512 ec607ebcab6b21b43bfae3ab22d0a73f62b4d387ebce0050fd11ee336db50afe6deb53e13c2fc05011021432209d2b69d3e67106aa206265396bc0f5d31311c9
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/persistent-qq/metadata.xml b/dev-haskell/persistent-qq/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/persistent-qq/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/persistent-qq/persistent-qq-2.9.0.ebuild b/dev-haskell/persistent-qq/persistent-qq-2.9.0.ebuild
new file mode 100644
index 000000000000..9570afee8d03
--- /dev/null
+++ b/dev-haskell/persistent-qq/persistent-qq-2.9.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 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="Provides a quasi-quoter for raw SQL for persistent"
+HOMEPAGE="https://github.com/yesodweb/persistent#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/haskell-src-meta:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/persistent-2.9:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'persistent >=2.9.1' 'persistent >=2.9'
+}
diff --git a/dev-haskell/postgresql-libpq/Manifest b/dev-haskell/postgresql-libpq/Manifest
new file mode 100644
index 000000000000..f23f714d0d37
--- /dev/null
+++ b/dev-haskell/postgresql-libpq/Manifest
@@ -0,0 +1,3 @@
+DIST postgresql-libpq-0.9.4.2.tar.gz 31349 BLAKE2B 3f590eacc034eedeec7c9e83122ac0d52faf29dea1c0d929eaac50a199f933fe755dadaa99b6a25abb9db46b13f51a8f581fb37c628f70ab850fb599347c88bc SHA512 8bb811d8a25a09e232391412a78125a419db00bd293eaff8f0d3c652a65a5d312e3f42fae41babe9edf820adead5c243dc5a055ab16d7f9725c861b464a8d4f4
+EBUILD postgresql-libpq-0.9.4.2-r2.ebuild 853 BLAKE2B f61715c0b7d22ebbcf51c1e36062d86ffadbdec22fcb4fdeb065a797b2291c6ea0003003293a144553a1ae0ec78371e266d8c2ea349822d4fb71d37921bba18a SHA512 01158b1c4a2dc1b752a9de9cd486c0bb675f889f2f9b69c7002ff6f931b7d3accfe673036ab0a28b8478802626459f961727c524f17318384552f4a1544bebbd
+MISC metadata.xml 541 BLAKE2B f0136949c8b8b35af226f3f02f58c36b709fc6129820a9948b0445038c7fb0b7ed64966a2e6a9cb0bc08c01a817a99cd91c0f7bde14cb8b464d101b79552ed50 SHA512 d1c3a475af3af921f51dee1df8c45f41733dcdb583cb10350aa3eb93f03c65b650ff090ad380b920450631eba5ede15ae34da638bcb66488add6d8258a8a5b85
diff --git a/dev-haskell/postgresql-libpq/metadata.xml b/dev-haskell/postgresql-libpq/metadata.xml
new file mode 100644
index 000000000000..da4203ad218c
--- /dev/null
+++ b/dev-haskell/postgresql-libpq/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This is a binding to libpq: the C application
+		programmer's interface to PostgreSQL. libpq is a
+		set of library functions that allow client
+		programs to pass queries to the PostgreSQL
+		backend server and to receive the results of
+		these queries.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/postgresql-libpq/postgresql-libpq-0.9.4.2-r2.ebuild b/dev-haskell/postgresql-libpq/postgresql-libpq-0.9.4.2-r2.ebuild
new file mode 100644
index 000000000000..c077b890a0ed
--- /dev/null
+++ b/dev-haskell/postgresql-libpq/postgresql-libpq-0.9.4.2-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 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: -use-pkg-config
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="low-level binding to libpq"
+HOMEPAGE="https://github.com/phadej/postgresql-libpq"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-db/postgresql-7:*
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10 <dev-haskell/cabal-3.3
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base       >=4.3     && <4.13' 'base       >=4.3' \
+		'Cabal >= 1.10 && <2.5' 'Cabal >= 1.10 && <3.3'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-use-pkg-config
+}
diff --git a/dev-haskell/postgresql-simple/Manifest b/dev-haskell/postgresql-simple/Manifest
new file mode 100644
index 000000000000..0440f33122f2
--- /dev/null
+++ b/dev-haskell/postgresql-simple/Manifest
@@ -0,0 +1,3 @@
+DIST postgresql-simple-0.6.2.tar.gz 93740 BLAKE2B c8aff5f0db21c9b83ade8b8f763f937eb03fbc7432499483e617dca0c0b99a76d98357c7401c3aadf88c21e3765151e42c326d265e83e81df5623ad7c4eeb1cb SHA512 508f599e70a09aa4e80e5f76b9774d0aeb8d741abc16611fa6b9acd4a08a6d300133d1bdffe5893f3bca68ac77f0aedb4a0a8e6724dbd462b982db436fd944d8
+EBUILD postgresql-simple-0.6.2.ebuild 2335 BLAKE2B 924888440d095d93db0ff0f4c60511be9c10ff390f4e681701612ca28b0cedeb3edd0e4705acd379c4f3ae0c5dc7fa16457d62537a571fed0fecf341f78f645b SHA512 f03a847e41be899c704d0de5275abed71357f3fd01405eca27bea04d73763f65cc7aec3f74e94f3ba971e21558fbc39d99fa05c514ffe1e902c9e70dad9adb89
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/postgresql-simple/metadata.xml b/dev-haskell/postgresql-simple/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/postgresql-simple/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/postgresql-simple/postgresql-simple-0.6.2.ebuild b/dev-haskell/postgresql-simple/postgresql-simple-0.6.2.ebuild
new file mode 100644
index 000000000000..f1ba2211f744
--- /dev/null
+++ b/dev-haskell/postgresql-simple/postgresql-simple-0.6.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 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="Mid-Level PostgreSQL client library"
+HOMEPAGE="https://hackage.haskell.org/package/postgresql-simple"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="test" # requires running postgres
+
+RDEPEND=">=dev-haskell/aeson-1.4.1.0:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
+	>=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/bytestring-builder-0.10.8.1.0:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
+	>=dev-haskell/case-insensitive-1.2.0.11:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/hashable-1.2.7.0:=[profile?]
+	>=dev-haskell/only-0.1:=[profile?] <dev-haskell/only-0.1.1:=[profile?]
+	>=dev-haskell/postgresql-libpq-0.9.4.2:=[profile?] <dev-haskell/postgresql-libpq-0.10:=[profile?]
+	>=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/semigroups-0.18.5:=[profile?]
+	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
+	>=dev-haskell/vector-0.12.0.1:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/base16-bytestring
+		>=dev-haskell/cryptohash-md5-0.11.100.1 <dev-haskell/cryptohash-md5-0.12
+		dev-haskell/hunit
+		>=dev-haskell/inspection-testing-0.4.1.1 <dev-haskell/inspection-testing-0.5
+		dev-haskell/tasty
+		dev-haskell/tasty-golden
+		dev-haskell/tasty-hunit )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base               >=4.6.0.0  && <4.13' 'base               >=4.6.0.0' \
+		'time               >=1.4.0.1  && <1.9' 'time               >=1.4.0.1' \
+		'template-haskell   >=2.8.0.0  && <2.15' 'template-haskell   >=2.8.0.0' \
+		'hashable           >=1.2.7.0     && <1.3' 'hashable           >=1.2.7.0' \
+		'semigroups >=0.18.5  && <0.19' 'semigroups >=0.18.5'
+}
diff --git a/dev-haskell/puremd5/Manifest b/dev-haskell/puremd5/Manifest
index 1941b0399d7d..831751932c38 100644
--- a/dev-haskell/puremd5/Manifest
+++ b/dev-haskell/puremd5/Manifest
@@ -1,5 +1,3 @@
-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 775 BLAKE2B be822bd6126a1cd1475a5446405082bc3ef2ec64a282e8d193075bd39374d07987308d71e7490291f2bdceaa6c7b0da1be6e4cb3e801e355203c6dbda1d47e4e SHA512 0f8c6b8763fde06c55921317e4219a5232deedb547ebf25ef9a7bdeec1a2d441af57165793e38793f3c1b4263a5532c5f682a39a98bb30c647f477207676b174
 EBUILD puremd5-2.1.3.ebuild 1071 BLAKE2B d2cececea47394060877e95ad74fce3ba58a8141431d9dfc197d2c77beaf820ef5e230ccb2bc80bdb671cbb5a305259d6ba8b8c2d8d89fb8292af279cdbb6f83 SHA512 3957c4550fb7a625ac877a0d0e3b27c771f2cb4cec06be55cb9fe7aff6f96e8aca7c357ab123614c112ce4bd77442636885abbff409b057a915e49a51eb57f51
 MISC metadata.xml 409 BLAKE2B 15eb0f35211933def995d2fae75c8dc314d7631253281407c163dc4165b2150717fc5e07f26b3f372d76227a58b4363156c11f012fe3856fecc6c23210a5a8f5 SHA512 4ba01f7301f2151bebf117ee4b322debc50d0a17f16b52d14267818fc4fb3716b7981a251a7c39b13dfab45cb02fa464b24dc0afa1dc73fecddfe81341d65797
diff --git a/dev-haskell/puremd5/puremd5-2.1.2.1.ebuild b/dev-haskell/puremd5/puremd5-2.1.2.1.ebuild
deleted file mode 100644
index 838e79386e84..000000000000
--- a/dev-haskell/puremd5/puremd5-2.1.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 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
-
-MY_PN="pureMD5"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Haskell-only implementation of the MD5 digest (hash) algorithm"
-HOMEPAGE="https://hackage.haskell.org/package/pureMD5"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4.0[profile?]
-		>=dev-haskell/cereal-0.2[profile?]
-		dev-haskell/crypto-api[profile?]
-		dev-haskell/tagged[profile?]
-		>=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/recaptcha/Manifest b/dev-haskell/recaptcha/Manifest
index 5aa9e7665e8e..7987c6044b94 100644
--- a/dev-haskell/recaptcha/Manifest
+++ b/dev-haskell/recaptcha/Manifest
@@ -1,5 +1,3 @@
-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.3.ebuild b/dev-haskell/recaptcha/recaptcha-0.1.0.3.ebuild
deleted file mode 100644
index b4030a5312f0..000000000000
--- a/dev-haskell/recaptcha/recaptcha-0.1.0.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Functions for using the reCAPTCHA service in web applications"
-HOMEPAGE="https://github.com/jgm/recaptcha/tree/master"
-SRC_URI="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.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/regex-posix/Manifest b/dev-haskell/regex-posix/Manifest
index 9ef5bfa211de..4d618669dd25 100644
--- a/dev-haskell/regex-posix/Manifest
+++ b/dev-haskell/regex-posix/Manifest
@@ -1,6 +1,4 @@
 AUX regex-posix-0.95.1-ghc-7.5.patch 554 BLAKE2B ceec0b6593f49a6ec9965c988e8b440a87ee11b5bc1e210d4466c8a84bc8044c34fcda91b8a359b763b9ef47b697f59fe1bdf5711f9a71ea2a33e00bbb717c44 SHA512 ea77dfc50967f5d3c8beb82ece23a1c48168fa59c08d7ce58b16c22c708fb4e49c76ab8b8aac0ef5306a2babb8666385f916295bd77f57b149cad5991ebb5516
-DIST regex-posix-0.95.2.tar.gz 42916 BLAKE2B 3b0192bf2eac5cf2376a5cfd73be4f138be2074fd3b80fe43c659015a2a731a61f1cf6537dd207c36e8fa893737b30f61516f23e815a8da52dc8866b36fc58d0 SHA512 2d22951f0302de144483d2c11d0711dc2cbd2fc6a0eac0126011eaa6f577837ae8c2a9516badb4beed6c18311241458dd6ad9f82a11d6f3763891880ebbc8c41
 DIST regex-posix-0.96.0.0.tar.gz 12529 BLAKE2B e949fd28a8fee8c0ae056dc0037dc9eb03b3814145740a053752ac121f6ffc60bad5db72832626340f0f201d06ccc649225af9506be671f63fd5b850e20bda6c SHA512 91bdc672a535cd1a6a65b1ae2adef43605b792ec9f99150fa239ab4353cddad47988ac7baa65673c53be36e83c8fad1511ba85fb5f7b43c51b4ae526d9af248a
-EBUILD regex-posix-0.95.2.ebuild 645 BLAKE2B 2b902b071d9389f1e5be2234ecb7a099a97992e5563b5839348d97cc07ab70040c03c1d34270c7ffc6b6427ebe80dc62691b780340ffab0c8df9086fa9228e79 SHA512 6e975304303b2be450703b71bc59f5a05c1bd81cabfb761a7335882f5d736f1168307f2174a7c7416b43174452048db58fbc37dca2cf4ed696b3b4910c4d1ca0
 EBUILD regex-posix-0.96.0.0.ebuild 1028 BLAKE2B 8bf0d211272d8cd6815f5d629d3be26087dccebad4cb8fb1bad003d067c5de1f6785909b018d50fa036d8d2f42755d5367dad5248d0c2daa65e29b25f2328647 SHA512 5eeef975061110880e101e4ca1ce631f3773734337b968148573f8bee13c6f71b3e37379f90cef1d1304ee13e40148fb0c0859e6a59c06a7c9890c2d42c097b1
 MISC metadata.xml 409 BLAKE2B 521ecdf88b2947d4a498d4efd608950ac471dd05d501d767e047711f77c4847e0ce1d32d5710ce274d77591e2b7da7ea60f1e71a797e3b22166b531d67108f9e SHA512 7268260f6f6f43ac70640d2dcdedf01bb465c7e5d34c0aec154e67be1e1a13560be1653c6a47e38cd9aed0fa02fcbc64ecb3fc9cd13ab4221968d9c9f5965626
diff --git a/dev-haskell/regex-posix/regex-posix-0.95.2.ebuild b/dev-haskell/regex-posix/regex-posix-0.95.2.ebuild
deleted file mode 100644
index 5b55bb37f143..000000000000
--- a/dev-haskell/regex-posix/regex-posix-0.95.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit base haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="https://hackage.haskell.org/package/regex-posix"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-haskell/regex-base-0.93[profile?]
-		>=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-PATCHES=("${FILESDIR}/${PN}-0.95.1-ghc-7.5.patch")
diff --git a/dev-haskell/shellish/Manifest b/dev-haskell/shellish/Manifest
deleted file mode 100644
index c7b083c7a170..000000000000
--- a/dev-haskell/shellish/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX shellish-0.1.4-ghc-7.10.patch 333 BLAKE2B 2375e508af85b207a50b499faf8f4b31de54ffdad118663c1b631a8727de110cbe47754b7fb60b4911f86ed635ea1069dd077103fdbe555aad514b4d0b4d8098 SHA512 ea9b8b75200dbae42cc7498905333e96c4a5f203671e6b8fe74954ca1bb249bb0657b171da1bc40a2f70c5b1b69ef2f9155ab7e08c7018f4209047585a775656
-AUX shellish-0.1.4-ghc-8.patch 287 BLAKE2B d03709941ecef3374790422aa78bd5601bd9d92c1116774106c9263426ce37cf4a63c3fd7d93ce057fe93f2e68b69c0fddc011d79fb2542efe7ac69dbb5b88be SHA512 84fe9c8ad7420c4567d5277b014ee62e0e1c9a594c7ba72c3e3192e40999ee5fdc9c883ff5b99a0091f6e8e0d0599dbdc44b34cc1d752bd16590d3bffe3fce73
-DIST shellish-0.1.4.tar.gz 7268 BLAKE2B d315b956f64d6ebf9cd3728468b63775448fd6446fdbed8570ddc81885027884b2112c1377a457693463d42dc9f43c8088119f4fa09b8612dd830a504ffcb07b SHA512 4507ab92ca2db6a0e79d799ba303b3cb64fa887ec4581f0e1d191340fa7116db2c4bae069d6692c51d3d754ea0672b2d5c12b582d769b81b5b0e25c8c97c8a62
-EBUILD shellish-0.1.4.ebuild 736 BLAKE2B ae6c6bd8bc6ff82353862679dc01b81649edc5383f05e98959d3b0304fa92c9bdbf24636d247e3096e8372dedace83d801a459bebf2b0fdc1af9dc9060f0f479 SHA512 2dcd80030860133a2e9f7ef675479d7ce2d422621070ac7536e478f327f2ecea87b476fa6b20baedd7eeef14d6e3e40a716da559c86d73c6877150f3527fb190
-MISC metadata.xml 675 BLAKE2B 52149b22d14e149ef8feeeb92fceea6fe1f9833ceb338cd630c9a4c2cf6c6c8e3332366e2a8b657b62b55f9ac64b42e6c7344959fdcfc9a47e1c49f9634ae279 SHA512 0eb2ad21fc402a2c9164b703aa26bcb733df7636dd22a3b358aed68a2d41df90da450d85516e0cce5f682c0768f35d7b5310cf4312fb9b0f3839979a67705807
diff --git a/dev-haskell/shellish/files/shellish-0.1.4-ghc-7.10.patch b/dev-haskell/shellish/files/shellish-0.1.4-ghc-7.10.patch
deleted file mode 100644
index c756635f6000..000000000000
--- a/dev-haskell/shellish/files/shellish-0.1.4-ghc-7.10.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/Shellish.hs b/Shellish.hs
-index 1e3c192..0ac20c2 100644
---- a/Shellish.hs
-+++ b/Shellish.hs
-@@ -1,3 +1,3 @@
- {-# LANGUAGE ScopedTypeVariables, DeriveDataTypeable, OverloadedStrings,
--             MultiParamTypeClasses, FlexibleInstances #-}
-+             MultiParamTypeClasses, FlexibleInstances, FlexibleContexts #-}
- 
diff --git a/dev-haskell/shellish/files/shellish-0.1.4-ghc-8.patch b/dev-haskell/shellish/files/shellish-0.1.4-ghc-8.patch
deleted file mode 100644
index 49525543acbd..000000000000
--- a/dev-haskell/shellish/files/shellish-0.1.4-ghc-8.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/Shellish.hs b/Shellish.hs
-index 0ac20c2..7de0e11 100644
---- a/Shellish.hs
-+++ b/Shellish.hs
-@@ -180,3 +180,3 @@ test_s = path >=> liftIO . \f -> do
-   stat <- getSymbolicLinkStatus f
--  return $ isSymbolicLink stat
-+  return $ System.PosixCompat.Files.isSymbolicLink stat
- 
diff --git a/dev-haskell/shellish/metadata.xml b/dev-haskell/shellish/metadata.xml
deleted file mode 100644
index 220975e213d9..000000000000
--- a/dev-haskell/shellish/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The shellisg package provides a single module for convenient
-		\"systems\" programming in Haskell, similar in spirit to POSIX
-		shells or PERL.
-		
-		* Elegance and safety is sacrificed for conciseness and
-		swiss-army-knife-ness.
-		
-		* The interface exported by Shellish is thread-safe.
-		
-		Overall, the module should help you to get a job done quickly,
-		without getting too dirty.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/shellish/shellish-0.1.4.ebuild b/dev-haskell/shellish/shellish-0.1.4.ebuild
deleted file mode 100644
index b441415f3876..000000000000
--- a/dev-haskell/shellish/shellish-0.1.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 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="shell-/perl- like (systems) programming in Haskell"
-HOMEPAGE="http://repos.mornfall.net/shellish"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl[profile?]
-		dev-haskell/strict[profile?]
-		dev-haskell/unix-compat[profile?]
-		>=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-	epatch "${FILESDIR}"/${P}-ghc-8.patch
-}
diff --git a/dev-haskell/size-based/Manifest b/dev-haskell/size-based/Manifest
new file mode 100644
index 000000000000..cdd2ad06bac2
--- /dev/null
+++ b/dev-haskell/size-based/Manifest
@@ -0,0 +1,3 @@
+DIST size-based-0.1.2.0.tar.gz 10324 BLAKE2B 789cf4603a0539ef3a919c43f64d9613d8473ea9b59c6a4e77a22b07916b01ad773a2c758b54439fab961b4c89891122651a21fb19231cd561a7a2af5f766f74 SHA512 661bcf34fa52253a54c2a0530bc484ef74c687ea98f7de7ff11232ac3be1f653dabb70e641bc5724ee35bdf19b86a20ed0fc9b56a4730c07aaf7a11900a99409
+EBUILD size-based-0.1.2.0.ebuild 906 BLAKE2B e61078db47b407e1b98d63885822270625e3bf350a01a8b3e649cd6ec465909759500ce9c785dbfda6e3da413068cbc67b747f8a07ecb758c24dd71431f0ef96 SHA512 6434319b3bf85bd2992767f950998584041838a69077a86fb8c862287c2b0a452109d144d3fadccc13409ce53ac6091bf1c029761054ef39e09c4836c70da8e3
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/size-based/metadata.xml b/dev-haskell/size-based/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/size-based/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/size-based/size-based-0.1.2.0.ebuild b/dev-haskell/size-based/size-based-0.1.2.0.ebuild
new file mode 100644
index 000000000000..353eda4a9c94
--- /dev/null
+++ b/dev-haskell/size-based/size-based-0.1.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 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="Sized functors, for size-based enumerations"
+HOMEPAGE="https://hackage.haskell.org/package/size-based"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/dictionary-sharing-0.1:=[profile?] <dev-haskell/dictionary-sharing-1.0:=[profile?]
+	<dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-haskell/testing-type-modifiers-0.1:=[profile?] <dev-haskell/testing-type-modifiers-1.0:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+src_prepare() {
+	default
+	cabal_chdeps \
+		'template-haskell  >=2.5 && <2.15' 'template-haskell  >=2.5'
+}
diff --git a/dev-haskell/statevar/Manifest b/dev-haskell/statevar/Manifest
index f017b69bd946..9640e6068f37 100644
--- a/dev-haskell/statevar/Manifest
+++ b/dev-haskell/statevar/Manifest
@@ -3,7 +3,7 @@ DIST StateVar-1.0.1.0.tar.gz 2800 BLAKE2B 504a3afe5a3c93c98967ee00b9771f83aac143
 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 578 BLAKE2B 8a2404a721a20e98810722cbbdbd1f3a106ea9f495ffbf057531bf1de537a7f0de3611b2b5d931bb73f103db48159acbfb120df92430cda9a599b2141d1f95e4 SHA512 4a2a31ea62fa66fe78d4899057f5da7041d907e98eaafec6f6ae0f274d9ef1907f88417cc8fe482119b22960bb3e4e65f9cec35ae60e2e7616aeb6c4388f42f4
+EBUILD statevar-1.0.0.0-r1.ebuild 579 BLAKE2B 4a70c75e2fa022bac395e5d3f70c7556666b088abd4165260c686ad675bc11d42ad664aea0855015aa433af31e2c3968c7b98f8e52cb396d54b173b4b37a84cd SHA512 c19c72bd2f85b072ad1fe352ed9a11d32ff9ac0d36f3281469ca7a5a58a7472765cd47f08442fb15e0143427a42a16e10d8efeb02c147e1ca79bbc3a72ee519c
 EBUILD statevar-1.0.1.0.ebuild 580 BLAKE2B 010c24423516ae6abee58b60c9974e28e1f26eeef162fb376fed46be7171bf9ea23bf7f967e3a0aed49103cbafbe789a36325ff296de711543576048f86847b6 SHA512 0ca39ea983c69f1c465dd4f577be84bc3d9b1d99321a37e316424e9c7afa492cb70897f10f62118734a2437add12a411fe60dff1dfe883f116c864713ce36d00
 EBUILD statevar-1.1.0.3.ebuild 746 BLAKE2B 799e6406150fb2888d92c9981bca72dc6cbb22af327eaf87efa6d8fedaf33d35d7f108f7bcd41fab601bc5297d95b94ba0e0c0500f3ab413516f78121700db34 SHA512 c3aac156f123e17b7a11811def578f1e2f9a7f6ccbdad3ba06a9d6706809b079c89990406ae94f63f6c3f96e6badd5951d761ec27f73db9b848e9a3ee512c7d8
 EBUILD statevar-1.1.0.4.ebuild 746 BLAKE2B c76901a8242a9fd8abacd0c8abb9208fa698a2fe8568e3075d92b58651d01dcff7f753a39d6b4e63a4881cc3a76416d0469a54eba75276bedd244d5ab065da0b SHA512 0500f572339dabf65b144582344e47571780d24f85613689f02cb445cf2bf7a208c7e6ccc093b2e8737624d92ba856ab434a53e3cbc103fb13256f3ef596f911
diff --git a/dev-haskell/statevar/statevar-1.0.0.0-r1.ebuild b/dev-haskell/statevar/statevar-1.0.0.0-r1.ebuild
index 4190eed22c19..2cf4f8417402 100644
--- a/dev-haskell/statevar/statevar-1.0.0.0-r1.ebuild
+++ b/dev-haskell/statevar/statevar-1.0.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ MY_PN="StateVar"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="State variables"
-HOMEPAGE="http://www.haskell.org/HOpenGL/"
+HOMEPAGE="https://www.haskell.org/HOpenGL/"
 SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-haskell/store/Manifest b/dev-haskell/store/Manifest
index 451c26083f81..1dc370761aa4 100644
--- a/dev-haskell/store/Manifest
+++ b/dev-haskell/store/Manifest
@@ -1,3 +1,3 @@
 DIST store-0.7.6.tar.gz 43198 BLAKE2B 9246dabb2222c42096b001db327e60821d8d7142e4f7cc6818b3ef8e8743ea0185ae5fa68beaf02eeb1ec3254d95010625f56714b639730ca29fc4269c1cec2d SHA512 c1bf63b76e300aabce656e06899de9b95fa5a3d9b08be47b6ed640f5ae2a63d5dbb08e8058bb334af6a771a2dc8eeb700bf7162b806481e47e08d22bbb83b674
-EBUILD store-0.7.6.ebuild 2165 BLAKE2B bf4c90489efe6fc36306540383f2725df9f7c481149ba908ba32fac95254007a760828771bce9d79f755289ff75ffa145d6d9bd2ae25b038c8cff285dfe00f61 SHA512 6709828bdb00e40a7ce9dc0ca02370ce3c00e6d3c39db75eb63d99d74b15f7e166cbe7424a73a990efa608754abbe726c0f4b9ec62ba1daef1e2ef07a8027cb3
+EBUILD store-0.7.6.ebuild 2185 BLAKE2B 327dc6f2d020b44bffbafbf6f3556212ce02cc408b2623e54701c8489fc0363c67f1918b0acac38ec415f4c82f7d22231c903e567c668f70ccf96f0ccfdc9407 SHA512 d374645ae376a876f11566dc6bc61f3d45c5e15db591732abf3558a43d4e4bba2933d169b7272eb76f4257979c645cd1d3041934f76ff967d2cbe33851b80563
 MISC metadata.xml 316 BLAKE2B 835f4bb685e005fae7a08c4232615b9627d6350e961c8757ac8cae97f79532eb302e63e6c1f33eb95ce0160577ee442f5a850e15231f9fcdc8d3efcda426e378 SHA512 e8fe6a6522fdb50f17a301c2668f519cbc88a51b2697d1da84d356098f4b12b27ab34b454f35c107d8b43e1dd1c6d4540ef578315c761124773d55c87747be20
diff --git a/dev-haskell/store/store-0.7.6.ebuild b/dev-haskell/store/store-0.7.6.ebuild
index 69fa5368d78f..515d0443bfc7 100644
--- a/dev-haskell/store/store-0.7.6.ebuild
+++ b/dev-haskell/store/store-0.7.6.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 # ebuild generated by hackport 0.6.6
-#hackport: flags: -small-bench,-comparison-bench,-integer-simple
+#hackport: flags: -small-bench,-comparison-bench
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Fast binary serialization"
@@ -18,6 +18,8 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+RESTRICT=test # fails to build with newer smallcheck
+
 RDEPEND=">=dev-haskell/async-2.0.2:=[profile?]
 	>=dev-haskell/base-orphans-0.4.3:=[profile?]
 	>=dev-haskell/base64-bytestring-0.1.1:=[profile?]
@@ -53,12 +55,12 @@ RDEPEND=">=dev-haskell/async-2.0.2:=[profile?]
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/clock-0.3 )
 "
+# 	test? ( >=dev-haskell/clock-0.3 )
+# "
 
 src_configure() {
 	haskell-cabal_src_configure \
 		--flag=-comparison-bench \
-		--flag=-integer-simple \
 		--flag=-small-bench
 }
diff --git a/dev-haskell/strict/Manifest b/dev-haskell/strict/Manifest
index 8a860c0faad3..3f90fcd3ef8d 100644
--- a/dev-haskell/strict/Manifest
+++ b/dev-haskell/strict/Manifest
@@ -1,3 +1,3 @@
 DIST strict-0.3.2.tar.gz 3948 BLAKE2B f882834fdd7b6df5c1f7c56e93f895380ff291096feb73b627ba26c7d6f41555ef6a135d7d5fdac19f28c48869f9987bd510530300f968482538c79fe1842286 SHA512 ca27ee2b557669c409c0417b2005ceb612ad95040fd4a798535cdbc83b8b7a51a36bb66bc2e7bff04b5b965313894a51910a274d67a891530ed119c831bcd686
-EBUILD strict-0.3.2.ebuild 534 BLAKE2B 86f83d80b5e6cc89c14650fa77a4c98a6a5358052ea6ab55da34d95ed425c2d6d17ca9a85475df77580a2fb8f959d1fc97adb3343338632de01280aed5fdc617 SHA512 a71d2b3d611dd6cf6708b972781108a45c91325882167d42dd8c6babe70061a9bf599e73601840a8298654d43dc5b845459e488c697441ae4ba2c5dc88364d15
+EBUILD strict-0.3.2-r1.ebuild 542 BLAKE2B 982ae770f0c6a0dfb7607579b2da313aaec4e469f9f098173dfa7f343d5c756f0930188df04607c608e589d5714141ed13682cdb7aee589e2e6e5c44fcb19afe SHA512 62df2fdfd3345fe7bc0a73aea36564b2d5481670d3aee73918d3e222ad69bb4f37b1351168fbd716a699b95ca9a8eba67752a47c4c554b3743b115efd873885f
 MISC metadata.xml 434 BLAKE2B d70d7c3c439f2cc625885ce9df67be8b9d5ca520ff672868b17a9ea5406519b9763f56ba3b8a04d76b8c0f6666f5971bc5744e4364119814efd4020a0bfd3f37 SHA512 ff58eaedb8c7e7e4f4937bd5a9423827479514333bae86d9a6e7b60f957468975d7764ede2900696da478ad50ba75963018f7782f4811ab01cb78ffcc1677553
diff --git a/dev-haskell/strict/strict-0.3.2.ebuild b/dev-haskell/strict/strict-0.3.2-r1.ebuild
index f79deb0e946c..501f31bfb9ea 100644
--- a/dev-haskell/strict/strict-0.3.2.ebuild
+++ b/dev-haskell/strict/strict-0.3.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# ebuild generated by hackport 0.2.17.9999
+EAPI=7
 
-EAPI=4
+# ebuild generated by hackport 0.6.4.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -13,10 +13,12 @@ HOMEPAGE="http://www.cse.unsw.edu.au/~rl/code/strict.html"
 SRC_URI="https://hackage.haskell.org/package/${P}/${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.2"
+	>=dev-haskell/cabal-1.2
+"
diff --git a/dev-haskell/system-filepath/Manifest b/dev-haskell/system-filepath/Manifest
index 7ed5dfdaca18..1cef884d676f 100644
--- a/dev-haskell/system-filepath/Manifest
+++ b/dev-haskell/system-filepath/Manifest
@@ -1,7 +1,3 @@
-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 746 BLAKE2B 01212a5c2ae8dd4cdd9fadca8148fead8ac5d336d7f06faa493921526d90a1c86839b0dc75ff48624e1becb1dbbd0258967a2edcd8e830fff6608e050f630c95 SHA512 1364291ff77051416e228094e4e752562618eb19dc6aa9902336f007e8c1158248613ae072cb7c175e28db62bbc7e582fbb15835e88e599cd580b073dcf04900
 MISC metadata.xml 439 BLAKE2B 4862fbaedc30b3a4520e630d113066e30c1233392789b97d0697891b8f4985c8679efed8dc515b8839126be02b3a3d17a702e4b6f2faaf01ac012b335286565d SHA512 85d9affd4354d2c9409400e6f9213b0e81c74ea4388b39c8893f588fdb3215016f0f3fc9ecb751bf45ebd8f3582b0327a25fc3cf92276b1a86e9c5479059a073
diff --git a/dev-haskell/system-filepath/system-filepath-0.4.13.4.ebuild b/dev-haskell/system-filepath/system-filepath-0.4.13.4.ebuild
deleted file mode 100644
index f0bc4522f532..000000000000
--- a/dev-haskell/system-filepath/system-filepath-0.4.13.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="High-level, byte-based file and directory path manipulations (deprecated)"
-HOMEPAGE="https://github.com/fpco/haskell-filesystem"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.11.0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/system-filepath/system-filepath-0.4.8-r1.ebuild b/dev-haskell/system-filepath/system-filepath-0.4.8-r1.ebuild
deleted file mode 100644
index 9eb658a75a95..000000000000
--- a/dev-haskell/system-filepath/system-filepath-0.4.8-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="High-level, byte-based file and directory path manipulations"
-HOMEPAGE="https://john-millikin.com/software/haskell-filesystem/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.7.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'deepseq >= 1.1 && < 1.4' 'deepseq >= 1.1' \
-		'text >= 0.7.1 && < 0.12' 'text >= 0.7.1'
-}
diff --git a/dev-haskell/tagstream-conduit/Manifest b/dev-haskell/tagstream-conduit/Manifest
index b7e09aaaf90e..580aef83819a 100644
--- a/dev-haskell/tagstream-conduit/Manifest
+++ b/dev-haskell/tagstream-conduit/Manifest
@@ -1,3 +1,3 @@
-DIST tagstream-conduit-0.5.5.3.tar.gz 9813 BLAKE2B efacae2982642e61470312a1374b522ae5d7c2d4e2b4e115c13b246a42c910604e9d51dc9bfee6163730b4dfd35bc7f87c8e3c522b36cb7a7bcafbcbb34bf392 SHA512 84625975df6c6c315011ebfd63d551b22c00927fa9add390d9e723bc104d4a7881743aaf6bceae0ff42efc6056a314baddb594fd5e344449333ea7ff6cbcf154
-EBUILD tagstream-conduit-0.5.5.3.ebuild 1038 BLAKE2B bab7481dc947e5a362c99d8cd6a5e80c145fec267d15247e225bdcd9ae6c0a581e63eda322f3adadfa8c578e0a410590e6c1deec9fb1eee03d9372ab82b1c28f SHA512 654d9520499953b327d72c169875e230f36eb1000e74f5bd9284d979cc0e2d2ae7ef310b15623dfbea48223da8116fd3baa17ee86b9fdd0ca5ef784b27a14910
+DIST tagstream-conduit-0.5.6.tar.gz 10258 BLAKE2B 2d484f1d1578dcfcc30ba44c16d473dbc269e8dbd7b294803b4f9372c8df498e28ffa7b49f96d46629f932bf91012c5f2c28d0f6a3ce75f9440a31df03783959 SHA512 bd389b9db3a179b4b58a0e3c0f57953a3eeb4ad216b4f29cd452ce73b76cebf8f77c4510115b5840919d63b7e32fdd0839736e7f522596679a5d7dcadfc003d0
+EBUILD tagstream-conduit-0.5.6.ebuild 1068 BLAKE2B 264cc45587599fcd397033324d75cc4ebc51761928fcd600c3e6eaedf9c3c9ab9440ca73bc50450db447bce9cacfdcd2c3866788d64ff1eece866c41600e816e SHA512 925b186d8372fc817c722053286a9ada036bb822f845351ef19a0a8b8f2feba0d4b75bbe4ac52d3290f5b1106f40eac6294874c2acea3c0856e5011173435673
 MISC metadata.xml 685 BLAKE2B 473260bcbc7a73a3599594a54894f430c787b830b14aeb6a6e98262e7b367a3fe24bacacfddb2ac1511c47997e5b2dd1d721a104f703808324bfad2af2896dc6 SHA512 2169c70ea9fdcf260c56a70f5fb77661d2bc9b86a7b51dc6e97ab73ffba575ff5b6ad1ce53708f2c44493286e5f6c1e02e19863b6f0e17b3dd1fb07bf8a29963
diff --git a/dev-haskell/tagstream-conduit/tagstream-conduit-0.5.5.3.ebuild b/dev-haskell/tagstream-conduit/tagstream-conduit-0.5.6.ebuild
index b7003ee0d08a..46ce6273b9ec 100644
--- a/dev-haskell/tagstream-conduit/tagstream-conduit-0.5.5.3.ebuild
+++ b/dev-haskell/tagstream-conduit/tagstream-conduit-0.5.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-# ebuild generated by hackport 0.4.3.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -23,14 +23,14 @@ RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
 	>=dev-haskell/conduit-1.2:=[profile?]
 	>=dev-haskell/conduit-extra-1.1.0:=[profile?]
 	>=dev-haskell/data-default-0.5.0:=[profile?]
+	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
 	dev-haskell/resourcet:=[profile?]
 	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/xml-conduit-1.1.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-haskell/xml-conduit-1.2.4:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
+	>=dev-haskell/cabal-1.18.1.3
 	test? ( >=dev-haskell/hspec-1.3
 		dev-haskell/hunit
 		dev-haskell/quickcheck )
diff --git a/dev-haskell/template-haskell-compat-v0208/Manifest b/dev-haskell/template-haskell-compat-v0208/Manifest
index 4ef128a9fcc3..fca1fc817322 100644
--- a/dev-haskell/template-haskell-compat-v0208/Manifest
+++ b/dev-haskell/template-haskell-compat-v0208/Manifest
@@ -1,3 +1,3 @@
-DIST template-haskell-compat-v0208-0.1.2.1.tar.gz 2892 BLAKE2B a4d941c715115a1e4bf01ad5bd9b935162407cfb697d2442838682e59183b67fa9e2168c8d0675572911fb2a473862790204e03632c64b5674b766a521db08ea SHA512 864cfb6a9fdd24f9a17d6e9ed2dcf8b00c6dc289165b2f34fb90384a90c03f554705437e15f87d53cd532c78243bf89f141d93a880aaeb7c6af9dc51e85ac96f
-EBUILD template-haskell-compat-v0208-0.1.2.1.ebuild 596 BLAKE2B 2168877e2f8264a4374ce5607f520a680ca3905416ad14c40a85d21b94fb3910f4f84bd4dc3770ae21d068bc3981edeac67f4a15ef304a4ce4ffc837d19da6f6 SHA512 70763acddeb5ed1be6ebff3817b27e8a7fff5cd39a842eeba8f1a489d8157aec4884690f4da103e101970818c78c1d9b4ae3461b872fe8178a20ca473186ae9a
+DIST template-haskell-compat-v0208-0.1.4.tar.gz 2957 BLAKE2B 604a9a64f84661d3babd083782844cd8c4d13138cecbbfabdcb4e933cc11233dc45eda2bb72426271b0bc859ad5babc86e8db6cb5a28d9f30e0f2b0169b4951c SHA512 00bda455148500ae49638ad8eead6516e37ab0fd6a35f5060dec73f4026dd02f0cd2be21dd8f64eadabd4b1bd6894f2bac3735a4dfc60115dfbf37dfe864d62e
+EBUILD template-haskell-compat-v0208-0.1.4.ebuild 596 BLAKE2B ebd38a814a4c60ed5af7716210556a069b5fd1223b9b9b7989bdcc4fff483bb4a9cc4d62eb5832842b998d1880a728fe487753686390b4f04a321adb60d4d2ac SHA512 f9c3d3a67cb9452764ff92b13352a132d9a7f5a71792cff5fecfda84ef32c1ebfd5e0b43f2ca62b1bd7f854f6e19d6faa3ef04adc356df53ae0b8176861d059c
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/template-haskell-compat-v0208/template-haskell-compat-v0208-0.1.2.1.ebuild b/dev-haskell/template-haskell-compat-v0208/template-haskell-compat-v0208-0.1.4.ebuild
index 347654e921ce..2b162c42cfc4 100644
--- a/dev-haskell/template-haskell-compat-v0208/template-haskell-compat-v0208-0.1.2.1.ebuild
+++ b/dev-haskell/template-haskell-compat-v0208/template-haskell-compat-v0208-0.1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
diff --git a/dev-haskell/tensor/Manifest b/dev-haskell/tensor/Manifest
index d7171307206d..ba6103f66475 100644
--- a/dev-haskell/tensor/Manifest
+++ b/dev-haskell/tensor/Manifest
@@ -1,6 +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 629 BLAKE2B ede543c70cccf9c6ed09d0328d00add6937bad7ca9fba010c0dfa50a93f7d4ce5783d40b0f28379483b2114c6bde45f115080c4ab62f3e14f8db3146f8d64ad0 SHA512 aa1508623fba11c47826f1219fa4bcb6dfa8a62bdc98f039bfacf2706c6f6aa0c86612d867efd8c0ab0f7debbb175aff63789454c90c60dd1556da4692518f25
+EBUILD tensor-1.0.0.1.ebuild 630 BLAKE2B 791d315125d21329f73e3e3b47c86644b86524def08c040c46d58e78fe1448bb4543ae898ecb4afdf7140e1cf7e3a84c4dd48531566f54152f8e3a86b11de318 SHA512 3f06a26b159b89698b483ae510566754a920548d7625f70cec825f6c3c424c6fe8d94c46f5f6f5cc3477036628313523a350ab18f61a830011df2a5b73b5fbc9
 EBUILD tensor-1.1.0.1.ebuild 585 BLAKE2B 791c221d10885bbf5a2d50bd7f18aacfaea261ce4c93e2c147e16b3a1db9ad27a9da9563f17fae8f8b6639d1b1cf366c540c74143237bcdb9198ac4e4be0e8e1 SHA512 01c75745ce1864ae3f3a1f035d134c1537bf973152d508dcd796357be1161301022db8ddec1b03a458d3ea05796ecfe572be88c80630e811c9e178dd2f4da48d
 MISC metadata.xml 381 BLAKE2B 27c33359d86af5c93547c77dc8c14e14de6f2b2afefa7726514e586b4b2d683a40a842d110508bea566769da26b1f8db030c9a7aa734386a9523a9196a6be81c SHA512 006ec9633cd8840f78485eba4ac7f17288079a22dcdd972616f47a57339b06a79488d3753320c657c319fa583d3a8443ebc358a7891d48b353907fef88411104
diff --git a/dev-haskell/tensor/tensor-1.0.0.1.ebuild b/dev-haskell/tensor/tensor-1.0.0.1.ebuild
index ad79307206fa..bd41a60d424b 100644
--- a/dev-haskell/tensor/tensor-1.0.0.1.ebuild
+++ b/dev-haskell/tensor/tensor-1.0.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ MY_PN="Tensor"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Tensor data types"
-HOMEPAGE="http://www.haskell.org/HOpenGL/"
+HOMEPAGE="https://www.haskell.org/HOpenGL/"
 SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-haskell/testing-feat/Manifest b/dev-haskell/testing-feat/Manifest
index 6d92b2d77047..96a6dd329a7f 100644
--- a/dev-haskell/testing-feat/Manifest
+++ b/dev-haskell/testing-feat/Manifest
@@ -1,3 +1,5 @@
 DIST testing-feat-0.4.0.3.tar.gz 17864 BLAKE2B ff57b181e3ed34a5e9794b9c3830122e2bd36a8199a641e2025cd5a2e467dae15cfc5d9cb4e21f198cdb667d7b9b6a5f88850f68c69d00da016200c5a12c33ce SHA512 0dabd9129472d9cf91b87a31aec9265369cdf58ec47fe74997df08097d4e93edb4f4bf52050bbca0c345e5993c12d0fcf755b94dd80093a33ba8fef366b08516
+DIST testing-feat-1.1.0.0.tar.gz 15291 BLAKE2B e590af9bbe5b5382bdefb4375cff05340e9be2bfa75e7dde895dee7bf1a84e8494f304306a979c8120b98c5fe9899d9ad8d271456e6318b5a78b1381306d4838 SHA512 b6480e990f9b8065d9f5e9fcf0dfeefe7e722830848ed5614cbe11581329f4341eb90547b67c1471d8b2e8b230490040714b1f560456797980c5cec9d0aef6e0
 EBUILD testing-feat-0.4.0.3.ebuild 735 BLAKE2B e0509bf68305523853d297d0fc65d74c7e59dc8d804ddbf430932e8321466286e4effc0f6761d91657cd353e4de7d94d8085bb49d9ea7c54a7beeb4c6e7fb1cb SHA512 ebb97528163b145aaff89d4a0fbed1df4173107803c0ef995ceb83aecf33baf3c6bf6376cacba7146dc0228c4f6245409408fb10e62bf6058a0a023b51e5460d
+EBUILD testing-feat-1.1.0.0.ebuild 760 BLAKE2B 8cf33439afb973fc6aa6129a8e7953bd7579ce2e363de3153ede60ff5a90cc8e24e4178841402ad255a67ee98489a3597e0dc8734ca72c767b73aa5609560349 SHA512 055f85ba42e689c9a28fd20e0cb9283a101527ca656575f9c0280bf1738a9605363e8d4e0a52030f45a579a7e31f7a00055b9a883a7e4ad2ec20871bec1c09c8
 MISC metadata.xml 896 BLAKE2B 4964075c0807fc2220156ac804d7d9d937f76f62b7fba6634844e70ac4961ddfa43c2868f64fde70f3a77806ee4ecdb9c1b300135059caa6f7bc1c5ddfc1359a SHA512 9b3d49257c04b2b4c836ec19aeb6c10ccf2a13a4266b65bfd31af3785d913f54f32689919c042b0d2a2d191d5bdff76b096cfbbfd48139771b5f208be7de418b
diff --git a/dev-haskell/testing-feat/testing-feat-1.1.0.0.ebuild b/dev-haskell/testing-feat/testing-feat-1.1.0.0.ebuild
new file mode 100644
index 000000000000..b49fdd83ecf5
--- /dev/null
+++ b/dev-haskell/testing-feat/testing-feat-1.1.0.0.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"
+inherit haskell-cabal
+
+DESCRIPTION="Functional Enumeration of Algebraic Types"
+HOMEPAGE="https://github.com/JonasDuregard/testing-feat"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">dev-haskell/quickcheck-2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
+	<dev-haskell/semigroups-0.19:=[profile?]
+	<dev-haskell/size-based-0.2:=[profile?]
+	<dev-haskell/testing-type-modifiers-0.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/testing-type-modifiers/Manifest b/dev-haskell/testing-type-modifiers/Manifest
new file mode 100644
index 000000000000..98170b665fe8
--- /dev/null
+++ b/dev-haskell/testing-type-modifiers/Manifest
@@ -0,0 +1,3 @@
+DIST testing-type-modifiers-0.1.0.1.tar.gz 2275 BLAKE2B 664760d4655f7c4ae4fea0b52f1687b81a754ec9d24aa940600279e6b029924b9505b29f24d7dfd07f6100e99b263727186ec8b65bd48b3d953be7554448c50b SHA512 21b76e469f2af199593a90579e9e2f0105444f508a3b244872936c95b28574cb8a782d74244249e4cf045d885b6878d8ae237ccd578c755f7314336137da56b8
+EBUILD testing-type-modifiers-0.1.0.1.ebuild 574 BLAKE2B 1d754ed7f47039737f2f74d66a8f55de99f69bbc7e31e6e63d84854823892ee7285f0829126a52be1355d060b552736edacfcb8c15a765c8c0073a14e4bb39cd SHA512 682fe7992bd18900fc4d7279e4fc8481e8a5d6b28ce457ac4ca516e196ca652cf6025be5eb7aaca4d51f8fb9515811a771d61eb132f8f2483edb3fd4dc3326b0
+MISC metadata.xml 932 BLAKE2B 5943f8307f4d7c2efb8366dbd4d2e186df5516baff1cc7695299502be5af80dd2ec9644d493b5679101e9d03039e67c023a223be819084304f0684f85234436b SHA512 99d103a5a9f86a2b462dedde3df3be4e60ae8d2957e44fe82404594513ee40618ec221dcfb5f8e86f99996c18121290c0ee37a01ba0b5d09ed720769bfb426be
diff --git a/dev-haskell/testing-type-modifiers/metadata.xml b/dev-haskell/testing-type-modifiers/metadata.xml
new file mode 100644
index 000000000000..a475c390c584
--- /dev/null
+++ b/dev-haskell/testing-type-modifiers/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Property based testing libraries such as QuickCheck tend to include type modifiers. Most of them
+		are used to quantify over subsets of a type. For example a property on non-empty lists:
+		
+		@  prop_tail_length (NonEmpty xs) = length (tail xs) == length xs - 1 @
+		
+		This library is intended to supply these modifiers to be used by testing libraries, in an effort to make
+		properties more portable between testing frameworks.
+		
+		For every modifier it also provides an access function that converts to the underlying type, which
+		enables point-free style properties as such:
+		
+		@
+		prop_tail_length2 = (&gt; 0) . length . nonEmpty
+		@
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/newtype/newtype-0.2.ebuild b/dev-haskell/testing-type-modifiers/testing-type-modifiers-0.1.0.1.ebuild
index beca6243a27f..dc256746b820 100644
--- a/dev-haskell/newtype/newtype-0.2.ebuild
+++ b/dev-haskell/testing-type-modifiers/testing-type-modifiers-0.1.0.1.ebuild
@@ -1,22 +1,24 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-# ebuild generated by hackport 0.2.18
+# ebuild generated by hackport 0.6.1
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
-DESCRIPTION="A typeclass and set of functions for working with newtypes"
-HOMEPAGE="https://hackage.haskell.org/package/newtype"
+DESCRIPTION="Data type modifiers for property based testing"
+HOMEPAGE="https://hackage.haskell.org/package/testing-type-modifiers"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
-LICENSE="BSD"
-SLOT="0"
+LICENSE="public-domain"
+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.2"
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/text-show/Manifest b/dev-haskell/text-show/Manifest
index 6c171e4c6536..df45a7a503ac 100644
--- a/dev-haskell/text-show/Manifest
+++ b/dev-haskell/text-show/Manifest
@@ -1,3 +1,3 @@
-DIST text-show-3.4.tar.gz 105127 BLAKE2B 4ea8f7cddaaad4630f0c8317dbe4d5505f27f3008c5e17117d9100f94bb49439edd2761acef60696ef8a97dc8412964d0a9750353f91b30257b025c9e88fd054 SHA512 48b7fdd801c4fc31e12f14a9ba0589e0971481a2f8562d00c697a9fd48f6420e73df0a7318ff4579a786cd606a1fda2287eab3f8c423810c0d00919c68eeebed
-EBUILD text-show-3.4.ebuild 2016 BLAKE2B e01a4519d216d8ce87098c71a16de8725b144c47d46468214792a5a34256164acfa969d5c539a788027026f7828485fd4c918922ee2f8091c63d2498ae76dcf3 SHA512 057855614fe96cb7d824e80a26ee7cecc2d64ae9797b8ebde4b63e39554e2c70598cb7750067b4ad7bc49f5c53ca9b33a2e8d15a759e591de7e9da88120c3936
+DIST text-show-3.8.5.tar.gz 95620 BLAKE2B 51c1a5f9b29d60e305b53db1a47bc415f8cec3fa4c29c22d103ffc20dd4585bc8241f471031eaaf798c0df379c589cd4a9622877b7f69cedc5f15c3fa94c9291 SHA512 17e6e4d188280d4545867b31210f9e8e69337996c80b8c4f9fd846e50605acb29ebb2429e72ce76545426741055c4806c20a32b59d47e190a38d0f1ed9405947
+EBUILD text-show-3.8.5.ebuild 2212 BLAKE2B c5ee88b668b59e175e7026ec2016e3604f6a255c72d681a65843d02645e8b3fa1c40ed98becb1e684ef4b8fcdad74ee9485690812d67a96c2f2843c1dcec3768 SHA512 849c9406d795b7c8f592770afc03fc157c383934829d74a3390a627a6a1bb5f8c0076ba942132dccdaed1ab1c5b0f8226592a369ac1877a5dca1156b9f2d64b6
 MISC metadata.xml 1745 BLAKE2B d094818a5099ee07ad3d768a300b456f1d5e62b11fcf1c5bbfcf6fb4ec0417709d96bb1f6f76eceb89e5154dfd19ce57fd281ef1011c1885e947992ebdaaeb05 SHA512 ee8e1085322a3ecfc53b35f651757515b214be5e3511931390e0e79b65d449a8cc15af6d50b695cd777abe5508c662b0bb9bb5cf4943399bd01809c9b124b2c7
diff --git a/dev-haskell/text-show/text-show-3.4.ebuild b/dev-haskell/text-show/text-show-3.4.ebuild
deleted file mode 100644
index 3e0806d71e12..000000000000
--- a/dev-haskell/text-show/text-show-3.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient conversion of values into Text"
-HOMEPAGE="https://github.com/RyanGlScott/text-show"
-SRC_URI="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.1:=[profile?] <dev-haskell/base-compat-1:=[profile?]
-	>=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/generic-deriving-1.11:=[profile?] <dev-haskell/generic-deriving-2:=[profile?]
-	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?]
-	>=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.11.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/th-lift-0.7.6:=[profile?] <dev-haskell/th-lift-1:=[profile?]
-	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/base-compat-0.8.2 <dev-haskell/base-compat-1
-		>=dev-haskell/base-orphans-0.5.2 <dev-haskell/base-orphans-1
-		>=dev-haskell/deriving-compat-0.3 <dev-haskell/deriving-compat-1
-		>=dev-haskell/hspec-2 <dev-haskell/hspec-3
-		>=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-3
-		>=dev-haskell/quickcheck-instances-0.1 <dev-haskell/quickcheck-instances-0.4
-		>=dev-haskell/tagged-0.8.3 <dev-haskell/tagged-1 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/text-show/text-show-3.8.5.ebuild b/dev-haskell/text-show/text-show-3.8.5.ebuild
new file mode 100644
index 000000000000..0bd37f1302be
--- /dev/null
+++ b/dev-haskell/text-show/text-show-3.8.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: -developer
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient conversion of values into Text"
+HOMEPAGE="https://github.com/RyanGlScott/text-show"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/base-compat-batteries-0.11:=[profile?] <dev-haskell/base-compat-batteries-0.12:=[profile?]
+	>=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+	dev-haskell/bytestring-builder:=[profile?]
+	>=dev-haskell/generic-deriving-1.11:=[profile?] <dev-haskell/generic-deriving-2:=[profile?]
+	>=dev-haskell/text-0.11.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
+	>=dev-haskell/th-lift-0.7.6:=[profile?] <dev-haskell/th-lift-1:=[profile?]
+	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/base-orphans-0.8.2 <dev-haskell/base-orphans-0.9
+		>=dev-haskell/deriving-compat-0.5.6 <dev-haskell/deriving-compat-1
+		>=dev-haskell/hspec-2 <dev-haskell/hspec-3
+		>=dev-haskell/quickcheck-2.12 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/quickcheck-instances-0.3.18 <dev-haskell/quickcheck-instances-0.4 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base                  >= 4.9 && < 4.14' 'base                  >= 4.9' \
+		'base      >= 4.5    && < 4.14' 'base      >= 4.5' \
+		'base                  >= 4.5 && < 4.9' 'base                  >= 4.5' \
+		'ghc-boot-th           >= 8.0  && < 8.9' 'ghc-boot-th           >= 8.0' \
+		'template-haskell      >= 2.11 && < 2.16' 'template-haskell      >= 2.11' \
+		'template-haskell      >= 2.5  && < 2.11' 'template-haskell      >= 2.5' \
+		'QuickCheck            >= 2.12   && < 2.14' 'QuickCheck            >= 2.12'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-developer
+}
diff --git a/dev-haskell/unix-time/Manifest b/dev-haskell/unix-time/Manifest
index 93279e4c1820..82fda14f76b5 100644
--- a/dev-haskell/unix-time/Manifest
+++ b/dev-haskell/unix-time/Manifest
@@ -1,9 +1,3 @@
-DIST unix-time-0.3.5.tar.gz 40201 BLAKE2B 398b47f43b6b56131f42842ad691b45e7fe987478583d498ad44885d480b14068b1d956d035e371f48518d62bff70f1f7f0ea34e398355d37bde9d76c5442dcb SHA512 8da13cd8e9a32ee8ce4ab9430eab951d84350e4c459948f4e5e833444f1f266fbac6b6fc08876e326313eaf92e31500b325825b1b2c4fb22c551efdf6e5b9db5
-DIST unix-time-0.3.6.tar.gz 40180 BLAKE2B 0233c673459f967e78a4a8985b0951efd224c57b172739413cb41950abbae05d29c575e128020b2ca6b8f96595326073e45d1bf4e040c81db10d1da3304d3def SHA512 a7ca1086d2a2a15bebdaad80e3e31cc3be403548650d6c490dd7aa3af14b017ad2034320f82c3c7729661a046156e41bb50acf6a8fc1aa1db8dc8a62522c03a1
-DIST unix-time-0.3.7.tar.gz 40549 BLAKE2B 86aa4e6b9d4b7adf55f27491dff7d4197c9540b7390fbfb93ccde33f618892be6c21387812cf41481d5863cff24bdbc29d213edf6c9bb13bdc1ca95e12889f95 SHA512 d10335af434e79980fd4221ade86dafa71d2aa9b30d7aaa13da25b8e75114430a143be5b9c6c1fa885d6ba01f6e6677484b04cd9e2cb263c650a945e954c44bd
 DIST unix-time-0.4.7.tar.gz 52235 BLAKE2B ec885f79c7f2be3766528dca640e59709aa984f70523714614414f921a7c7808feed274b44bc33cf23d4acee49dc0d8e4e30e9016a372850dfa1695abf81f7d2 SHA512 a9e5b77cb9c93b9a20687406aaeeaff5277d05b95ee9d874f3e0292eca83574b2e842785e0a88f71be3e91610db228c68b5cec885c4b3ea15fc6ec1bb861c072
-EBUILD unix-time-0.3.5.ebuild 742 BLAKE2B c7b93ccf2533ef7e6841bbfd4defddd6896f038233f45fe5793d1a31e180c896ab611d48efbba03447f9cde63372f8480b0ae51bc4a124b6fedfeb1412312323 SHA512 efe3056a2054f0cadff87f77260839d6eef086d9722ae43878f0d0b1e20f6d303a7540c1d0d8c8c1f4704ed6e4573cf2558ec034a62890ae865bdccfe5fbbcb5
-EBUILD unix-time-0.3.6.ebuild 742 BLAKE2B a27992974fd5b93fc652eec866a9b1f7d6988c85e4cd72105df4ac331d9665bb83030c8537d291f2f9cbd96dbc1529f9686a1736291b9942669ccdb5cb006f49 SHA512 bb15a6a4b21604fec54fbcd56f84021b3ce99b989e9fb9a0f7f7a8b2aaa17fd6ae91533552761b27bbb2e9acb43d93d9d4871896254766872e267f248eee989b
-EBUILD unix-time-0.3.7.ebuild 708 BLAKE2B 2eedcf6a64ca8900bf508541bb1a5a027781eba40280f06041eef4bda4cf6967fe0eaf429577931667f298dc82d12637a4f7f413a37a861cafe7bf095dd7ec6e SHA512 2dd0ee4ccd811dc69408942c0974c485e845843e3cfbcdac1ebc5a2b938391755907b36b7cde23ae31f81a2bf8fbed7c57c7290cd1a4f14bbc3ac645b04e605a
 EBUILD unix-time-0.4.7.ebuild 968 BLAKE2B 1c643774574a05cc8fff1784740cde290ccde85182bf491e874b2bd962334fd308d744fb8a46150276dbf3b5837b35aeae51fe2be5545151dc19a6c3541517ea SHA512 e8fedb9a382d5fe308287c6f1c2d702d289d24c3bdda8685142318cda44052e71b91a0b8dcba18ee6bb81a9c5c2deae824d59ec9a18e3c57f70c72e4d4abc5ab
 MISC metadata.xml 338 BLAKE2B 81aeb9ddd2ebe58011cece155d563ef83d59cb0ef762b85da7d43c053361f9f9994631a63fd4815c67e3ec81edb0eff2592a0a6804c90c195a7e1b4c2f8f3532 SHA512 3f3da8a70deabaeefdb28541bc5b398a03c0106098261811e3e1f7dba6ffaccc64bbe9905a7184d8cf84cddee7498f06bd9ed1b65909450262fa35da3f4f80d5
diff --git a/dev-haskell/unix-time/unix-time-0.3.5.ebuild b/dev-haskell/unix-time/unix-time-0.3.5.ebuild
deleted file mode 100644
index 4bdffb75d5b8..000000000000
--- a/dev-haskell/unix-time/unix-time-0.3.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Unix time parser/formatter and utilities"
-HOMEPAGE="https://hackage.haskell.org/package/unix-time"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/binary:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/doctest-0.9.3
-		>=dev-haskell/hspec-1.5
-		dev-haskell/old-locale
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/unix-time/unix-time-0.3.6.ebuild b/dev-haskell/unix-time/unix-time-0.3.6.ebuild
deleted file mode 100644
index a4e0f62c8ec5..000000000000
--- a/dev-haskell/unix-time/unix-time-0.3.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 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 test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Unix time parser/formatter and utilities"
-HOMEPAGE="https://hackage.haskell.org/package/unix-time"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/binary:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/doctest-0.9.3
-		>=dev-haskell/hspec-1.5
-		dev-haskell/old-locale
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/unix-time/unix-time-0.3.7.ebuild b/dev-haskell/unix-time/unix-time-0.3.7.ebuild
deleted file mode 100644
index c1fa638a2f8b..000000000000
--- a/dev-haskell/unix-time/unix-time-0.3.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Unix time parser/formatter and utilities"
-HOMEPAGE="https://hackage.haskell.org/package/unix-time"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/old-time:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/doctest-0.9.3
-		>=dev-haskell/hspec-1.5
-		dev-haskell/old-locale
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/vector-space/Manifest b/dev-haskell/vector-space/Manifest
index 4d87fe1e281f..6f381e4178b0 100644
--- a/dev-haskell/vector-space/Manifest
+++ b/dev-haskell/vector-space/Manifest
@@ -1,3 +1,3 @@
 DIST vector-space-0.16.tar.gz 16049 BLAKE2B e8851c515f774176c3589d6aa2ccef3d22c6957fa8c93dbb858da3e74785624fb5e5aaea4ba0bd9a3a3a55f74a801d5c51a8cb5e99b954ff9c7cd7a5a8c9001f SHA512 d79bc2e76a26653d5361a319265e52d8dea6273d10060a61215162490109a37b17261f897a6472bc7f16fc1f5566423c9a8ead6469fe10e366f982ab3d0ef2f5
-EBUILD vector-space-0.16.ebuild 762 BLAKE2B 669ea52ed037093138f664ad8cdbeed5d3ae41f865c7290f6aea84263cd550ae24f5dc0d7fdba74b8639ed8a1e2b8f6261e06a800f14db3aeeb4c3968d1c01bf SHA512 6e671aa14eb9d38da035c6a7bb0207206a5b4b9b07982471780bdb2e6756bcd8e9f5faada875d002b25426e8e556f58d8c3d99d16d21cceb93a913c5e2dc246c
+EBUILD vector-space-0.16.ebuild 763 BLAKE2B c2dc84c557eb46afb9c2b050b668242aef6acd95b2c058a2b0e22e31c84c804ece026ef5d76875ae0b568832c18e496f8ff4097cdd88c29d2e1184e32db00647 SHA512 61dc7f4ebed1fdee4702e46be468b660ca71e3861527350c03803a997359d76e00ff6f792c02438d67421002cd3c0a04a27ded5bb12a397b8397f24cbe3fa897
 MISC metadata.xml 854 BLAKE2B c5f0198f03e8c5d2c4c85653882b8f62f15f353811349b411ed41014157285dd1169e9f5368db5b2d6093de7d6b12ce032e68d51a3dc34285ba1255ee48e14dd SHA512 60ccfe4844f3c8f02c616458928712d60c0294bb3fb378a752cbe9be5111d576f6f2ee137cdd320a7ccd801ccdc3dbfd8b4d0e349987c687ab484f2eda2e96c8
diff --git a/dev-haskell/vector-space/vector-space-0.16.ebuild b/dev-haskell/vector-space/vector-space-0.16.ebuild
index 2e717470e936..c92770e4bb49 100644
--- a/dev-haskell/vector-space/vector-space-0.16.ebuild
+++ b/dev-haskell/vector-space/vector-space-0.16.ebuild
@@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Vector & affine spaces, linear maps, and derivatives"
-HOMEPAGE="http://hackage.haskell.org/package/vector-space"
+HOMEPAGE="https://hackage.haskell.org/package/vector-space"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-haskell/wxcore/Manifest b/dev-haskell/wxcore/Manifest
index ffb1ca6f00d1..d5097ece149d 100644
--- a/dev-haskell/wxcore/Manifest
+++ b/dev-haskell/wxcore/Manifest
@@ -1,3 +1,7 @@
+AUX wxcore-0.92.2.0-ghc-8.4.patch 182 BLAKE2B caf297ccf8d04e9f6751dbf47e6ef9a8dab77e50aedd8612640a477f234041815afc499da4194172e3806f721669fe272c0366c085671af2051e266f3b4e33cb SHA512 2989283b7ba0b700bb9be6f0b5648e0332b9900c36900740653da861a7a81328efcfdabb28d5d11000a5eb3d742c77fa3c3e866eba5f8afbb5b1bd8a5e18bee2
+AUX wxcore-0.92.3.0-cabal-3.patch 714 BLAKE2B fa8590e575386ed6e1efce2a5221693d497a1243f715acdbc99986c19272b5d9b6a8e49dbed94761c81a375890b42d4f44dc76ad8bb819ab7944954315dcc0bf SHA512 cb7ed7541dcff3c44cd5476a73cbe1c65d35bf8c2cd8ce9235edd6e04bafccce88183e18ff30d9f4963ae058278aa244431fe14dd528860d99be774d8feaa6e5
 DIST wxcore-0.92.2.0.tar.gz 400116 BLAKE2B c4d87792ad7a7fdf125ef68211f1efe89bff9d3114dc2dacb8f7b96a824fa359addb00c331e3d8fd6325cf90cf3c78448c500431ef18ac7d2989eedee952e17c SHA512 e1339ea30a699e22a9fc2f12b6ddcd773911e4d611f834886952bde4d76205c448e1702bab3148f4c370eec1cabeac06655b4cf3cbbfe24e2ea08a628906880a
+DIST wxcore-0.92.3.0.tar.gz 400300 BLAKE2B ce7ea6e2ec71935001d0b1fd347d5aa57de5d9f7cab9cf9fa87879c8dfd6291e76811899aeaccf8c227d54e6b0499ea5420dabac84014cbbf6373f8dd8a60f0f SHA512 199eb8afa9b568637c8d1fb2ab8b98a73d4ea9f03df088a855a88f17728997ed1044fb7c1c69d732530d7b24ae312e8dfc3f6ffc0396765d583531524d10a442
 EBUILD wxcore-0.92.2.0.ebuild 1005 BLAKE2B b2d127a6425ea425e6023a4ec4ef2fe3517684064ca1ae8036c34d49898aeee568722656f154a9c19a8893eee1807a2c47d85d827e409c70d71cac1117443b3f SHA512 be6543c3dda704e959d8f2bb1ed4820ea49dc1855a3cd991a728dc68b1a0ce6a14e1e1e28fe4c71c4c78c99d69d73efad34066afaea279a899a201633eac9c55
+EBUILD wxcore-0.92.3.0.ebuild 1204 BLAKE2B cf7e5c5516f6ed70a99fa5289f163c554952b82f64a5fffc94770d18a710d37c6994633b36c3b9d6b93a3e37f9ba13df40242a68e228e8612ee163d9832e044f SHA512 a6b3ad3bc03c96d6ceb6aaaf5dc9031c8d90f6be422fd6a855174c81bdd5f608c13fcdd8b6c14d6464b277292b0ff2127bb1ed30b70e6d2100617c2439c03df4
 MISC metadata.xml 552 BLAKE2B ee833f6c1a6469ecb6e1ae439a4b049fbd30af28f7a671f64687da3fbc4ac3ec5c0cba933364fd7f00933940d2462e107a62978f65fe6379dd587dac68f5c2a7 SHA512 2fc1a19d4fece7df270b76dc9aec6003f67f1a2a2adc7beb8999f9938762487fbda660734eddcbed33ae8472f748ba5079108d3806c844283696711ecd288f18
diff --git a/dev-haskell/wxcore/files/wxcore-0.92.2.0-ghc-8.4.patch b/dev-haskell/wxcore/files/wxcore-0.92.2.0-ghc-8.4.patch
new file mode 100644
index 000000000000..6c7c2c7e9ce5
--- /dev/null
+++ b/dev-haskell/wxcore/files/wxcore-0.92.2.0-ghc-8.4.patch
@@ -0,0 +1,5 @@
+--- a/src/haskell/Graphics/UI/WXCore/WxcTypes.hs
++++ b/src/haskell/Graphics/UI/WXCore/WxcTypes.hs
+@@ -125 +125 @@ import Data.Ix
+-import Foreign.C
++import Foreign.C hiding (CBool)
diff --git a/dev-haskell/wxcore/files/wxcore-0.92.3.0-cabal-3.patch b/dev-haskell/wxcore/files/wxcore-0.92.3.0-cabal-3.patch
new file mode 100644
index 000000000000..b93da91f7f43
--- /dev/null
+++ b/dev-haskell/wxcore/files/wxcore-0.92.3.0-cabal-3.patch
@@ -0,0 +1,11 @@
+--- a/Setup.hs
++++ b/Setup.hs
+@@ -7,7 +7,7 @@ import Data.List (foldl', intersperse, intercalate, nub, lookup, isPrefixOf, isI
+ import Data.Maybe (fromJust)
+ import Distribution.PackageDescription hiding (includeDirs)
+ import qualified Distribution.PackageDescription as PD (includeDirs)
+-import Distribution.InstalledPackageInfo(installedPackageId, sourcePackageId, includeDirs)
++import Distribution.InstalledPackageInfo({-installedPackageId,-} sourcePackageId, includeDirs)
+ import Distribution.Simple
+ import Distribution.Simple.LocalBuildInfo (LocalBuildInfo, localPkgDescr, installedPkgs, withPrograms, buildDir)
+ import Distribution.Simple.PackageIndex(SearchResult (..), searchByName, allPackages )
diff --git a/dev-haskell/wxcore/wxcore-0.92.3.0.ebuild b/dev-haskell/wxcore/wxcore-0.92.3.0.ebuild
new file mode 100644
index 000000000000..45fad5cbefe2
--- /dev/null
+++ b/dev-haskell/wxcore/wxcore-0.92.3.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+
+WX_GTK_VER="3.0"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal wxwidgets
+
+DESCRIPTION="wxHaskell core"
+HOMEPAGE="https://wiki.haskell.org/WxHaskell"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="wxWinLL-3.1"
+SLOT="${WX_GTK_VER}/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="gstreamer"
+
+RDEPEND="dev-haskell/parsec:=[profile?]
+	dev-haskell/stm:=[profile?]
+	>=dev-haskell/wxc-0.92:${WX_GTK_VER}=[profile?,gstreamer?]
+	>=dev-haskell/wxdirect-0.91:${WX_GTK_VER}=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	x11-libs/wxGTK:${WX_GTK_VER}=[X,gstreamer?,opengl]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.23
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.92.2.0-ghc-8.4.patch
+	"${FILESDIR}"/${PN}-0.92.3.0-cabal-3.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e "s@wxdirect@wxdirect-${WX_GTK_VER}@g" \
+		-i "${S}/Setup.hs" \
+		|| die "Could not change Setup.hs for wxdirect slot ${WX_GTK_VER}"
+
+	cabal_chdeps\
+		'containers >= 0.2 && < 0.6' 'containers >=0.2'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=splitbase
+}
diff --git a/dev-haskell/x11-xft/Manifest b/dev-haskell/x11-xft/Manifest
index b7135e9f2a68..a3f47ad912a9 100644
--- a/dev-haskell/x11-xft/Manifest
+++ b/dev-haskell/x11-xft/Manifest
@@ -1,4 +1,3 @@
 DIST X11-xft-0.3.1.tar.gz 13621 BLAKE2B a8b7f1d042e4cc10707a8d38b570cf4af8041b978afb75eddd8ce65c7ad20a4b13de384aab51a46d298ffc4be73912381d9c8cc1d8d987069259e1dfb163f7d6 SHA512 8f40db25453227ef9ce53b05a0c6af869e3a2efdb1d9b9ad683baf52601f320c85b09f0e514bb6ffeb17516d9b75c6772aa49613bb96272d56f06788118b7cfe
 EBUILD x11-xft-0.3.1-r1.ebuild 773 BLAKE2B ed66f549a57436db27492f035d82da286d9a1cf22eef2d0fa11c0badb0b1dd0af7960374387140ce68591fe825d2151557292d2d9a794ba1b3c0fe092ae08923 SHA512 4acbf13112519cb312368fc11d5a11fd0889f050bfc25916a3173a6800ddd18ef5c1a56a9b56e0ba249ffb745327c57c1c6e523fb67311bd0988354c410e8d85
-EBUILD x11-xft-0.3.1.ebuild 707 BLAKE2B b93732cb011a8f2bfb55076624dac4d423d8a7e628d1f8e3b627c5316ba78962a134f679e162ba43ac48a701d3b734653b1b4edd222e3b5727a0e62606256768 SHA512 6c5d8c1133dd628f8892b668ee343b6c81227bcd3133ad89875695d55d6e4c60c522b200494a908cf61edfbcda1431d9ec285cc42a24277e588ddbd968282f35
 MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/x11-xft/x11-xft-0.3.1.ebuild b/dev-haskell/x11-xft/x11-xft-0.3.1.ebuild
deleted file mode 100644
index 98b31928525e..000000000000
--- a/dev-haskell/x11-xft/x11-xft-0.3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
-
-MY_PN="X11-xft"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Bindings to the Xft, X Free Type interface library, and some Xrender parts"
-HOMEPAGE="https://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11-xft"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.6.1
-		 >=dev-haskell/utf8-string-0.1[profile?]
-		 >=dev-haskell/x11-1.2.1[profile?]
-		 x11-libs/libXft"
-
-DEPEND="${RDEPEND}
-		dev-haskell/cabal"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/x11/Manifest b/dev-haskell/x11/Manifest
index 63feff1ec39a..61cd468ba0c3 100644
--- a/dev-haskell/x11/Manifest
+++ b/dev-haskell/x11/Manifest
@@ -1,11 +1,4 @@
-AUX x11-1.8-no-LDFLAGS.patch 375 BLAKE2B ffaed9994a08f5e69354235cdc08d3c7a4156a22c4528e82a2c12e92bcc8d3451d5f30a619066f553cd4a96ebfe22f75fca1284ceb37bf33b8726e72d92dad1e SHA512 10637a22e5a49cbc570d60861ad6912c886355e99033d3a31ff874681e5bd00907d929b8bbac24372766f2bab36b9ac75aee3bc1e1c72a49366be73e566273b9
 AUX x11-1.9-no-LDFLAGS.patch 296 BLAKE2B 8ab586c978cbf6a224bd4edb65be6e19f7135ad5572c28fc732ab0e12b975840a08178cc8edead2589b6ea3b027c02967fbb013f6b95bc4a7d6fae85f7f508f5 SHA512 0937dda56fe2590c75bd3c1be5bfaaf87b9dfd4c960978143cc689f8e762c9a2f7ad056029c850e8fd52e367d75816866c8136635e1056da2101bed68a88bbc1
-DIST X11-1.6.1.1.tar.gz 188628 BLAKE2B 8ce533c89812c1b1e5babd1025773919518f021396d67bda3cc87b0ec61b241ebe27ca40ff4ae9fca9562a73263b71b64ceda098ff809a9a688230d5a71efcde SHA512 d5f58a7ab2450e145e890187e8dc7b43e286d2a95414a605e549cbf48568ef0d89f662870b2010eecba3b8fdd2a3a57214d33fc8775426e7e23ffad727b4e144
-DIST X11-1.6.1.2.tar.gz 188612 BLAKE2B f75e16010000fc28f899a008c547d6c7b3275f17eafface70f42cc9ef0542514090fccc42b69835df48f261b70f598e8484e99f563a41156b7613b555351292e SHA512 f8d01c806f59a20ad6d6632367b80ca972ebc2df9ba65fe23338d5fa1b933049c08609d25be690d87ba6dbe9cd1ba0f5a95e491c8abaca9eaec078ca03e0e01b
-DIST X11-1.8.tar.gz 191331 BLAKE2B a539da2bb0231c4749a948574b99e7fa4d30e21b94d1eaa81f1d9f79885b16d5fa60578db868cceb842e27e6b84fa6e3c7a7d1cb757d4df26dfaf2786fc2f4e6 SHA512 bb647bcc7504b3e4267d6a8a6ec73766fe62d7f5b3966bfa037742849c4a1128ea22608dd8353a6035aedc2046c53fae65c8b54f2933a4b896297159f5c2e59c
-DIST X11-1.9.1.tar.gz 190698 BLAKE2B ba8ee8f26b6e7cacb2334248d3609863277817b2c06d5eb7d8491ee2804691bcc49bb1588e3f2308acacebb739d9d7920507969729ef651e9b0600aa5acbc1f4 SHA512 6fc3c8b71681ba45d14c4b709c58760d7bfcb3e6363ef6c79e3d3ecce8f5a30bda877141cea9de73094fc00fa064d23d36f1f8fa61aa65f2d9d75acd1808eaa7
-EBUILD x11-1.6.1.1.ebuild 991 BLAKE2B ed00e9399463af29a3f185c6a120ba2c5f87595d7e11576525da4300d4ec61586a267f174b11b7877e19c56be8023ed16b00f53cbec59b7750d4d324a3d0bc22 SHA512 2f5381da1f645faa41ad7ea69ebdc1714c891766fe0bb5dcbd4f14d615c0e89befdb7c95158160f20eded435cba6259930d7dd2b1df406a0241f20308bb2894b
-EBUILD x11-1.6.1.2.ebuild 990 BLAKE2B 76e9a41954fbc4982c0b2634f658a7ba3d1aa1474f40a900c54b69f4206371974a4083704a2f2a0ce0c1f6cab8f229f515e9f8c55745d2de068d8c8f2737c049 SHA512 b5bb526380b38b61c2b93900e1b871468d549e916e2f0ac3b1f999b3ffaed39f9c1a5cfa4f9c9203da274c754975d7f4fd20d5b02ba388d3cca2d7ce7933fc1a
-EBUILD x11-1.8-r1.ebuild 1023 BLAKE2B c60019d21af4074509b60bc8ff5ed6ee419a1b2b0dd1aacb907b1a3d4800d687279146313ff08697790caf3572e8354c1bdd913ba01a0788700d5859c02ae050 SHA512 71397810ce81a0f5af351ab2e0bcde0f16af354f31793f67bf78797a23e54608bbba4dd0bb8ad52a99cf161bc7836b8b27dd7bae5a96d669f6c1d91156029c45
-EBUILD x11-1.9.1.ebuild 939 BLAKE2B 15156ef15ad16286035930913de0b1f9bc49cc020c24e5da947bcc11f2a820a1b226b5cc18fa08d099ef3dd73eea0f0967fb4bd03cfe1d2dc58b4a04b129bff1 SHA512 8d092ecaa8eb6902277624215ffa841aaae7d65e7a6e1fd4d5bc2d22b3c0e2364f8da1f7b737b04ae5c639649972838b8ee9171a0e6475f6b11bf114eaf5f0f7
-MISC metadata.xml 700 BLAKE2B 080b3aca0b33588e2b2f5b2f8d984564a6de2db86c97cf03b807a875089f30a33f246f4eac92cc91d7adea48cf63c7e07146682288a6df9d277738e999cbfe0d SHA512 73e5b575860e2f3540b0bda58b551a8688d4003451913326f4e55ec0adc35dbb42bef7da015ad00d12683be286b1b7ee611884479f618ffdfabccf3a9c0fb074
+DIST X11-1.9.2.tar.gz 190757 BLAKE2B cae5bd1e689bec914d612f59070ab5da3f604d33991ba885d83257337ca6d53089374e427f8bcfee2dd7504687b49b830ac98ab5947021c6c2d6e500123203ec SHA512 e9658c33b6dcbb6a42f1cc4a8976365506af94ddc15c32f73205b453934ef3232f3b383f8365b6aa6e69b51acfda4a0f3a8038f3164523b33781139a80582a41
+EBUILD x11-1.9.2.ebuild 941 BLAKE2B 82064b0310daa30aa54e6c285de9999bcf0588f77ca3269c63f022932bb3e349e66258da90e4d816cadd17d36a676e04c38ed15a96ef1a05f4239c7fcdcc4375 SHA512 69273118f44da0a00ff34bdc73da22f1ad274243e8f568fbce5afdb877bd61e24e554a942d31d39d98917e135782b7aefdb5598ba7b367ccb909baf7980cfc91
+MISC metadata.xml 543 BLAKE2B d29d4081691780e98aa55b3f5316e43ac844a8a6fbba6915874d6ab9091fa88773dcac66e880c79939176eb7922ac22c2caeea4e4a3979b4b6dfaca0b23b3ee1 SHA512 50d4070a3804970ed1fb8e050935d5f331fc960dc8c8a0fcc9ecf0349cd93f059237dfccfd02d29f8197368f3af9fd02af8dcc207cc99a1cfc1720f779143968
diff --git a/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch b/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch
deleted file mode 100644
index f1d5c179036e..000000000000
--- a/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Don't persist LDFLAGS into package database.
-
-https://bugs.gentoo.org/609624
-diff --git a/X11.buildinfo.in b/X11.buildinfo.in
-index 6925939..6a18b58 100644
---- a/X11.buildinfo.in
-+++ b/X11.buildinfo.in
-@@ -5,3 +5,3 @@ buildable: @BUILD_PACKAGE_BOOL@
- cc-options: @X_CFLAGS@ @CPPFLAGS@
--ld-options: @X_LIBS@ @LDFLAGS@
-+ld-options: @X_LIBS@
- extra-libraries: @EXTRA_LIBRARIES@
diff --git a/dev-haskell/x11/metadata.xml b/dev-haskell/x11/metadata.xml
index 4c6b85a81825..e9eac3ea9674 100644
--- a/dev-haskell/x11/metadata.xml
+++ b/dev-haskell/x11/metadata.xml
@@ -6,15 +6,9 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<longdescription>
-		A Haskell binding to the X11 graphics library.
-		The binding is a direct translation of the C binding; for
-		documentation of these calls, refer to "The Xlib Programming
-		Manual", available online at &lt;http://tronche.com/gui/x/xlib/&gt;.
+		A Haskell binding to the X11 graphics library. The binding is a direct
+		translation of the C binding; for documentation of these calls, refer
+		to \&quot;The Xlib Programming Manual\&quot;, available online at
+		&lt;http://tronche.com/gui/x/xlib/&gt;.
 	</longdescription>
-	<use>
-		<flag name="screensaver">whether to build XScreenSaver.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">haskell-pkg-janitors/X11</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/x11/x11-1.6.1.1.ebuild b/dev-haskell/x11/x11-1.6.1.1.ebuild
deleted file mode 100644
index 248061d60543..000000000000
--- a/dev-haskell/x11/x11-1.6.1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="X11"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the X11 graphics library"
-HOMEPAGE="https://github.com/haskell-pkg-janitors/X11"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+screensaver +xinerama"
-
-RDEPEND="dev-haskell/data-default:=[profile?]
-		>=dev-lang/ghc-7.4.1:=
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-		screensaver? ( x11-libs/libXScrnSaver )
-		xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--configure-option=$(use_with xinerama) \
-		--configure-option=$(use_with screensaver xscreensaver)
-}
diff --git a/dev-haskell/x11/x11-1.6.1.2.ebuild b/dev-haskell/x11/x11-1.6.1.2.ebuild
deleted file mode 100644
index 5c8d1e671cee..000000000000
--- a/dev-haskell/x11/x11-1.6.1.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="X11"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the X11 graphics library"
-HOMEPAGE="https://github.com/haskell-pkg-janitors/X11"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+screensaver +xinerama"
-
-RDEPEND="dev-haskell/data-default:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-		screensaver? ( x11-libs/libXScrnSaver )
-		xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--configure-option=$(use_with xinerama) \
-		--configure-option=$(use_with screensaver xscreensaver)
-}
diff --git a/dev-haskell/x11/x11-1.8-r1.ebuild b/dev-haskell/x11/x11-1.8-r1.ebuild
deleted file mode 100644
index 9f9524f235d7..000000000000
--- a/dev-haskell/x11/x11-1.8-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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"
-inherit haskell-cabal
-
-MY_PN="X11"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the X11 graphics library"
-HOMEPAGE="https://github.com/xmonad/X11"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+screensaver +xinerama"
-
-RDEPEND="dev-haskell/data-default:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	screensaver? ( x11-libs/libXScrnSaver )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-PATCHES=("${FILESDIR}"/${P}-no-LDFLAGS.patch)
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--configure-option=$(use_with xinerama) \
-		--configure-option=$(use_with screensaver xscreensaver)
-}
diff --git a/dev-haskell/x11/x11-1.9.1.ebuild b/dev-haskell/x11/x11-1.9.2.ebuild
index 6f5d9102b177..9c2823eba68f 100644
--- a/dev-haskell/x11/x11-1.9.1.ebuild
+++ b/dev-haskell/x11/x11-1.9.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
diff --git a/dev-haskell/zlib/Manifest b/dev-haskell/zlib/Manifest
index 0277381c136b..5ad872a4ee2b 100644
--- a/dev-haskell/zlib/Manifest
+++ b/dev-haskell/zlib/Manifest
@@ -1,4 +1,3 @@
-AUX zlib-0.6.1.2-fix-w8-tests.patch 1138 BLAKE2B 4a819faaca83aea0a6d338924907c8a02fe7d8b04a5ad57bc983e1a93cde3183c080883b97e49355a022e80dfa2f289b4cf11cc5e3e625d25b25ff7c0b6426bf SHA512 bd2f510dc6516668c130edd969d7002d178331a0d09e1e0cca9d899ff8164810f9875c652ab25cd331322ac5d369162a9c45a106b0ad9173f844bbc8f1e96bdc
 DIST zlib-0.5.4.2.tar.gz 127818 BLAKE2B 899a0edf39b9830d5223c05dce0d6e4a7884ac12b918bc54bdd820fb77c3701acde768179a1f1b1a88330c9c5ab46433eab0420744994013e9adbbe72fe451ff SHA512 9ee75d04bea192967dcc9f59f500a199c605ed6b18b7883e2876e1b3116929ef62ccff9cb7174a2d72b567241c3fc2eb794b3532831b929bd5f5a6236bc03410
 DIST zlib-0.6.2.2.tar.gz 148178 BLAKE2B 8de5626a20f4ee2ea0dada54bdddc2340e3c3eba225ac5421a99bee9056aa6aecfd74f609745c4bc238e5cee056e6e463f0851ef7a6d5b0ec3312026f677d912 SHA512 3619b5c32e16a4fb9a68a9e6ea0beb9b14d06a4b5825811f429ee232a0ea13035335cd86c0301f8afcff126a473b86698fd310f9608e0e0ecb849714842be1ea
 EBUILD zlib-0.5.4.2.ebuild 599 BLAKE2B fb1bfb8a36a3662fb2d5650dbf3bc357f2d0a60f415615e1e667d264d2815eb3bf1ef7149e359424882523e9f660b5477d94a79ea01d62c813e3c9591a86a9bf SHA512 3a3542806f53bfc14a0e962fff5e939680eb172029ee2fb95df44b06e34ad23e9339e551ce52bc06919b3c05c0dcfe1c3cae78cb7c442f6d43be035767603c40
diff --git a/dev-haskell/zlib/files/zlib-0.6.1.2-fix-w8-tests.patch b/dev-haskell/zlib/files/zlib-0.6.1.2-fix-w8-tests.patch
deleted file mode 100644
index 5b4cb5a6eca2..000000000000
--- a/dev-haskell/zlib/files/zlib-0.6.1.2-fix-w8-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-zlib does not really support windows size of 8 bits:
-
-Reported by eroen
-
-https://github.com/haskell/zlib/issues/11
-https://bugs.gentoo.org/show_bug.cgi?id=613532
-diff --git a/test/Test.hs b/test/Test.hs
-index bbd8b94..81bd260 100644
---- a/test/Test.hs
-+++ b/test/Test.hs
-@@ -66,2 +66,3 @@ prop_decompress_after_compress w cp dp =
-    -- of the zlib source code.
-+   compressWindowBits cp /= WindowBits 8 &&
-    (decompressWindowBits dp > compressWindowBits cp || decompressWindowBits dp > WindowBits 8) &&
-@@ -76,2 +77,3 @@ prop_gziporzlib1 cp dp =
-    decompressWindowBits dp > compressWindowBits cp &&
-+   compressWindowBits cp /= WindowBits 8 &&
-    decompressBufferSize dp > 0 && compressBufferSize cp > 0 ==>
-@@ -85,2 +87,3 @@ prop_gziporzlib2 cp dp =
-    decompressWindowBits dp >= compressWindowBits cp &&
-+   compressWindowBits cp /= WindowBits 8 &&
-    decompressBufferSize dp > 0 && compressBufferSize cp > 0 ==>
-@@ -94,2 +97,3 @@ prop_gzip_concat cp dp input =
-    decompressWindowBits dp >= compressWindowBits cp &&
-+   compressWindowBits cp /= WindowBits 8 &&
-    decompressBufferSize dp > 0 && compressBufferSize cp > 0 ==>
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-02 14:09:07 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-02 14:09:07 +0100
commit	b17a3ef12038de50228bade1f05502c74e135321 (patch)
tree	9026dffec53f92cba48ca9a500a4f778e6304380 /dev-haskell
parent	3cf7c3ef441822c889356fd1812ebf2944a59851 (diff)